# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1546710696 -3600
# Node ID ac72032d69a294ac4fc85858681d88c02a002003
# Parent  d9eb978a1039fd8da86fac5302fec81946329d05
cont

diff -r d9eb978a1039 -r ac72032d69a2 OrthancServer/OrthancMoveRequestHandler.cpp
--- a/OrthancServer/OrthancMoveRequestHandler.cpp	Sat Jan 05 18:27:11 2019 +0100
+++ b/OrthancServer/OrthancMoveRequestHandler.cpp	Sat Jan 05 18:51:36 2019 +0100
@@ -41,6 +41,7 @@
 #include "ServerContext.h"
 #include "ServerJobs/DicomModalityStoreJob.h"
 
+
 namespace Orthanc
 {
   namespace
diff -r d9eb978a1039 -r ac72032d69a2 OrthancServer/OrthancRestApi/OrthancRestModalities.cpp
--- a/OrthancServer/OrthancRestApi/OrthancRestModalities.cpp	Sat Jan 05 18:27:11 2019 +0100
+++ b/OrthancServer/OrthancRestApi/OrthancRestModalities.cpp	Sat Jan 05 18:51:36 2019 +0100
@@ -41,10 +41,10 @@
 
 #include "../OrthancConfiguration.h"
 #include "../QueryRetrieveHandler.h"
+#include "../ServerContext.h"
 #include "../ServerJobs/DicomModalityStoreJob.h"
 #include "../ServerJobs/DicomMoveScuJob.h"
 #include "../ServerJobs/OrthancPeerStoreJob.h"
-#include "../ServerContext.h"
 #include "../ServerToolbox.h"
 
 
diff -r d9eb978a1039 -r ac72032d69a2 OrthancServer/OrthancRestApi/OrthancRestSystem.cpp
--- a/OrthancServer/OrthancRestApi/OrthancRestSystem.cpp	Sat Jan 05 18:27:11 2019 +0100
+++ b/OrthancServer/OrthancRestApi/OrthancRestSystem.cpp	Sat Jan 05 18:51:36 2019 +0100
@@ -34,10 +34,10 @@
 #include "../PrecompiledHeadersServer.h"
 #include "OrthancRestApi.h"
 
+#include "../../Core/DicomParsing/FromDcmtkBridge.h"
+#include "../../Plugins/Engine/OrthancPlugins.h"
+#include "../../Plugins/Engine/PluginsManager.h"
 #include "../OrthancConfiguration.h"
-#include "../../Core/DicomParsing/FromDcmtkBridge.h"
-#include "../../Plugins/Engine/PluginsManager.h"
-#include "../../Plugins/Engine/OrthancPlugins.h"
 #include "../ServerContext.h"
 
 
diff -r d9eb978a1039 -r ac72032d69a2 OrthancServer/PrecompiledHeadersServer.h
--- a/OrthancServer/PrecompiledHeadersServer.h	Sat Jan 05 18:27:11 2019 +0100
+++ b/OrthancServer/PrecompiledHeadersServer.h	Sat Jan 05 18:51:36 2019 +0100
@@ -37,6 +37,6 @@
 
 #if ORTHANC_USE_PRECOMPILED_HEADERS == 1
 
-#include "ServerContext.h"
+#include <boost/thread.hpp>
 
 #endif
diff -r d9eb978a1039 -r ac72032d69a2 OrthancServer/ServerContext.cpp
--- a/OrthancServer/ServerContext.cpp	Sat Jan 05 18:27:11 2019 +0100
+++ b/OrthancServer/ServerContext.cpp	Sat Jan 05 18:51:36 2019 +0100
@@ -39,6 +39,7 @@
 #include "../Core/FileStorage/StorageAccessor.h"
 #include "../Core/HttpServer/FilesystemHttpSender.h"
 #include "../Core/HttpServer/HttpStreamTranscoder.h"
+#include "../Core/JobsEngine/SetOfInstancesJob.h"
 #include "../Core/Logging.h"
 #include "../Plugins/Engine/OrthancPlugins.h"
 
diff -r d9eb978a1039 -r ac72032d69a2 OrthancServer/ServerContext.h
--- a/OrthancServer/ServerContext.h	Sat Jan 05 18:27:11 2019 +0100
+++ b/OrthancServer/ServerContext.h	Sat Jan 05 18:51:36 2019 +0100
@@ -33,28 +33,26 @@
 
 #pragma once
 
-#include "DicomInstanceToStore.h"
 #include "IServerListener.h"
 #include "LuaScripting.h"
 #include "OrthancHttpHandler.h"
 #include "ServerIndex.h"
 
 #include "../Core/Cache/MemoryCache.h"
-#include "../Core/FileStorage/IStorageArea.h"
-#include "../Core/JobsEngine/JobsEngine.h"
-#include "../Core/JobsEngine/SetOfInstancesJob.h"
-#include "../Core/MultiThreading/SharedMessageQueue.h"
-#include "../Core/RestApi/RestApiOutput.h"
-
-#include <boost/filesystem.hpp>
-#include <boost/thread.hpp>
 
 
 namespace Orthanc
 {
+  class DicomInstanceToStore;
+  class IStorageArea;
+  class JobsEngine;
   class OrthancPlugins;
   class ParsedDicomFile;
+  class RestApiOutput;
+  class SetOfInstancesJob;
   class SharedArchive;
+  class SharedMessageQueue;
+  
   
   /**
    * This class is responsible for maintaining the storage area on the
diff -r d9eb978a1039 -r ac72032d69a2 OrthancServer/SliceOrdering.cpp
--- a/OrthancServer/SliceOrdering.cpp	Sat Jan 05 18:27:11 2019 +0100
+++ b/OrthancServer/SliceOrdering.cpp	Sat Jan 05 18:51:36 2019 +0100
@@ -37,6 +37,7 @@
 #include "../Core/Logging.h"
 #include "../Core/Toolbox.h"
 #include "ServerEnumerations.h"
+#include "ServerIndex.h"
 
 #include <algorithm>
 #include <boost/lexical_cast.hpp>
diff -r d9eb978a1039 -r ac72032d69a2 OrthancServer/SliceOrdering.h
--- a/OrthancServer/SliceOrdering.h	Sat Jan 05 18:27:11 2019 +0100
+++ b/OrthancServer/SliceOrdering.h	Sat Jan 05 18:51:36 2019 +0100
@@ -33,10 +33,12 @@
 
 #pragma once
 
-#include "ServerIndex.h"
+#include "../Core/DicomFormat/DicomMap.h"
 
 namespace Orthanc
 {
+  class ServerIndex;
+  
   class SliceOrdering
   {
   private: