diff --git a/command.c b/command.c
old mode 100755
new mode 100644
diff --git a/ui/drivers/ui_cocoatouch.m b/ui/drivers/ui_cocoatouch.m
index 0c82711846..c9eadf6afc 100644
--- a/ui/drivers/ui_cocoatouch.m
+++ b/ui/drivers/ui_cocoatouch.m
@@ -689,9 +689,9 @@ ui_companion_driver_t ui_companion_cocoatouch = {
    ui_companion_cocoatouch_render_messagebox,
    NULL, /* get_main_window */
    NULL, /* log_msg */
-   &ui_browser_window_null,
-   &ui_msg_window_null,
-   &ui_window_null,
-   &ui_application_null,
+   NULL, /* ui_browser_window_null */
+   NULL, /* ui_msg_window_null */
+   NULL, /* ui_window_null */
+   NULL, /* ui_application_null */
    "cocoatouch",
 };
diff --git a/ui/ui_companion_driver.h b/ui/ui_companion_driver.h
index 9a58017450..9be4c179e2 100644
--- a/ui/ui_companion_driver.h
+++ b/ui/ui_companion_driver.h
@@ -145,22 +145,18 @@ typedef struct ui_companion_driver
    const char        *ident;
 } ui_companion_driver_t;
 
-extern ui_browser_window_t   ui_browser_window_null;
 extern ui_browser_window_t   ui_browser_window_cocoa;
 extern ui_browser_window_t   ui_browser_window_qt;
 extern ui_browser_window_t   ui_browser_window_win32;
 
-extern ui_window_t           ui_window_null;
 extern ui_window_t           ui_window_cocoa;
 extern ui_window_t           ui_window_qt;
 extern ui_window_t           ui_window_win32;
 
-extern ui_msg_window_t       ui_msg_window_null;
 extern ui_msg_window_t       ui_msg_window_win32;
 extern ui_msg_window_t       ui_msg_window_qt;
 extern ui_msg_window_t       ui_msg_window_cocoa;
 
-extern ui_application_t      ui_application_null;
 extern ui_application_t      ui_application_cocoa;
 extern ui_application_t      ui_application_qt;
 extern ui_application_t      ui_application_win32;