--- a/Resources/CMake/DatabasesPluginConfiguration.cmake	Mon Jun 29 19:22:34 2020 +0200
+++ b/Resources/CMake/DatabasesPluginConfiguration.cmake	Wed Jul 01 08:54:32 2020 +0200
@@ -19,10 +19,10 @@
 
 
 include(${CMAKE_SOURCE_DIR}/../Resources/CMake/DatabasesFrameworkConfiguration.cmake)
-include(${ORTHANC_ROOT}/Resources/CMake/AutoGeneratedCode.cmake)
+include(${ORTHANC_FRAMEWORK_ROOT}/Resources/CMake/AutoGeneratedCode.cmake)
 
 
-include_directories(${ORTHANC_ROOT}/Core)
+include_directories(${ORTHANC_FRAMEWORK_ROOT}/Sources)
 
 if (STATIC_BUILD OR NOT USE_SYSTEM_ORTHANC_SDK)
   if (ORTHANC_SDK_VERSION STREQUAL "0.9.5")
@@ -34,7 +34,7 @@
   elseif (ORTHANC_SDK_VERSION STREQUAL "1.5.4")
     include_directories(${ORTHANC_DATABASES_ROOT}/Resources/Orthanc/Sdk-1.5.4)
   elseif (ORTHANC_SDK_VERSION STREQUAL "framework")
-    include_directories(${ORTHANC_ROOT}/Plugins/Include)
+    include_directories(${ORTHANC_FRAMEWORK_ROOT}/Plugins/Include)
   else()
     message(FATAL_ERROR "Unsupported version of the Orthanc plugin SDK: ${ORTHANC_SDK_VERSION}")
   endif()
@@ -61,6 +61,7 @@
 
 add_definitions(
   -DHAS_ORTHANC_EXCEPTION=1
+  -DORTHANC_BUILDING_SERVER_LIBRARY=0
   -DORTHANC_ENABLE_PLUGINS=1
   -DORTHANC_OPTIMAL_VERSION_MAJOR=${ORTHANC_OPTIMAL_VERSION_MAJOR}
   -DORTHANC_OPTIMAL_VERSION_MINOR=${ORTHANC_OPTIMAL_VERSION_MINOR}
@@ -73,9 +74,7 @@
   ${ORTHANC_DATABASES_ROOT}/Framework/Plugins/GlobalProperties.cpp
   ${ORTHANC_DATABASES_ROOT}/Framework/Plugins/IndexBackend.cpp
   ${ORTHANC_DATABASES_ROOT}/Framework/Plugins/StorageBackend.cpp
-  ${ORTHANC_ROOT}/Plugins/Samples/Common/OrthancPluginCppWrapper.cpp
-
-  # New from "db-changes"
-  ${ORTHANC_ROOT}/OrthancServer/Search/DatabaseConstraint.cpp
-  ${ORTHANC_ROOT}/OrthancServer/Search/ISqlLookupFormatter.cpp
+  ${ORTHANC_DATABASES_ROOT}/Resources/Orthanc/Databases/DatabaseConstraint.cpp
+  ${ORTHANC_DATABASES_ROOT}/Resources/Orthanc/Databases/ISqlLookupFormatter.cpp
+  ${ORTHANC_DATABASES_ROOT}/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.cpp
   )