diff --git a/client/displayservers/Wayland/clipboard.c b/client/displayservers/Wayland/clipboard.c
index 73ee7c8c..294bfc0e 100644
--- a/client/displayservers/Wayland/clipboard.c
+++ b/client/displayservers/Wayland/clipboard.c
@@ -29,8 +29,8 @@
 #include <unistd.h>
 #include <wayland-client.h>
 
-#include "../../src/clipboard.h"
-#include "../../src/clipboard_files.h"
+#include "core/clipboard.h"
+#include "core/clipboard_files.h"
 #include "common/debug.h"
 #include "common/KVMFRClipboard.h"
 
diff --git a/client/displayservers/X11/clipboard.c b/client/displayservers/X11/clipboard.c
index 7cf02785..10f54851 100644
--- a/client/displayservers/X11/clipboard.c
+++ b/client/displayservers/X11/clipboard.c
@@ -28,8 +28,8 @@
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 
-#include "../../src/clipboard.h"
-#include "../../src/clipboard_files.h"
+#include "core/clipboard.h"
+#include "core/clipboard_files.h"
 #include "common/array.h"
 #include "common/debug.h"
 #include "common/KVMFRClipboard.h"
diff --git a/client/src/clipboard.h b/client/include/core/clipboard.h
similarity index 100%
rename from client/src/clipboard.h
rename to client/include/core/clipboard.h
diff --git a/client/src/clipboard_files.h b/client/include/core/clipboard_files.h
similarity index 100%
rename from client/src/clipboard_files.h
rename to client/include/core/clipboard_files.h
diff --git a/client/src/clipboard.c b/client/src/clipboard.c
index 411b1008..0b1fc7e9 100644
--- a/client/src/clipboard.c
+++ b/client/src/clipboard.c
@@ -18,8 +18,8 @@
  * Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "clipboard.h"
-#include "clipboard_files.h"
+#include "core/clipboard.h"
+#include "core/clipboard_files.h"
 #include "main.h"
 
 #include "common/debug.h"
diff --git a/client/src/clipboard_files.c b/client/src/clipboard_files.c
index b741c999..81e4a924 100644
--- a/client/src/clipboard_files.c
+++ b/client/src/clipboard_files.c
@@ -20,8 +20,8 @@
 
 #define FUSE_USE_VERSION 310
 
-#include "clipboard_files.h"
-#include "clipboard.h"
+#include "core/clipboard_files.h"
+#include "core/clipboard.h"
 
 #include "common/KVMFRClipboard.h"
 #include "common/debug.h"
diff --git a/client/src/main.c b/client/src/main.c
index 3c716a32..5aa80b39 100644
--- a/client/src/main.c
+++ b/client/src/main.c
@@ -59,7 +59,7 @@
 #include "app.h"
 #include "audio.h"
 #include "keybind.h"
-#include "clipboard.h"
+#include "core/clipboard.h"
 #include "kb.h"
 #include "egl_dynprocs.h"
 #include "gl_dynprocs.h"
diff --git a/client/src/transport_fallback.c b/client/src/transport_fallback.c
index c3a71a2c..6963c0ad 100644
--- a/client/src/transport_fallback.c
+++ b/client/src/transport_fallback.c
@@ -21,7 +21,7 @@
 #include "transport_fallback.h"
 
 #include "audio.h"
-#include "clipboard.h"
+#include "core/clipboard.h"
 #include "input.h"
 #include "sw_surface.h"
 
