Cleanup of cmake files

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_policy(SET CMP0014 NEW)
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 3.0.2)
 project (Sapphire)
 
 set(CMAKE_BINARY_DIR ${CMAKE_SOURCE_DIR}/bin)
@@ -23,7 +23,6 @@ set(SAPPHIRE_BOOST_FOLDER_NAME boost_1_60_0)
 
 ##########################################################################
 # Common and library path
-set(SERVER_COMMON_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/common")
 set(LIBRARY_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/libraries")
 
 ##########################################################################
@@ -32,38 +31,22 @@ include( "cmake/boost.cmake" )
 include( "cmake/mysql.cmake" )
 include( "cmake/compiler.cmake" )
 include( "cmake/cotire.cmake" )
-
 ##############################
 #             Git            #
 ##############################
 include(GetGitRevisionDescription)
 get_git_head_revision(GIT_REFSPEC GIT_SHA1)
 git_describe(VERSION --all --dirty=-d)
-configure_file("${SERVER_COMMON_DIR}/Version.cpp.in"
-               "${SERVER_COMMON_DIR}/Version.cpp" @ONLY)
+configure_file("src/common/Version.cpp.in"
+               "src/common/Version.cpp" @ONLY)
 
 ##########################################################################
-# Common include folders
-include_directories("${CMAKE_CURRENT_SOURCE_DIR}/src/libraries/sapphire/datReader/")
-include_directories("${CMAKE_CURRENT_SOURCE_DIR}/src/libraries/sapphire/mysqlConnector/")
-include_directories("${CMAKE_CURRENT_SOURCE_DIR}/src")
-
-include_directories("${PROJECT_INCLUDE_DIR}")
-include_directories("${PROJECT_SOURCE_DIR}")
-
-##########################################################################
-# Common lib folders
-link_directories(${MYSQLCONNECTORCPP_LIBRARIES})
-link_directories(${SERVER_COMMON_DIR})
-link_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/libraries/sapphire/datReader)
-
-add_subdirectory("src/servers")
-
 add_subdirectory("src/libraries/sapphire/datReader")
 add_subdirectory("src/libraries/sapphire/mysqlConnector")
-
 add_subdirectory("src/common")
 
+add_subdirectory("src/servers")
+
 add_subdirectory("src/tools/exd_common_gen")
 add_subdirectory("src/tools/exd_struct_gen")
 add_subdirectory("src/tools/exd_struct_test")

src/common/CMakeLists.txt

@@ -1,12 +1,6 @@
-cmake_minimum_required(VERSION 2.6)
-project(Sapphire)
+cmake_minimum_required( VERSION 3.0.2 )
+project( Sapphire )
 
-include_directories( ${CMAKE_CURRENT_SOURCE_DIR} )
-
-file(GLOB UTILS_PUBLIC_INCLUDE_FILES 
-        "${CMAKE_CURRENT_SOURCE_DIR}"
-        "${CMAKE_CURRENT_SOURCE_DIR}/*.h"
-        "${CMAKE_CURRENT_SOURCE_DIR}/Exd/*.h" )
 file(GLOB UTILS_SOURCE_FILES
         "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp"
         "${CMAKE_CURRENT_SOURCE_DIR}/Config/*.cpp"
@@ -18,13 +12,13 @@ file(GLOB UTILS_SOURCE_FILES
         "${CMAKE_CURRENT_SOURCE_DIR}/Network/PacketDef/*.cpp"
         "${CMAKE_CURRENT_SOURCE_DIR}/Script/*.cpp"
         "${CMAKE_CURRENT_SOURCE_DIR}/Util/*.cpp")
-      
 
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} )
 
-add_library(common ${UTILS_PUBLIC_INCLUDE_FILES} ${UTILS_SOURCE_FILES})
 
