diff --git a/src/cmd/synergyc/OSXClientTaskBarReceiver.h b/src/cmd/synergyc/OSXClientTaskBarReceiver.h
index 30e7f739..efe1996e 100644
--- a/src/cmd/synergyc/OSXClientTaskBarReceiver.h
+++ b/src/cmd/synergyc/OSXClientTaskBarReceiver.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/OSXServerTaskBarReceiver.h b/src/cmd/synergys/OSXServerTaskBarReceiver.h
index fa362769..9a45fc3b 100644
--- a/src/cmd/synergys/OSXServerTaskBarReceiver.h
+++ b/src/cmd/synergys/OSXServerTaskBarReceiver.h
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include "synergys/ServerTaskBarReceiver.h"
+#include "synergy/ServerTaskBarReceiver.h"
 
 class CBufferedLogOutputter;
 
diff --git a/src/lib/platform/CMakeLists.txt b/src/lib/platform/CMakeLists.txt
index 29016dd8..90ec1a60 100644
--- a/src/lib/platform/CMakeLists.txt
+++ b/src/lib/platform/CMakeLists.txt
@@ -19,7 +19,7 @@ if (WIN32)
 	file(GLOB sources "MSWindows*.cpp")
 elseif (APPLE)
 	file(GLOB headers "OSX*.h")
-	file(GLOB sources "OSX*.cpp")
+	file(GLOB sources "OSX*.cpp" "OSX*.m")
 elseif (UNIX)
 	file(GLOB headers "XWindows*.h")
 	file(GLOB sources "XWindows*.cpp")
diff --git a/src/lib/platform/OSXDragSimulator.m b/src/lib/platform/OSXDragSimulator.m
index a1436e9a..aac66c9f 100644
--- a/src/lib/platform/OSXDragSimulator.m
+++ b/src/lib/platform/OSXDragSimulator.m
@@ -12,9 +12,9 @@
  * GNU General Public License for more details.
  */
 
-#import "platform/COSXDragSimulator.h"
+#import "platform/OSXDragSimulator.h"
 
-#import "platform/COSXDragView.h"
+#import "platform/OSXDragView.h"
 
 #import <Foundation/Foundation.h>
 #import <CoreData/CoreData.h>
diff --git a/src/lib/platform/OSXDragView.m b/src/lib/platform/OSXDragView.m
index 26544187..24c0f409 100644
--- a/src/lib/platform/OSXDragView.m
+++ b/src/lib/platform/OSXDragView.m
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#import "platform/COSXDragView.h"
+#import "platform/OSXDragView.h"
 
 #ifdef MAC_OS_X_VERSION_10_7
 
diff --git a/src/lib/platform/OSXEventQueueBuffer.h b/src/lib/platform/OSXEventQueueBuffer.h
index fc664d5a..fc5d3bbd 100644
--- a/src/lib/platform/OSXEventQueueBuffer.h
+++ b/src/lib/platform/OSXEventQueueBuffer.h
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include "IEventQueueBuffer.h"
+#include "base/IEventQueueBuffer.h"
 
 #include <Carbon/Carbon.h>
 
diff --git a/src/lib/platform/OSXPasteboardPeeker.m b/src/lib/platform/OSXPasteboardPeeker.m
index e7c0a241..c844d58d 100644
--- a/src/lib/platform/OSXPasteboardPeeker.m
+++ b/src/lib/platform/OSXPasteboardPeeker.m
@@ -12,7 +12,7 @@
  * GNU General Public License for more details.
  */
 
-#import "platform/COSXPasteboardPeeker.h"
+#import "platform/OSXPasteboardPeeker.h"
 
 #import <Foundation/Foundation.h>
 #import <CoreData/CoreData.h>
diff --git a/src/lib/platform/OSXScreen.cpp b/src/lib/platform/OSXScreen.cpp
index b134c93f..928b9f1e 100644
--- a/src/lib/platform/OSXScreen.cpp
+++ b/src/lib/platform/OSXScreen.cpp
@@ -18,6 +18,7 @@
 
 #include "platform/OSXScreen.h"
 
+#include "client/Client.h"
 #include "platform/OSXClipboard.h"
 #include "platform/OSXEventQueueBuffer.h"
 #include "platform/OSXKeyState.h"
@@ -27,7 +28,6 @@
 #include "synergy/Clipboard.h"
 #include "synergy/KeyMap.h"
 #include "synergy/ClientApp.h"
-#include "synergy/Client.h"
 #include "mt/CondVar.h"
 #include "mt/Lock.h"
 #include "mt/Mutex.h"
diff --git a/src/lib/platform/OSXScreenSaver.cpp b/src/lib/platform/OSXScreenSaver.cpp
index 86469314..8ae9dc5c 100644
--- a/src/lib/platform/OSXScreenSaver.cpp
+++ b/src/lib/platform/OSXScreenSaver.cpp
@@ -16,9 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#import "platform/COSXScreenSaver.h"
+#import "platform/OSXScreenSaver.h"
 
-#import "platform/COSXScreenSaverUtil.h"
+#import "platform/OSXScreenSaverUtil.h"
 #import "synergy/IPrimaryScreen.h"
 #import "base/Log.h"
 #import "base/IEventQueue.h"
diff --git a/src/lib/platform/OSXScreenSaver.h b/src/lib/platform/OSXScreenSaver.h
index 35d0b7bb..9ad7d10e 100644
--- a/src/lib/platform/OSXScreenSaver.h
+++ b/src/lib/platform/OSXScreenSaver.h
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include "platform/IScreenSaver.h"
+#include "synergy/IScreenSaver.h"
 
 #include <Carbon/Carbon.h>
 
diff --git a/src/lib/platform/OSXScreenSaverUtil.m b/src/lib/platform/OSXScreenSaverUtil.m
index 5c255bfb..bb4319d5 100644
--- a/src/lib/platform/OSXScreenSaverUtil.m
+++ b/src/lib/platform/OSXScreenSaverUtil.m
@@ -12,7 +12,7 @@
  * GNU General Public License for more details.
  */
 
-#import "platform/COSXScreenSaverUtil.h"
+#import "platform/OSXScreenSaverUtil.h"
 
 #import "platform/OSXScreenSaverControl.h"