diff --git a/client/tests/CMakeLists.txt b/client/tests/CMakeLists.txt
index 64274d5c..515f272b 100644
--- a/client/tests/CMakeLists.txt
+++ b/client/tests/CMakeLists.txt
@@ -108,7 +108,7 @@ add_executable(lgmp-clipboard-tests
   ../transports/LGMP/clipboard.c
 )
 target_include_directories(lgmp-clipboard-tests PRIVATE
-  "${CMAKE_CURRENT_SOURCE_DIR}/../src"
+  "${CMAKE_CURRENT_SOURCE_DIR}/../transports/LGMP"
 )
 target_link_libraries(lgmp-clipboard-tests
   ${EXE_FLAGS}
diff --git a/client/tests/clipboard_files_stub.c b/client/tests/clipboard_files_stub.c
index 3dba5b80..7ec3690e 100644
--- a/client/tests/clipboard_files_stub.c
+++ b/client/tests/clipboard_files_stub.c
@@ -18,7 +18,7 @@
  * Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "../src/clipboard_files.h"
+#include "core/clipboard_files.h"
 
 unsigned lgClipboardFilesStubRemoteOfferCount;
 unsigned lgClipboardFilesStubRemoteClearCount;
diff --git a/client/tests/clipboard_files_test.c b/client/tests/clipboard_files_test.c
index 9d161bbe..7561751e 100644
--- a/client/tests/clipboard_files_test.c
+++ b/client/tests/clipboard_files_test.c
@@ -18,8 +18,8 @@
  * Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "../src/clipboard.h"
-#include "../src/clipboard_files.h"
+#include "core/clipboard.h"
+#include "core/clipboard_files.h"
 #include "test.h"
 
 #include "common/debug.h"
diff --git a/client/tests/clipboard_test.c b/client/tests/clipboard_test.c
index fb81c8a4..3f6d48d0 100644
--- a/client/tests/clipboard_test.c
+++ b/client/tests/clipboard_test.c
@@ -18,7 +18,7 @@
  * Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "clipboard.h"
+#include "core/clipboard.h"
 #include "main.h"
 #include "test.h"
 
diff --git a/client/tests/lgmp_clipboard_test.c b/client/tests/lgmp_clipboard_test.c
index 59ac5d49..c87686ba 100644
--- a/client/tests/lgmp_clipboard_test.c
+++ b/client/tests/lgmp_clipboard_test.c
@@ -18,7 +18,7 @@
  * Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "../transports/LGMP/clipboard.h"
+#include "clipboard.h"
 
 #include "common/KVMFRClipboard.h"
 #include "common/LGMPConfig.h"
diff --git a/client/tests/spice_clipboard_test.c b/client/tests/spice_clipboard_test.c
index db270796..af0e9389 100644
--- a/client/tests/spice_clipboard_test.c
+++ b/client/tests/spice_clipboard_test.c
@@ -18,9 +18,9 @@
  * Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "../src/clipboard.h"
-#include "../src/main.h"
-#include "../transports/SPICE/clipboard.h"
+#include "core/clipboard.h"
+#include "main.h"
+#include "clipboard.h"
 #include "test.h"
 
 #include "common/debug.h"
diff --git a/client/tests/wayland_clipboard_test.c b/client/tests/wayland_clipboard_test.c
index 3c41bd87..7ddca6c4 100644
--- a/client/tests/wayland_clipboard_test.c
+++ b/client/tests/wayland_clipboard_test.c
@@ -20,8 +20,8 @@
 
 #include "wayland.h"
 #include "test.h"
-#include "../src/clipboard.h"
-#include "../src/clipboard_files.h"
+#include "core/clipboard.h"
+#include "core/clipboard_files.h"
 
 #include "common/debug.h"
 
diff --git a/client/tests/x11_clipboard_test.c b/client/tests/x11_clipboard_test.c
index 82fc6138..bc85301a 100644
--- a/client/tests/x11_clipboard_test.c
+++ b/client/tests/x11_clipboard_test.c
@@ -22,8 +22,8 @@
 #include "clipboard.h"
 #include "test.h"
 #include "x11.h"
-#include "../src/clipboard.h"
-#include "../src/clipboard_files.h"
+#include "core/clipboard.h"
+#include "core/clipboard_files.h"
 
 #include "common/debug.h"