diff --git a/src/cmd/synergyc/XWindowsClientTaskBarReceiver.h b/src/cmd/synergyc/XWindowsClientTaskBarReceiver.h
index 7467ae43..79e3093b 100644
--- a/src/cmd/synergyc/XWindowsClientTaskBarReceiver.h
+++ b/src/cmd/synergyc/XWindowsClientTaskBarReceiver.h
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include "synergyc/ClientTaskBarReceiver.h"
+#include "synergy/ClientTaskBarReceiver.h"
 
 class CBufferedLogOutputter;
 class IEventQueue;
diff --git a/src/cmd/synergys/XWindowsServerTaskBarReceiver.h b/src/cmd/synergys/XWindowsServerTaskBarReceiver.h
index f43d6c97..9fe8b763 100644
--- a/src/cmd/synergys/XWindowsServerTaskBarReceiver.h
+++ b/src/cmd/synergys/XWindowsServerTaskBarReceiver.h
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include "synergys/ServerTaskBarReceiver.h"
+#include "synergy/ServerTaskBarReceiver.h"
 
 class CBufferedLogOutputter;
 class IEventQueue;
diff --git a/src/lib/arch/unix/ArchConsoleUnix.cpp b/src/lib/arch/unix/ArchConsoleUnix.cpp
index 2dc30bbf..c1a26c8b 100644
--- a/src/lib/arch/unix/ArchConsoleUnix.cpp
+++ b/src/lib/arch/unix/ArchConsoleUnix.cpp
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "arch/ArchConsoleUnix.h"
+#include "arch/unix/ArchConsoleUnix.h"
 
 CArchConsoleUnix::CArchConsoleUnix() { }
 
diff --git a/src/lib/arch/unix/ArchDaemonUnix.cpp b/src/lib/arch/unix/ArchDaemonUnix.cpp
index e48528a6..f6418947 100644
--- a/src/lib/arch/unix/ArchDaemonUnix.cpp
+++ b/src/lib/arch/unix/ArchDaemonUnix.cpp
@@ -16,8 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "arch/ArchDaemonUnix.h"
-#include "arch/XArchUnix.h"
+#include "arch/unix/ArchDaemonUnix.h"
+
+#include "arch/unix/XArchUnix.h"
 #include "base/Log.h"
 
 #include <unistd.h>
diff --git a/src/lib/arch/unix/ArchFileUnix.cpp b/src/lib/arch/unix/ArchFileUnix.cpp
index 326866dc..dd9de7d2 100644
--- a/src/lib/arch/unix/ArchFileUnix.cpp
+++ b/src/lib/arch/unix/ArchFileUnix.cpp
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "arch/ArchFileUnix.h"
+#include "arch/unix/ArchFileUnix.h"
 
 #include <stdio.h>
 #include <unistd.h>
diff --git a/src/lib/arch/unix/ArchInternetUnix.cpp b/src/lib/arch/unix/ArchInternetUnix.cpp
index 7db939d7..cdbd44f5 100644
--- a/src/lib/arch/unix/ArchInternetUnix.cpp
+++ b/src/lib/arch/unix/ArchInternetUnix.cpp
@@ -15,7 +15,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "arch/ArchInternetUnix.h"
+#include "arch/unix/ArchInternetUnix.h"
+
 #include "arch/XArch.h"
 #include "common/Version.h"
 #include "base/Log.h"
diff --git a/src/lib/arch/unix/ArchLogUnix.cpp b/src/lib/arch/unix/ArchLogUnix.cpp
index fc59e67b..3d376f5a 100644
--- a/src/lib/arch/unix/ArchLogUnix.cpp
+++ b/src/lib/arch/unix/ArchLogUnix.cpp
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "arch/ArchLogUnix.h"
+#include "arch/unix/ArchLogUnix.h"
 
 #include <syslog.h>
 
diff --git a/src/lib/arch/unix/ArchLogUnix.h b/src/lib/arch/unix/ArchLogUnix.h
index 5a77010a..7d13edd4 100644
--- a/src/lib/arch/unix/ArchLogUnix.h
+++ b/src/lib/arch/unix/ArchLogUnix.h
@@ -34,5 +34,3 @@ public:
 	virtual void		showLog(bool);
 	virtual void		writeLog(ELevel, const char*);
 };
-
-#endif
diff --git a/src/lib/arch/unix/ArchMultithreadPosix.cpp b/src/lib/arch/unix/ArchMultithreadPosix.cpp
index 4f3150b9..b3683c9c 100644
--- a/src/lib/arch/unix/ArchMultithreadPosix.cpp
+++ b/src/lib/arch/unix/ArchMultithreadPosix.cpp
@@ -16,7 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "arch/ArchMultithreadPosix.h"
+#include "arch/unix/ArchMultithreadPosix.h"
+
 #include "arch/Arch.h"
 #include "arch/XArch.h"
 
diff --git a/src/lib/arch/unix/ArchNetworkBSD.cpp b/src/lib/arch/unix/ArchNetworkBSD.cpp
index 084002db..33e913d8 100644
--- a/src/lib/arch/unix/ArchNetworkBSD.cpp
+++ b/src/lib/arch/unix/ArchNetworkBSD.cpp
@@ -16,10 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "arch/ArchNetworkBSD.h"
+#include "arch/unix/ArchNetworkBSD.h"
+
+#include "arch/unix/ArchMultithreadPosix.h"
+#include "arch/unix/XArchUnix.h"
 #include "arch/Arch.h"
-#include "arch/ArchMultithreadPosix.h"
-#include "arch/XArchUnix.h"
 
 #if HAVE_UNISTD_H
 #	include <unistd.h>