-set_target_properties(common PROPERTIES
+add_library( common ${UTILS_PUBLIC_INCLUDE_FILES} ${UTILS_SOURCE_FILES} )
+
+set_target_properties( common PROPERTIES
     CXX_STANDARD 14
     CXX_STANDARD_REQUIRED ON
     CXX_EXTENSIONS ON
@@ -34,8 +28,14 @@ set_target_properties(common PROPERTIES
     RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL "${CMAKE_CURRENT_SOURCE_DIR}/../../bin/"
 )
 
-if (UNIX)
-  target_link_libraries( common xivdat mysqlclient mysqlConnector )
+target_link_libraries( common PUBLIC xivdat )
+target_link_libraries( common PUBLIC mysqlConnector )
+
+if( UNIX )
+  target_link_libraries( common PUBLIC mysqlclient )
 else()
-  target_link_libraries( common xivdat mysqlConnector libmysql )
+  target_link_libraries( common PUBLIC libmysql )
 endif()
+
+target_include_directories( common PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/" )
+target_include_directories( common PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/src/libraries/external/")

src/common/Database/CharaDbConnection.cpp

@@ -1,5 +1,5 @@
 #include "CharaDbConnection.h"
-#include <libraries/sapphire/mysqlConnector/MySqlConnector.h>
+#include <MySqlConnector.h>
 
 Core::Db::CharaDbConnection::CharaDbConnection( ConnectionInfo& connInfo ) : DbConnection( connInfo )
 {
@@ -136,4 +136,4 @@ void Core::Db::CharaDbConnection::doPrepareStatements()
 
 
 
-}
+}

src/common/Database/DatabaseDef.h

@@ -1,11 +1,11 @@
 #ifndef _DATABASEDEF_H
 #define _DATABASEDEF_H
 
-#include "src/libraries/sapphire/mysqlConnector/MySqlConnector.h"
-#include <common/Database/DbLoader.h>
-#include <common/Database/CharaDbConnection.h>
-#include <common/Database/DbWorkerPool.h>
-#include <common/Database/PreparedStatement.h>
+#include <MySqlConnector.h>
+#include "Database/DbLoader.h"
+#include "Database/CharaDbConnection.h"
+#include "Database/DbWorkerPool.h"
+#include "Database/PreparedStatement.h"
 
 extern Core::Db::DbWorkerPool< Core::Db::CharaDbConnection > g_charaDb;
 

src/common/Database/DbConnection.cpp

@@ -1,8 +1,8 @@
 #include "DbConnection.h"
 #include "DbWorker.h"
-#include "src/libraries/sapphire/mysqlConnector/MySqlConnector.h"
+#include <MySqlConnector.h>
 
-#include <common/Logging/Logger.h>
+#include "Logging/Logger.h"
 #include "PreparedStatement.h"
 #include <boost/make_shared.hpp>
 

src/common/Database/DbConnection.h

@@ -6,7 +6,7 @@
 #include <mutex>
 #include <string>
 #include <vector>
-#include <common/Util/LockedWaitQueue.h>
+#include "Util/LockedWaitQueue.h"
 #include <boost/scoped_ptr.hpp>
 #include <boost/enable_shared_from_this.hpp>
 

src/common/Database/DbLoader.cpp

@@ -2,7 +2,7 @@
 #include <mysqld_error.h>
 #include "CharaDbConnection.h"
 #include "DbWorkerPool.h"
-#include <common/Logging/Logger.h>
+#include "Logging/Logger.h"
 
 extern Core::Logger g_log;
 

src/common/Database/DbWorker.cpp

@@ -1,6 +1,6 @@
 #include "DbWorker.h"
 #include "Operation.h"
-#include <common/Util/LockedWaitQueue.h>
+#include "Util/LockedWaitQueue.h"
 
 Core::Db::DbWorker::DbWorker( Core::LockedWaitQueue< boost::shared_ptr< Operation > >* newQueue, DbConnection* pConn )
 {

src/common/Database/DbWorker.h

@@ -3,7 +3,7 @@
 
 #include <atomic>
 #include <thread>
-#include <common/Util/LockedWaitQueue.h>
+#include "Util/LockedWaitQueue.h"
 #include <boost/shared_ptr.hpp>
 
 namespace Core

src/common/Database/DbWorkerPool.cpp

@@ -1,13 +1,13 @@
 #include "DbWorkerPool.h"
 #include "DbConnection.h"
 #include "PreparedStatement.h"
-#include <libraries/sapphire/mysqlConnector/MySqlConnector.h>
+#include <MySqlConnector.h>
 #include "StatementTask.h"
 #include "Operation.h"
 #include "CharaDbConnection.h"
 #include <boost/make_shared.hpp>
 
-#include <common/Logging/Logger.h>
+#include "Logging/Logger.h"
 extern Core::Logger g_log;
 
 class PingOperation : public Core::Db::Operation

src/common/Database/DbWorkerPool.h

@@ -5,7 +5,7 @@
 #include <string>
 #include <vector>
 #include <ResultSet.h>
-#include <common/Util/LockedWaitQueue.h>
+#include "Util/LockedWaitQueue.h"
 #include "DbConnection.h"
 namespace Core
 {

src/common/Network/Acceptor.cpp

@@ -1,6 +1,6 @@
-#include <common/Network/Hive.h>
+#include "Hive.h"
 #include "Acceptor.h"
-#include <common/Network/Connection.h>
+#include "Connection.h"
 #include <boost/interprocess/detail/atomic.hpp>
 #include <boost/bind.hpp>
 

src/common/Network/Acceptor.h

@@ -5,7 +5,7 @@
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/enable_shared_from_this.hpp>
 #include <boost/shared_ptr.hpp>
-#include <common/Forwards.h>
+#include "Forwards.h"
 
 namespace Core 
 {

src/common/Network/Connection.h

@@ -9,7 +9,7 @@
 #include <list>
 #include <boost/cstdint.hpp>
 
-#include <common/Forwards.h>
+#include "Forwards.h"
 #include "Acceptor.h"
 
 

src/common/Network/GamePacket.cpp

@@ -5,7 +5,7 @@
 #include <time.h>
 #include <boost/lexical_cast.hpp>
 #include <boost/format.hpp>
-#include <common/Util/Util.h>
+#include "Util/Util.h"
 
 Core::Network::Packets::GamePacket::GamePacket( uint16_t subType, uint16_t size, uint32_t id1, uint32_t id2, uint16_t type )
 {

src/common/Network/GamePacket.h

@@ -2,7 +2,7 @@
 #define _GAMEPACKET_H_
 
 #include "CommonNetwork.h"
-#include <common/Forwards.h>
+#include "Forwards.h"
 #include <stdint.h>
 #include <string.h>
 

src/common/Network/PacketContainer.cpp

@@ -1,6 +1,6 @@
 #include "PacketContainer.h"
 #include "GamePacket.h"
-#include <common/Common.h>
+#include "Common.h"
 
 #include <boost/format.hpp>
 

src/common/Network/PacketContainer.h

@@ -3,7 +3,7 @@
 
 #include <vector>
 
-#include <common/Common.h>
+#include "Common.h"
 #include "CommonNetwork.h"
 #include "GamePacket.h"
 

src/common/Network/PacketDef/Chat/ServerChatDef.h

@@ -1,8 +1,8 @@
 #ifndef _CORE_NETWORK_PACKETS_CHAT_SERVER_IPC_H
 #define _CORE_NETWORK_PACKETS_CHAT_SERVER_IPC_H
 
-#include <common/Common.h>
-#include <common/Network/CommonNetwork.h>
+#include <Common.h>
+#include <Network/CommonNetwork.h>
 
 namespace Core {
 namespace Network {

src/common/Network/PacketDef/Lobby/ServerLobbyDef.h

@@ -1,8 +1,8 @@
 #ifndef _CORE_NETWORK_PACKETS_LOBBY_SERVER_IPC_H
 #define _CORE_NETWORK_PACKETS_LOBBY_SERVER_IPC_H
 
-#include <common/Common.h>
-#include <common/Network/CommonNetwork.h>
+#include <Common.h>
+#include <Network/CommonNetwork.h>
 
 namespace Core {
 namespace Network {

src/common/Network/PacketDef/Zone/ServerZoneDef.h

@@ -7,8 +7,8 @@
 #ifndef _CORE_NETWORK_PACKETS_ZONE_SERVER_IPC_H
 #define _CORE_NETWORK_PACKETS_ZONE_SERVER_IPC_H
 
-#include <common/Common.h>
-#include <common/Network/CommonNetwork.h>
+#include <Common.h>
+#include <Network/CommonNetwork.h>
 
 namespace Core {
 namespace Network {

src/common/Util/UtilMath.h

@@ -1,7 +1,7 @@
 #ifndef _UTILMATH_H
 #define _UTILMATH_H
 
-#include <common/Common.h>
+#include "Common.h"
 
 #define PI 3.14159265358979323846f
 

src/servers/sapphire_api/CMakeLists.txt

@@ -7,7 +7,6 @@ file(GLOB SERVER_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}*.c*")
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY  "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/")
 add_executable(sapphire_api ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES})
-add_dependencies(sapphire_api common xivdat)
 
 set_target_properties(sapphire_api PROPERTIES
     CXX_STANDARD 14
@@ -21,13 +20,9 @@ set_target_properties(sapphire_api PROPERTIES
 )
 
 if (UNIX)
-  target_link_libraries (sapphire_api common xivdat pthread mysqlclient mysqlConnector dl z)
+  target_link_libraries (sapphire_api common pthread dl z)
 else()
-  # ignore unchecked iterators warnings from msvc
-  add_definitions(-D_SCL_SECURE_NO_WARNINGS)
-
-  target_link_libraries (sapphire_api common xivdat libmysql mysqlConnector zlib1)
-
+  target_link_libraries (sapphire_api common zlib1)
 endif()
 
 target_link_libraries( sapphire_api ${Boost_LIBRARIES} ${Boost_LIBRARIES} )

src/servers/sapphire_api/PlayerMinimal.cpp

@@ -1,10 +1,10 @@
 #include "PlayerMinimal.h"
 
-#include <common/Util/Util.h>
-#include <common/Common.h>
-#include <common/Exd/ExdDataGenerated.h>
+#include <Util/Util.h>
+#include <Common.h>
+#include <Exd/ExdDataGenerated.h>
 
-#include <common/Database/DatabaseDef.h>
+#include <Database/DatabaseDef.h>
 
 extern Core::Data::ExdDataGenerated g_exdDataGen;
 

src/servers/sapphire_api/SapphireAPI.cpp

@@ -1,5 +1,5 @@
 #include "SapphireAPI.h"
-#include <common/Crypt/base64.h>
+#include <Crypt/base64.h>
 #include "Session.h"
 #include "PlayerMinimal.h"
 #include <time.h>
@@ -11,7 +11,7 @@
 #include <boost/foreach.hpp>
 #include <boost/shared_ptr.hpp>
 
-#include <common/Database/DatabaseDef.h>
+#include <Database/DatabaseDef.h>
 #include <boost/make_shared.hpp>
 
 Core::Network::SapphireAPI::SapphireAPI()

src/servers/sapphire_api/main.cpp

@@ -6,20 +6,20 @@
 #include <boost/property_tree/xml_parser.hpp>
 #include <boost/property_tree/json_parser.hpp>
 
-#include <common/Logging/Logger.h>
-#include <common/Config/XMLConfig.h>
+#include <Logging/Logger.h>
+#include <Config/XMLConfig.h>
 
-#include <common/Network/Connection.h>
-#include <common/Network/Hive.h>
-#include <common/Network/Acceptor.h>
+#include <Network/Connection.h>
+#include <Network/Hive.h>
+#include <Network/Acceptor.h>
 
-#include <common/Exd/ExdDataGenerated.h>
-#include <common/Crypt/base64.h>
+#include <Exd/ExdDataGenerated.h>
+#include <Crypt/base64.h>
 
-#include <common/Database/DbLoader.h>
-#include <common/Database/CharaDbConnection.h>
-#include <common/Database/DbWorkerPool.h>
-#include <common/Database/PreparedStatement.h>
+#include <Database/DbLoader.h>
+#include <Database/CharaDbConnection.h>
+#include <Database/DbWorkerPool.h>
+#include <Database/PreparedStatement.h>
 
 //Added for the default_resource example
 #include <fstream>

src/servers/sapphire_lobby/CMakeLists.txt

@@ -8,7 +8,6 @@ file(GLOB SERVER_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}*.c*")
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY  "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/")
 
 add_executable(sapphire_lobby ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES})
-add_dependencies(sapphire_lobby common xivdat)
 
 set_target_properties(sapphire_lobby PROPERTIES
     CXX_STANDARD 14
@@ -22,9 +21,10 @@ set_target_properties(sapphire_lobby PROPERTIES
 )
 
 if (UNIX)
-  target_link_libraries(sapphire_lobby common xivdat pthread mysqlclient mysqlConnector dl z)
+  target_link_libraries(sapphire_lobby common pthread dl z)
 else()
-  target_link_libraries(sapphire_lobby common xivdat libmysql mysqlConnector zlib1)
+  target_link_libraries(sapphire_lobby common zlib1)
 endif()
 
 target_link_libraries(sapphire_lobby ${Boost_LIBRARIES} ${Boost_LIBRARIES})
+cotire( sapphire_lobby )

src/servers/sapphire_lobby/GameConnection.cpp

@@ -1,15 +1,15 @@
 #include "GameConnection.h"
 
-#include <common/Common.h>
-#include <common/Network/CommonNetwork.h>
-#include <common/Util/Util.h>
-#include <common/Logging/Logger.h>
-#include <common/Network/GamePacket.h>
-#include <common/Network/GamePacketNew.h>
-#include <common/Network/PacketDef/Lobby/ServerLobbyDef.h>
-#include <common/Network/GamePacketParser.h>
-#include <common/Crypt/md5.h>
-#include <common/Crypt/blowfish.h>
+#include <Common.h>
+#include <Network/CommonNetwork.h>
+#include <Util/Util.h>
+#include <Logging/Logger.h>
+#include <Network/GamePacket.h>
+#include <Network/GamePacketNew.h>
+#include <Network/PacketDef/Lobby/ServerLobbyDef.h>
+#include <Network/GamePacketParser.h>
+#include <Crypt/md5.h>
+#include <Crypt/blowfish.h>
 
 #include <boost/property_tree/json_parser.hpp>
 

src/servers/sapphire_lobby/GameConnection.h

@@ -1,13 +1,13 @@
 #ifndef GAMECONNECTION_H
 #define GAMECONNECTION_H
 
-#include <common/Network/Connection.h>
-#include <common/Network/Acceptor.h>
-#include <common/Network/CommonNetwork.h>
+#include <Network/Connection.h>
+#include <Network/Acceptor.h>
+#include <Network/CommonNetwork.h>
 
-#include <common/Network/GamePacket.h>
-#include <common/Network/PacketContainer.h>
-#include <common/Util/LockedQueue.h>
+#include <Network/GamePacket.h>
+#include <Network/PacketContainer.h>
+#include <Util/LockedQueue.h>
 
 #include "LobbyPacketContainer.h"
 

src/servers/sapphire_lobby/LobbyPacketContainer.cpp

@@ -1,7 +1,7 @@
 #include "LobbyPacketContainer.h"
-#include <common/Network/GamePacket.h>
-#include <common/Network/GamePacketNew.h>
-#include <common/Crypt/blowfish.h>
+#include <Network/GamePacket.h>
+#include <Network/GamePacketNew.h>
+#include <Crypt/blowfish.h>
 
 namespace Core {
    namespace Network {

src/servers/sapphire_lobby/LobbyPacketContainer.h

@@ -4,8 +4,8 @@
 #include <vector>
 #include <string.h>
 
-#include <common/Network/CommonNetwork.h>
-#include <common/Util/Util.h>
+#include <Network/CommonNetwork.h>
+#include <Util/Util.h>
 
 #include "Forwards.h"
 

src/servers/sapphire_lobby/RestConnector.cpp

@@ -1,8 +1,8 @@
 #include "RestConnector.h"
 #include "LobbySession.h"
 #include "ServerLobby.h"
-#include <common/Logging/Logger.h>
-#include <common/Crypt/base64.h>
+#include <Logging/Logger.h>
+#include <Crypt/base64.h>
 #include <time.h>
 #include <iomanip>
 

src/servers/sapphire_lobby/ServerLobby.cpp

@@ -3,12 +3,12 @@
 #include <time.h>
 #include <map>
 
-#include <common/Network/Hive.h>
-#include <common/Network/Acceptor.h>
+#include <Network/Hive.h>
+#include <Network/Acceptor.h>
 
-#include <common/Version.h>
-#include <common/Logging/Logger.h>
-#include <common/Config/XMLConfig.h>
+#include <Version.h>
+#include <Logging/Logger.h>
+#include <Config/XMLConfig.h>
 
 //#include "LobbySession.h"
 

src/servers/sapphire_lobby/ServerLobby.h

@@ -6,7 +6,7 @@
 #include <map>
 
 #include <boost/shared_ptr.hpp>
-#include <common/Config/XMLConfig.h>
+#include <Config/XMLConfig.h>
 
 #include "Forwards.h"
 

src/servers/sapphire_zone/Action/Action.cpp

@@ -1,6 +1,6 @@
 #include "Action.h"
 
-#include <common/Util/Util.h>
+#include <Util/Util.h>
 
 
 Core::Action::Action::Action()

src/servers/sapphire_zone/Action/Action.h

@@ -1,7 +1,7 @@
 #ifndef _ACTION_H_
 #define _ACTION_H_
 
-#include <common/Common.h>
+#include <Common.h>
 #include "../Forwards.h"
 
 namespace Core {

src/servers/sapphire_zone/Action/ActionCast.cpp

@@ -1,8 +1,8 @@
-#include <common/Common.h>
-#include <common/Util/Util.h>
-#include <common/Util/UtilMath.h>
-#include <common/Logging/Logger.h>
-#include <common/Exd/ExdDataGenerated.h>
+#include <Common.h>
+#include <Util/Util.h>
+#include <Util/UtilMath.h>
+#include <Logging/Logger.h>
+#include <Exd/ExdDataGenerated.h>
 
 #include "Network/PacketWrappers/ActorControlPacket142.h"
 #include "Network/PacketWrappers/ActorControlPacket143.h"

src/servers/sapphire_zone/Action/ActionCollision.cpp

@@ -1,7 +1,7 @@
-#include <common/Util/Util.h>
-#include <common/Util/UtilMath.h>
+#include <Util/Util.h>
+#include <Util/UtilMath.h>
 
-#include <common/Exd/ExdDataGenerated.h>
+#include <Exd/ExdDataGenerated.h>
 
 #include "ActionCollision.h"
 #include "Actor/Actor.h"

src/servers/sapphire_zone/Action/ActionCollision.h

@@ -1,7 +1,7 @@
 #ifndef _ACTIONCOLLISION_H
 #define _ACTIONCOLLISION_H
 
-#include <common/Common.h>
+#include <Common.h>
 #include "Action.h"
 
 

src/servers/sapphire_zone/Action/ActionMount.cpp

@@ -1,7 +1,7 @@
-#include <common/Common.h>
-#include <common/Util/Util.h>
-#include <common/Util/UtilMath.h>
-#include <common/Logging/Logger.h>
+#include <Common.h>
+#include <Util/Util.h>
+#include <Util/UtilMath.h>
+#include <Logging/Logger.h>
 
 #include "Network/PacketWrappers/ActorControlPacket142.h"
 #include "Network/PacketWrappers/ActorControlPacket143.h"

src/servers/sapphire_zone/Action/ActionTeleport.cpp

@@ -1,6 +1,6 @@
-#include <common/Util/Util.h>
-#include <common/Exd/ExdDataGenerated.h>
-#include <common/Logging/Logger.h>
+#include <Util/Util.h>
+#include <Exd/ExdDataGenerated.h>
+#include <Logging/Logger.h>
 
 #include "Network/PacketWrappers/ActorControlPacket142.h"
 #include "Network/PacketWrappers/ActorControlPacket143.h"

src/servers/sapphire_zone/Action/EventAction.cpp

@@ -1,6 +1,6 @@
-#include <common/Util/Util.h>
-#include <common/Logging/Logger.h>
-#include <common/Exd/ExdDataGenerated.h>
+#include <Util/Util.h>
+#include <Logging/Logger.h>
+#include <Exd/ExdDataGenerated.h>
 
 #include "Network/PacketWrappers/ActorControlPacket142.h"
 #include "Network/PacketWrappers/ActorControlPacket143.h"

src/servers/sapphire_zone/Action/EventAction.h

@@ -1,7 +1,7 @@
 #ifndef _EVENTACTION_H_
 #define _EVENTACTION_H_
 
-#include <common/Common.h>
+#include <Common.h>
 
 #include "../Forwards.h"
 #include "Action.h"

src/servers/sapphire_zone/Action/EventItemAction.cpp

@@ -1,8 +1,8 @@
 #include <string.h>
 
-#include <common/Util/Util.h>
-#include <common/Util/UtilMath.h>
-#include <common/Logging/Logger.h>
+#include <Util/Util.h>
+#include <Util/UtilMath.h>
+#include <Logging/Logger.h>
 
 #include "Network/PacketWrappers/ActorControlPacket142.h"
 #include "Network/PacketWrappers/ActorControlPacket143.h"

src/servers/sapphire_zone/Actor/Actor.cpp

@@ -1,9 +1,9 @@
 #include "Actor.h"
 
-#include <common/Network/PacketContainer.h>
-#include <common/Network/GamePacket.h>
-#include <common/Util/Util.h>
-#include <common/Util/UtilMath.h>
+#include <Network/PacketContainer.h>
+#include <Network/GamePacket.h>
+#include <Util/Util.h>
+#include <Util/UtilMath.h>
 
 #include "Forwards.h"
 #include "Action/Action.h"

src/servers/sapphire_zone/Actor/Actor.h

@@ -1,7 +1,7 @@
 #ifndef _GAME_OBJECT_H_
 #define _GAME_OBJECT_H_
 
-#include <common/Common.h>
+#include <Common.h>
 #include <boost/enable_shared_from_this.hpp>
 
 #include "Forwards.h"

src/servers/sapphire_zone/Actor/Chara.cpp

@@ -1,8 +1,8 @@
-#include <common/Util/Util.h>
-#include <common/Util/UtilMath.h>
-#include <common/Network/PacketContainer.h>
-#include <common/Exd/ExdDataGenerated.h>
-#include <common/Network/GamePacket.h>
+#include <Util/Util.h>
+#include <Util/UtilMath.h>
+#include <Network/PacketContainer.h>
+#include <Exd/ExdDataGenerated.h>
+#include <Network/GamePacket.h>
 
 #include "Forwards.h"
 #include "Action/Action.h"

src/servers/sapphire_zone/Actor/Chara.h

@@ -1,7 +1,7 @@
 #ifndef _ACTOR_H_
 #define _ACTOR_H_
 
-#include <common/Common.h>
+#include <Common.h>
 #include <boost/enable_shared_from_this.hpp>
 
 #include "Forwards.h"

src/servers/sapphire_zone/Actor/EventObject.cpp

@@ -3,13 +3,13 @@
 #include "Zone/InstanceContent.h"
 #include "Actor/Player.h"
 
-#include <common/Logging/Logger.h>
-#include <common/Network/GamePacket.h>
-#include <common/Network/GamePacketNew.h>
-#include <common/Network/CommonNetwork.h>
-#include <common/Network/PacketDef/Zone/ServerZoneDef.h>
-#include <common/Network/PacketContainer.h>
-#include <common/Util/UtilMath.h>
+#include <Logging/Logger.h>
+#include <Network/GamePacket.h>
+#include <Network/GamePacketNew.h>
+#include <Network/CommonNetwork.h>
+#include <Network/PacketDef/Zone/ServerZoneDef.h>
+#include <Network/PacketContainer.h>
+#include <Util/UtilMath.h>
 
 using namespace Core::Common;
 using namespace Core::Network::Packets;

src/servers/sapphire_zone/Actor/Player.cpp

@@ -1,13 +1,13 @@
 #include <boost/make_shared.hpp>
 
-#include <common/Common.h>
-#include <common/Util/Util.h>
-#include <common/Util/UtilMath.h>
-#include <common/Config/XMLConfig.h>
-#include <common/Network/GamePacket.h>
-#include <common/Logging/Logger.h>
-#include <common/Exd/ExdDataGenerated.h>
-#include <common/Network/PacketContainer.h>
+#include <Common.h>
+#include <Util/Util.h>
+#include <Util/UtilMath.h>
+#include <Config/XMLConfig.h>
+#include <Network/GamePacket.h>
+#include <Logging/Logger.h>
+#include <Exd/ExdDataGenerated.h>
+#include <Network/PacketContainer.h>
 
 #include "Session.h"
 #include "Player.h"

src/servers/sapphire_zone/Actor/Player.h

@@ -3,8 +3,8 @@
 
 #include "Forwards.h"
 
-#include <common/Common.h>
-#include <common/Util/SpawnIndexAllocator.h>
+#include <Common.h>
+#include <Util/SpawnIndexAllocator.h>
 
 #include "Chara.h"
 #include "Inventory/Inventory.h"

src/servers/sapphire_zone/Actor/PlayerEvent.cpp

@@ -1,8 +1,8 @@
-#include <common/Common.h>
-#include <common/Network/GamePacket.h>
-#include <common/Logging/Logger.h>
-#include <common/Network/PacketContainer.h>
-#include <common/Config/XMLConfig.h>
+#include <Common.h>
+#include <Network/GamePacket.h>
+#include <Logging/Logger.h>
+#include <Network/PacketContainer.h>
+#include <Config/XMLConfig.h>
 
 #include "Network/GameConnection.h"
 #include "Network/PacketWrappers/ActorControlPacket142.h"

src/servers/sapphire_zone/Actor/PlayerInventory.cpp

@@ -1,6 +1,6 @@
-#include <common/Common.h>
-#include <common/Network/GamePacket.h>
-#include <common/Logging/Logger.h>
+#include <Common.h>
+#include <Network/GamePacket.h>
+#include <Logging/Logger.h>
 
 #include "Zone/Zone.h"
 

src/servers/sapphire_zone/Actor/PlayerQuest.cpp

@@ -1,8 +1,8 @@
-#include <common/Common.h>
-#include <common/Network/PacketDef/Zone/ServerZoneDef.h>
-#include <common/Network/GamePacket.h>
-#include <common/Exd/ExdDataGenerated.h>
-#include <common/Network/PacketContainer.h>
+#include <Common.h>
+#include <Network/PacketDef/Zone/ServerZoneDef.h>
+#include <Network/GamePacket.h>
+#include <Exd/ExdDataGenerated.h>
+#include <Network/PacketContainer.h>
 
 #include "Network/GameConnection.h"
 #include "Network/PacketWrappers/QuestMessagePacket.h"

src/servers/sapphire_zone/Actor/PlayerSql.cpp

@@ -2,16 +2,16 @@
 #include <stdio.h>
 #include <time.h>
 
-#include <common/Common.h>
-#include <common/Network/GamePacket.h>
-#include <common/Util/Util.h>
-#include <common/Util/UtilMath.h>
-#include <common/Config/XMLConfig.h>
-#include <common/Logging/Logger.h>
-#include <common/Exd/ExdDataGenerated.h>
-#include <common/Network/PacketContainer.h>
-#include <common/Common.h>
-#include <common/Database/DatabaseDef.h>
+#include <Common.h>
+#include <Network/GamePacket.h>
+#include <Util/Util.h>
+#include <Util/UtilMath.h>
+#include <Config/XMLConfig.h>
+#include <Logging/Logger.h>
+#include <Exd/ExdDataGenerated.h>
+#include <Network/PacketContainer.h>
+#include <Common.h>
+#include <Database/DatabaseDef.h>
 
 #include "Network/GameConnection.h"
 #include "Network/PacketWrappers/InitUIPacket.h"

src/servers/sapphire_zone/CMakeLists.txt

@@ -1,11 +1,10 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 3.0.2)
 cmake_policy(SET CMP0015 NEW)
 cmake_policy(SET CMP0014 OLD)
 
 add_subdirectory("Script/Scripts")
 
 project(sapphire_zone)
-include_directories( ${CMAKE_CURRENT_SOURCE_DIR} )
 
 file(GLOB SERVER_PUBLIC_INCLUDE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
         /*.h
@@ -42,7 +41,6 @@ file(GLOB SERVER_SOURCE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY  "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/")
 
 add_executable(sapphire_zone ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES} )
-add_dependencies(sapphire_zone common xivdat mysqlConnector )
 
 set_target_properties(sapphire_zone PROPERTIES
     CXX_STANDARD 14
@@ -57,11 +55,19 @@ set_target_properties(sapphire_zone PROPERTIES
     VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/"
 )
 
+target_link_libraries( sapphire_zone common )
+
 if (UNIX)
-  target_link_libraries ( sapphire_zone common xivdat pthread mysqlclient mysqlConnector dl z )
+  target_link_libraries( sapphire_zone pthread )
+  target_link_libraries( sapphire_zone dl )
+  target_link_libraries( sapphire_zone z )
 else()
-  target_link_libraries ( sapphire_zone common xivdat libmysql zlib1 mysqlConnector )
+  target_link_libraries( sapphire_zone zlib1 )
 endif()
 
 target_link_libraries( sapphire_zone ${Boost_LIBRARIES} )
+target_include_directories( sapphire_zone PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" )
+target_include_directories( sapphire_zone PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/Script" )
+target_include_directories( sapphire_zone PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/Script/Scripts" )
+target_include_directories( sapphire_zone PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external" )
 cotire( sapphire_zone )

src/servers/sapphire_zone/DebugCommand/DebugCommand.h

@@ -1,7 +1,7 @@
 #ifndef _GAMECOMMAND_H_
 #define _GAMECOMMAND_H_
 
-#include <common/Common.h>
+#include <Common.h>
 
 #include "Forwards.h"
 

src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp

@@ -3,15 +3,15 @@
 #include <boost/format.hpp>
 #include <cinttypes>
 
-#include <common/Common.h>
-#include <common/Version.h>
-#include <common/Network/GamePacketNew.h>
-#include <common/Network/CommonNetwork.h>
-#include <common/Util/UtilMath.h>
-#include <common/Network/PacketContainer.h>
-#include <common/Logging/Logger.h>
-#include <common/Exd/ExdDataGenerated.h>
-#include <common/Database/DatabaseDef.h>
+#include <Common.h>
+#include <Version.h>
+#include <Network/GamePacketNew.h>
+#include <Network/CommonNetwork.h>
+#include <Util/UtilMath.h>
+#include <Network/PacketContainer.h>
+#include <Logging/Logger.h>
+#include <Exd/ExdDataGenerated.h>
+#include <Database/DatabaseDef.h>
 
 #include "DebugCommand.h"
 #include "DebugCommandHandler.h"

src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.h

@@ -2,9 +2,9 @@
 #define _GAMECOMMANDHANDLER_H_
 
 #include <map>
+#include <Common.h>
 
 #include "DebugCommand.h"
-#include <common/Common.h>
 #include "Forwards.h"
 
 namespace Core {

src/servers/sapphire_zone/Event/Director.cpp

@@ -1,7 +1,7 @@
 #include "Director.h"
 
-#include <common/Network/PacketDef/Ipcs.h>
-#include <common/Network/PacketDef/Zone/ServerZoneDef.h>
+#include <Network/PacketDef/Ipcs.h>
+#include <Network/PacketDef/Zone/ServerZoneDef.h>
 
 #include "Actor/Player.h"
 

src/servers/sapphire_zone/Event/Director.h

@@ -1,7 +1,7 @@
 #ifndef SAPPHIRE_DIRECTOR_H
 #define SAPPHIRE_DIRECTOR_H
 
-#include <common/Common.h>
+#include <Common.h>
 
 #include "Forwards.h"
 

src/servers/sapphire_zone/Event/EventHelper.cpp

@@ -1,5 +1,5 @@
-#include <common/Common.h>
-#include <common/Exd/ExdDataGenerated.h>
+#include <Common.h>
+#include <Exd/ExdDataGenerated.h>
 #include "Framework.h"
 #include "EventHelper.h"
 #include "EventHandler.h"

src/servers/sapphire_zone/Framework.h

@@ -6,12 +6,12 @@
 
 #include "Forwards.h"
 
-
 #include "ServerZone.h"
 
-#include <common/Logging/Logger.h>
-
-#include <common/Exd/ExdDataGenerated.h>
+#include <Logging/Logger.h>
+#include <Exd/ExdDataGenerated.h>
+#include <Database/CharaDbConnection.h>
+#include <Database/DbWorkerPool.h>
 
 #include "Script/ScriptMgr.h"
 
@@ -21,8 +21,6 @@
 
 #include "DebugCommand/DebugCommandHandler.h"
 
-#include <common/Database/CharaDbConnection.h>
-#include <common/Database/DbWorkerPool.h>
 
 namespace Core
 {

src/servers/sapphire_zone/Inventory/Inventory.cpp

@@ -1,11 +1,11 @@
 #include <boost/lexical_cast.hpp>
 #include <boost/algorithm/clamp.hpp>
 
-#include <common/Network/PacketDef/Zone/ServerZoneDef.h>
-#include <common/Common.h>
-#include <common/Exd/ExdDataGenerated.h>
-#include <common/Logging/Logger.h>
-#include <common/Database/DatabaseDef.h>
+#include <Network/PacketDef/Zone/ServerZoneDef.h>
+#include <Common.h>
+#include <Exd/ExdDataGenerated.h>
+#include <Logging/Logger.h>
+#include <Database/DatabaseDef.h>
 
 #include "Actor/Player.h"
 

src/servers/sapphire_zone/Inventory/Inventory.h

@@ -1,7 +1,7 @@
 #ifndef INVENTORY_H_
 #define INVENTORY_H_
 #include <map>
-#include <common/Common.h>
+#include <Common.h>
 #include "../Forwards.h"
 
 namespace Core

src/servers/sapphire_zone/Inventory/Item.cpp

@@ -1,5 +1,5 @@
-#include <common/Common.h>
-#include <common/Exd/ExdDataGenerated.h>
+#include <Common.h>
+#include <Exd/ExdDataGenerated.h>
 
 #include "Framework.h"
 #include "Item.h"

src/servers/sapphire_zone/Inventory/Item.h

@@ -1,7 +1,7 @@
 #ifndef _ITEM_H_
 #define _ITEM_H_
 
-#include <common/Common.h>
+#include <Common.h>
 
 namespace Core {
 

src/servers/sapphire_zone/Inventory/ItemContainer.cpp

@@ -1,6 +1,6 @@
-#include <common/Common.h>
-#include <common/Logging/Logger.h>
-#include <common/Database/DatabaseDef.h>
+#include <Common.h>
+#include <Logging/Logger.h>
+#include <Database/DatabaseDef.h>
 
 #include "Actor/Player.h"
 

src/servers/sapphire_zone/Inventory/ItemContainer.h

@@ -3,7 +3,7 @@
 
 #include <map>
 
-#include <common/Common.h>
+#include <Common.h>
 
 #include "../Forwards.h"
 

src/servers/sapphire_zone/Linkshell/Linkshell.h

@@ -1,7 +1,7 @@
 #ifndef CORE_LINKSHELL_H
 #define CORE_LINKSHELL_H
 
-#include <common/Common.h>
+#include <Common.h>
 #include <set>
 
 namespace Core

src/servers/sapphire_zone/Linkshell/LinkshellMgr.cpp

@@ -1,7 +1,7 @@
 #include <boost/make_shared.hpp>
 
-#include <common/Logging/Logger.h>
-#include <common/Database/DatabaseDef.h>
+#include <Logging/Logger.h>
+#include <Database/DatabaseDef.h>
 
 #include "Linkshell.h"
 #include "Framework.h"

src/servers/sapphire_zone/Math/CalcBattle.cpp

@@ -1,7 +1,7 @@
 #include <cmath>
 
-#include <common/Exd/ExdDataGenerated.h>
-#include <common/Common.h>
+#include <Exd/ExdDataGenerated.h>
+#include <Common.h>
 
 #include "Actor/Chara.h"
 

src/servers/sapphire_zone/Math/CalcBattle.h

@@ -1,7 +1,7 @@
 #ifndef _CALCBATTLE_H
 #define _CALCBATTLE_H
 
-#include <common/Common.h>
+#include <Common.h>
 #include "Forwards.h"
 
 using namespace Core::Entity;

src/servers/sapphire_zone/Math/CalcStats.cpp

@@ -1,7 +1,7 @@
 #include <cmath>
 
-#include <common/Exd/ExdDataGenerated.h>
-#include <common/Common.h>
+#include <Exd/ExdDataGenerated.h>
+#include <Common.h>
 
 #include "Actor/Chara.h"
 

src/servers/sapphire_zone/Math/CalcStats.h

@@ -1,7 +1,7 @@
 #ifndef _CALCSTATS_H
 #define _CALCSTATS_H
 
-#include <common/Common.h>
+#include <Common.h>
 #include "Forwards.h"
 
 using namespace Core::Entity;

src/servers/sapphire_zone/Network/GameConnection.cpp

@@ -1,11 +1,11 @@
 #include <boost/format.hpp>
 
-#include <common/Common.h>
-#include <common/Network/CommonNetwork.h>
-#include <common/Util/Util.h>
-#include <common/Logging/Logger.h>
-#include <common/Network/PacketContainer.h>
-#include <common/Network/GamePacketParser.h>
+#include <Common.h>
+#include <Network/CommonNetwork.h>
+#include <Util/Util.h>
+#include <Logging/Logger.h>
+#include <Network/PacketContainer.h>
+#include <Network/GamePacketParser.h>
 
 #include "Zone/Zone.h"
 

src/servers/sapphire_zone/Network/GameConnection.h

@@ -1,11 +1,11 @@
 #ifndef GAMECONNECTION_H
 #define GAMECONNECTION_H
 
-#include <common/Network/Connection.h>
-#include <common/Network/Acceptor.h>
-#include <common/Network/CommonNetwork.h>
-#include <common/Network/GamePacket.h>
-#include <common/Util/LockedQueue.h>
+#include <Network/Connection.h>
+#include <Network/Acceptor.h>
+#include <Network/CommonNetwork.h>
+#include <Network/GamePacket.h>
+#include <Util/LockedQueue.h>
 
 #include "Forwards.h"
 

src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp

@@ -1,11 +1,11 @@
 #include <boost/format.hpp>
 
-#include <common/Common.h>
-#include <common/Network/CommonNetwork.h>
-#include <common/Network/GamePacketNew.h>
-#include <common/Logging/Logger.h>
-#include <common/Exd/ExdDataGenerated.h>
-#include <common/Network/PacketContainer.h>
+#include <Common.h>
+#include <Network/CommonNetwork.h>
+#include <Network/GamePacketNew.h>
+#include <Logging/Logger.h>
+#include <Exd/ExdDataGenerated.h>
+#include <Network/PacketContainer.h>
 
 #include "Zone/Zone.h"
 #include "Zone/ZonePosition.h"

src/servers/sapphire_zone/Network/Handlers/CFHandlers.cpp

@@ -1,9 +1,9 @@
-#include <common/Common.h>
-#include <common/Network/CommonNetwork.h>
-#include <common/Network/GamePacketNew.h>
-#include <common/Logging/Logger.h>
-#include <common/Network/PacketContainer.h>
-#include <common/Exd/ExdDataGenerated.h>
+#include <Common.h>
+#include <Network/CommonNetwork.h>
+#include <Network/GamePacketNew.h>
+#include <Logging/Logger.h>
+#include <Network/PacketContainer.h>
+#include <Exd/ExdDataGenerated.h>
 
 #include "Zone/TerritoryMgr.h"
 #include "Zone/Zone.h"

src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp

@@ -1,11 +1,11 @@
 #include <boost/format.hpp>
 
-#include <common/Common.h>
-#include <common/Exd/ExdDataGenerated.h>
-#include <common/Network/CommonNetwork.h>
-#include <common/Network/GamePacketNew.h>
-#include <common/Network/PacketContainer.h>
-#include <common/Network/PacketDef/Zone/ServerZoneDef.h>
+#include <Common.h>
+#include <Exd/ExdDataGenerated.h>
+#include <Network/CommonNetwork.h>
+#include <Network/GamePacketNew.h>
+#include <Network/PacketContainer.h>
+#include <Network/PacketDef/Zone/ServerZoneDef.h>
 
 #include "Network/GameConnection.h"
 #include "Network/PacketWrappers/ServerNoticePacket.h"

src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp

@@ -1,10 +1,10 @@
 #include <boost/format.hpp>
 
-#include <common/Common.h>
-#include <common/Network/CommonNetwork.h>
-#include <common/Network/GamePacketNew.h>
-#include <common/Logging/Logger.h>
-#include <common/Network/PacketContainer.h>
+#include <Common.h>
+#include <Network/CommonNetwork.h>
+#include <Network/GamePacketNew.h>
+#include <Logging/Logger.h>
+#include <Network/PacketContainer.h>
 
 #include <unordered_map>
 #include <boost/format.hpp>

src/servers/sapphire_zone/Network/Handlers/InventoryHandler.cpp

@@ -1,10 +1,10 @@
 #include <boost/format.hpp>
 
-#include <common/Common.h>
-#include <common/Network/CommonNetwork.h>
-#include <common/Network/GamePacketNew.h>
-#include <common/Logging/Logger.h>
-#include <common/Network/PacketContainer.h>
+#include <Common.h>
+#include <Network/CommonNetwork.h>
+#include <Network/GamePacketNew.h>
+#include <Logging/Logger.h>
+#include <Network/PacketContainer.h>
 
 #include "Network/GameConnection.h"
 #include "Network/PacketWrappers/ServerNoticePacket.h"

src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp

@@ -1,12 +1,12 @@
 #include <boost/format.hpp>
 
-#include <common/Common.h>
-#include <common/Network/CommonNetwork.h>
-#include <common/Network/GamePacketNew.h>
-#include <common/Logging/Logger.h>
-#include <common/Network/PacketContainer.h>
-#include <common/Network/PacketDef/Chat/ServerChatDef.h>
-#include <common/Database/DatabaseDef.h>
+#include <Common.h>
+#include <Network/CommonNetwork.h>
+#include <Network/GamePacketNew.h>
+#include <Logging/Logger.h>
+#include <Network/PacketContainer.h>
+#include <Network/PacketDef/Chat/ServerChatDef.h>
+#include <Database/DatabaseDef.h>
 #include <boost/format.hpp>
 #include <unordered_map>
 #include "Network/GameConnection.h"

src/servers/sapphire_zone/Network/Handlers/SkillHandler.cpp

@@ -1,11 +1,11 @@
 #include <boost/format.hpp>
 
-#include <common/Common.h>
-#include <common/Network/CommonNetwork.h>
-#include <common/Exd/ExdDataGenerated.h>
-#include <common/Network/GamePacketNew.h>
-#include <common/Network/PacketContainer.h>
-#include <common/Logging/Logger.h>
+#include <Common.h>
+#include <Network/CommonNetwork.h>
+#include <Exd/ExdDataGenerated.h>
+#include <Network/GamePacketNew.h>
+#include <Network/PacketContainer.h>
+#include <Logging/Logger.h>
 
 #include "Network/GameConnection.h"
 #include "Network/PacketWrappers/ServerNoticePacket.h"

src/servers/sapphire_zone/Network/PacketWrappers/ActorControlPacket142.h

@@ -1,8 +1,8 @@
 #ifndef _ACTORCONTROL142_H
 #define _ACTORCONTROL142_H
 
-#include <common/Network/GamePacketNew.h>
-#include <common/Network/PacketDef/Zone/ServerZoneDef.h>
+#include <Network/GamePacketNew.h>
+#include <Network/PacketDef/Zone/ServerZoneDef.h>
 #include "Forwards.h"
 
 namespace Core {

src/servers/sapphire_zone/Network/PacketWrappers/ActorControlPacket143.h

@@ -1,8 +1,8 @@
 #ifndef _ACTORCONTROL143_H
 #define _ACTORCONTROL143_H
 
-#include <common/Network/GamePacketNew.h>
-#include <common/Network/PacketDef/Zone/ServerZoneDef.h>
+#include <Network/GamePacketNew.h>
+#include <Network/PacketDef/Zone/ServerZoneDef.h>
 #include "Forwards.h"
 
 

src/servers/sapphire_zone/Network/PacketWrappers/ActorControlPacket144.h

@@ -1,8 +1,8 @@
 #ifndef _ACTORCONTROL144_H
 #define _ACTORCONTROL144_H
 
-#include <common/Network/GamePacketNew.h>
-#include <common/Network/PacketDef/Zone/ServerZoneDef.h>
+#include <Network/GamePacketNew.h>
+#include <Network/PacketDef/Zone/ServerZoneDef.h>
 
 namespace Core {
 namespace Network {

src/servers/sapphire_zone/Network/PacketWrappers/ChatPacket.h

@@ -1,8 +1,8 @@
 #ifndef _CHATPACKET_H
 #define _CHATPACKET_H
 
-#include <common/Network/GamePacketNew.h>
-#include <common/Network/PacketDef/Zone/ServerZoneDef.h>
+#include <Network/GamePacketNew.h>
+#include <Network/PacketDef/Zone/ServerZoneDef.h>
 #include "Forwards.h"
 
 

src/servers/sapphire_zone/Network/PacketWrappers/DirectorPlayScenePacket.h

@@ -1,7 +1,7 @@
 #ifndef _DIRECTORPLAYSCENE_H
 #define _DIRECTORPLAYSCENE_H
 
-#include <common/Network/GamePacketNew.h>
+#include <Network/GamePacketNew.h>
 #include "Forwards.h"
 
 namespace Core {

src/servers/sapphire_zone/Network/PacketWrappers/EventFinishPacket.h

@@ -1,7 +1,7 @@
 #ifndef _EVENTFINISH_H
 #define _EVENTFINISH_H
 
-#include <common/Network/GamePacketNew.h>
+#include <Network/GamePacketNew.h>
 
 namespace Core {
 namespace Network {

src/servers/sapphire_zone/Network/PacketWrappers/EventPlayPacket.h

@@ -1,7 +1,7 @@
 #ifndef _EVENTPLAY_H
 #define _EVENTPLAY_H
 
-#include <common/Network/GamePacketNew.h>
+#include <Network/GamePacketNew.h>
 #include "Forwards.h"
 
 namespace Core {

src/servers/sapphire_zone/Network/PacketWrappers/EventStartPacket.h

@@ -1,7 +1,7 @@
 #ifndef _EVENTSTART_H
 #define _EVENTSTART_H
 
-#include <common/Network/GamePacketNew.h>
+#include <Network/GamePacketNew.h>
 #include "Forwards.h"
 
 namespace Core {

src/servers/sapphire_zone/Network/PacketWrappers/InitUIPacket.h

@@ -1,8 +1,8 @@
 #ifndef _CORE_NETWORK_PACKETS_INITUIPACKET_H
 #define _CORE_NETWORK_PACKETS_INITUIPACKET_H
 
-#include <common/Network/GamePacketNew.h>
-#include <common/Network/PacketDef/Zone/ServerZoneDef.h>
+#include <Network/GamePacketNew.h>
+#include <Network/PacketDef/Zone/ServerZoneDef.h>
 #include "Actor/Player.h"
 #include "Forwards.h"
 

src/servers/sapphire_zone/Network/PacketWrappers/ModelEquipPacket.h

@@ -1,7 +1,7 @@
 #ifndef _MODELEQUIPPACKET_H
 #define _MODELEQUIPPACKET_H
 
-#include <common/Network/GamePacketNew.h>
+#include <Network/GamePacketNew.h>
 #include "Actor/Player.h"
 #include "Forwards.h"
 

src/servers/sapphire_zone/Network/PacketWrappers/MoveActorPacket.h

@@ -1,9 +1,9 @@
 #ifndef _MOVEACTORPACKET_H
 #define _MOVEACTORPACKET_H
 
-#include <common/Network/GamePacketNew.h>
-#include <common/Network/PacketDef/Zone/ServerZoneDef.h>
-#include <common/Util/UtilMath.h>
+#include <Network/GamePacketNew.h>
+#include <Network/PacketDef/Zone/ServerZoneDef.h>
+#include <Util/UtilMath.h>
 #include "Actor/Player.h"
 #include "Forwards.h"
 

src/servers/sapphire_zone/Network/PacketWrappers/PingPacket.h

@@ -1,7 +1,7 @@
 #ifndef _CORE_NETWORK_PACKETS_PINGPACKET_H
 #define _CORE_NETWORK_PACKETS_PINGPACKET_H
 
-#include <common/Network/GamePacketNew.h>
+#include <Network/GamePacketNew.h>
 
 #include "Forwards.h"
 

src/servers/sapphire_zone/Network/PacketWrappers/PlayerSpawnPacket.h

@@ -1,9 +1,9 @@
 #ifndef _PLAYERSPAWN_H
 #define _PLAYERSPAWN_H
 
-#include <common/Network/PacketDef/Zone/ServerZoneDef.h>
-#include <common/Network/GamePacketNew.h>
-#include <common/Util/Util.h>
+#include <Network/PacketDef/Zone/ServerZoneDef.h>
+#include <Network/GamePacketNew.h>
+#include <Util/Util.h>
 #include "Actor/Player.h"
 #include "Forwards.h"
 #include "Inventory/Inventory.h"

src/servers/sapphire_zone/Network/PacketWrappers/PlayerStateFlagsPacket.h

@@ -1,7 +1,7 @@
 #ifndef _PLAYERSTATE_H
 #define _PLAYERSTATE_H
 
-#include <common/Network/GamePacketNew.h>
+#include <Network/GamePacketNew.h>
 #include "Actor/Player.h"
 #include "Forwards.h"
 

src/servers/sapphire_zone/Network/PacketWrappers/QuestMessagePacket.h

@@ -1,7 +1,7 @@
 #ifndef _QUESTMESSAGE_H
 #define _QUESTMESSAGE_H
 
-#include <common/Network/GamePacketNew.h>
+#include <Network/GamePacketNew.h>
 #include "Actor/Player.h"
 #include "Forwards.h"
 

src/servers/sapphire_zone/Network/PacketWrappers/ServerNoticePacket.h

@@ -1,8 +1,8 @@
 #ifndef _SERVERNOTICEPACKET_H
 #define _SERVERNOTICEPACKET_H
 
-#include <common/Network/GamePacketNew.h>
-#include <common/Network/PacketDef/Zone/ServerZoneDef.h>
+#include <Network/GamePacketNew.h>
+#include <Network/PacketDef/Zone/ServerZoneDef.h>
 #include "Forwards.h"
 
 namespace Core {