diff --git a/src/gui/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp
index a4c8f0b3..8263d5ea 100644
--- a/src/gui/src/MainWindow.cpp
+++ b/src/gui/src/MainWindow.cpp
@@ -1351,7 +1351,7 @@ void MainWindow::delay(unsigned int s)
 {
 	QTime dieTime= QTime::currentTime().addSecs(s);
 
-	while( QTime::currentTime() < dieTime ) {
+	while (QTime::currentTime() < dieTime) {
 		QCoreApplication::processEvents(QEventLoop::AllEvents, 100);
 	}
 }
diff --git a/src/lib/arch/win32/ArchPluginWindows.cpp b/src/lib/arch/win32/ArchPluginWindows.cpp
index 37440d7c..bd0f6832 100644
--- a/src/lib/arch/win32/ArchPluginWindows.cpp
+++ b/src/lib/arch/win32/ArchPluginWindows.cpp
@@ -69,8 +69,8 @@ ArchPluginWindows::load()
 		void* lib = reinterpret_cast<void*>(library);
 		String filename = synergy::string::removeFileExt(*it);
 		m_pluginTable.insert(std::make_pair(filename, lib));
+		const char* version = (char*)invoke(filename.c_str(), "version",NULL);
 
-		const char * version = (char*)invoke( filename.c_str(),"version",NULL);
 		if (version == NULL) {
 			version = kPre174Plugin;
 		}
diff --git a/src/lib/platform/MSWindowsKeyState.cpp b/src/lib/platform/MSWindowsKeyState.cpp
index 863dae68..2b66a048 100644
--- a/src/lib/platform/MSWindowsKeyState.cpp
+++ b/src/lib/platform/MSWindowsKeyState.cpp
@@ -810,11 +810,11 @@ MSWindowsKeyState::fakeCtrlAltDel()
 	// current thread must be on that desktop to do the broadcast
 	// and we can't switch just any thread because some own windows
 	// or hooks.  so start a new thread to do the real work.
-	HANDLE hEvtSendSas = OpenEvent( EVENT_MODIFY_STATE, FALSE, "Global\\SendSAS" );
-	if ( hEvtSendSas ) {
+	HANDLE hEvtSendSas = OpenEvent(EVENT_MODIFY_STATE, FALSE, "Global\\SendSAS");
+	if (hEvtSendSas) {
 		LOG((CLOG_DEBUG "found the SendSAS event - signaling my launcher to simulate ctrl+alt+del"));
-		SetEvent( hEvtSendSas );
-		CloseHandle( hEvtSendSas );
+		SetEvent(hEvtSendSas);
+		CloseHandle(hEvtSendSas);
 	}
 	else {
 		Thread cad(new FunctionJob(&MSWindowsKeyState::ctrlAltDelThread));
diff --git a/src/lib/platform/XWindowsEventQueueBuffer.cpp b/src/lib/platform/XWindowsEventQueueBuffer.cpp
index 6376213e..49836e23 100644
--- a/src/lib/platform/XWindowsEventQueueBuffer.cpp
+++ b/src/lib/platform/XWindowsEventQueueBuffer.cpp
@@ -162,7 +162,7 @@ XWindowsEventQueueBuffer::waitForEvent(double dtimeout)
 	// we want to give the cpu a chance s owe up this to 25ms
 #define TIMEOUT_DELAY 25
 
-	while( ((dtimeout < 0.0) || (remaining > 0)) && QLength(m_display)==0 && retval==0){
+	while (((dtimeout < 0.0) || (remaining > 0)) && QLength(m_display)==0 && retval==0){
 #if HAVE_POLL
 	retval = poll(pfds, 2, TIMEOUT_DELAY); //16ms = 60hz, but we make it > to play nicely with the cpu
  	if (pfds[1].revents & POLLIN) {
diff --git a/src/lib/plugin/winmmjoy/winmmjoy.cpp b/src/lib/plugin/winmmjoy/winmmjoy.cpp
index ab3e5a59..40dddede 100644
--- a/src/lib/plugin/winmmjoy/winmmjoy.cpp
+++ b/src/lib/plugin/winmmjoy/winmmjoy.cpp
@@ -28,7 +28,7 @@ std::stringstream _logStream;
 #define LOG(s) \
 	_logStream.str(""); \
 	_logStream << "winmmjoy: " << s << std::endl; \
-	s_log( _logStream.str().c_str())
+	s_log(_logStream.str().c_str())
 
 static bool s_running = true;
 static void (*s_sendEvent)(const char*, void*) = NULL;
diff --git a/src/lib/server/Server.cpp b/src/lib/server/Server.cpp
index 93e1b450..1baf6150 100644
--- a/src/lib/server/Server.cpp
+++ b/src/lib/server/Server.cpp
@@ -886,7 +886,7 @@ Server::isSwitchOkay(BaseClientProxy* newScreen,
 	}
 
 	// check for optional needed modifiers
-	KeyModifierMask mods = this->m_primaryClient->getToggleMask( );
+	KeyModifierMask mods = this->m_primaryClient->getToggleMask();
 
 	if (!preventSwitch && (
 			(this->m_switchNeedsShift && ((mods & KeyModifierShift) != KeyModifierShift)) ||
diff --git a/src/lib/synergy/ServerApp.cpp b/src/lib/synergy/ServerApp.cpp
index ae9246df..c4de7dd3 100644
--- a/src/lib/synergy/ServerApp.cpp
+++ b/src/lib/synergy/ServerApp.cpp
@@ -317,7 +317,7 @@ ServerApp::updateStatus()
 	updateStatus("");
 }
 
-void ServerApp::updateStatus( const String& msg )
+void ServerApp::updateStatus(const String& msg)
 {
 	if (m_taskBarReceiver)
 	{