diff --git a/src/servers/Server_Zone/CMakeLists.txt b/src/servers/Server_Zone/CMakeLists.txt
index 8f661d7d..11d27f8d 100644
--- a/src/servers/Server_Zone/CMakeLists.txt
+++ b/src/servers/Server_Zone/CMakeLists.txt
@@ -4,7 +4,21 @@ cmake_policy(SET CMP0014 OLD)
 
 project(Sapphire_Zone)
 
-file(GLOB SERVER_PUBLIC_INCLUDE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/* ${CMAKE_CURRENT_SOURCE_DIR}/Script/*)
+file(GLOB SERVER_PUBLIC_INCLUDE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+        /*.h
+        Actor/*.h
+        Action/*.h
+        DebugCommand/*.h
+        Event/*.h
+        Inventory/*.h
+        Linkshell/*.h
+        Network/*.h
+        Network/Handlers/*.h
+        Network/PacketWrappers/*.h
+        Script/*.h
+        StatusEffect/*.h
+        Zone/*.h)
+
 file(GLOB SERVER_SOURCE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
         *.c*
         Actor/*.c*
@@ -42,4 +56,4 @@ else()
   target_link_libraries ( server_zone Common xivdat libmysql zlib1 mysqlConnector )
 endif()
 
-target_link_libraries(server_zone ${Boost_LIBRARIES} ${Boost_LIBRARIES} )
+target_link_libraries(server_zone ${Boost_LIBRARIES} )