4 files changed, 22 insertions, 40 deletions
diff --git a/src/server/authserver/CMakeLists.txt b/src/server/authserver/CMakeLists.txt
index a4ef58ef920..561565e717b 100644
--- a/src/server/authserver/CMakeLists.txt
+++ b/src/server/authserver/CMakeLists.txt
@@ -13,12 +13,13 @@
 file(GLOB_RECURSE sources_authentication Authentication/*.cpp Authentication/*.h)
 file(GLOB_RECURSE sources_realms Realms/*.cpp Realms/*.h)
 file(GLOB_RECURSE sources_server Server/*.cpp Server/*.h)
+file(GLOB sources_localdir *.cpp *.h)
 
 set(authserver_SRCS
   ${sources_authentication}
   ${sources_realms}
   ${sources_server}
-  Main.cpp
+  ${sources_localdir}
 )
 
 if( WIN32 )
diff --git a/src/server/collision/CMakeLists.txt b/src/server/collision/CMakeLists.txt
index 28256361d14..034daf09553 100644
--- a/src/server/collision/CMakeLists.txt
+++ b/src/server/collision/CMakeLists.txt
@@ -8,10 +8,16 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-file(GLOB_RECURSE sources *.cpp *.h)
+file(GLOB_RECURSE sources_Management Management/*.cpp Management/*.h)
+file(GLOB_RECURSE sources_Maps Maps/*.cpp Maps/*.h)
+file(GLOB_RECURSE sources_Models Models/*.cpp Models/*.h)
+file(GLOB sources_localdir *.cpp *.h)
 
 set(collision_STAT_SRCS
-  ${sources}
+  ${sources_Management}
+  ${sources_Maps}
+  ${sources_Models}
+  ${sources_localdir}
 )
 
 include_directories(
diff --git a/src/server/shared/CMakeLists.txt b/src/server/shared/CMakeLists.txt
index ee361497a34..b5a23b1b7d4 100644
--- a/src/server/shared/CMakeLists.txt
+++ b/src/server/shared/CMakeLists.txt
@@ -8,44 +8,20 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-file(GLOB_RECURSE sources_Configuration Configuration/*.cpp Configuration*/.h)
-file(GLOB_RECURSE sources_Cryptography Cryptography/*.cpp Cryptography*/.h)
-file(GLOB_RECURSE sources_Database Database/*.cpp Database*/.h)
-file(GLOB_RECURSE sources_DataStores DataStores/*.cpp DataStores*/.h)
-file(GLOB_RECURSE sources_Dynamic Dynamic/*.cpp Dynamic*/.h)
-file(GLOB_RECURSE sources_Logging Logging/*.cpp Logging*/.h)
-file(GLOB_RECURSE sources_Packets Packets/*.cpp Packets*/.h)
-file(GLOB_RECURSE sources_Threading Threading/*.cpp Threading*/.h)
+file(GLOB_RECURSE sources_Configuration Configuration/*.cpp Configuration/*.h)
+file(GLOB_RECURSE sources_Cryptography Cryptography/*.cpp Cryptography/*.h)
+file(GLOB_RECURSE sources_Database Database/*.cpp Database/*.h)
+file(GLOB_RECURSE sources_DataStores DataStores/*.cpp DataStores/*.h)
+file(GLOB_RECURSE sources_Debugging Debugging/*.cpp Debugging/*.h)
+file(GLOB_RECURSE sources_Dynamic Dynamic/*.cpp Dynamic/*.h)
+file(GLOB_RECURSE sources_Logging Logging/*.cpp Logging/*.h)
+file(GLOB_RECURSE sources_Packets Packets/*.cpp Packets/*.h)
+file(GLOB_RECURSE sources_Threading Threading/*.cpp Threading/*.h)
+file(GLOB_RECURSE sources_Utilities Utilities/*.cpp Utilities/*.h)
 
 file(GLOB sources_localdir *.cpp *.h)
 
 #
-# Debugging/ contains platform specific files - create baselist
-#
-
-set(sources_Debugging
-  Debugging/Errors.h
-  Debugging/MemoryLeaks.cpp
-  Debugging/MemoryLeaks.h
-)
-
-#
-# Utilities/ contains platform specific files - create baselist
-#
-
-set(sources_Utilities
-  Utilities/ByteConverter.h
-  Utilities/EventProcessor.cpp
-  Utilities/EventProcessor.h
-  Utilities/ProgressBar.cpp
-  Utilities/ProgressBar.h
-  Utilities/SignalHandler.h
-  Utilities/Timer.h
-  Utilities/Util.cpp
-  Utilities/Util.h
-)
-
-#
 # Build shared sourcelist
 #
 
diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt
index eb59ace8c88..37545ac4b46 100644
--- a/src/server/worldserver/CMakeLists.txt
+++ b/src/server/worldserver/CMakeLists.txt
@@ -12,15 +12,14 @@ file(GLOB_RECURSE sources_CommandLine CommandLine/*.cpp CommandLine/*.h)
 file(GLOB_RECURSE sources_RemoteAccess RemoteAccess/*.cpp RemoteAccess/*.h)
 file(GLOB_RECURSE sources_TCSoap TCSoap/*.cpp TCSoap/*.h)
 file(GLOB_RECURSE sources_WorldThread WorldThread/*.cpp WorldThread/*.h)
+file(GLOB sources_localdir *.cpp *.h)
 
 set(worldserver_SRCS
   ${sources_CommandLine}
   ${sources_RemoteAccess}
   ${sources_TCSoap}
   ${sources_WorldThread}
-  Main.cpp
-  Master.cpp
-  Master.h
+  ${sources_localdir}
 )
 
 if( WIN32 )