diff --git a/CMakeLists.txt b/CMakeLists.txt
index 124af8203..80b8b6680 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46,10 +46,8 @@ set_target_properties(osrm-routed PROPERTIES COMPILE_FLAGS -DROUTED)
 
 file(GLOB DescriptorGlob Descriptors/*.cpp)
 file(GLOB LibOSRMGlob Library/*.cpp)
-file(GLOB SearchEngineSource DataStructures/SearchEngine*.cpp)
-file(GLOB ServerStructureGlob Server/DataStructures/*.cpp)
 
-set(OSRMSources ${LibOSRMGlob} ${DescriptorGlob} ${SearchEngineSource} ${ServerStructureGlob})
+set(OSRMSources ${LibOSRMGlob} ${DescriptorGlob})
 add_library(OSRM SHARED ${OSRMSources})
 add_library(UUID STATIC Util/UUID.cpp)
 add_dependencies( UUID UUIDConfigure )
diff --git a/cmake/UUID-Config.cmake b/cmake/UUID-Config.cmake
index c9faa1771..14a057d54 100644
--- a/cmake/UUID-Config.cmake
+++ b/cmake/UUID-Config.cmake
@@ -6,6 +6,6 @@ file(MD5 ${SOURCE_DIR}/prepare.cpp MD5PREPARE)
 file(MD5 ${SOURCE_DIR}/DataStructures/StaticRTree.h MD5RTREE)
 file(MD5 ${SOURCE_DIR}/DataStructures/NodeInformationHelpDesk.h MD5NODEINFO)
 file(MD5 ${SOURCE_DIR}/Util/GraphLoader.h MD5GRAPH)
-file(MD5 ${SOURCE_DIR}/Server/DataStructures/QueryObjectsStorage.cpp MD5OBJECTS)
+file(MD5 ${SOURCE_DIR}/Server/DataStructures/InternalDataFacade.h MD5OBJECTS)
 
 CONFIGURE_FILE( ${SOURCE_DIR}/Util/UUID.cpp.in ${SOURCE_DIR}/Util/UUID.cpp )