code style fixes:

- reordered includes to prevent accidental dependencies.
- moved arch specific files into their own folder (easier to include with cmake).
- renamed non-class files to reflect new code style (lower case with underscores).
- using full relative paths for includes (easier for understanding dependencies).
- using #pragma once instead of classic-style header guards.

src/cmd/synergyc/CMakeLists.txt

@@ -19,9 +19,9 @@ set(sources
 )
 
 if (WIN32)
+	file(GLOB arch_headers "MSWindows*.h")
+	file(GLOB arch_sources "MSWindows*.cpp")
 	list(APPEND sources
-		CMSWindowsClientTaskBarReceiver.cpp
-		CMSWindowsClientTaskBarReceiver.h
 		resource.h
 		synergyc.ico
 		synergyc.rc
@@ -31,24 +31,23 @@ if (WIN32)
 		tb_wait.ico
 	)
 elseif (APPLE)
-	list(APPEND sources COSXClientTaskBarReceiver.cpp)
+	file(GLOB arch_headers "OSX*.h")
+	file(GLOB arch_sources "OSX*.cpp")
 elseif (UNIX)
-	list(APPEND sources CXWindowsClientTaskBarReceiver.cpp)	
+	file(GLOB arch_headers "XWindows*.h")
+	file(GLOB arch_sources "XWindows*.cpp")
+endif()
+
+list(APPEND sources ${arch_sources})
+list(APPEND headers ${arch_headers})
+
+if (SYNERGY_ADD_HEADERS)
+	list(APPEND sources ${headers})
 endif()
 
 include_directories(
-	../../lib/arch
-	../../lib/base
-	../../lib/client
-	../../lib/common
-	../../lib/io
-	../../lib/ipc
-	../../lib/mt
-	../../lib/net
-	../../lib/platform
-	../../lib/synergy
-	../../lib/synwinhk
-	../../lib/synwinxt
+	../
+	../../lib/
 )
 
 if (UNIX)

src/cmd/synergyc/MSWindowsClientTaskBarReceiver.cpp

@@ -16,17 +16,18 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "CMSWindowsClientTaskBarReceiver.h"
-#include "CClient.h"
-#include "CMSWindowsClipboard.h"
-#include "LogOutputters.h"
-#include "BasicTypes.h"
-#include "CArch.h"
-#include "CArchTaskBarWindows.h"
-#include "CArchMiscWindows.h"
+#include "synergyc/MSWindowsClientTaskBarReceiver.h"
+
 #include "resource.h"
-#include "CMSWindowsScreen.h"
-#include "CEventQueue.h"
+#include "client/Client.h"
+#include "platform/MSWindowsClipboard.h"
+#include "platform/MSWindowsScreen.h"
+#include "arch/win32/ArchTaskBarWindows.h"
+#include "arch/win32/ArchMiscWindows.h"
+#include "arch/Arch.h"
+#include "base/EventQueue.h"
+#include "base/log_outputters.h"
+#include "base/EventTypes.h"
 
 //
 // CMSWindowsClientTaskBarReceiver

src/cmd/synergyc/MSWindowsClientTaskBarReceiver.h

@@ -16,13 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef CMSWINDOWSCLIENTTASKBARRECEIVER_H
-#define CMSWINDOWSCLIENTTASKBARRECEIVER_H
+#pragma once
+
+#include "synergy/ClientTaskBarReceiver.h"
 
 #define WIN32_LEAN_AND_MEAN
-
-#include "CClientTaskBarReceiver.h"
-#include <windows.h>
+#include <Windows.h>
 
 class CBufferedLogOutputter;
 class IEventQueue;
@@ -67,5 +66,3 @@ private:
 
 	static const UINT	s_stateToIconID[];
 };
-
-#endif

src/cmd/synergyc/OSXClientTaskBarReceiver.cpp

@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "COSXClientTaskBarReceiver.h"
-#include "CArch.h"
+#include "synergyc/OSXClientTaskBarReceiver.h"
+#include "arch/Arch.h"
 
 //
 // COSXClientTaskBarReceiver

src/cmd/synergyc/OSXClientTaskBarReceiver.h

@@ -16,10 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef COSXCLIENTTASKBARRECEIVER_H
-#define COSXCLIENTTASKBARRECEIVER_H
+#pragma once
 
-#include "CClientTaskBarReceiver.h"
+#include "synergyc/ClientTaskBarReceiver.h"
 
 class CBufferedLogOutputter;
 class IEventQueue;
@@ -36,5 +35,3 @@ public:
 	virtual void		primaryAction();
 	virtual const Icon	getIcon() const;
 };
-
-#endif

src/cmd/synergyc/XWindowsClientTaskBarReceiver.cpp

@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "CXWindowsClientTaskBarReceiver.h"
-#include "CArch.h"
+#include "synergyc/XWindowsClientTaskBarReceiver.h"
+#include "arch/Arch.h"
 
 //
 // CXWindowsClientTaskBarReceiver

src/cmd/synergyc/XWindowsClientTaskBarReceiver.h

@@ -16,10 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef CXWINDOWSCLIENTTASKBARRECEIVER_H
-#define CXWINDOWSCLIENTTASKBARRECEIVER_H
+#pragma once
 
-#include "CClientTaskBarReceiver.h"
+#include "synergyc/ClientTaskBarReceiver.h"
 
 class CBufferedLogOutputter;
 class IEventQueue;
@@ -37,5 +36,3 @@ public:
 	virtual void		primaryAction();
 	virtual const Icon	getIcon() const;
 };
-
-#endif

src/cmd/synergyc/synergyc.cpp

@@ -16,17 +16,17 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "CClientApp.h"
-#include "CLog.h"
-#include "CArch.h"
-#include "CEventQueue.h"
+#include "synergy/ClientApp.h"
+#include "arch/Arch.h"
+#include "base/Log.h"
+#include "base/EventQueue.h"
 
 #if WINAPI_MSWINDOWS
-#include "CMSWindowsClientTaskBarReceiver.h"
+#include "synergyc/MSWindowsClientTaskBarReceiver.h"
 #elif WINAPI_XWINDOWS
-#include "CXWindowsClientTaskBarReceiver.h"
+#include "synergyc/XWindowsClientTaskBarReceiver.h"
 #elif WINAPI_CARBON
-#include "COSXClientTaskBarReceiver.h"
+#include "synergyc/OSXClientTaskBarReceiver.h"
 #else
 #error Platform not supported.
 #endif

src/cmd/synergyd/CMakeLists.txt

@@ -18,15 +18,8 @@ file(GLOB headers "*.h")
 file(GLOB sources "*.cpp")
 
 include_directories(
-	../../lib/arch
-	../../lib/base
-	../../lib/common
-	../../lib/io
-	../../lib/ipc
-	../../lib/mt
-	../../lib/net
-	../../lib/platform
-	../../lib/synergy
+	../
+	../../lib/
 )
 
 if (UNIX)

