diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index 811e94e4..a87b1ac1 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -27,14 +27,13 @@ set_target_properties( common PROPERTIES
     RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_CURRENT_SOURCE_DIR}/../../bin/"
     RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL "${CMAKE_CURRENT_SOURCE_DIR}/../../bin/"
 )
-
+target_link_libraries( common PUBLIC ${Boost_LIBRARIES} )
 target_link_libraries( common PUBLIC xivdat )
 target_link_libraries( common PUBLIC mysqlConnector )
 
 if( UNIX )
-  target_link_libraries( common PUBLIC mysqlclient pthread )
-else()
-  target_link_libraries( common PUBLIC libmysql )
+  target_link_libraries( common PUBLIC pthread )
+
 endif()
 
 target_include_directories( common PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/" )
diff --git a/src/servers/Scripts/ScriptObject.h b/src/servers/Scripts/ScriptObject.h
index 1106541c..f5db9532 100644
--- a/src/servers/Scripts/ScriptObject.h
+++ b/src/servers/Scripts/ScriptObject.h
@@ -1,7 +1,7 @@
 #ifndef SAPPHIRE_SCRIPTOBJECT_H
 #define SAPPHIRE_SCRIPTOBJECT_H
 
-#include <Forwards.h>
+#include <ForwardsZone.h>
 #include <Script/NativeScriptApi.h>
 
 #include <Event/EventDefs.h>
diff --git a/src/servers/sapphire_lobby/CMakeLists.txt b/src/servers/sapphire_lobby/CMakeLists.txt
index a063ef63..63409d58 100644
--- a/src/servers/sapphire_lobby/CMakeLists.txt
+++ b/src/servers/sapphire_lobby/CMakeLists.txt
@@ -19,11 +19,6 @@ set_target_properties(sapphire_lobby PROPERTIES
         VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/"
         )
 
-if (UNIX)
-    target_link_libraries(sapphire_lobby common pthread dl z)
-else()
-    target_link_libraries(sapphire_lobby common zlib1)
-endif()
+target_link_libraries(sapphire_lobby PRIVATE common)
 
-target_link_libraries(sapphire_lobby ${Boost_LIBRARIES} ${Boost_LIBRARIES})
-cotire( sapphire_lobby )
\ No newline at end of file
+cotire( sapphire_lobby )
diff --git a/src/servers/sapphire_zone/Actor/Player.h b/src/servers/sapphire_zone/Actor/Player.h
index 75306a01..fd5f4a65 100644
--- a/src/servers/sapphire_zone/Actor/Player.h
+++ b/src/servers/sapphire_zone/Actor/Player.h
@@ -1,7 +1,7 @@
 #ifndef _PLAYER_H
 #define _PLAYER_H
 
-#include "Forwards.h"
+#include "ForwardsZone.h"
 
 #include <Common.h>
 #include <Util/SpawnIndexAllocator.h>
diff --git a/src/servers/sapphire_zone/CMakeLists.txt b/src/servers/sapphire_zone/CMakeLists.txt
index ba454f5c..248715dc 100644
--- a/src/servers/sapphire_zone/CMakeLists.txt
+++ b/src/servers/sapphire_zone/CMakeLists.txt
@@ -35,19 +35,10 @@ set_target_properties(sapphire_zone PROPERTIES
         VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/"
         )
 
-target_link_libraries( sapphire_zone common )
+target_link_libraries( sapphire_zone PUBLIC common )
 
-if (UNIX)
-    target_link_libraries( sapphire_zone pthread )
-    target_link_libraries( sapphire_zone dl )
-    target_link_libraries( sapphire_zone z )
-else()
-    target_link_libraries( sapphire_zone zlib1 )
-endif()
-
-target_link_libraries( sapphire_zone ${Boost_LIBRARIES} )
 target_include_directories( sapphire_zone PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" )
 
 if (UNIX)
     cotire( sapphire_zone )
-endif()
\ No newline at end of file
+endif()
diff --git a/src/servers/sapphire_zone/Script/NativeScriptApi.h b/src/servers/sapphire_zone/Script/NativeScriptApi.h
index 191f174d..39fabd6e 100644
--- a/src/servers/sapphire_zone/Script/NativeScriptApi.h
+++ b/src/servers/sapphire_zone/Script/NativeScriptApi.h
@@ -5,7 +5,7 @@
 #include <typeinfo>
 #include <typeindex>
 #include <Event/EventHandler.h>
-#include "Forwards.h"
+#include "ForwardsZone.h"
 
 #ifdef _MSC_VER
 #define EXPORT __declspec( dllexport )