diff --git a/tools/chatgui/src/audiodevicesettingspage.cpp b/tools/chatgui/src/audiodevicesettingspage.cpp
index 407aed42..01e90fbc 100644
--- a/tools/chatgui/src/audiodevicesettingspage.cpp
+++ b/tools/chatgui/src/audiodevicesettingspage.cpp
@@ -8,7 +8,7 @@
 #include "../transport/gui_bridge.h"
 #include "../../lib/mem.h"
 extern "C" {
-#include "../transport/chat_core.h"
+#include "chat/chat_core.h"
 }
 #include <QVBoxLayout>
 #include <QHBoxLayout>
diff --git a/tools/chatgui/src/joindialog.cpp b/tools/chatgui/src/joindialog.cpp
index cca19499..7750c0ba 100644
--- a/tools/chatgui/src/joindialog.cpp
+++ b/tools/chatgui/src/joindialog.cpp
@@ -3,7 +3,7 @@
 #include "debug_ui.h"
 #include "../transport/utun_node.h"
 #include "../transport/gui_bridge.h"
-#include "../transport/chat_sync.h"
+#include "chat/chat_sync.h"
 #include "../db/db_manager.h"
 #include <QVBoxLayout>
 #include <QHBoxLayout>
diff --git a/tools/chatgui/src/mainwindow.cpp b/tools/chatgui/src/mainwindow.cpp
index b4064fc1..c48d0452 100644
--- a/tools/chatgui/src/mainwindow.cpp
+++ b/tools/chatgui/src/mainwindow.cpp
@@ -29,7 +29,7 @@
 #include <cmath>
 
 extern "C" {
-#include "../transport/chat_core.h"
+#include "chat/chat_core.h"
 #include "../../lib/mem.h"
 #include "../../lib/debug_config.h"
 }
diff --git a/tools/chatgui/src/messagelist.cpp b/tools/chatgui/src/messagelist.cpp
index a1229137..e91e221b 100644
--- a/tools/chatgui/src/messagelist.cpp
+++ b/tools/chatgui/src/messagelist.cpp
@@ -26,7 +26,7 @@ static std::vector<std::unique_ptr<LottieIcon>> s_icons;
 
 extern "C" {
 #include "../transport/gui_bridge.h"
-#include "../transport/chat_core.h"
+#include "chat/chat_core.h"
 #include "../../lib/u_async.h"
 #include "../../lib/mem.h"
 #include "../../lib/debug_config.h"
diff --git a/tools/chatgui/src/settingsdialog.cpp b/tools/chatgui/src/settingsdialog.cpp
index 86d54c38..03cb3378 100644
--- a/tools/chatgui/src/settingsdialog.cpp
+++ b/tools/chatgui/src/settingsdialog.cpp
@@ -11,7 +11,7 @@
 #include "../db/db_manager.h"
 #include "../transport/utun_node.h"
 extern "C" {
-#include "../transport/chat_core.h"
+#include "chat/chat_core.h"
 }
 #include <QVBoxLayout>
 #include <QHBoxLayout>
diff --git a/tools/chatgui/src/soundsettingspage.cpp b/tools/chatgui/src/soundsettingspage.cpp
index 6e38e13f..c6b04c71 100644
--- a/tools/chatgui/src/soundsettingspage.cpp
+++ b/tools/chatgui/src/soundsettingspage.cpp
@@ -4,7 +4,7 @@
 #include "../transport/gui_bridge.h"
 #include "../../lib/mem.h"
 extern "C" {
-#include "../transport/chat_core.h"
+#include "chat/chat_core.h"
 }
 #include <QVBoxLayout>
 #include <QHBoxLayout>
diff --git a/tools/chatgui/src/statuspage.cpp b/tools/chatgui/src/statuspage.cpp
index 935601bd..b1b28f09 100644
--- a/tools/chatgui/src/statuspage.cpp
+++ b/tools/chatgui/src/statuspage.cpp
@@ -4,7 +4,7 @@
 
 extern "C" {
 #include "../transport/gui_bridge.h"
-#include "../transport/chat_core.h"
+#include "chat/chat_core.h"
 }
 
 #include <QVBoxLayout>
diff --git a/tools/chatgui/transport/utun_node.cpp b/tools/chatgui/transport/utun_node.cpp
index ab0653e7..839463af 100644
--- a/tools/chatgui/transport/utun_node.cpp
+++ b/tools/chatgui/transport/utun_node.cpp
@@ -25,7 +25,7 @@ extern "C" {
     #include "chat/chat_sync.h"
     #include "chat/chat_core.h"
     #include "chat/chat_event.h"
-    #include "db_sync.h"
+    #include "chat/db_sync.h"
     #include "gui_bridge.h"
 #include "topo_node_sqlite.h"
 #include "topo_node.h"