--- a/OrthancStone/Sources/Oracle/WebAssemblyOracle.cpp	Thu Aug 13 09:57:35 2020 +0200
+++ b/OrthancStone/Sources/Oracle/WebAssemblyOracle.cpp	Thu Aug 13 15:56:01 2020 +0200
@@ -19,22 +19,14 @@
  **/
 
 
-#include "WebAssemblyOracle.h"
-
-#include "OracleCommandExceptionMessage.h"
-#include "SleepOracleCommand.h"
-
-#if ORTHANC_ENABLE_DCMTK == 1
-#  include "ParseDicomSuccessMessage.h"
-static unsigned int BUCKET_SOP = 1;
+#if defined(ORTHANC_BUILDING_STONE_LIBRARY) && ORTHANC_BUILDING_STONE_LIBRARY == 1
+#  include "WebAssemblyOracle_Includes.h"
+#else
+// This is the case when using the WebAssembly side module, and this
+// source file must be compiled within the WebAssembly main module
+#  include <Oracle/WebAssemblyOracle_Includes.h>
 #endif
 
-#include "GetOrthancImageCommand.h"
-#include "GetOrthancWebViewerJpegCommand.h"
-#include "HttpCommand.h"
-#include "OrthancRestApiCommand.h"
-#include "ParseDicomFromWadoCommand.h"
-
 #include <OrthancException.h>
 #include <Toolbox.h>
 
@@ -42,6 +34,12 @@
 #include <emscripten/html5.h>
 #include <emscripten/fetch.h>
 
+
+#if ORTHANC_ENABLE_DCMTK == 1
+static unsigned int BUCKET_SOP = 1;
+#endif
+
+
 namespace OrthancStone
 {
   class WebAssemblyOracle::TimeoutContext