diff --git a/engine/shared/library/sharedNetwork/src/CMakeLists.txt b/engine/shared/library/sharedNetwork/src/CMakeLists.txt
index dcf5201c..11def0eb 100644
--- a/engine/shared/library/sharedNetwork/src/CMakeLists.txt
+++ b/engine/shared/library/sharedNetwork/src/CMakeLists.txt
@@ -85,7 +85,6 @@ include_directories(
 	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedThread/include/public
 	${SWG_EXTERNALS_SOURCE_DIR}/ours/library/archive/include
 	${SWG_EXTERNALS_SOURCE_DIR}/3rd/library/udplibrary
-	${SWG_EXTERNALS_SOURCE_DIR}/3rd/library/webAPI
 )
 
 add_library(sharedNetwork STATIC
@@ -98,7 +97,6 @@ target_link_libraries(sharedNetwork
 	sharedLog
 	sharedMessageDispatch
 	udplibrary
-	webAPI
 )
 
 if(WIN32)
diff --git a/engine/shared/library/sharedNetwork/src/shared/FirstSharedNetwork.h b/engine/shared/library/sharedNetwork/src/shared/FirstSharedNetwork.h
index 336b8322..2408bc7b 100755
--- a/engine/shared/library/sharedNetwork/src/shared/FirstSharedNetwork.h
+++ b/engine/shared/library/sharedNetwork/src/shared/FirstSharedNetwork.h
@@ -15,9 +15,6 @@
 #include "sharedDebug/FirstSharedDebug.h"
 #include "sharedMemoryManager/FirstSharedMemoryManager.h"
 
-#include "webAPI/webAPIHeartbeat.h"
-webAPIHeartbeat wb = new webAPIHeartbeat();
-
 #include <string>
 
 //-----------------------------------------------------------------------
diff --git a/game/server/application/SwgGameServer/src/CMakeLists.txt b/game/server/application/SwgGameServer/src/CMakeLists.txt
index 85758e34..0257b9af 100644
--- a/game/server/application/SwgGameServer/src/CMakeLists.txt
+++ b/game/server/application/SwgGameServer/src/CMakeLists.txt
@@ -98,7 +98,8 @@ include_directories(
     ${SWG_EXTERNALS_SOURCE_DIR}/ours/library/singleton/include
     ${SWG_EXTERNALS_SOURCE_DIR}/ours/library/unicode/include
     ${SWG_EXTERNALS_SOURCE_DIR}/ours/library/unicodeArchive/include/public
-    ${JNI_INCLUDE_DIRS}
+	${SWG_EXTERNALS_SOURCE_DIR}/3rd/library/webAPI
+	${JNI_INCLUDE_DIRS}
 )
 
 add_executable(SwgGameServer
@@ -149,5 +150,7 @@ target_link_libraries(SwgGameServer
     unicode
     unicodeArchive
     Base
+	webAPI
+	${CURL_LIBRARIES}
     ${CMAKE_DL_LIBS}
 )
diff --git a/game/server/application/SwgGameServer/src/linux/main.cpp b/game/server/application/SwgGameServer/src/linux/main.cpp
index 8c52d111..085eeaa2 100755
--- a/game/server/application/SwgGameServer/src/linux/main.cpp
+++ b/game/server/application/SwgGameServer/src/linux/main.cpp
@@ -32,11 +32,14 @@
 #include "swgSharedNetworkMessages/SetupSwgSharedNetworkMessages.h"
 #include "swgServerNetworkMessages/SetupSwgServerNetworkMessages.h"
 
+#include "webAPIHeartbeat.h"
 
 // ======================================================================
 
 int main(int argc, char ** argv)
 {
+	auto wb = StellaBellum::webAPIHeartbeat();
+
 	SetupSharedThread::install();
 	SetupSharedDebug::install(1024);