6 files changed, 12 insertions, 11 deletions
diff --git a/src/server/shared/Auth/CMakeLists.txt b/src/server/shared/Auth/CMakeLists.txt
index c843a6b0f35..6e5d10d40e5 100644
--- a/src/server/shared/Auth/CMakeLists.txt
+++ b/src/server/shared/Auth/CMakeLists.txt
@@ -19,8 +19,8 @@ SET(trinityauth_STAT_SRCS
 include_directories(
   ${ACE_INCLUDE_DIR}
   ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/src/shared
-  ${CMAKE_SOURCE_DIR}/src/framework
+  ${CMAKE_SOURCE_DIR}/src/server/shared
+  ${CMAKE_SOURCE_DIR}/src/server/framework
   ${MYSQL_INCLUDE_DIR}
 )
 
diff --git a/src/server/shared/CMakeLists.txt b/src/server/shared/CMakeLists.txt
index d00f8b83fb8..ed43a4eb6cd 100644
--- a/src/server/shared/CMakeLists.txt
+++ b/src/server/shared/CMakeLists.txt
@@ -30,8 +30,8 @@ include_directories(
   ${CMAKE_BINARY_DIR}
   ${CMAKE_SOURCE_DIR}/dep/include
   ${CMAKE_SOURCE_DIR}/dep/include/sockets
-  ${CMAKE_SOURCE_DIR}/src/framework
-  ${CMAKE_SOURCE_DIR}/src/shared
+  ${CMAKE_SOURCE_DIR}/src/server/framework
+  ${CMAKE_SOURCE_DIR}/src/server/shared
   ${MYSQL_INCLUDE_DIR}
 )
 
diff --git a/src/server/shared/Config/CMakeLists.txt b/src/server/shared/Config/CMakeLists.txt
index 98065034f08..da1c2e8aa3b 100644
--- a/src/server/shared/Config/CMakeLists.txt
+++ b/src/server/shared/Config/CMakeLists.txt
@@ -14,8 +14,8 @@ SET(trinityconfig_STAT_SRCS
 include_directories(
   ${ACE_INCLUDE_DIR}
   ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/src/shared
-  ${CMAKE_SOURCE_DIR}/src/framework
+  ${CMAKE_SOURCE_DIR}/src/server/shared
+  ${CMAKE_SOURCE_DIR}/src/server/framework
 )
 
 add_library(trinityconfig STATIC ${trinityconfig_STAT_SRCS})
diff --git a/src/server/shared/Database/CMakeLists.txt b/src/server/shared/Database/CMakeLists.txt
index 405a5f89a57..e30c8ae3ca2 100644
--- a/src/server/shared/Database/CMakeLists.txt
+++ b/src/server/shared/Database/CMakeLists.txt
@@ -21,9 +21,10 @@ SET(trinitydatabase_STAT_SRCS
 include_directories(
   ${ACE_INCLUDE_DIR}
   ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/src/shared
-  ${CMAKE_SOURCE_DIR}/src/shared/Database
-  ${CMAKE_SOURCE_DIR}/src/framework
+  ${CMAKE_SOURCE_DIR}/src/server/shared
+  ${CMAKE_SOURCE_DIR}/src/server/shared/Database
+  ${CMAKE_SOURCE_DIR}/src/server/framework
+  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Object
   ${MYSQL_INCLUDE_DIR}
 )
 
diff --git a/src/server/shared/Database/Database.cpp b/src/server/shared/Database/Database.cpp
index 379388d7997..7646a451eb4 100644
--- a/src/server/shared/Database/Database.cpp
+++ b/src/server/shared/Database/Database.cpp
@@ -22,7 +22,7 @@
 #include "Config/ConfigEnv.h"
 
 #include "Common.h"
-#include "../../game/UpdateFields.h"
+#include "UpdateFields.h"
 
 #include "Util.h"
 #include "Policies/SingletonImp.h"
diff --git a/src/server/shared/vmap/CMakeLists.txt b/src/server/shared/vmap/CMakeLists.txt
index c930a0c5a25..7d865d354e7 100644
--- a/src/server/shared/vmap/CMakeLists.txt
+++ b/src/server/shared/vmap/CMakeLists.txt
@@ -23,7 +23,7 @@ SET(vmaps_STAT_SRCS
 
 include_directories(
   ${ACE_INCLUDE_DIR}
-  ${CMAKE_SOURCE_DIR}/src/framework
+  ${CMAKE_SOURCE_DIR}/src/server/framework
   ${CMAKE_SOURCE_DIR}/dep/include/g3dlite
 )