diff --git a/src/lib/client/ServerProxy.h b/src/lib/client/ServerProxy.h
index 798e92c04..2e50a1623 100644
--- a/src/lib/client/ServerProxy.h
+++ b/src/lib/client/ServerProxy.h
@@ -9,8 +9,8 @@
 
 #include "base/Event.h"
 #include "base/Stopwatch.h"
+#include "deskflow/ClipboardTypes.h"
 #include "deskflow/KeyTypes.h"
-#include "deskflow/clipboard_types.h"
 #include "deskflow/languages/LanguageManager.h"
 
 class Client;
diff --git a/src/lib/deskflow/CMakeLists.txt b/src/lib/deskflow/CMakeLists.txt
index 3f383ffa8..a983f4b09 100644
--- a/src/lib/deskflow/CMakeLists.txt
+++ b/src/lib/deskflow/CMakeLists.txt
@@ -82,7 +82,7 @@ add_library(${lib_name} STATIC ${PLATFORM_CODE}
   ClientApp.h
   ClientArgs.cpp
   ClientArgs.h
-  clipboard_types.h
+  ClipboardTypes.h
   Clipboard.cpp
   Clipboard.h
   ClipboardChunk.cpp
diff --git a/src/lib/deskflow/ClipboardChunk.h b/src/lib/deskflow/ClipboardChunk.h
index 82cea7e97..8a768c64e 100644
--- a/src/lib/deskflow/ClipboardChunk.h
+++ b/src/lib/deskflow/ClipboardChunk.h
@@ -8,7 +8,7 @@
 
 #include "common/common.h"
 #include "deskflow/Chunk.h"
-#include "deskflow/clipboard_types.h"
+#include "deskflow/ClipboardTypes.h"
 
 #include <string>
 
diff --git a/src/lib/deskflow/clipboard_types.h b/src/lib/deskflow/ClipboardTypes.h
similarity index 100%
rename from src/lib/deskflow/clipboard_types.h
rename to src/lib/deskflow/ClipboardTypes.h
diff --git a/src/lib/deskflow/IClient.h b/src/lib/deskflow/IClient.h
index 3a785e434..79bbe0ffc 100644
--- a/src/lib/deskflow/IClient.h
+++ b/src/lib/deskflow/IClient.h
@@ -7,9 +7,9 @@
 
 #pragma once
 
+#include "deskflow/ClipboardTypes.h"
 #include "deskflow/IScreen.h"
 #include "deskflow/KeyTypes.h"
-#include "deskflow/clipboard_types.h"
 #include "deskflow/mouse_types.h"
 #include "deskflow/option_types.h"
 
diff --git a/src/lib/deskflow/IPlatformScreen.h b/src/lib/deskflow/IPlatformScreen.h
index 052426246..46195934c 100644
--- a/src/lib/deskflow/IPlatformScreen.h
+++ b/src/lib/deskflow/IPlatformScreen.h
@@ -7,12 +7,12 @@
 
 #pragma once
 
+#include "deskflow/ClipboardTypes.h"
 #include "deskflow/DragInformation.h"
 #include "deskflow/IKeyState.h"
 #include "deskflow/IPrimaryScreen.h"
 #include "deskflow/IScreen.h"
 #include "deskflow/ISecondaryScreen.h"
-#include "deskflow/clipboard_types.h"
 #include "deskflow/option_types.h"
 
 class IClipboard;
diff --git a/src/lib/deskflow/IScreen.h b/src/lib/deskflow/IScreen.h
index bbb5ec4c0..b661b372b 100644
--- a/src/lib/deskflow/IScreen.h
+++ b/src/lib/deskflow/IScreen.h
@@ -10,7 +10,7 @@
 #include "base/Event.h"
 #include "base/EventTypes.h"
 #include "common/IInterface.h"
-#include "deskflow/clipboard_types.h"
+#include "deskflow/ClipboardTypes.h"
 
 class IClipboard;
 
diff --git a/src/lib/deskflow/Screen.h b/src/lib/deskflow/Screen.h
index cd6720f47..a94c0ea17 100644
--- a/src/lib/deskflow/Screen.h
+++ b/src/lib/deskflow/Screen.h
@@ -7,10 +7,10 @@
 
 #pragma once
 
+#include "deskflow/ClipboardTypes.h"
 #include "deskflow/DragInformation.h"
 #include "deskflow/IScreen.h"
 #include "deskflow/KeyTypes.h"
-#include "deskflow/clipboard_types.h"
 #include "deskflow/mouse_types.h"
 #include "deskflow/option_types.h"
 
diff --git a/src/lib/deskflow/StreamChunker.h b/src/lib/deskflow/StreamChunker.h
index 2a93ca168..32caf59e0 100644
--- a/src/lib/deskflow/StreamChunker.h
+++ b/src/lib/deskflow/StreamChunker.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "deskflow/clipboard_types.h"
+#include "deskflow/ClipboardTypes.h"
 
 #include <string>
 
diff --git a/src/lib/platform/XWindowsClipboard.h b/src/lib/platform/XWindowsClipboard.h
index 2b3884415..5d0bab514 100644
--- a/src/lib/platform/XWindowsClipboard.h
+++ b/src/lib/platform/XWindowsClipboard.h
@@ -10,8 +10,8 @@
 #include "common/stdlist.h"
 #include "common/stdmap.h"
 #include "common/stdvector.h"
+#include "deskflow/ClipboardTypes.h"
 #include "deskflow/IClipboard.h"
-#include "deskflow/clipboard_types.h"
 
 #if X_DISPLAY_MISSING
 #error X11 is required to build deskflow
diff --git a/src/lib/server/Server.h b/src/lib/server/Server.h
index 61bb15568..b3ec846c1 100644
--- a/src/lib/server/Server.h
+++ b/src/lib/server/Server.h
@@ -14,11 +14,11 @@
 #include "common/stdset.h"
 #include "common/stdvector.h"
 #include "deskflow/Clipboard.h"
+#include "deskflow/ClipboardTypes.h"
 #include "deskflow/DragInformation.h"
 #include "deskflow/INode.h"
 #include "deskflow/KeyTypes.h"
 #include "deskflow/ServerArgs.h"
-#include "deskflow/clipboard_types.h"
 #include "deskflow/mouse_types.h"
 #include "deskflow/option_types.h"
 #include "server/Config.h"