diff --git a/src/apps/deskflow-gui/CMakeLists.txt b/src/apps/deskflow-gui/CMakeLists.txt
index e0f2dadcd..7e7771e13 100644
--- a/src/apps/deskflow-gui/CMakeLists.txt
+++ b/src/apps/deskflow-gui/CMakeLists.txt
@@ -48,6 +48,8 @@ add_executable(${target} WIN32 MACOSX_BUNDLE
   Action.h
   DataDownloader.cpp
   DataDownloader.h
+  Diagnostic.cpp
+  Diagnostic.h
   Hotkey.cpp
   Hotkey.h
   KeySequence.cpp
diff --git a/src/lib/gui/Diagnostic.cpp b/src/apps/deskflow-gui/Diagnostic.cpp
similarity index 100%
rename from src/lib/gui/Diagnostic.cpp
rename to src/apps/deskflow-gui/Diagnostic.cpp
diff --git a/src/lib/gui/Diagnostic.h b/src/apps/deskflow-gui/Diagnostic.h
similarity index 100%
rename from src/lib/gui/Diagnostic.h
rename to src/apps/deskflow-gui/Diagnostic.h
diff --git a/src/apps/deskflow-gui/MainWindow.cpp b/src/apps/deskflow-gui/MainWindow.cpp
index 7be0b6d2a..7efcf6e40 100644
--- a/src/apps/deskflow-gui/MainWindow.cpp
+++ b/src/apps/deskflow-gui/MainWindow.cpp
@@ -9,6 +9,7 @@
 #include "MainWindow.h"
 #include "ui_MainWindow.h"
 
+#include "Diagnostic.h"
 #include "StyleUtils.h"
 
 #include "dialogs/AboutDialog.h"
@@ -19,7 +20,6 @@
 #include "base/String.h"
 #include "common/Settings.h"
 #include "common/UrlConstants.h"
-#include "gui/Diagnostic.h"
 #include "gui/Logger.h"
 #include "gui/Messages.h"
 #include "gui/StringUtils.h"
diff --git a/src/apps/deskflow-gui/main.cpp b/src/apps/deskflow-gui/main.cpp
index a8a4e3e8a..2f30a3cfb 100644
--- a/src/apps/deskflow-gui/main.cpp
+++ b/src/apps/deskflow-gui/main.cpp
@@ -6,11 +6,12 @@
  * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
  */
 
+#include "Diagnostic.h"
 #include "MainWindow.h"
 #include "StyleUtils.h"
+
 #include "common/Constants.h"
 #include "common/UrlConstants.h"
-#include "gui/Diagnostic.h"
 #include "gui/DotEnv.h"
 #include "gui/Logger.h"
 #include "gui/Messages.h"
diff --git a/src/lib/gui/CMakeLists.txt b/src/lib/gui/CMakeLists.txt
index feb8960ca..f422a2dba 100644
--- a/src/lib/gui/CMakeLists.txt
+++ b/src/lib/gui/CMakeLists.txt
@@ -15,8 +15,6 @@ endif()
 
 add_library(${target} STATIC
   ${platform_sources}
-  Diagnostic.cpp
-  Diagnostic.h
   DotEnv.cpp
   DotEnv.h
   FileTail.cpp