diff --git a/src/MacVim/DBPrefsWindowController.h b/src/MacVim/DBPrefsWindowController.h
index 2e9bf9d4dc..74ca024f1a 100644
--- a/src/MacVim/DBPrefsWindowController.h
+++ b/src/MacVim/DBPrefsWindowController.h
@@ -43,7 +43,7 @@
 
 
 @interface DBPrefsWindowController : NSWindowController
-#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6)
+#if (MAC_OS_X_VERSION_MAX_ALLOWED >= 1060)
     // 10.6 has turned delegate messages into formal protocols
     <NSAnimationDelegate, NSToolbarDelegate>
 #endif
diff --git a/src/MacVim/MMVimController.h b/src/MacVim/MMVimController.h
index 9dfba668eb..be2d3ec1a9 100644
--- a/src/MacVim/MMVimController.h
+++ b/src/MacVim/MMVimController.h
@@ -8,7 +8,6 @@
  * See README.txt for an overview of the Vim source code.
  */
 
-#import <Cocoa/Cocoa.h>
 #import "MacVim.h"
 
 #ifdef MM_ENABLE_PLUGINS
diff --git a/src/MacVim/MMWindowController.h b/src/MacVim/MMWindowController.h
index 8f2aa2c422..62704b8e85 100644
--- a/src/MacVim/MMWindowController.h
+++ b/src/MacVim/MMWindowController.h
@@ -8,7 +8,7 @@
  * See README.txt for an overview of the Vim source code.
  */
 
-#import <Cocoa/Cocoa.h>
+#import "MacVim.h"
 
 
 
diff --git a/src/MacVim/PSMTabBarControl/source/PSMTabBarControl.h b/src/MacVim/PSMTabBarControl/source/PSMTabBarControl.h
index b807366700..26a41b5253 100644
--- a/src/MacVim/PSMTabBarControl/source/PSMTabBarControl.h
+++ b/src/MacVim/PSMTabBarControl/source/PSMTabBarControl.h
@@ -40,7 +40,7 @@ enum {
 };
 
 @interface PSMTabBarControl : NSControl
-#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6)
+#if (MAC_OS_X_VERSION_MAX_ALLOWED >= 1060)
     // 10.6 has turned delegate messages into formal protocols
     <NSTabViewDelegate>
 #endif