diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5e0757b0..e4018e01 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -235,6 +235,8 @@ include_directories(
 
 	"dNet"
 
+	"dWeb"
+
 	"tests"
 	"tests/dCommonTests"
 	"tests/dGameTests"
diff --git a/dChatServer/CMakeLists.txt b/dChatServer/CMakeLists.txt
index 6124b146..c281cbbe 100644
--- a/dChatServer/CMakeLists.txt
+++ b/dChatServer/CMakeLists.txt
@@ -6,17 +6,13 @@ set(DCHATSERVER_SOURCES
 	"ChatWeb.cpp"
 )
 
-include_directories(
-	${PROJECT_SOURCE_DIR}/dWeb
-)
-
 add_executable(ChatServer "ChatServer.cpp")
-target_include_directories(ChatServer PRIVATE "${PROJECT_SOURCE_DIR}/dChatFilter")
+target_include_directories(ChatServer PRIVATE "${PROJECT_SOURCE_DIR}/dChatFilter" "${PROJECT_SOURCE_DIR}/dWeb")
 add_compile_definitions(ChatServer PRIVATE PROJECT_VERSION="\"${PROJECT_VERSION}\"")
 
 add_library(dChatServer ${DCHATSERVER_SOURCES})
 target_include_directories(dChatServer PRIVATE "${PROJECT_SOURCE_DIR}/dServer")
 
 target_link_libraries(dChatServer ${COMMON_LIBRARIES} dChatFilter)
-target_link_libraries(ChatServer ${COMMON_LIBRARIES} dChatFilter dChatServer dServer mongoose dWeb)
+target_link_libraries(ChatServer ${COMMON_LIBRARIES} dChatFilter dChatServer dServer dWeb)
 
diff --git a/dChatServer/ChatWeb.cpp b/dChatServer/ChatWeb.cpp
index 26e73fea..62022b63 100644
--- a/dChatServer/ChatWeb.cpp
+++ b/dChatServer/ChatWeb.cpp
@@ -99,7 +99,7 @@ void HandleWSUnsubscribe(mg_connection* connection, json data) {
 	}
 }
 
-void RegisterRoutes() {
+void ChatWeb::RegisterRoutes() {
 	// REST API v1 routes
 	std::string v1_route = "/api/v1/";
 	Game::web.RegisterHTTPRoute({
diff --git a/dWeb/CMakeLists.txt b/dWeb/CMakeLists.txt
index 14ef1b04..ae681a4e 100644
--- a/dWeb/CMakeLists.txt
+++ b/dWeb/CMakeLists.txt
@@ -4,4 +4,4 @@ set(DWEB_SOURCES
 add_library(dWeb STATIC ${DWEB_SOURCES})
 
 target_include_directories(dWeb PUBLIC ".")
-target_link_libraries(dWeb dCommon)
+target_link_libraries(dWeb dCommon mongoose)
diff --git a/dWeb/Web.cpp b/dWeb/Web.cpp
index 0c9e48fe..33b0a96d 100644
--- a/dWeb/Web.cpp
+++ b/dWeb/Web.cpp
@@ -7,6 +7,9 @@
 #include "GeneralUtils.h"
 #include "JSONUtils.h"
 
+namespace Game {
+	Web web;
+}
 
 namespace {
 	const char * json_content_type = "application/json";
diff --git a/dWeb/Web.h b/dWeb/Web.h
index 45b1c599..da40f329 100644
--- a/dWeb/Web.h
+++ b/dWeb/Web.h
@@ -8,7 +8,10 @@
 #include "json_fwd.hpp"
 #include "eHTTPStatusCode.h"
 
-
+class Web;
+namespace Game {
+	extern Web web;
+}
 
 enum class eHTTPMethod;
 
@@ -49,8 +52,4 @@ private:
 	mg_mgr mgr;
 };
 
-namespace Game {
-	Web web;
-}
-
 #endif // !__WEB_H__