src/cmd/synergyd/synergyd.cpp

@@ -16,7 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "CDaemonApp.h"
+#include "synergy/DaemonApp.h"
+
 #include <iostream>
 
 #ifdef SYSAPI_UNIX

src/cmd/synergyp/CMakeLists.txt

@@ -19,9 +19,9 @@ set(sources
 )
 
 if (WIN32)
+	file(GLOB arch_headers "MSWindows*.h")
+	file(GLOB arch_sources "MSWindows*.cpp")
 	list(APPEND sources
-		CMSWindowsPortableTaskBarReceiver.cpp
-		CMSWindowsPortableTaskBarReceiver.h
 		resource.h
 		synergyp.ico
 		synergyp.rc
@@ -31,24 +31,23 @@ if (WIN32)
 		tb_wait.ico
 	)
 elseif (APPLE)
-	list(APPEND sources COSXPortableTaskBarReceiver.cpp)	
+	file(GLOB arch_headers "OSX*.h")
+	file(GLOB arch_sources "OSX*.cpp")
 elseif (UNIX)
-	list(APPEND sources CXWindowsPortableTaskBarReceiver.cpp)
+	file(GLOB arch_headers "XWindows*.h")
+	file(GLOB arch_sources "XWindows*.cpp")
+endif()
+
+list(APPEND sources ${arch_sources})
+list(APPEND headers ${arch_headers})
+
+if (SYNERGY_ADD_HEADERS)
+	list(APPEND sources ${headers})
 endif()
 
 include_directories(
-	../../lib/arch
-	../../lib/base
-	../../lib/common
-	../../lib/io
-	../../lib/ipc
-	../../lib/mt
-	../../lib/net
-	../../lib/platform
-	../../lib/synergy
-	../../lib/server
-	../../lib/synwinhk
-	../../lib/synwinxt
+	../
+	../../lib/
 )
 
 if (UNIX)

src/cmd/synergyp/MSWindowsPortableTaskBarReceiver.cpp

@@ -16,17 +16,18 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "CMSWindowsPortableTaskBarReceiver.h"
-#include "CMSWindowsClipboard.h"
-#include "IEventQueue.h"
-#include "LogOutputters.h"
-#include "BasicTypes.h"
-#include "CArch.h"
-#include "CArchTaskBarWindows.h"
+#include "synergyp/MSWindowsPortableTaskBarReceiver.h"
+
 #include "resource.h"
-#include "CArchMiscWindows.h"
-#include "CMSWindowsScreen.h"
-#include "CEventQueue.h"
+#include "platform/MSWindowsClipboard.h"
+#include "platform/MSWindowsScreen.h"
+#include "arch/win32/ArchTaskBarWindows.h"
+#include "arch/win32/ArchMiscWindows.h"
+#include "arch/Arch.h"
+#include "base/EventQueue.h"
+#include "base/IEventQueue.h"
+#include "base/log_outputters.h"
+#include "base/EventTypes.h"
 
 //
 // CMSWindowsPortableTaskBarReceiver

src/cmd/synergyp/MSWindowsPortableTaskBarReceiver.h

@@ -18,10 +18,10 @@
 
 #pragma once
 
-#define WIN32_LEAN_AND_MEAN
+#include "synergy/PortableTaskBarReceiver.h"
 
-#include "CPortableTaskBarReceiver.h"
-#include <windows.h>
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
 
 class CBufferedLogOutputter;
 class IEventQueue;

src/cmd/synergyp/OSXPortableTaskBarReceiver.cpp

@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "COSXServerTaskBarReceiver.h"
-#include "CArch.h"
+#include "synergys/OSXServerTaskBarReceiver.h"
+#include "arch/Arch.h"
 
 //
 // COSXServerTaskBarReceiver

src/cmd/synergyp/OSXPortableTaskBarReceiver.h

@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include "CPortableTaskBarReceiver.h"
+#include "synergyp/PortableTaskBarReceiver.h"
 
 class CBufferedLogOutputter;
 

src/cmd/synergyp/XWindowsPortableTaskBarReceiver.cpp

@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "CXWindowsServerTaskBarReceiver.h"
-#include "CArch.h"
+#include "synergys/XWindowsServerTaskBarReceiver.h"
+#include "arch/Arch.h"
 
 //
 // CXWindowsServerTaskBarReceiver

src/cmd/synergyp/XWindowsPortableTaskBarReceiver.h

@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include "CPortableTaskBarReceiver.h"
+#include "synergyp/PortableTaskBarReceiver.h"
 
 class CBufferedLogOutputter;
 

src/cmd/synergyp/synergyp.cpp

@@ -15,25 +15,25 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#define WIN32_LEAN_AND_MEAN
-
-#include "Windows.h"
-#include "CServerApp.h"
-#include "CClientApp.h"
-#include "CLog.h"
-#include "CArch.h"
-#include "CEventQueue.h"
+#include "synergy/ServerApp.h"
+#include "synergy/ClientApp.h"
+#include "arch/Arch.h"
+#include "base/Log.h"
+#include "base/EventQueue.h"
 
 #if WINAPI_MSWINDOWS
-#include "CMSWindowsPortableTaskBarReceiver.h"
+#include "MSWindowsPortableTaskBarReceiver.h"
 #elif WINAPI_XWINDOWS
-#include "CXWindowsPortableTaskBarReceiver.h"
+#include "XWindowsPortableTaskBarReceiver.h"
 #elif WINAPI_CARBON
