# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1521802762 -3600
# Node ID e9c7a78a3e77f9596c82c3a5cf48dbb51ae2eaff
# Parent  03afbee0cc7b61d12cfc215f220634b499b11495
removed absolute paths

diff -r 03afbee0cc7b -r e9c7a78a3e77 Applications/IBasicApplication.cpp
--- a/Applications/IBasicApplication.cpp	Fri Mar 23 11:04:03 2018 +0100
+++ b/Applications/IBasicApplication.cpp	Fri Mar 23 11:59:22 2018 +0100
@@ -24,9 +24,9 @@
 #include "../Framework/Toolbox/MessagingToolbox.h"
 #include "Sdl/SdlEngine.h"
 
-#include <Core/Logging.h>
-#include <Core/HttpClient.h>
-#include <Plugins/Samples/Common/OrthancHttpConnection.h>
+#include "../Resources/Orthanc/Core/Logging.h"
+#include "../Resources/Orthanc/Core/HttpClient.h"
+#include "../Resources/Orthanc/Plugins/Samples/Common/OrthancHttpConnection.h"
 
 namespace OrthancStone
 {
diff -r 03afbee0cc7b -r e9c7a78a3e77 Applications/Samples/SingleFrameApplication.h
--- a/Applications/Samples/SingleFrameApplication.h	Fri Mar 23 11:04:03 2018 +0100
+++ b/Applications/Samples/SingleFrameApplication.h	Fri Mar 23 11:59:22 2018 +0100
@@ -26,7 +26,7 @@
 #include "../../Framework/Layers/OrthancFrameLayerSource.h"
 #include "../../Framework/Widgets/LayerWidget.h"
 
-#include <Core/Logging.h>
+#include "../../Resources/Orthanc/Core/Logging.h"
 
 namespace OrthancStone
 {
diff -r 03afbee0cc7b -r e9c7a78a3e77 Applications/Samples/SingleVolumeApplication.h
--- a/Applications/Samples/SingleVolumeApplication.h	Fri Mar 23 11:04:03 2018 +0100
+++ b/Applications/Samples/SingleVolumeApplication.h	Fri Mar 23 11:59:22 2018 +0100
@@ -27,10 +27,10 @@
 #include "../../Framework/Layers/LineMeasureTracker.h"
 #include "../../Framework/Layers/CircleMeasureTracker.h"
 
-#include <Core/Toolbox.h>
-#include <Core/Logging.h>
+#include "../../Resources/Orthanc/Core/Toolbox.h"
+#include "../../Resources/Orthanc/Core/Logging.h"
 
-#include <Plugins/Samples/Common/OrthancHttpConnection.h>   // TODO REMOVE
+#include "../../Resources/Orthanc/Plugins/Samples/Common/OrthancHttpConnection.h"   // TODO REMOVE
 #include "../../Framework/Layers/DicomStructureSetRendererFactory.h"   // TODO REMOVE
 #include "../../Framework/Toolbox/MessagingToolbox.h"   // TODO REMOVE
 
diff -r 03afbee0cc7b -r e9c7a78a3e77 Applications/Sdl/SdlEngine.cpp
--- a/Applications/Sdl/SdlEngine.cpp	Fri Mar 23 11:04:03 2018 +0100
+++ b/Applications/Sdl/SdlEngine.cpp	Fri Mar 23 11:59:22 2018 +0100
@@ -23,7 +23,8 @@
 
 #if ORTHANC_ENABLE_SDL == 1
 
-#include <Core/Logging.h>
+#include "../../Resources/Orthanc/Core/Logging.h"
+
 #include <SDL.h>
 
 namespace OrthancStone
diff -r 03afbee0cc7b -r e9c7a78a3e77 Applications/Sdl/SdlSurface.cpp
--- a/Applications/Sdl/SdlSurface.cpp	Fri Mar 23 11:04:03 2018 +0100
+++ b/Applications/Sdl/SdlSurface.cpp	Fri Mar 23 11:59:22 2018 +0100
@@ -23,8 +23,8 @@
 
 #if ORTHANC_ENABLE_SDL == 1
 
-#include <Core/Logging.h>
-#include <Core/OrthancException.h>
+#include "../../Resources/Orthanc/Core/Logging.h"
+#include "../../Resources/Orthanc/Core/OrthancException.h"
 
 namespace OrthancStone
 {
diff -r 03afbee0cc7b -r e9c7a78a3e77 Applications/Sdl/SdlWindow.cpp
--- a/Applications/Sdl/SdlWindow.cpp	Fri Mar 23 11:04:03 2018 +0100
+++ b/Applications/Sdl/SdlWindow.cpp	Fri Mar 23 11:59:22 2018 +0100
@@ -23,8 +23,8 @@
 
 #if ORTHANC_ENABLE_SDL == 1
 
-#include <Core/Logging.h>
-#include <Core/OrthancException.h>
+#include "../../Resources/Orthanc/Core/Logging.h"
+#include "../../Resources/Orthanc/Core/OrthancException.h"
 
 namespace OrthancStone
 {
diff -r 03afbee0cc7b -r e9c7a78a3e77 Framework/Layers/ColorFrameRenderer.cpp
--- a/Framework/Layers/ColorFrameRenderer.cpp	Fri Mar 23 11:04:03 2018 +0100
+++ b/Framework/Layers/ColorFrameRenderer.cpp	Fri Mar 23 11:59:22 2018 +0100
@@ -21,8 +21,8 @@
 
 #include "ColorFrameRenderer.h"
 
-#include <Core/OrthancException.h>
-#include <Core/Images/ImageProcessing.h>
+#include "../../Resources/Orthanc/Core/OrthancException.h"
+#include "../../Resources/Orthanc/Core/Images/ImageProcessing.h"
 
 namespace OrthancStone
 {
diff -r 03afbee0cc7b -r e9c7a78a3e77 Framework/Layers/FrameRenderer.cpp
--- a/Framework/Layers/FrameRenderer.cpp	Fri Mar 23 11:04:03 2018 +0100
+++ b/Framework/Layers/FrameRenderer.cpp	Fri Mar 23 11:59:22 2018 +0100
@@ -24,7 +24,7 @@
 #include "GrayscaleFrameRenderer.h"
 #include "ColorFrameRenderer.h"
 
-#include <Core/OrthancException.h>
+#include "../../Resources/Orthanc/Core/OrthancException.h"
 
 namespace OrthancStone
 {
diff -r 03afbee0cc7b -r e9c7a78a3e77 Framework/Layers/GrayscaleFrameRenderer.cpp
--- a/Framework/Layers/GrayscaleFrameRenderer.cpp	Fri Mar 23 11:04:03 2018 +0100
+++ b/Framework/Layers/GrayscaleFrameRenderer.cpp	Fri Mar 23 11:59:22 2018 +0100
@@ -21,7 +21,7 @@
 
 #include "GrayscaleFrameRenderer.h"
 
-#include <Core/OrthancException.h>
+#include "../../Resources/Orthanc/Core/OrthancException.h"
 
 namespace OrthancStone
 {
diff -r 03afbee0cc7b -r e9c7a78a3e77 Framework/Layers/LayerSourceBase.cpp
--- a/Framework/Layers/LayerSourceBase.cpp	Fri Mar 23 11:04:03 2018 +0100
+++ b/Framework/Layers/LayerSourceBase.cpp	Fri Mar 23 11:59:22 2018 +0100
@@ -21,7 +21,7 @@
 
 #include "LayerSourceBase.h"
 
-#include <Core/OrthancException.h>
+#include "../../Resources/Orthanc/Core/OrthancException.h"
 
 namespace OrthancStone
 {
diff -r 03afbee0cc7b -r e9c7a78a3e77 Framework/Layers/OrthancFrameLayerSource.cpp
--- a/Framework/Layers/OrthancFrameLayerSource.cpp	Fri Mar 23 11:04:03 2018 +0100
+++ b/Framework/Layers/OrthancFrameLayerSource.cpp	Fri Mar 23 11:59:22 2018 +0100
@@ -24,8 +24,8 @@
 #include "FrameRenderer.h"
 #include "../Toolbox/DicomFrameConverter.h"
 
-#include <Core/Logging.h>
-#include <Core/OrthancException.h>
+#include "../../Resources/Orthanc/Core/Logging.h"
+#include "../../Resources/Orthanc/Core/OrthancException.h"
 
 #include <boost/lexical_cast.hpp>
 
diff -r 03afbee0cc7b -r e9c7a78a3e77 Framework/Layers/RenderStyle.cpp
--- a/Framework/Layers/RenderStyle.cpp	Fri Mar 23 11:04:03 2018 +0100
+++ b/Framework/Layers/RenderStyle.cpp	Fri Mar 23 11:59:22 2018 +0100
@@ -21,7 +21,7 @@
 
 #include "RenderStyle.h"
 
-#include <Core/OrthancException.h>
+#include "../../Resources/Orthanc/Core/OrthancException.h"
 
 namespace OrthancStone
 {
diff -r 03afbee0cc7b -r e9c7a78a3e77 Framework/Layers/SeriesFrameRendererFactory.cpp
--- a/Framework/Layers/SeriesFrameRendererFactory.cpp	Fri Mar 23 11:04:03 2018 +0100
+++ b/Framework/Layers/SeriesFrameRendererFactory.cpp	Fri Mar 23 11:59:22 2018 +0100
@@ -23,9 +23,9 @@
 
 #include "FrameRenderer.h"
 
-#include <Core/OrthancException.h>
-#include <Core/Logging.h>
-#include <Core/Toolbox.h>
+#include "../../Resources/Orthanc/OrthancException.h"
+#include "../../Resources/Orthanc/Logging.h"
+#include "../../Resources/Orthanc/Toolbox.h"
 #include <Plugins/Samples/Common/OrthancPluginException.h>
 #include <Plugins/Samples/Common/DicomDatasetReader.h>
 
diff -r 03afbee0cc7b -r e9c7a78a3e77 Framework/Layers/SingleFrameRendererFactory.cpp
--- a/Framework/Layers/SingleFrameRendererFactory.cpp	Fri Mar 23 11:04:03 2018 +0100
+++ b/Framework/Layers/SingleFrameRendererFactory.cpp	Fri Mar 23 11:59:22 2018 +0100
@@ -25,7 +25,7 @@
 #include "../Toolbox/MessagingToolbox.h"
 #include "../Toolbox/DicomFrameConverter.h"
 
-#include <Core/OrthancException.h>
+#include "../../Resources/Orthanc/OrthancException.h"
 #include <Plugins/Samples/Common/FullOrthancDataset.h>
 #include <Plugins/Samples/Common/DicomDatasetReader.h>
 
diff -r 03afbee0cc7b -r e9c7a78a3e77 Framework/StoneEnumerations.cpp
--- a/Framework/StoneEnumerations.cpp	Fri Mar 23 11:04:03 2018 +0100
+++ b/Framework/StoneEnumerations.cpp	Fri Mar 23 11:59:22 2018 +0100
@@ -21,9 +21,9 @@
 
 #include "StoneEnumerations.h"
 
-#include <Core/Logging.h>
-#include <Core/OrthancException.h>
-#include <Core/Toolbox.h>
+#include "../Resources/Orthanc/Core/Logging.h"
+#include "../Resources/Orthanc/Core/OrthancException.h"
+#include "../Resources/Orthanc/Core/Toolbox.h"
 
 namespace OrthancStone
 {  
diff -r 03afbee0cc7b -r e9c7a78a3e77 Framework/Toolbox/CoordinateSystem3D.cpp
--- a/Framework/Toolbox/CoordinateSystem3D.cpp	Fri Mar 23 11:04:03 2018 +0100
+++ b/Framework/Toolbox/CoordinateSystem3D.cpp	Fri Mar 23 11:59:22 2018 +0100
@@ -24,9 +24,9 @@
 #include "LinearAlgebra.h"
 #include "GeometryToolbox.h"
 
-#include <Core/Logging.h>
-#include <Core/Toolbox.h>
-#include <Core/OrthancException.h>
+#include "../../Resources/Orthanc/Core/Logging.h"
+#include "../../Resources/Orthanc/Core/Toolbox.h"
+#include "../../Resources/Orthanc/Core/OrthancException.h"
 
 namespace OrthancStone
 {
diff -r 03afbee0cc7b -r e9c7a78a3e77 Framework/Toolbox/CoordinateSystem3D.h
--- a/Framework/Toolbox/CoordinateSystem3D.h	Fri Mar 23 11:04:03 2018 +0100
+++ b/Framework/Toolbox/CoordinateSystem3D.h	Fri Mar 23 11:59:22 2018 +0100
@@ -23,7 +23,7 @@
 
 #include "LinearAlgebra.h"
 
-#include <Plugins/Samples/Common/IDicomDataset.h>
+#include "../../Resources/Orthanc/Plugins/Samples/Common/IDicomDataset.h"
 
 namespace OrthancStone
 {
diff -r 03afbee0cc7b -r e9c7a78a3e77 Framework/Toolbox/DicomFrameConverter.cpp
--- a/Framework/Toolbox/DicomFrameConverter.cpp	Fri Mar 23 11:04:03 2018 +0100
+++ b/Framework/Toolbox/DicomFrameConverter.cpp	Fri Mar 23 11:59:22 2018 +0100
@@ -23,10 +23,10 @@
 
 #include "LinearAlgebra.h"
 
-#include <Core/Images/Image.h>
-#include <Core/Images/ImageProcessing.h>
-#include <Core/OrthancException.h>
-#include <Core/Toolbox.h>
+#include "../../Resources/Orthanc/Core/Images/Image.h"
+#include "../../Resources/Orthanc/Core/Images/ImageProcessing.h"
+#include "../../Resources/Orthanc/Core/OrthancException.h"
+#include "../../Resources/Orthanc/Core/Toolbox.h"
 
 namespace OrthancStone
 {
diff -r 03afbee0cc7b -r e9c7a78a3e77 Framework/Toolbox/DicomFrameConverter.h
--- a/Framework/Toolbox/DicomFrameConverter.h	Fri Mar 23 11:04:03 2018 +0100
+++ b/Framework/Toolbox/DicomFrameConverter.h	Fri Mar 23 11:59:22 2018 +0100
@@ -21,8 +21,8 @@
 
 #pragma once
 
-#include <Core/DicomFormat/DicomMap.h>
-#include <Core/Images/ImageAccessor.h>
+#include "../../Resources/Orthanc/Core/DicomFormat/DicomMap.h"
+#include "../../Resources/Orthanc/Core/Images/ImageAccessor.h"
 
 #include <memory>
 
diff -r 03afbee0cc7b -r e9c7a78a3e77 Framework/Toolbox/DicomStructureSet.cpp
--- a/Framework/Toolbox/DicomStructureSet.cpp	Fri Mar 23 11:04:03 2018 +0100
+++ b/Framework/Toolbox/DicomStructureSet.cpp	Fri Mar 23 11:59:22 2018 +0100
@@ -24,10 +24,10 @@
 #include "../Toolbox/GeometryToolbox.h"
 #include "../Toolbox/MessagingToolbox.h"
 
-#include <Core/Logging.h>
-#include <Core/OrthancException.h>
-#include <Plugins/Samples/Common/FullOrthancDataset.h>
-#include <Plugins/Samples/Common/DicomDatasetReader.h>
+#include "../../Resources/Orthanc/Core/Logging.h"
+#include "../../Resources/Orthanc/Core/OrthancException.h"
+#include "../../Resources/Orthanc/Plugins/Samples/Common/FullOrthancDataset.h"
+#include "../../Resources/Orthanc/Plugins/Samples/Common/DicomDatasetReader.h"
 
 #include <limits>
 #include <stdio.h>
diff -r 03afbee0cc7b -r e9c7a78a3e77 Framework/Toolbox/DicomStructureSet.h
--- a/Framework/Toolbox/DicomStructureSet.h	Fri Mar 23 11:04:03 2018 +0100
+++ b/Framework/Toolbox/DicomStructureSet.h	Fri Mar 23 11:59:22 2018 +0100
@@ -24,7 +24,8 @@
 #include "CoordinateSystem3D.h"
 #include "Extent2D.h"
 
-#include <Plugins/Samples/Common/FullOrthancDataset.h>
+#include "../../Resources/Orthanc/Plugins/Samples/Common/FullOrthancDataset.h"
+
 #include <list>
 
 namespace OrthancStone
diff -r 03afbee0cc7b -r e9c7a78a3e77 Framework/Toolbox/DownloadStack.cpp
--- a/Framework/Toolbox/DownloadStack.cpp	Fri Mar 23 11:04:03 2018 +0100
+++ b/Framework/Toolbox/DownloadStack.cpp	Fri Mar 23 11:59:22 2018 +0100
@@ -21,7 +21,7 @@
 
 #include "DownloadStack.h"
 
-#include <Core/OrthancException.h>
+#include "../../Resources/Orthanc/Core/OrthancException.h"
 
 #include <cassert>
 
diff -r 03afbee0cc7b -r e9c7a78a3e77 Framework/Toolbox/FiniteProjectiveCamera.cpp
--- a/Framework/Toolbox/FiniteProjectiveCamera.cpp	Fri Mar 23 11:04:03 2018 +0100
+++ b/Framework/Toolbox/FiniteProjectiveCamera.cpp	Fri Mar 23 11:59:22 2018 +0100
@@ -24,10 +24,10 @@
 #include "GeometryToolbox.h"
 #include "SubpixelReader.h"
 
-#include <Core/Logging.h>
-#include <Core/OrthancException.h>
-#include <Core/Images/Image.h>
-#include <Core/Images/ImageProcessing.h>
+#include "../../Resources/Orthanc/Core/Logging.h"
+#include "../../Resources/Orthanc/Core/OrthancException.h"
+#include "../../Resources/Orthanc/Core/Images/Image.h"
+#include "../../Resources/Orthanc/Core/Images/ImageProcessing.h"
 
 namespace OrthancStone
 {
diff -r 03afbee0cc7b -r e9c7a78a3e77 Framework/Toolbox/GeometryToolbox.cpp
--- a/Framework/Toolbox/GeometryToolbox.cpp	Fri Mar 23 11:04:03 2018 +0100
+++ b/Framework/Toolbox/GeometryToolbox.cpp	Fri Mar 23 11:59:22 2018 +0100
@@ -21,8 +21,8 @@
 
 #include "GeometryToolbox.h"
 
-#include <Core/Logging.h>
-#include <Core/OrthancException.h>
+#include "../../Resources/Orthanc/Core/Logging.h"
+#include "../../Resources/Orthanc/Core/OrthancException.h"
 
 #include <cassert>
 
diff -r 03afbee0cc7b -r e9c7a78a3e77 Framework/Toolbox/ISeriesLoader.h
--- a/Framework/Toolbox/ISeriesLoader.h	Fri Mar 23 11:04:03 2018 +0100
+++ b/Framework/Toolbox/ISeriesLoader.h	Fri Mar 23 11:59:22 2018 +0100
@@ -23,8 +23,8 @@
 
 #include "ParallelSlices.h"
 
-#include <Core/Images/ImageAccessor.h>
-#include <Plugins/Samples/Common/IDicomDataset.h>
+#include "../../Resources/Orthanc/Images/ImageAccessor.h"
+#include "../../Resources/Orthanc/Plugins/Samples/Common/IDicomDataset.h"
 
 namespace OrthancStone
 {
diff -r 03afbee0cc7b -r e9c7a78a3e77 Framework/Toolbox/IWebService.h
--- a/Framework/Toolbox/IWebService.h	Fri Mar 23 11:04:03 2018 +0100
+++ b/Framework/Toolbox/IWebService.h	Fri Mar 23 11:59:22 2018 +0100
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include <Core/IDynamicObject.h>
+#include "../../Resources/Orthanc/Core/IDynamicObject.h"
 
 #include <string>
 
diff -r 03afbee0cc7b -r e9c7a78a3e77 Framework/Toolbox/ImageGeometry.cpp
--- a/Framework/Toolbox/ImageGeometry.cpp	Fri Mar 23 11:04:03 2018 +0100
+++ b/Framework/Toolbox/ImageGeometry.cpp	Fri Mar 23 11:59:22 2018 +0100
@@ -24,8 +24,8 @@
 #include "Extent2D.h"
 #include "SubpixelReader.h"
 
-#include <Core/Images/ImageProcessing.h>
-#include <Core/Logging.h>
+#include "../../Resources/Orthanc/Core/Images/ImageProcessing.h"
+#include "../../Resources/Orthanc/Core/Logging.h"
 
 
 namespace OrthancStone
diff -r 03afbee0cc7b -r e9c7a78a3e77 Framework/Toolbox/ImageGeometry.h
--- a/Framework/Toolbox/ImageGeometry.h	Fri Mar 23 11:04:03 2018 +0100
+++ b/Framework/Toolbox/ImageGeometry.h	Fri Mar 23 11:59:22 2018 +0100
@@ -24,7 +24,7 @@
 #include "../StoneEnumerations.h"
 #include "LinearAlgebra.h"
 
-#include <Core/Images/ImageAccessor.h>
+#include "../../Resources/Orthanc/Core/Images/ImageAccessor.h"
 
 
 namespace OrthancStone
diff -r 03afbee0cc7b -r e9c7a78a3e77 Framework/Toolbox/LinearAlgebra.cpp
--- a/Framework/Toolbox/LinearAlgebra.cpp	Fri Mar 23 11:04:03 2018 +0100
+++ b/Framework/Toolbox/LinearAlgebra.cpp	Fri Mar 23 11:59:22 2018 +0100
@@ -21,9 +21,9 @@
 
 #include "LinearAlgebra.h"
 
-#include <Core/Logging.h>
-#include <Core/OrthancException.h>
-#include <Core/Toolbox.h>
+#include "../../Resources/Orthanc/Core/Logging.h"
+#include "../../Resources/Orthanc/Core/OrthancException.h"
+#include "../../Resources/Orthanc/Core/Toolbox.h"
 
 #include <stdio.h>
 #include <boost/lexical_cast.hpp>
diff -r 03afbee0cc7b -r e9c7a78a3e77 Framework/Toolbox/LinearAlgebra.h
--- a/Framework/Toolbox/LinearAlgebra.h	Fri Mar 23 11:04:03 2018 +0100
+++ b/Framework/Toolbox/LinearAlgebra.h	Fri Mar 23 11:59:22 2018 +0100
@@ -28,7 +28,7 @@
 #  include <boost/serialization/array_wrapper.hpp>
 #endif
 
-#include <Core/DicomFormat/DicomMap.h>
+#include "../../Resources/Orthanc/Core/DicomFormat/DicomMap.h"
 
 #include <boost/numeric/ublas/matrix.hpp>
 #include <boost/numeric/ublas/vector.hpp>
diff -r 03afbee0cc7b -r e9c7a78a3e77 Framework/Toolbox/MessagingToolbox.cpp
--- a/Framework/Toolbox/MessagingToolbox.cpp	Fri Mar 23 11:04:03 2018 +0100
+++ b/Framework/Toolbox/MessagingToolbox.cpp	Fri Mar 23 11:59:22 2018 +0100
@@ -21,13 +21,13 @@
 
 #include "MessagingToolbox.h"
 
-#include <Core/Images/Image.h>
-#include <Core/Images/ImageProcessing.h>
-#include <Core/Images/JpegReader.h>
-#include <Core/Images/PngReader.h>
-#include <Core/OrthancException.h>
-#include <Core/Toolbox.h>
-#include <Core/Logging.h>
+#include "../../Resources/Orthanc/Core/Images/Image.h"
+#include "../../Resources/Orthanc/Core/Images/ImageProcessing.h"
+#include "../../Resources/Orthanc/Core/Images/JpegReader.h"
+#include "../../Resources/Orthanc/Core/Images/PngReader.h"
+#include "../../Resources/Orthanc/Core/OrthancException.h"
+#include "../../Resources/Orthanc/Core/Toolbox.h"
+#include "../../Resources/Orthanc/Core/Logging.h"
 
 #include <boost/lexical_cast.hpp>
 #include <json/reader.h>
diff -r 03afbee0cc7b -r e9c7a78a3e77 Framework/Toolbox/MessagingToolbox.h
--- a/Framework/Toolbox/MessagingToolbox.h	Fri Mar 23 11:04:03 2018 +0100
+++ b/Framework/Toolbox/MessagingToolbox.h	Fri Mar 23 11:59:22 2018 +0100
@@ -23,10 +23,10 @@
 
 #include "../StoneEnumerations.h"
 
-#include <Plugins/Samples/Common/IOrthancConnection.h>
-#include <Plugins/Samples/Common/IDicomDataset.h>
-#include <Core/Images/ImageAccessor.h>
-#include <Core/DicomFormat/DicomMap.h>
+#include "../../Resources/Orthanc/Core/DicomFormat/DicomMap.h"
+#include "../../Resources/Orthanc/Core/Images/ImageAccessor.h"
+#include "../../Resources/Orthanc/Plugins/Samples/Common/IDicomDataset.h"
+#include "../../Resources/Orthanc/Plugins/Samples/Common/IOrthancConnection.h"
 
 #include <json/value.h>
 
diff -r 03afbee0cc7b -r e9c7a78a3e77 Framework/Toolbox/ObserversRegistry.h
--- a/Framework/Toolbox/ObserversRegistry.h	Fri Mar 23 11:04:03 2018 +0100
+++ b/Framework/Toolbox/ObserversRegistry.h	Fri Mar 23 11:59:22 2018 +0100
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include <Core/OrthancException.h>
+#include "../../Resources/Orthanc/Core/OrthancException.h"
 
 #include <boost/noncopyable.hpp>
 #include <set>
diff -r 03afbee0cc7b -r e9c7a78a3e77 Framework/Toolbox/OrientedBoundingBox.cpp
--- a/Framework/Toolbox/OrientedBoundingBox.cpp	Fri Mar 23 11:04:03 2018 +0100
+++ b/Framework/Toolbox/OrientedBoundingBox.cpp	Fri Mar 23 11:59:22 2018 +0100
@@ -23,7 +23,7 @@
 
 #include "GeometryToolbox.h"
 
-#include <Core/OrthancException.h>
+#include "../../Resources/Orthanc/Core/OrthancException.h"
 
 #include <cassert>
 
diff -r 03afbee0cc7b -r e9c7a78a3e77 Framework/Toolbox/OrthancSlicesLoader.cpp
--- a/Framework/Toolbox/OrthancSlicesLoader.cpp	Fri Mar 23 11:04:03 2018 +0100
+++ b/Framework/Toolbox/OrthancSlicesLoader.cpp	Fri Mar 23 11:59:22 2018 +0100
@@ -23,16 +23,16 @@
 
 #include "MessagingToolbox.h"
 
-#include <Core/Endianness.h>
-#include <Core/Images/Image.h>
-#include <Core/Images/ImageProcessing.h>
-#include <Core/Images/JpegReader.h>
-#include <Core/Images/PngReader.h>
-#include <Core/Compression/GzipCompressor.h>
-#include <Core/Logging.h>
-#include <Core/OrthancException.h>
-#include <Core/Toolbox.h>
-#include <Plugins/Samples/Common/FullOrthancDataset.h>
+#include "../../Resources/Orthanc/Core/Compression/GzipCompressor.h"
+#include "../../Resources/Orthanc/Core/Endianness.h"
+#include "../../Resources/Orthanc/Core/Images/Image.h"
+#include "../../Resources/Orthanc/Core/Images/ImageProcessing.h"
+#include "../../Resources/Orthanc/Core/Images/JpegReader.h"
+#include "../../Resources/Orthanc/Core/Images/PngReader.h"
+#include "../../Resources/Orthanc/Core/Logging.h"
+#include "../../Resources/Orthanc/Core/OrthancException.h"
+#include "../../Resources/Orthanc/Core/Toolbox.h"
+#include "../../Resources/Orthanc/Plugins/Samples/Common/FullOrthancDataset.h"
 
 #include <boost/lexical_cast.hpp>
 
diff -r 03afbee0cc7b -r e9c7a78a3e77 Framework/Toolbox/ParallelSlices.cpp
--- a/Framework/Toolbox/ParallelSlices.cpp	Fri Mar 23 11:04:03 2018 +0100
+++ b/Framework/Toolbox/ParallelSlices.cpp	Fri Mar 23 11:59:22 2018 +0100
@@ -23,8 +23,8 @@
 
 #include "GeometryToolbox.h"
 
-#include <Core/Logging.h>
-#include <Core/OrthancException.h>
+#include "../../Resources/Orthanc/Core/Logging.h"
+#include "../../Resources/Orthanc/Core/OrthancException.h"
 
 namespace OrthancStone
 {
diff -r 03afbee0cc7b -r e9c7a78a3e77 Framework/Toolbox/ParallelSlicesCursor.cpp
--- a/Framework/Toolbox/ParallelSlicesCursor.cpp	Fri Mar 23 11:04:03 2018 +0100
+++ b/Framework/Toolbox/ParallelSlicesCursor.cpp	Fri Mar 23 11:59:22 2018 +0100
@@ -21,7 +21,7 @@
 
 #include "ParallelSlicesCursor.h"
 
-#include <Core/OrthancException.h>
+#include "../../Resources/Orthanc/Core/OrthancException.h"
 
 namespace OrthancStone
 {
diff -r 03afbee0cc7b -r e9c7a78a3e77 Framework/Toolbox/ShearWarpProjectiveTransform.cpp
--- a/Framework/Toolbox/ShearWarpProjectiveTransform.cpp	Fri Mar 23 11:04:03 2018 +0100
+++ b/Framework/Toolbox/ShearWarpProjectiveTransform.cpp	Fri Mar 23 11:59:22 2018 +0100
@@ -26,10 +26,10 @@
 #include "FiniteProjectiveCamera.h"
 #include "GeometryToolbox.h"
 
-#include <Core/Images/PixelTraits.h>
-#include <Core/Images/ImageProcessing.h>
-#include <Core/OrthancException.h>
-#include <Core/Logging.h>
+#include "../../Resources/Orthanc/Core/Images/PixelTraits.h"
+#include "../../Resources/Orthanc/Core/Images/ImageProcessing.h"
+#include "../../Resources/Orthanc/Core/OrthancException.h"
+#include "../../Resources/Orthanc/Core/Logging.h"
 
 #include <boost/numeric/ublas/matrix_proxy.hpp>
 #include <boost/math/special_functions/round.hpp>
diff -r 03afbee0cc7b -r e9c7a78a3e77 Framework/Toolbox/Slice.cpp
--- a/Framework/Toolbox/Slice.cpp	Fri Mar 23 11:04:03 2018 +0100
+++ b/Framework/Toolbox/Slice.cpp	Fri Mar 23 11:59:22 2018 +0100
@@ -24,9 +24,9 @@
 #include "../StoneEnumerations.h"
 #include "GeometryToolbox.h"
 
-#include <Core/Logging.h>
-#include <Core/OrthancException.h>
-#include <Core/Toolbox.h>
+#include "../../Resources/Orthanc/Core/Logging.h"
+#include "../../Resources/Orthanc/Core/OrthancException.h"
+#include "../../Resources/Orthanc/Core/Toolbox.h"
 
 #include <boost/lexical_cast.hpp>
 
diff -r 03afbee0cc7b -r e9c7a78a3e77 Framework/Toolbox/Slice.h
--- a/Framework/Toolbox/Slice.h	Fri Mar 23 11:04:03 2018 +0100
+++ b/Framework/Toolbox/Slice.h	Fri Mar 23 11:59:22 2018 +0100
@@ -24,7 +24,7 @@
 #include "CoordinateSystem3D.h"
 #include "DicomFrameConverter.h"
 
-#include <Core/DicomFormat/DicomImageInformation.h>
+#include "../../Resources/Orthanc/Core/DicomFormat/DicomImageInformation.h"
 
 namespace OrthancStone
 {
diff -r 03afbee0cc7b -r e9c7a78a3e77 Framework/Toolbox/SlicesSorter.cpp
--- a/Framework/Toolbox/SlicesSorter.cpp	Fri Mar 23 11:04:03 2018 +0100
+++ b/Framework/Toolbox/SlicesSorter.cpp	Fri Mar 23 11:59:22 2018 +0100
@@ -23,7 +23,7 @@
 
 #include "GeometryToolbox.h"
 
-#include <Core/OrthancException.h>
+#include "../../Resources/Orthanc/Core/OrthancException.h"
 
 namespace OrthancStone
 {
diff -r 03afbee0cc7b -r e9c7a78a3e77 Framework/Toolbox/SubpixelReader.h
--- a/Framework/Toolbox/SubpixelReader.h	Fri Mar 23 11:04:03 2018 +0100
+++ b/Framework/Toolbox/SubpixelReader.h	Fri Mar 23 11:59:22 2018 +0100
@@ -24,7 +24,7 @@
 #include "../StoneEnumerations.h"
 #include "GeometryToolbox.h"
 
-#include <Core/Images/ImageTraits.h>
+#include "../../Resources/Orthanc/Core/Images/ImageTraits.h"
 
 #include <boost/noncopyable.hpp>
 #include <cmath>
diff -r 03afbee0cc7b -r e9c7a78a3e77 Framework/Toolbox/SubvoxelReader.h
--- a/Framework/Toolbox/SubvoxelReader.h	Fri Mar 23 11:04:03 2018 +0100
+++ b/Framework/Toolbox/SubvoxelReader.h	Fri Mar 23 11:59:22 2018 +0100
@@ -24,7 +24,7 @@
 #include "../Volumes/ImageBuffer3D.h"
 #include "GeometryToolbox.h"
 
-#include <Core/Images/ImageTraits.h>
+#include "../../Resources/Orthanc/Core/Images/ImageTraits.h"
 
 #include <boost/noncopyable.hpp>
 #include <cmath>
diff -r 03afbee0cc7b -r e9c7a78a3e77 Framework/Toolbox/ViewportGeometry.cpp
--- a/Framework/Toolbox/ViewportGeometry.cpp	Fri Mar 23 11:04:03 2018 +0100
+++ b/Framework/Toolbox/ViewportGeometry.cpp	Fri Mar 23 11:59:22 2018 +0100
@@ -21,8 +21,8 @@
 
 #include "ViewportGeometry.h"
 
-#include <Core/Logging.h>
-#include <Core/OrthancException.h>
+#include "../../Resources/Orthanc/Core/Logging.h"
+#include "../../Resources/Orthanc/Core/OrthancException.h"
 
 #include <boost/math/special_functions/round.hpp>
 
diff -r 03afbee0cc7b -r e9c7a78a3e77 Framework/Viewport/CairoContext.cpp
--- a/Framework/Viewport/CairoContext.cpp	Fri Mar 23 11:04:03 2018 +0100
+++ b/Framework/Viewport/CairoContext.cpp	Fri Mar 23 11:59:22 2018 +0100
@@ -21,8 +21,8 @@
 
 #include "CairoContext.h"
 
-#include <Core/Logging.h>
-#include <Core/OrthancException.h>
+#include "../../Resources/Orthanc/Core/Logging.h"
+#include "../../Resources/Orthanc/Core/OrthancException.h"
 
 namespace OrthancStone
 {
diff -r 03afbee0cc7b -r e9c7a78a3e77 Framework/Viewport/CairoFont.cpp
--- a/Framework/Viewport/CairoFont.cpp	Fri Mar 23 11:04:03 2018 +0100
+++ b/Framework/Viewport/CairoFont.cpp	Fri Mar 23 11:59:22 2018 +0100
@@ -21,8 +21,8 @@
 
 #include "CairoFont.h"
 
-#include <Core/Logging.h>
-#include <Core/OrthancException.h>
+#include "../../Resources/Orthanc/Core/Logging.h"
+#include "../../Resources/Orthanc/Core/OrthancException.h"
 
 namespace OrthancStone
 {
diff -r 03afbee0cc7b -r e9c7a78a3e77 Framework/Viewport/CairoSurface.cpp
--- a/Framework/Viewport/CairoSurface.cpp	Fri Mar 23 11:04:03 2018 +0100
+++ b/Framework/Viewport/CairoSurface.cpp	Fri Mar 23 11:59:22 2018 +0100
@@ -21,9 +21,9 @@
 
 #include "CairoSurface.h"
 
-#include <Core/Logging.h>
-#include <Core/OrthancException.h>
-#include <Core/Images/ImageProcessing.h>
+#include "../../Resources/Orthanc/Core/Logging.h"
+#include "../../Resources/Orthanc/Core/OrthancException.h"
+#include "../../Resources/Orthanc/Core/Images/ImageProcessing.h"
 
 namespace OrthancStone
 {
diff -r 03afbee0cc7b -r e9c7a78a3e77 Framework/Viewport/CairoSurface.h
--- a/Framework/Viewport/CairoSurface.h	Fri Mar 23 11:04:03 2018 +0100
+++ b/Framework/Viewport/CairoSurface.h	Fri Mar 23 11:59:22 2018 +0100
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include <Core/Images/ImageAccessor.h>
+#include "../../Resources/Orthanc/Core/Images/ImageAccessor.h"
 
 #include <boost/noncopyable.hpp>
 #include <cairo.h>
diff -r 03afbee0cc7b -r e9c7a78a3e77 Framework/Viewport/IViewport.h
--- a/Framework/Viewport/IViewport.h	Fri Mar 23 11:04:03 2018 +0100
+++ b/Framework/Viewport/IViewport.h	Fri Mar 23 11:59:22 2018 +0100
@@ -24,7 +24,7 @@
 #include "IStatusBar.h"
 #include "../StoneEnumerations.h"
 
-#include <Core/Images/ImageAccessor.h>
+#include "../../Resources/Orthanc/Core/Images/ImageAccessor.h"
 
 namespace OrthancStone
 {
diff -r 03afbee0cc7b -r e9c7a78a3e77 Framework/Viewport/WidgetViewport.cpp
--- a/Framework/Viewport/WidgetViewport.cpp	Fri Mar 23 11:04:03 2018 +0100
+++ b/Framework/Viewport/WidgetViewport.cpp	Fri Mar 23 11:59:22 2018 +0100
@@ -21,8 +21,8 @@
 
 #include "WidgetViewport.h"
 
-#include <Core/Images/ImageProcessing.h>
-#include <Core/OrthancException.h>
+#include "../../Resources/Orthanc/Core/Images/ImageProcessing.h"
+#include "../../Resources/Orthanc/Core/OrthancException.h"
 
 namespace OrthancStone
 {
diff -r 03afbee0cc7b -r e9c7a78a3e77 Framework/Volumes/ImageBuffer3D.cpp
--- a/Framework/Volumes/ImageBuffer3D.cpp	Fri Mar 23 11:04:03 2018 +0100
+++ b/Framework/Volumes/ImageBuffer3D.cpp	Fri Mar 23 11:59:22 2018 +0100
@@ -21,9 +21,9 @@
 
 #include "ImageBuffer3D.h"
 
-#include <Core/Images/ImageProcessing.h>
-#include <Core/Logging.h>
-#include <Core/OrthancException.h>
+#include "../../Resources/Orthanc/Core/Images/ImageProcessing.h"
+#include "../../Resources/Orthanc/Core/Logging.h"
+#include "../../Resources/Orthanc/Core/OrthancException.h"
 
 #include <string.h>
 
diff -r 03afbee0cc7b -r e9c7a78a3e77 Framework/Volumes/ImageBuffer3D.h
--- a/Framework/Volumes/ImageBuffer3D.h	Fri Mar 23 11:04:03 2018 +0100
+++ b/Framework/Volumes/ImageBuffer3D.h	Fri Mar 23 11:59:22 2018 +0100
@@ -27,7 +27,7 @@
 #include "../Toolbox/DicomFrameConverter.h"
 #include "../Toolbox/ParallelSlices.h"
 
-#include <Core/Images/Image.h>
+#include "../../Resources/Orthanc/Core/Images/Image.h"
 
 namespace OrthancStone
 {
diff -r 03afbee0cc7b -r e9c7a78a3e77 Framework/Volumes/StructureSetLoader.cpp
--- a/Framework/Volumes/StructureSetLoader.cpp	Fri Mar 23 11:04:03 2018 +0100
+++ b/Framework/Volumes/StructureSetLoader.cpp	Fri Mar 23 11:59:22 2018 +0100
@@ -23,7 +23,7 @@
 
 #include "../Toolbox/MessagingToolbox.h"
 
-#include <Core/OrthancException.h>
+#include "../../Resources/Orthanc/Core/OrthancException.h"
 
 namespace OrthancStone
 {
diff -r 03afbee0cc7b -r e9c7a78a3e77 Framework/Volumes/VolumeReslicer.cpp
--- a/Framework/Volumes/VolumeReslicer.cpp	Fri Mar 23 11:04:03 2018 +0100
+++ b/Framework/Volumes/VolumeReslicer.cpp	Fri Mar 23 11:59:22 2018 +0100
@@ -24,9 +24,9 @@
 #include "../Toolbox/GeometryToolbox.h"
 #include "../Toolbox/SubvoxelReader.h"
 
-#include <Core/Images/ImageTraits.h>
-#include <Core/Logging.h>
-#include <Core/OrthancException.h>
+#include "../../Resources/Orthanc/Core/Images/ImageTraits.h"
+#include "../../Resources/Orthanc/Core/Logging.h"
+#include "../../Resources/Orthanc/Core/OrthancException.h"
 
 #include <boost/math/special_functions/round.hpp>
 
diff -r 03afbee0cc7b -r e9c7a78a3e77 Framework/Widgets/CairoWidget.cpp
--- a/Framework/Widgets/CairoWidget.cpp	Fri Mar 23 11:04:03 2018 +0100
+++ b/Framework/Widgets/CairoWidget.cpp	Fri Mar 23 11:59:22 2018 +0100
@@ -21,8 +21,8 @@
 
 #include "CairoWidget.h"
 
-#include <Core/Images/ImageProcessing.h>
-#include <Core/OrthancException.h>
+#include "../../Resources/Orthanc/Core/Images/ImageProcessing.h"
+#include "../../Resources/Orthanc/Core/OrthancException.h"
 
 namespace OrthancStone
 {
diff -r 03afbee0cc7b -r e9c7a78a3e77 Framework/Widgets/EmptyWidget.cpp
--- a/Framework/Widgets/EmptyWidget.cpp	Fri Mar 23 11:04:03 2018 +0100
+++ b/Framework/Widgets/EmptyWidget.cpp	Fri Mar 23 11:59:22 2018 +0100
@@ -21,8 +21,8 @@
 
 #include "EmptyWidget.h"
 
-#include <Core/Images/ImageProcessing.h>
-#include <Core/OrthancException.h>
+#include "../../Resources/Orthanc/Core/Images/ImageProcessing.h"
+#include "../../Resources/Orthanc/Core/OrthancException.h"
 
 namespace OrthancStone
 {
diff -r 03afbee0cc7b -r e9c7a78a3e77 Framework/Widgets/LayerWidget.cpp
--- a/Framework/Widgets/LayerWidget.cpp	Fri Mar 23 11:04:03 2018 +0100
+++ b/Framework/Widgets/LayerWidget.cpp	Fri Mar 23 11:59:22 2018 +0100
@@ -24,7 +24,7 @@
 #include "../Layers/SliceOutlineRenderer.h"
 #include "../Toolbox/GeometryToolbox.h"
 
-#include <Core/Logging.h>
+#include "../../Resources/Orthanc/Core/Logging.h"
 
 static const double THIN_SLICE_THICKNESS = 100.0 * std::numeric_limits<double>::epsilon();
 
diff -r 03afbee0cc7b -r e9c7a78a3e77 Framework/Widgets/LayoutWidget.cpp
--- a/Framework/Widgets/LayoutWidget.cpp	Fri Mar 23 11:04:03 2018 +0100
+++ b/Framework/Widgets/LayoutWidget.cpp	Fri Mar 23 11:59:22 2018 +0100
@@ -21,8 +21,8 @@
 
 #include "LayoutWidget.h"
 
-#include <Core/Logging.h>
-#include <Core/OrthancException.h>
+#include "../../Resources/Orthanc/Core/Logging.h"
+#include "../../Resources/Orthanc/Core/OrthancException.h"
 
 #include <boost/math/special_functions/round.hpp>
 
diff -r 03afbee0cc7b -r e9c7a78a3e77 Framework/Widgets/WidgetBase.cpp
--- a/Framework/Widgets/WidgetBase.cpp	Fri Mar 23 11:04:03 2018 +0100
+++ b/Framework/Widgets/WidgetBase.cpp	Fri Mar 23 11:59:22 2018 +0100
@@ -21,9 +21,9 @@
 
 #include "WidgetBase.h"
 
-#include <Core/OrthancException.h>
-#include <Core/Images/ImageProcessing.h>
-#include <Core/Logging.h>
+#include "../../Resources/Orthanc/Core/OrthancException.h"
+#include "../../Resources/Orthanc/Core/Images/ImageProcessing.h"
+#include "../../Resources/Orthanc/Core/Logging.h"
 
 namespace OrthancStone
 {
diff -r 03afbee0cc7b -r e9c7a78a3e77 Framework/dev.h
--- a/Framework/dev.h	Fri Mar 23 11:04:03 2018 +0100
+++ b/Framework/dev.h	Fri Mar 23 11:59:22 2018 +0100
@@ -32,8 +32,8 @@
 #include "Volumes/ImageBuffer3D.h"
 #include "Volumes/SlicedVolumeBase.h"
 
-#include <Core/Logging.h>
-#include <Core/Images/ImageProcessing.h>
+#include "../Resources/Orthanc/Core/Logging.h"
+#include "../Resources/Orthanc/Core/Images/ImageProcessing.h"
 
 #include <boost/math/special_functions/round.hpp>
 
diff -r 03afbee0cc7b -r e9c7a78a3e77 Platforms/Generic/IOracleCommand.h
--- a/Platforms/Generic/IOracleCommand.h	Fri Mar 23 11:04:03 2018 +0100
+++ b/Platforms/Generic/IOracleCommand.h	Fri Mar 23 11:59:22 2018 +0100
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include <Core/IDynamicObject.h>
+#include "../../Resources/Orthanc/Core/IDynamicObject.h"
 
 namespace OrthancStone
 {
diff -r 03afbee0cc7b -r e9c7a78a3e77 Platforms/Generic/Oracle.cpp
--- a/Platforms/Generic/Oracle.cpp	Fri Mar 23 11:04:03 2018 +0100
+++ b/Platforms/Generic/Oracle.cpp	Fri Mar 23 11:59:22 2018 +0100
@@ -21,9 +21,9 @@
 
 #include "Oracle.h"
 
-#include <Core/Logging.h>
-#include <Core/MultiThreading/SharedMessageQueue.h>
-#include <Core/OrthancException.h>
+#include "../../Resources/Orthanc/Core/Logging.h"
+#include "../../Resources/Orthanc/Core/MultiThreading/SharedMessageQueue.h"
+#include "../../Resources/Orthanc/Core/OrthancException.h"
 
 #include <vector>
 #include <stdio.h>
diff -r 03afbee0cc7b -r e9c7a78a3e77 Platforms/Generic/WebServiceGetCommand.cpp
--- a/Platforms/Generic/WebServiceGetCommand.cpp	Fri Mar 23 11:04:03 2018 +0100
+++ b/Platforms/Generic/WebServiceGetCommand.cpp	Fri Mar 23 11:59:22 2018 +0100
@@ -21,7 +21,7 @@
 
 #include "WebServiceGetCommand.h"
 
-#include <Core/HttpClient.h>
+#include "../../Resources/Orthanc/Core/HttpClient.h"
 
 namespace OrthancStone
 {
diff -r 03afbee0cc7b -r e9c7a78a3e77 Platforms/Generic/WebServiceGetCommand.h
--- a/Platforms/Generic/WebServiceGetCommand.h	Fri Mar 23 11:04:03 2018 +0100
+++ b/Platforms/Generic/WebServiceGetCommand.h	Fri Mar 23 11:59:22 2018 +0100
@@ -25,7 +25,7 @@
 
 #include "../../Framework/Toolbox/IWebService.h"
 
-#include <Core/WebServiceParameters.h>
+#include "../../Resources/Orthanc/Core/WebServiceParameters.h"
 
 #include <memory>
 
diff -r 03afbee0cc7b -r e9c7a78a3e77 Platforms/Generic/WebServicePostCommand.cpp
--- a/Platforms/Generic/WebServicePostCommand.cpp	Fri Mar 23 11:04:03 2018 +0100
+++ b/Platforms/Generic/WebServicePostCommand.cpp	Fri Mar 23 11:59:22 2018 +0100
@@ -21,7 +21,7 @@
 
 #include "WebServicePostCommand.h"
 
-#include <Core/HttpClient.h>
+#include "../../Resources/Orthanc/Core/HttpClient.h"
 
 namespace OrthancStone
 {
diff -r 03afbee0cc7b -r e9c7a78a3e77 Platforms/Generic/WebServicePostCommand.h
--- a/Platforms/Generic/WebServicePostCommand.h	Fri Mar 23 11:04:03 2018 +0100
+++ b/Platforms/Generic/WebServicePostCommand.h	Fri Mar 23 11:59:22 2018 +0100
@@ -25,7 +25,7 @@
 
 #include "../../Framework/Toolbox/IWebService.h"
 
-#include <Core/WebServiceParameters.h>
+#include "../../Resources/Orthanc/Core/WebServiceParameters.h"
 
 #include <memory>
 
diff -r 03afbee0cc7b -r e9c7a78a3e77 Resources/CMake/OrthancStoneConfiguration.cmake
--- a/Resources/CMake/OrthancStoneConfiguration.cmake	Fri Mar 23 11:04:03 2018 +0100
+++ b/Resources/CMake/OrthancStoneConfiguration.cmake	Fri Mar 23 11:59:22 2018 +0100
@@ -27,8 +27,6 @@
 
 include(${ORTHANC_ROOT}/Resources/CMake/OrthancFrameworkConfiguration.cmake)
 
-include_directories(${ORTHANC_ROOT})
-
 
 #####################################################################
 ## Sanity check of the configuration
diff -r 03afbee0cc7b -r e9c7a78a3e77 Resources/Orthanc/Resources/Patches/curl-7.57.0-cmake.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Resources/Orthanc/Resources/Patches/curl-7.57.0-cmake.patch	Fri Mar 23 11:59:22 2018 +0100
@@ -0,0 +1,12 @@
+diff -urEb curl-7.57.0.orig/CMake/Macros.cmake curl-7.57.0/CMake/Macros.cmake
+--- curl-7.57.0.orig/CMake/Macros.cmake	2017-11-09 23:40:36.000000000 +0100
++++ curl-7.57.0/CMake/Macros.cmake	2018-01-03 10:39:15.589520034 +0100
+@@ -38,7 +38,7 @@
+     message(STATUS "Performing Curl Test ${CURL_TEST}")
+     try_compile(${CURL_TEST}
+       ${CMAKE_BINARY_DIR}
+-      ${CMAKE_CURRENT_SOURCE_DIR}/CMake/CurlTests.c
++      ${CURL_SOURCES_DIR}/CMake/CurlTests.c
+       CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_FUNCTION_DEFINITIONS}
+       "${CURL_TEST_ADD_LIBRARIES}"
+       OUTPUT_VARIABLE OUTPUT)
diff -r 03afbee0cc7b -r e9c7a78a3e77 Resources/Orthanc/Resources/Patches/dcmtk-3.6.2-linux-standard-base.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Resources/Orthanc/Resources/Patches/dcmtk-3.6.2-linux-standard-base.patch	Fri Mar 23 11:59:22 2018 +0100
@@ -0,0 +1,12 @@
+diff -urEb dcmtk-3.6.2.orig/ofstd/include/dcmtk/ofstd/offile.h dcmtk-3.6.2/ofstd/include/dcmtk/ofstd/offile.h
+--- dcmtk-3.6.2.orig/ofstd/include/dcmtk/ofstd/offile.h	2017-07-14 17:41:11.000000000 +0200
++++ dcmtk-3.6.2/ofstd/include/dcmtk/ofstd/offile.h	2018-01-02 13:56:04.075293459 +0100
+@@ -551,7 +551,7 @@
+    */
+   void setlinebuf()
+   {
+-#if defined(_WIN32) || defined(__hpux)
++#if defined(_WIN32) || defined(__hpux) || defined(__LSB_VERSION__)
+     this->setvbuf(NULL, _IOLBF, 0);
+ #else
+     :: setlinebuf(file_);
diff -r 03afbee0cc7b -r e9c7a78a3e77 Resources/SyncOrthancFolder.py
--- a/Resources/SyncOrthancFolder.py	Fri Mar 23 11:04:03 2018 +0100
+++ b/Resources/SyncOrthancFolder.py	Fri Mar 23 11:59:22 2018 +0100
@@ -153,6 +153,8 @@
     'Resources/MinGW-W64-Toolchain64.cmake',
     'Resources/MinGWToolchain.cmake',
     'Resources/Patches/boost-1.65.1-linux-standard-base.patch',
+    'Resources/Patches/curl-7.57.0-cmake.patch',
+    'Resources/Patches/dcmtk-3.6.2-linux-standard-base.patch',
     'Resources/ThirdParty/VisualStudio/stdint.h',
     'Resources/ThirdParty/base64/base64.cpp',
     'Resources/ThirdParty/base64/base64.h',
diff -r 03afbee0cc7b -r e9c7a78a3e77 UnitTestsSources/UnitTestsMain.cpp
--- a/UnitTestsSources/UnitTestsMain.cpp	Fri Mar 23 11:04:03 2018 +0100
+++ b/UnitTestsSources/UnitTestsMain.cpp	Fri Mar 23 11:59:22 2018 +0100
@@ -31,11 +31,11 @@
 #include "../Framework/Volumes/SlicedVolumeBase.h"
 #include "../Platforms/Generic/OracleWebService.h"
 
-#include <Core/HttpClient.h>
-#include <Core/Images/ImageProcessing.h>
-#include <Core/Logging.h>
-#include <Core/MultiThreading/SharedMessageQueue.h>
-#include <Core/OrthancException.h>
+#include "../Resources/Orthanc/Core/HttpClient.h"
+#include "../Resources/Orthanc/Core/Images/ImageProcessing.h"
+#include "../Resources/Orthanc/Core/Logging.h"
+#include "../Resources/Orthanc/Core/MultiThreading/SharedMessageQueue.h"
+#include "../Resources/Orthanc/Core/OrthancException.h"
 
 #include <boost/lexical_cast.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>