diff --git a/src/lib/arch/unix/ArchPluginUnix.cpp b/src/lib/arch/unix/ArchPluginUnix.cpp
index fd20b996..5eb7dd78 100644
--- a/src/lib/arch/unix/ArchPluginUnix.cpp
+++ b/src/lib/arch/unix/ArchPluginUnix.cpp
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "arch/ArchPluginUnix.h"
+#include "arch/unix/ArchPluginUnix.h"
 
 CArchPluginUnix::CArchPluginUnix()
 {
diff --git a/src/lib/arch/unix/ArchSleepUnix.cpp b/src/lib/arch/unix/ArchSleepUnix.cpp
index efafc60e..96823ec3 100644
--- a/src/lib/arch/unix/ArchSleepUnix.cpp
+++ b/src/lib/arch/unix/ArchSleepUnix.cpp
@@ -16,7 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "arch/ArchSleepUnix.h"
+#include "arch/unix/ArchSleepUnix.h"
+
 #include "arch/Arch.h"
 
 #if TIME_WITH_SYS_TIME
diff --git a/src/lib/arch/unix/ArchStringUnix.cpp b/src/lib/arch/unix/ArchStringUnix.cpp
index c7586e02..91e6918f 100644
--- a/src/lib/arch/unix/ArchStringUnix.cpp
+++ b/src/lib/arch/unix/ArchStringUnix.cpp
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "arch/ArchStringUnix.h"
+#include "arch/unix/ArchStringUnix.h"
 
 #include <stdio.h>
 
diff --git a/src/lib/arch/unix/ArchSystemUnix.cpp b/src/lib/arch/unix/ArchSystemUnix.cpp
index 849e7216..8c8a7846 100644
--- a/src/lib/arch/unix/ArchSystemUnix.cpp
+++ b/src/lib/arch/unix/ArchSystemUnix.cpp
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "arch/ArchSystemUnix.h"
+#include "arch/unix/ArchSystemUnix.h"
 
 #include <sys/utsname.h>
 
diff --git a/src/lib/arch/win32/ArchTaskBarXWindows.cpp b/src/lib/arch/unix/ArchTaskBarXWindows.cpp
similarity index 96%
rename from src/lib/arch/win32/ArchTaskBarXWindows.cpp
rename to src/lib/arch/unix/ArchTaskBarXWindows.cpp
index 523bfbb8..97657a6b 100644
--- a/src/lib/arch/win32/ArchTaskBarXWindows.cpp
+++ b/src/lib/arch/unix/ArchTaskBarXWindows.cpp
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "arch/win32/ArchTaskBarXWindows.h"
+#include "arch/unix/ArchTaskBarXWindows.h"
 
 //
 // CArchTaskBarXWindows
diff --git a/src/lib/arch/win32/ArchTaskBarXWindows.h b/src/lib/arch/unix/ArchTaskBarXWindows.h
similarity index 100%
rename from src/lib/arch/win32/ArchTaskBarXWindows.h
rename to src/lib/arch/unix/ArchTaskBarXWindows.h
diff --git a/src/lib/arch/unix/ArchTimeUnix.cpp b/src/lib/arch/unix/ArchTimeUnix.cpp
index 372ac628..443e1c00 100644
--- a/src/lib/arch/unix/ArchTimeUnix.cpp
+++ b/src/lib/arch/unix/ArchTimeUnix.cpp
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "arch/ArchTimeUnix.h"
+#include "arch/unix/ArchTimeUnix.h"
 
 #if TIME_WITH_SYS_TIME
 #	include <sys/time.h>
diff --git a/src/lib/arch/unix/XArchUnix.cpp b/src/lib/arch/unix/XArchUnix.cpp
index aa314115..6bc94157 100644
--- a/src/lib/arch/unix/XArchUnix.cpp
+++ b/src/lib/arch/unix/XArchUnix.cpp
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "arch/XArchUnix.h"
+#include "arch/unix/XArchUnix.h"
 
 #include <cstring>
 
diff --git a/src/lib/platform/XWindowsClipboard.h b/src/lib/platform/XWindowsClipboard.h
index cc524267..293a91f3 100644
--- a/src/lib/platform/XWindowsClipboard.h
+++ b/src/lib/platform/XWindowsClipboard.h
@@ -18,8 +18,8 @@
 
 #pragma once
 
+#include "synergy/clipboard_types.h"
 #include "synergy/IClipboard.h"
-#include "synerty/ClipboardTypes.h"
 #include "common/stdmap.h"
 #include "common/stdlist.h"
 #include "common/stdvector.h"
diff --git a/src/lib/platform/XWindowsKeyState.h b/src/lib/platform/XWindowsKeyState.h
index 6cc035cf..75079abe 100644
--- a/src/lib/platform/XWindowsKeyState.h
+++ b/src/lib/platform/XWindowsKeyState.h
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include "base/KeyState.h"
+#include "synergy/KeyState.h"
 #include "common/stdmap.h"
 #include "common/stdvector.h"
 
diff --git a/src/lib/platform/XWindowsUtil.cpp b/src/lib/platform/XWindowsUtil.cpp
index 0cf72823..1ca1f7dd 100644
--- a/src/lib/platform/XWindowsUtil.cpp
+++ b/src/lib/platform/XWindowsUtil.cpp
@@ -18,7 +18,7 @@
 
 #include "platform/XWindowsUtil.h"
 
-#include "platform/KeyTypes.h"
+#include "synergy/key_types.h"
 #include "mt/Thread.h"
 #include "base/Log.h"
 #include "base/StringUtil.h"