-#include "COSXPortableTaskBarReceiver.h"
+#include "OSXPortableTaskBarReceiver.h"
 #else
 #error Platform not supported.
 #endif
 
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
+
 INT WINAPI
 WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, PSTR lpCmdLine, INT nCmdShow)
 {

src/cmd/synergys/CMakeLists.txt

@@ -19,9 +19,9 @@ set(sources
 )
 
 if (WIN32)
+	file(GLOB arch_headers "MSWindows*.h")
+	file(GLOB arch_sources "MSWindows*.cpp")
 	list(APPEND sources
-		CMSWindowsServerTaskBarReceiver.cpp
-		CMSWindowsServerTaskBarReceiver.h
 		resource.h
 		synergys.ico
 		synergys.rc
@@ -31,24 +31,23 @@ if (WIN32)
 		tb_wait.ico
 	)
 elseif (APPLE)
-	list(APPEND sources COSXServerTaskBarReceiver.cpp)	
+	file(GLOB arch_headers "OSX*.h")
+	file(GLOB arch_sources "OSX*.cpp")
 elseif (UNIX)
-	list(APPEND sources CXWindowsServerTaskBarReceiver.cpp)
+	file(GLOB arch_headers "XWindows*.h")
+	file(GLOB arch_sources "XWindows*.cpp")
+endif()
+
+list(APPEND sources ${arch_sources})
+list(APPEND headers ${arch_headers})
+
+if (SYNERGY_ADD_HEADERS)
+	list(APPEND sources ${headers})
 endif()
 
 include_directories(
-	../../lib/arch
-	../../lib/base
-	../../lib/common
-	../../lib/io
-	../../lib/ipc
-	../../lib/mt
-	../../lib/net
-	../../lib/platform
-	../../lib/synergy
-	../../lib/server
-	../../lib/synwinhk
-	../../lib/synwinxt
+	../
+	../../lib/
 )
 
 if (UNIX)

src/cmd/synergys/MSWindowsServerTaskBarReceiver.cpp

@@ -16,18 +16,19 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "CMSWindowsServerTaskBarReceiver.h"
-#include "CServer.h"
-#include "CMSWindowsClipboard.h"
-#include "IEventQueue.h"
-#include "LogOutputters.h"
-#include "BasicTypes.h"
-#include "CArch.h"
-#include "CArchTaskBarWindows.h"
+#include "synergys/MSWindowsServerTaskBarReceiver.h"
+
 #include "resource.h"
-#include "CArchMiscWindows.h"
-#include "CMSWindowsScreen.h"
-#include "CEventQueue.h"
+#include "server/Server.h"
+#include "platform/MSWindowsClipboard.h"
+#include "platform/MSWindowsScreen.h"
+#include "arch/win32/ArchTaskBarWindows.h"
+#include "arch/win32/ArchMiscWindows.h"
+#include "arch/Arch.h"
+#include "base/EventQueue.h"
+#include "base/IEventQueue.h"
+#include "base/log_outputters.h"
+#include "base/EventTypes.h"
 
 //
 // CMSWindowsServerTaskBarReceiver

src/cmd/synergys/MSWindowsServerTaskBarReceiver.h

@@ -16,13 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef CMSWINDOWSSERVERTASKBARRECEIVER_H
-#define CMSWINDOWSSERVERTASKBARRECEIVER_H
+#pragma once
+
+#include "synergy/ServerTaskBarReceiver.h"
 
 #define WIN32_LEAN_AND_MEAN
-
-#include "CServerTaskBarReceiver.h"
-#include <windows.h>
+#include <Windows.h>
 
 class CBufferedLogOutputter;
 class IEventQueue;
@@ -68,5 +67,3 @@ private:
 
 	static const UINT	s_stateToIconID[];
 };
-
-#endif

src/cmd/synergys/OSXServerTaskBarReceiver.cpp

@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "COSXServerTaskBarReceiver.h"
-#include "CArch.h"
+#include "synergys/OSXServerTaskBarReceiver.h"
+#include "arch/Arch.h"
 
 //
 // COSXServerTaskBarReceiver

src/cmd/synergys/OSXServerTaskBarReceiver.h

@@ -16,10 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef COSXSERVERTASKBARRECEIVER_H
-#define COSXSERVERTASKBARRECEIVER_H
+#pragma once
 
-#include "CServerTaskBarReceiver.h"
+#include "synergys/ServerTaskBarReceiver.h"
 
 class CBufferedLogOutputter;
 
@@ -35,5 +34,3 @@ public:
 	virtual void		primaryAction();
 	virtual const Icon	getIcon() const;
 };
-
-#endif

src/cmd/synergys/XWindowsServerTaskBarReceiver.cpp

@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "CXWindowsServerTaskBarReceiver.h"
-#include "CArch.h"
+#include "synergys/XWindowsServerTaskBarReceiver.h"
+#include "arch/Arch.h"
 
 //
 // CXWindowsServerTaskBarReceiver

src/cmd/synergys/XWindowsServerTaskBarReceiver.h

@@ -16,10 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef CXWINDOWSSERVERTASKBARRECEIVER_H
-#define CXWINDOWSSERVERTASKBARRECEIVER_H
+#pragma once
 
-#include "CServerTaskBarReceiver.h"
+#include "synergys/ServerTaskBarReceiver.h"
 
 class CBufferedLogOutputter;
 class IEventQueue;
@@ -37,5 +36,3 @@ public:
 	virtual void		primaryAction();
 	virtual const Icon	getIcon() const;
 };
-
-#endif

src/cmd/synergys/synergys.cpp

@@ -16,17 +16,17 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "CServerApp.h"
-#include "CLog.h"
-#include "CArch.h"
-#include "CEventQueue.h"
+#include "synergy/ServerApp.h"
+#include "arch/Arch.h"
+#include "base/Log.h"
+#include "base/EventQueue.h"
 
 #if WINAPI_MSWINDOWS
-#include "CMSWindowsServerTaskBarReceiver.h"
+#include "synergys/MSWindowsServerTaskBarReceiver.h"
 #elif WINAPI_XWINDOWS
-#include "CXWindowsServerTaskBarReceiver.h"
+#include "synergys/XWindowsServerTaskBarReceiver.h"
 #elif WINAPI_CARBON
-#include "COSXServerTaskBarReceiver.h"
+#include "synergys/OSXServerTaskBarReceiver.h"
 #else
 #error Platform not supported.
 #endif

src/cmd/syntool/CMakeLists.txt

@@ -17,17 +17,8 @@ file(GLOB headers "*.h")
 file(GLOB sources "*.cpp")
 
 include_directories(
-	../../lib/arch
-	../../lib/base
-	../../lib/common
-	../../lib/io
-	../../lib/ipc
-	../../lib/mt
-	../../lib/net
-	../../lib/platform
-	../../lib/synergy
-	../../lib/synwinhk
-	../../lib/synwinxt
+	../
+	../../lib/
 )
 
 if (UNIX)

src/cmd/syntool/syntool.cpp

@@ -15,8 +15,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "CToolApp.h"
-#include "CArch.h"
+#include "synergy/ToolApp.h"
+#include "arch/Arch.h"
 
 int
 main(int argc, char** argv) 

src/lib/arch/Arch.cpp

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "CArch.h"
+#include "arch/Arch.h"
 
 //
 // CArch

src/lib/arch/Arch.h

@@ -33,42 +33,41 @@
 // class lazy-loaded so that apps like the daemon don't load
 // stuff when they don't need it.
 
-#ifndef CARCH_H
-#define CARCH_H
+#pragma once
 
-#include "common.h"
+#include "common/common.h"
 
 #if SYSAPI_WIN32
