diff --git a/source/mact/include/keyboard.h b/source/mact/include/keyboard.h
index c940dc860..a582c68ad 100644
--- a/source/mact/include/keyboard.h
+++ b/source/mact/include/keyboard.h
@@ -85,6 +85,7 @@ extern kb_scancode KB_LastScan;
 #define KB_GetCh keyGetChar
 #define KB_KeyWaiting keyBufferWaiting
 #define KB_FlushKeyboardQueue keyFlushChars
+#define KB_FlushKeyboardQueueScans keyFlushScans
 
 static inline void KB_ClearKeysDown(void)
 {
diff --git a/source/mact/include/mouse.h b/source/mact/include/mouse.h
index 76ea74e63..bf357ec36 100644
--- a/source/mact/include/mouse.h
+++ b/source/mact/include/mouse.h
@@ -29,6 +29,9 @@ Modifications for JonoF's port by Jonathon Fowler (jf@jonof.id.au)
 
 #ifndef mouse_h_
 #define mouse_h_
+
+#include "baselayer.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -44,8 +47,6 @@ extern "C" {
 #define RIGHT_MOUSE_PRESSED(button)     (((button)&RIGHT_MOUSE) != 0)
 #define MIDDLE_MOUSE_PRESSED(button)    (((button)&MIDDLE_MOUSE) != 0)
 
-#include "baselayer.h"
-
 static inline bool Mouse_Init(void)
 {
     mouseInit();