diff --git a/src/keypress.h b/src/keypress.h
index 46d910f2..5ad43986 100644
--- a/src/keypress.h
+++ b/src/keypress.h
@@ -16,15 +16,13 @@ extern "C"
 #endif
 #if defined(IS_MACOSX)
 
-	enum _MMKeyFlags {
+	typedef enum  {
 		MOD_NONE = 0,
 		MOD_META = kCGEventFlagMaskCommand,
 		MOD_ALT = kCGEventFlagMaskAlternate,
 		MOD_CONTROL = kCGEventFlagMaskControl,
 		MOD_SHIFT = kCGEventFlagMaskShift
-	};
-
-	typedef CGEventFlags MMKeyFlags;
+	} MMKeyFlags;
 
 #elif defined(USE_X11)
 
diff --git a/src/mouse.h b/src/mouse.h
index fd2b8f05..667fc0cc 100644
--- a/src/mouse.h
+++ b/src/mouse.h
@@ -18,12 +18,11 @@ extern "C"
 
 	#include <ApplicationServices/ApplicationServices.h>
 
-	enum _MMMouseButton {
+	typedef enum  {
 		LEFT_BUTTON = kCGMouseButtonLeft,
 		RIGHT_BUTTON = kCGMouseButtonRight,
 		CENTER_BUTTON = kCGMouseButtonCenter
-	};
-	typedef CGMouseButton MMMouseButton;
+	} MMMouseButton;
 
 #elif defined(USE_X11)