-#	include "CArchConsoleWindows.h"
-#	include "CArchDaemonWindows.h"
-#	include "CArchFileWindows.h"
-#	include "CArchLogWindows.h"
-#	include "CArchMiscWindows.h"
-#	include "CArchMultithreadWindows.h"
-#	include "CArchNetworkWinsock.h"
-#	include "CArchSleepWindows.h"
-#	include "CArchStringWindows.h"
-#	include "CArchSystemWindows.h"
-#	include "CArchTaskBarWindows.h"
-#	include "CArchTimeWindows.h"
-#	include "CArchPluginWindows.h"
-#	include "CArchInternetWindows.h"
+#	include "arch/win32/ArchConsoleWindows.h"
+#	include "arch/win32/ArchDaemonWindows.h"
+#	include "arch/win32/ArchFileWindows.h"
+#	include "arch/win32/ArchLogWindows.h"
+#	include "arch/win32/ArchMiscWindows.h"
+#	include "arch/win32/ArchMultithreadWindows.h"
+#	include "arch/win32/ArchNetworkWinsock.h"
+#	include "arch/win32/ArchSleepWindows.h"
+#	include "arch/win32/ArchStringWindows.h"
+#	include "arch/win32/ArchSystemWindows.h"
+#	include "arch/win32/ArchTaskBarWindows.h"
+#	include "arch/win32/ArchTimeWindows.h"
+#	include "arch/win32/ArchPluginWindows.h"
+#	include "arch/win32/ArchInternetWindows.h"
 #elif SYSAPI_UNIX
-#	include "CArchConsoleUnix.h"
-#	include "CArchDaemonUnix.h"
-#	include "CArchFileUnix.h"
-#	include "CArchLogUnix.h"
+#	include "arch/unix/ArchConsoleUnix.h"
+#	include "arch/unix/ArchDaemonUnix.h"
+#	include "arch/unix/ArchFileUnix.h"
+#	include "arch/unix/ArchLogUnix.h"
 #	if HAVE_PTHREAD
-#		include "CArchMultithreadPosix.h"
+#		include "arch/unix/ArchMultithreadPosix.h"
 #	endif
