diff --git a/src/gui_mac.c b/src/gui_mac.c
index 901e81f..77006a7 100644
--- a/src/gui_mac.c
+++ b/src/gui_mac.c
@@ -3037,13 +3037,11 @@
 gui_mch_init(void)
 {
     /* TODO: Move most of this stuff toward gui_mch_init */
-    Rect	windRect;
-    MenuHandle	pomme;
+    Rect	    windRect;
+    MenuHandle	    pomme;
     EventHandlerRef mouseWheelHandlerRef;
-#ifdef USE_CARBONKEYHANDLER
     EventTypeSpec   eventTypeSpec;
-#endif
-    ControlRef rootControl;
+    ControlRef	    rootControl;
 
     if (Gestalt(gestaltSystemVersion, &gMacSystemVersion) != noErr)
 	gMacSystemVersion = 0x1000; /* TODO: Default to minimum sensible value */
diff --git a/src/version.c b/src/version.c
index 78788ec..a397e8a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    278,
+/**/
     277,
 /**/
     276,