diff --git a/lib/platform/COSXClipboard.h b/lib/platform/COSXClipboard.h
index a086205e..48edf854 100644
--- a/lib/platform/COSXClipboard.h
+++ b/lib/platform/COSXClipboard.h
@@ -15,9 +15,9 @@
 #ifndef COSXCLIPBOARD_H
 #define COSXCLIPBOARD_H
 
+#include <Carbon/Carbon.h>
 #include "IClipboard.h"
 #include <vector>
-#include <Carbon/Carbon.h>
 
 class IOSXClipboardConverter;
 
diff --git a/lib/platform/COSXEventQueueBuffer.h b/lib/platform/COSXEventQueueBuffer.h
index 659b5940..2160b410 100644
--- a/lib/platform/COSXEventQueueBuffer.h
+++ b/lib/platform/COSXEventQueueBuffer.h
@@ -15,8 +15,8 @@
 #ifndef COSXEVENTQUEUEBUFFER_H
 #define COSXEVENTQUEUEBUFFER_H
 
-#include "IEventQueueBuffer.h"
 #include <Carbon/Carbon.h>
+#include "IEventQueueBuffer.h"
 
 //! Event queue buffer for OS X
 class COSXEventQueueBuffer : public IEventQueueBuffer {
diff --git a/lib/platform/COSXKeyState.cpp b/lib/platform/COSXKeyState.cpp
index 0435be40..4e83b333 100644
--- a/lib/platform/COSXKeyState.cpp
+++ b/lib/platform/COSXKeyState.cpp
@@ -353,7 +353,7 @@ COSXKeyState::fakeKey(const Keystroke& keystroke)
 		LOG((CLOG_DEBUG1 "  %03x (%08x) %s", keystroke.m_data.m_button.m_button, keystroke.m_data.m_button.m_client, keystroke.m_data.m_button.m_press ? "down" : "up"));
 
 		// let system figure out character for us
-		CGPostKeyboardEvent(0, mapKeyButtonToVirtualKey(
+		CGEventCreateKeyboardEvent(0, mapKeyButtonToVirtualKey(
 									keystroke.m_data.m_button.m_button),
 								keystroke.m_data.m_button.m_press);
 
diff --git a/lib/platform/COSXKeyState.h b/lib/platform/COSXKeyState.h
index 775d3f19..bb0cd1e4 100644
--- a/lib/platform/COSXKeyState.h
+++ b/lib/platform/COSXKeyState.h
@@ -15,11 +15,11 @@
 #ifndef COSXKEYSTATE_H
 #define COSXKEYSTATE_H
 
+#include <Carbon/Carbon.h>
 #include "CKeyState.h"
 #include "stdmap.h"
 #include "stdset.h"
 #include "stdvector.h"
-#include <Carbon/Carbon.h>
 
 //! OS X key state
 /*!
diff --git a/lib/platform/COSXScreen.h b/lib/platform/COSXScreen.h
index e688eb31..202d545f 100644
--- a/lib/platform/COSXScreen.h
+++ b/lib/platform/COSXScreen.h
@@ -15,10 +15,10 @@
 #ifndef COSXSCREEN_H
 #define COSXSCREEN_H
 
+#include <Carbon/Carbon.h>
 #include "CPlatformScreen.h"
 #include "stdmap.h"
 #include "stdvector.h"
-#include <Carbon/Carbon.h>
 
 #include <mach/mach_port.h>
 #include <mach/mach_interface.h>