-#	include "CArchNetworkBSD.h"
-#	include "CArchSleepUnix.h"
-#	include "CArchStringUnix.h"
-#	include "CArchSystemUnix.h"
-#	include "CArchTaskBarXWindows.h"
-#	include "CArchTimeUnix.h"
-#	include "CArchPluginUnix.h"
-#	include "CArchInternetUnix.h"
+#	include "arch/unix/ArchNetworkBSD.h"
+#	include "arch/unix/ArchSleepUnix.h"
+#	include "arch/unix/ArchStringUnix.h"
+#	include "arch/unix/ArchSystemUnix.h"
+#	include "arch/unix/ArchTaskBarXWindows.h"
+#	include "arch/unix/ArchTimeUnix.h"
+#	include "arch/unix/ArchPluginUnix.h"
+#	include "arch/unix/ArchInternetUnix.h"
 #endif
 
 /*!
@@ -144,5 +143,3 @@ public:
 private:
 	CArchMutex			m_mutex;
 };
-
-#endif

src/lib/arch/ArchConsoleStd.cpp

@@ -16,8 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "CArchConsoleStd.h"
-#include "CLog.h"
+#include "arch/ArchConsoleStd.h"
+#include "base/Log.h"
+
 #include <iostream>
 
 void

src/lib/arch/ArchConsoleStd.h

@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include "IArchConsole.h"
+#include "arch/IArchConsole.h"
 
 //! Cross platform implementation of IArchConsole
 class CArchConsoleStd : public IArchConsole {

src/lib/arch/ArchDaemonNone.cpp

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "CArchDaemonNone.h"
+#include "arch/ArchDaemonNone.h"
 
 //
 // CArchDaemonNone

src/lib/arch/ArchDaemonNone.h

@@ -16,10 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef CARCHDAEMONNONE_H
-#define CARCHDAEMONNONE_H
+#pragma once
 
-#include "IArchDaemon.h"
+#include "arch/IArchDaemon.h"
 
 #define ARCH_DAEMON CArchDaemonNone
 
@@ -50,5 +49,3 @@ public:
 	virtual void		uninstallDaemon();
 	virtual std::string	commandLine() const;
 };
-
-#endif

src/lib/arch/CMakeLists.txt

@@ -14,92 +14,36 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-set(sources
-	CArch.cpp
-	IArchString.cpp
-	XArch.cpp
-	CArchConsoleStd.cpp
-)
+file(GLOB headers "*.h")
+file(GLOB sources "*.cpp")
 
+if (SYNERGY_ADD_HEADERS)
+	list(APPEND sources ${headers})
+endif()
+
+# arch
 if (WIN32)
-
-	set(headers
-		CArch.h
-		CArchConsoleWindows.h
-		CArchDaemonWindows.h
-		CArchFileWindows.h
-		CArchLogWindows.h
-		CArchMiscWindows.h
-		CArchMultithreadWindows.h
-		CArchNetworkWinsock.h
-		CArchSleepWindows.h
-		CArchStringWindows.h
-		CArchSystemWindows.h
-		CArchTaskBarWindows.h
-		CArchTimeWindows.h
-		CArchConsoleStd.h
-		XArchWindows.h
-		CMultibyte.h
-		vsnprintf.h
-		XArch.h
-		IArchPlugin.h
-		CArchPluginWindows.h
-		CArchInternetWindows.h
-	)
-
-	list(APPEND sources
-		${headers}
-		CArchConsoleWindows.cpp
-		CArchDaemonWindows.cpp
-		CArchFileWindows.cpp
-		CArchLogWindows.cpp
-		CArchMiscWindows.cpp
-		CArchMultithreadWindows.cpp
-		CArchNetworkWinsock.cpp
-		CArchSleepWindows.cpp
-		CArchStringWindows.cpp
-		CArchSystemWindows.cpp
-		CArchTaskBarWindows.cpp
-		CArchTimeWindows.cpp
-		XArchWindows.cpp
-		CArchPluginWindows.cpp
-		CArchInternetWindows.cpp
-	)
-	
+	file(GLOB arch_headers "awin32/*.h")
+	file(GLOB arch_sources "win32/*.cpp")
 elseif (UNIX)
+	file(GLOB arch_headers "unix/*.h")
+	file(GLOB arch_sources "unix/*.cpp")
+endif()
 
-	list(APPEND sources
-		CArchConsoleUnix.cpp
-		CArchDaemonUnix.cpp
-		CArchFileUnix.cpp
-		CArchLogUnix.cpp
-		CArchMultithreadPosix.cpp
-		CArchNetworkBSD.cpp
-		CArchSleepUnix.cpp
-		CArchStringUnix.cpp
-		CArchSystemUnix.cpp
-		CArchTaskBarXWindows.cpp
-		CArchTimeUnix.cpp
-		XArchUnix.cpp
-		CArchDaemonNone.cpp
-		CArchPluginUnix.cpp
-		CArchInternetUnix.cpp
-	)
+list(APPEND sources ${arch_sources})
+list(APPEND headers ${arch_headers})
 
+if (SYNERGY_ADD_HEADERS)
+	list(APPEND sources ${headers})
 endif()
 
 include_directories(
-	../base
-	../common
-	../mt
-	../platform
-	../synergy
+	../
 )
 
 if (UNIX)
 	include_directories(
 		../../..
-		../arch
 	)
 endif()
 

src/lib/arch/IArchConsole.h

@@ -16,11 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef IARCHCONSOLE_H
-#define IARCHCONSOLE_H
+#pragma once
 
-#include "IInterface.h"
-#include "ELevel.h"
+#include "common/IInterface.h"
+#include "base/ELevel.h"
 
 //! Interface for architecture dependent console output
 /*!
@@ -65,5 +64,3 @@ public:
 
 	//@}
 };
-
-#endif

src/lib/arch/IArchDaemon.h

@@ -16,11 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef IARCHDAEMON_H
-#define IARCHDAEMON_H
+#pragma once
 
-#include "IInterface.h"
-#include "CString.h"
+#include "common/IInterface.h"
+#include "base/String.h"
 
 //! Interface for architecture dependent daemonizing
 /*!
@@ -128,5 +127,3 @@ public:
 
 	//@}
 };
-
-#endif

src/lib/arch/IArchFile.h

@@ -16,11 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef IARCHFILE_H
-#define IARCHFILE_H
+#pragma once
 
-#include "IInterface.h"
-#include "stdstring.h"
+#include "common/IInterface.h"
+#include "common/stdstring.h"
 
 //! Interface for architecture dependent file system operations
 /*!
@@ -64,5 +63,3 @@ public:
 
 	//@}
 };
-
-#endif

src/lib/arch/IArchLog.h

@@ -16,11 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef IARCHLOG_H
-#define IARCHLOG_H
+#pragma once
 
-#include "IInterface.h"
-#include "ELevel.h"
+#include "common/IInterface.h"
+#include "base/ELevel.h"
 
 //! Interface for architecture dependent logging
 /*!
@@ -62,5 +61,3 @@ public:
 
 	//@}
 };
-
-#endif

src/lib/arch/IArchMultithread.h

@@ -16,10 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef IARCHMULTITHREAD_H
-#define IARCHMULTITHREAD_H
+#pragma once
 
-#include "IInterface.h"
+#include "common/IInterface.h"
 
 /*!      
 \class CArchCondImpl
@@ -272,5 +271,3 @@ public:
 
 	//@}
 };
-
-#endif

src/lib/arch/IArchNetwork.h

@@ -16,11 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef IARCHNETWORK_H
-#define IARCHNETWORK_H
+#pragma once
 
-#include "IInterface.h"
-#include "stdstring.h"
+#include "common/IInterface.h"
+#include "common/stdstring.h"
 
 class CArchThreadImpl;
 typedef CArchThreadImpl* CArchThread;
@@ -281,5 +280,3 @@ public:
 
 	virtual void init() = 0;
 };
-
-#endif

src/lib/arch/IArchPlugin.h

@@ -20,7 +20,7 @@
 
 #define PLUGINS_DIR "plugins"
 
-#include "IInterface.h"
+#include "common/IInterface.h"
 
 class IEventQueue;
 

src/lib/arch/IArchSleep.h

@@ -16,10 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef IARCHSLEEP_H
-#define IARCHSLEEP_H
+#pragma once
 
-#include "IInterface.h"
+#include "common/IInterface.h"
 
 //! Interface for architecture dependent sleeping
 /*!
@@ -43,5 +42,3 @@ public:
 
 	//@}
 };
-
-#endif

src/lib/arch/IArchString.cpp

@@ -16,9 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "IArchString.h"
-#include "common.h"
-#include "CArch.h"
+#include "arch/IArchString.h"
+#include "arch/Arch.h"
+#include "common/common.h"
+
 #include <climits>
 #include <cstring>
 #include <cstdlib>

src/lib/arch/IArchString.h

@@ -16,11 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef IARCHSTRING_H
-#define IARCHSTRING_H
+#pragma once
+
+#include "common/IInterface.h"
+#include "common/basic_types.h"
 
-#include "IInterface.h"
-#include "BasicTypes.h"
 #include <stdarg.h>
 
 //! Interface for architecture dependent string operations
@@ -70,5 +70,3 @@ public:
 
 	//@}
 };
-
-#endif

src/lib/arch/IArchSystem.h

@@ -16,11 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef IARCHSYSTEM_H
-#define IARCHSYSTEM_H
+#pragma once
 
-#include "IInterface.h"
-#include "stdstring.h"
+#include "common/IInterface.h"
+#include "common/stdstring.h"
 
 //! Interface for architecture dependent system queries
 /*!
@@ -58,5 +57,3 @@ public:
 	virtual void setting(const std::string& valueName, const std::string& valueString) const = 0;
 	//@}
 };
-
-#endif

src/lib/arch/IArchTaskBar.h

@@ -16,10 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef IARCHTASKBAR_H
-#define IARCHTASKBAR_H
+#pragma once
 
-#include "IInterface.h"
+#include "common/IInterface.h"
 
 class IArchTaskBarReceiver;
 
@@ -62,5 +61,3 @@ public:
 
 	virtual void init() = 0;
 };
-
-#endif

src/lib/arch/IArchTaskBarReceiver.h

@@ -16,11 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef IARCHTASKBARRECEIVER_H
-#define IARCHTASKBARRECEIVER_H
+#pragma once
 
-#include "IInterface.h"
-#include "stdstring.h"
+#include "base/String.h"
+#include "common/IInterface.h"
 
 class IScreen;
 class INode;
@@ -97,5 +96,3 @@ public:
 
 	//@}
 };
-
-#endif

src/lib/arch/IArchTime.h

@@ -16,10 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef IARCHTIME_H
-#define IARCHTIME_H
+#pragma once
 
-#include "IInterface.h"
+#include "common/IInterface.h"
 
 //! Interface for architecture dependent time operations
 /*!
@@ -40,5 +39,3 @@ public:
 
 	//@}
 };
-
-#endif

src/lib/arch/XArch.cpp

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "XArch.h"
+#include "arch/XArch.h"
 
 //
 // XArch

src/lib/arch/XArch.h

@@ -16,11 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef XARCH_H
-#define XARCH_H
+#pragma once
 
-#include "common.h"
-#include "stdstring.h"
+#include "common/common.h"
+#include "common/stdstring.h"
 
 //! Generic thread exception
 /*!
@@ -169,6 +168,3 @@ XARCH_SUBCLASS(XArchDaemonUninstallFailed, XArchDaemon);
 
 //! Attempted to uninstall a daemon that was not installed
 XARCH_SUBCLASS(XArchDaemonUninstallNotInstalled, XArchDaemonUninstallFailed);
-
-
-#endif

src/lib/arch/multibyte.h

@@ -16,11 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef CMULTIBYTE_H
-#define CMULTIBYTE_H
+#pragma once
+
+#include "common/common.h"
+#include "arch/Arch.h"
 
-#include "common.h"
-#include "CArch.h"
 #include <climits>
 #include <cstring>
 #include <cstdlib>
@@ -54,5 +54,3 @@ wctomb(char* dst, wchar_t src)
 }
 
 #endif
-
-#endif

src/lib/arch/unix/ArchConsoleUnix.cpp

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "CArchConsoleUnix.h"
+#include "arch/ArchConsoleUnix.h"
 
 CArchConsoleUnix::CArchConsoleUnix() { }
 

src/lib/arch/unix/ArchConsoleUnix.h

@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include "CArchConsoleStd.h"
+#include "arch/ArchConsoleStd.h"
 
 #define ARCH_CONSOLE CArchConsoleUnix
 

src/lib/arch/unix/ArchDaemonUnix.cpp

@@ -16,15 +16,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "CArchDaemonUnix.h"
-#include "XArchUnix.h"
+#include "arch/ArchDaemonUnix.h"
+#include "arch/XArchUnix.h"
+#include "base/Log.h"
+
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <cstdlib>
-#include "CLog.h"
 
 //
 // CArchDaemonUnix

src/lib/arch/unix/ArchDaemonUnix.h

@@ -16,10 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef CARCHDAEMONUNIX_H
-#define CARCHDAEMONUNIX_H
+#pragma once
 
-#include "CArchDaemonNone.h"
+#include "arch/ArchDaemonNone.h"
 
 #undef ARCH_DAEMON
 #define ARCH_DAEMON CArchDaemonUnix
@@ -35,5 +34,3 @@ public:
 };
 
 #define CONFIG_FILE "/etc/synergy/synergyd.conf"
-
-#endif

src/lib/arch/unix/ArchFileUnix.cpp

@@ -16,7 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "CArchFileUnix.h"
+#include "arch/ArchFileUnix.h"
+
 #include <stdio.h>
 #include <unistd.h>
 #include <pwd.h>

src/lib/arch/unix/ArchFileUnix.h

@@ -16,10 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef CARCHFILEUNIX_H
-#define CARCHFILEUNIX_H
+#pragma once
 
-#include "IArchFile.h"
+#include "arch/IArchFile.h"
 
 #define ARCH_FILE CArchFileUnix
 
@@ -36,5 +35,3 @@ public:
 	virtual std::string	concatPath(const std::string& prefix,
 							const std::string& suffix);
 };
-
-#endif

src/lib/arch/unix/ArchInternetUnix.cpp

@@ -15,10 +15,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "CArchInternetUnix.h"
-#include "Version.h"
-#include "XArch.h"
-#include "CLog.h"
+#include "arch/ArchInternetUnix.h"
+#include "arch/XArch.h"
+#include "common/Version.h"
+#include "base/Log.h"
 
 #include <sstream>
 #include <curl/curl.h>

src/lib/arch/unix/ArchInternetUnix.h

@@ -19,7 +19,7 @@
 
 #define ARCH_INTERNET CArchInternetUnix
 
-#include "CString.h"
+#include "base/String.h"
 
 class CArchInternetUnix {
 public:

src/lib/arch/unix/ArchLogUnix.cpp

@@ -16,7 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "CArchLogUnix.h"
+#include "arch/ArchLogUnix.h"
+
 #include <syslog.h>
 
 //

src/lib/arch/unix/ArchLogUnix.h

@@ -16,10 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef CARCHLOGUNIX_H
-#define CARCHLOGUNIX_H
+#pragma once
 
-#include "IArchLog.h"
+#include "arch/IArchLog.h"
 
 #define ARCH_LOG CArchLogUnix
 

src/lib/arch/unix/ArchMultithreadPosix.cpp

@@ -16,9 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "CArchMultithreadPosix.h"
-#include "CArch.h"
-#include "XArch.h"
+#include "arch/ArchMultithreadPosix.h"
+#include "arch/Arch.h"
+#include "arch/XArch.h"
+
 #include <signal.h>
 #if TIME_WITH_SYS_TIME
 #	include <sys/time.h>

src/lib/arch/unix/ArchMultithreadPosix.h

@@ -16,11 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef CARCHMULTITHREADPOSIX_H
-#define CARCHMULTITHREADPOSIX_H
+#pragma once
+
+#include "arch/IArchMultithread.h"
+#include "common/stdlist.h"
 
-#include "IArchMultithread.h"
-#include "stdlist.h"
 #include <pthread.h>
 
 #define ARCH_MULTITHREAD CArchMultithreadPosix
@@ -113,5 +113,3 @@ private:
 	SignalFunc			m_signalFunc[kNUM_SIGNALS];
 	void*				m_signalUserData[kNUM_SIGNALS];
 };
-
-#endif

src/lib/arch/unix/ArchNetworkBSD.cpp

@@ -16,10 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "CArchNetworkBSD.h"
-#include "CArch.h"
-#include "CArchMultithreadPosix.h"
-#include "XArchUnix.h"
+#include "arch/ArchNetworkBSD.h"
+#include "arch/Arch.h"
+#include "arch/ArchMultithreadPosix.h"
+#include "arch/XArchUnix.h"
+
 #if HAVE_UNISTD_H
 #	include <unistd.h>
 #endif

src/lib/arch/unix/ArchNetworkBSD.h

@@ -16,11 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef CARCHNETWORKBSD_H
-#define CARCHNETWORKBSD_H
+#pragma once
+
+#include "arch/IArchNetwork.h"
+#include "arch/IArchMultithread.h"
 
-#include "IArchNetwork.h"
-#include "IArchMultithread.h"
 #if HAVE_SYS_TYPES_H
 #	include <sys/types.h>
 #endif
@@ -102,5 +102,3 @@ private:
 private:
 	CArchMutex			m_mutex;
 };
-
-#endif

src/lib/arch/unix/ArchPluginUnix.cpp

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "CArchPluginUnix.h"
+#include "arch/ArchPluginUnix.h"
 
 CArchPluginUnix::CArchPluginUnix()
 {

src/lib/arch/unix/ArchPluginUnix.h

@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include "IArchPlugin.h"
+#include "arch/IArchPlugin.h"
 
 #define ARCH_PLUGIN CArchPluginUnix
 

src/lib/arch/unix/ArchSleepUnix.cpp

@@ -16,8 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "CArchSleepUnix.h"
-#include "CArch.h"
+#include "arch/ArchSleepUnix.h"
+#include "arch/Arch.h"
+
 #if TIME_WITH_SYS_TIME
 #	include <sys/time.h>
 #	include <time.h>

src/lib/arch/unix/ArchSleepUnix.h

@@ -16,10 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef CARCHSLEEPUNIX_H
-#define CARCHSLEEPUNIX_H
+#pragma once
 
-#include "IArchSleep.h"
+#include "arch/IArchSleep.h"
 
 #define ARCH_SLEEP CArchSleepUnix
 
@@ -32,5 +31,3 @@ public:
 	// IArchSleep overrides
 	virtual void		sleep(double timeout);
 };
-
-#endif

src/lib/arch/unix/ArchStringUnix.cpp

@@ -16,15 +16,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "CArchStringUnix.h"
+#include "arch/ArchStringUnix.h"
+
 #include <stdio.h>
 
 //
 // CArchStringUnix
 //
 
-#include "CMultibyte.h"
-#include "vsnprintf.h"
+#include "arch/multibyte.h"
+#include "arch/vsnprintf.h"
 
 CArchStringUnix::CArchStringUnix()
 {

src/lib/arch/unix/ArchStringUnix.h

@@ -16,10 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef CARCHSTRINGUNIX_H
-#define CARCHSTRINGUNIX_H
+#pragma once
 
-#include "IArchString.h"
+#include "arch/IArchString.h"
 
 #define ARCH_STRING CArchStringUnix
 
@@ -33,5 +32,3 @@ public:
 	virtual EWideCharEncoding
 						getWideCharEncoding();
 };
-
-#endif

src/lib/arch/unix/ArchSystemUnix.cpp

@@ -16,7 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "CArchSystemUnix.h"
+#include "arch/ArchSystemUnix.h"
+
 #include <sys/utsname.h>
 
 //

src/lib/arch/unix/ArchSystemUnix.h

@@ -16,10 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef CARCHSYSTEMUNIX_H
-#define CARCHSYSTEMUNIX_H
+#pragma once
 
-#include "IArchSystem.h"
+#include "arch/IArchSystem.h"
 
 #define ARCH_SYSTEM CArchSystemUnix
 
@@ -35,5 +34,3 @@ public:
 	virtual std::string setting(const std::string&) const;
 	virtual void setting(const std::string&, const std::string&) const;
 };
-
-#endif

src/lib/arch/unix/ArchTimeUnix.cpp

@@ -16,7 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "CArchTimeUnix.h"
+#include "arch/ArchTimeUnix.h"
+
 #if TIME_WITH_SYS_TIME
 #	include <sys/time.h>
 #	include <time.h>

src/lib/arch/unix/ArchTimeUnix.h

@@ -16,10 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef CARCHTIMEUNIX_H
-#define CARCHTIMEUNIX_H
+#pragma once
 
-#include "IArchTime.h"
+#include "arch/IArchTime.h"
 
 #define ARCH_TIME CArchTimeUnix
 
@@ -32,5 +31,3 @@ public:
 	// IArchTime overrides
 	virtual double		time();
 };
-
-#endif

src/lib/arch/unix/XArchUnix.cpp

@@ -16,7 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "XArchUnix.h"
+#include "arch/XArchUnix.h"
+
 #include <cstring>
 
 //

src/lib/arch/unix/XArchUnix.h

@@ -16,10 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef XARCHUNIX_H
-#define XARCHUNIX_H
+#pragma once
 
-#include "XArch.h"
+#include "arch/XArch.h"
 
 //! Lazy error message string evaluation for unix
 class XArchEvalUnix : public XArchEval {
@@ -34,5 +33,3 @@ public:
 private:
 	int					m_errno;
 };
-
-#endif

src/lib/arch/vsnprintf.h

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "IArchString.h"
+#include "arch/IArchString.h"
 
 #if HAVE_VSNPRINTF
 

src/lib/arch/win32/ArchConsoleWindows.cpp

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "CArchConsoleWindows.h"
+#include "arch/win32/ArchConsoleWindows.h"
 
 CArchConsoleWindows::CArchConsoleWindows() { }
 

src/lib/arch/win32/ArchConsoleWindows.h

@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include "CArchConsoleStd.h"
+#include "arch/ArchConsoleStd.h"
 
 #define ARCH_CONSOLE CArchConsoleWindows
 

src/lib/arch/win32/ArchDaemonWindows.cpp

@@ -16,11 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "CArchDaemonWindows.h"
-#include "CArch.h"
-#include "CArchMiscWindows.h"
-#include "XArchWindows.h"
-#include "stdvector.h"
+#include "arch/win32/ArchDaemonWindows.h"
+#include "arch/win32/ArchMiscWindows.h"
+#include "arch/win32/XArchWindows.h"
+#include "arch/Arch.h"
+#include "common/stdvector.h"
+
 #include <sstream>
 
 //

src/lib/arch/win32/ArchDaemonWindows.h

@@ -16,15 +16,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef CARCHDAEMONWINDOWS_H
-#define CARCHDAEMONWINDOWS_H
+#pragma once
+
+#include "arch/IArchDaemon.h"
+#include "arch/IArchMultithread.h"
+#include "common/stdstring.h"
 
 #define WIN32_LEAN_AND_MEAN
-
-#include "IArchDaemon.h"
-#include "IArchMultithread.h"
-#include "stdstring.h"
-#include <windows.h>
+#include <Windows.h>
 #include <tchar.h>
 
 #define ARCH_DAEMON CArchDaemonWindows
@@ -156,5 +155,3 @@ static const TCHAR* const g_daemonKeyPath[] = {
 	_T("Service"),
 	NULL
 };
-
-#endif

src/lib/arch/win32/ArchFileWindows.cpp

@@ -16,8 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "CArchFileWindows.h"
-#include <windows.h>
+#include "arch/win32/ArchFileWindows.h"
+
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
 #include <shlobj.h>
 #include <tchar.h>
 #include <string.h>

src/lib/arch/win32/ArchFileWindows.h

@@ -16,10 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef CARCHFILEWINDOWS_H
-#define CARCHFILEWINDOWS_H
+#pragma once
 
-#include "IArchFile.h"
+#include "arch/IArchFile.h"
 
 #define ARCH_FILE CArchFileWindows
 
@@ -36,5 +35,3 @@ public:
 	virtual std::string	concatPath(const std::string& prefix,
 							const std::string& suffix);
 };
-
-#endif

src/lib/arch/win32/ArchInternetWindows.cpp

@@ -15,10 +15,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "CArchInternetWindows.h"
-#include "CArch.h"
-#include "Version.h"
-#include "XArchWindows.h"
+#include "arch/win32/ArchInternetWindows.h"
+#include "arch/win32/XArchWindows.h"
+#include "arch/Arch.h"
+#include "common/Version.h"
 
 #include <sstream>
 #include <Wininet.h>

src/lib/arch/win32/ArchInternetWindows.h

@@ -19,7 +19,7 @@
 
 #define ARCH_INTERNET CArchInternetWindows
 
-#include "CString.h"
+#include "base/String.h"
 
 class CArchInternetWindows {
 public:

src/lib/arch/win32/ArchLogWindows.cpp

@@ -16,8 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "CArchLogWindows.h"
-#include "CArchMiscWindows.h"
+#include "arch/win32/ArchLogWindows.h"
+#include "arch/win32/ArchMiscWindows.h"
+
 #include <string.h>
 
 //

src/lib/arch/win32/ArchLogWindows.h

@@ -16,13 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef CARCHLOGWINDOWS_H
-#define CARCHLOGWINDOWS_H
+#pragma once
+
+#include "arch/IArchLog.h"
 
 #define WIN32_LEAN_AND_MEAN
-
-#include "IArchLog.h"
-#include <windows.h>
+#include <Windows.h>
 
 #define ARCH_LOG CArchLogWindows
 
@@ -41,5 +40,3 @@ public:
 private:
 	HANDLE				m_eventLog;
 };
-
-#endif

src/lib/arch/win32/ArchMiscWindows.cpp

@@ -16,15 +16,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "CArchMiscWindows.h"
-#include "CArchDaemonWindows.h"
-#include "CLog.h"
+#include "arch/win32/ArchMiscWindows.h"
+#include "arch/win32/ArchDaemonWindows.h"
+#include "base/Log.h"
+#include "common/Version.h"
 
 #include <Wtsapi32.h>
 #pragma warning(disable: 4099)
 #include <Userenv.h>
 #pragma warning(default: 4099)
-#include "Version.h"
 
 // parent process name for services in Vista
 #define SERVICE_LAUNCHER "services.exe"

src/lib/arch/win32/ArchMiscWindows.h

@@ -16,17 +16,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef CARCHMISCWINDOWS_H
-#define CARCHMISCWINDOWS_H
+#pragma once
+
+#include "common/common.h"
+#include "common/stdstring.h"
+#include "common/stdset.h"
+#include "base/String.h"
 
 #define WIN32_LEAN_AND_MEAN
-
-#include "common.h"
-#include "stdstring.h"
-#include "stdset.h"
-#include <windows.h>
+#include <Windows.h>
 #include <Tlhelp32.h>
-#include "CString.h"
 
 //! Miscellaneous win32 functions.
 class CArchMiscWindows {
@@ -214,5 +213,3 @@ private:
 	static HICON		s_smallIcon;
 	static HINSTANCE	s_instanceWin32;
 };
-
-#endif

src/lib/arch/win32/ArchMultithreadWindows.cpp

@@ -20,9 +20,10 @@
 #	error multithreading compile option is required
 #endif
 
-#include "CArchMultithreadWindows.h"
-#include "CArch.h"
-#include "XArch.h"
+#include "arch/win32/ArchMultithreadWindows.h"
+#include "arch/Arch.h"
+#include "arch/XArch.h"
+
 #include <process.h>
 
 //

src/lib/arch/win32/ArchMultithreadWindows.h

@@ -16,14 +16,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef CARCHMULTITHREADWINDOWS_H
-#define CARCHMULTITHREADWINDOWS_H
+#pragma once
+
+#include "arch/IArchMultithread.h"
+#include "common/stdlist.h"
 
 #define WIN32_LEAN_AND_MEAN
-
-#include "IArchMultithread.h"
-#include "stdlist.h"
-#include <windows.h>
+#include <Windows.h>
 
 #define ARCH_MULTITHREAD CArchMultithreadWindows
 
@@ -115,5 +114,3 @@ private:
 	SignalFunc			m_signalFunc[kNUM_SIGNALS];
 	void*				m_signalUserData[kNUM_SIGNALS];
 };
-
-#endif

src/lib/arch/win32/ArchNetworkWinsock.cpp

@@ -16,12 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "arch/win32/ArchNetworkWinsock.h"
+#include "arch/win32/ArchMultithreadWindows.h"
+#include "arch/win32/XArchWindows.h"
+#include "arch/IArchMultithread.h"
+#include "arch/Arch.h"
 
-#include "CArchNetworkWinsock.h"
-#include "CArch.h"
-#include "CArchMultithreadWindows.h"
-#include "IArchMultithread.h"
-#include "XArchWindows.h"
 #include <malloc.h>
 
 static const int s_family[] = {

src/lib/arch/win32/ArchNetworkWinsock.h

@@ -16,18 +16,17 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef CARCHNETWORKWINSOCK_H
-#define CARCHNETWORKWINSOCK_H
-
-#define WIN32_LEAN_AND_MEAN
+#pragma once
 
 // declare no functions in winsock2
 #define INCL_WINSOCK_API_PROTOTYPES 0
 #define INCL_WINSOCK_API_TYPEDEFS 0
 
-#include "IArchNetwork.h"
-#include "IArchMultithread.h"
-#include <windows.h>
+#include "arch/IArchNetwork.h"
+#include "arch/IArchMultithread.h"
+
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
 #include <winsock2.h>
 #include <list>
 
@@ -105,5 +104,3 @@ private:
 	CArchMutex			m_mutex;
 	CEventList			m_unblockEvents;
 };
-
-#endif

src/lib/arch/win32/ArchPluginWindows.cpp

@@ -16,12 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "CArchPluginWindows.h"
-#include "XArchWindows.h"
-#include "CLog.h"
-#include "IEventQueue.h"
-#include "CEvent.h"
-#include "CScreen.h"
+#include "arch/win32/ArchPluginWindows.h"
+#include "arch/win32/XArchWindows.h"
+#include "base/Log.h"
+#include "base/IEventQueue.h"
+#include "base/Event.h"
+#include "synergy/Screen.h"
 
 #define WIN32_LEAN_AND_MEAN
 #include <Windows.h>

src/lib/arch/win32/ArchPluginWindows.h

@@ -18,8 +18,9 @@
 
 #pragma once
 
-#include "IArchPlugin.h"
-#include "CString.h"
+#include "arch/IArchPlugin.h"
+#include "base/String.h"
+
 #include <vector>
 
 #define ARCH_PLUGIN CArchPluginWindows

src/lib/arch/win32/ArchSleepWindows.cpp

@@ -16,9 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "CArchSleepWindows.h"
-#include "CArch.h"
-#include "CArchMultithreadWindows.h"
+#include "arch/win32/ArchSleepWindows.h"
+#include "arch/Arch.h"
+#include "arch/win32/ArchMultithreadWindows.h"
 
 //
 // CArchSleepWindows

src/lib/arch/win32/ArchSleepWindows.h

@@ -16,10 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef CARCHSLEEPWINDOWS_H
-#define CARCHSLEEPWINDOWS_H
+#pragma once
 
-#include "IArchSleep.h"
+#include "arch/IArchSleep.h"
 
 #define ARCH_SLEEP CArchSleepWindows
 
@@ -32,5 +31,3 @@ public:
 	// IArchSleep overrides
 	virtual void		sleep(double timeout);
 };
-
-#endif

src/lib/arch/win32/ArchStringWindows.cpp

@@ -16,20 +16,20 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#define WIN32_LEAN_AND_MEAN
+#include "arch/win32/ArchStringWindows.h"
 
-#include "CArchStringWindows.h"
-#include <windows.h>
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
 #include <stdio.h>
 
 //
 // CArchStringWindows
 //
 
-#include "CMultibyte.h"
+#include "arch/multibyte.h"
 #define HAVE_VSNPRINTF 1
 #define ARCH_VSNPRINTF _vsnprintf
-#include "vsnprintf.h"
+#include "arch/vsnprintf.h"
 
 CArchStringWindows::CArchStringWindows()
 {