diff --git a/Makefile.common b/Makefile.common
index 56941d2ec9..b808048894 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -159,11 +159,6 @@ DEF_FLAGS += -DHAVE_DR_MP3
 OBJ += frontend/frontend.o \
        frontend/frontend_driver.o \
        frontend/drivers/platform_null.o \
-       ui/drivers/ui_null.o \
-       ui/drivers/null/ui_null_window.o \
-       ui/drivers/null/ui_null_browser_window.o \
-       ui/drivers/null/ui_null_msg_window.o \
-       ui/drivers/null/ui_null_application.o \
        retroarch.o \
        paths.o \
        command.o \
diff --git a/griffin/griffin.c b/griffin/griffin.c
index c2f655366c..2327b1100b 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -1057,12 +1057,6 @@ FRONTEND
 /*============================================================
 UI
 ============================================================ */
-#include "../ui/drivers/ui_null.c"
-#include "../ui/drivers/null/ui_null_window.c"
-#include "../ui/drivers/null/ui_null_browser_window.c"
-#include "../ui/drivers/null/ui_null_msg_window.c"
-#include "../ui/drivers/null/ui_null_application.c"
-
 #if defined(_WIN32) && !defined(_XBOX) && !defined(__WINRT__)
 #include "../ui/drivers/ui_win32.c"
 #include "../ui/drivers/win32/ui_win32_window.c"
diff --git a/retroarch.c b/retroarch.c
index 0ff671a8fd..11f3bcae1e 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -645,7 +645,6 @@ static const ui_companion_driver_t *ui_companion_drivers[] = {
 #ifdef HAVE_COCOATOUCH
    &ui_companion_cocoatouch,
 #endif
-   &ui_companion_null,
    NULL
 };
 
@@ -4958,18 +4957,14 @@ void ui_companion_driver_notify_refresh(void)
 void ui_companion_driver_notify_list_loaded(file_list_t *list, file_list_t *menu_list)
 {
    const ui_companion_driver_t *ui = ui_companion;
-   if (!ui)
-      return;
-   if (ui->notify_list_loaded)
+   if (ui && ui->notify_list_loaded)
       ui->notify_list_loaded(ui_companion_data, list, menu_list);
 }
 
 void ui_companion_driver_notify_content_loaded(void)
 {
    const ui_companion_driver_t *ui = ui_companion;
-   if (!ui)
-      return;
-   if (ui->notify_content_loaded)
+   if (ui && ui->notify_content_loaded)
       ui->notify_content_loaded(ui_companion_data);
 }
 
diff --git a/ui/drivers/null/ui_null_application.c b/ui/drivers/null/ui_null_application.c
deleted file mode 100644
index f10667d390..0000000000
--- a/ui/drivers/null/ui_null_application.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/* RetroArch - A frontend for libretro.
- *  Copyright (C) 2011-2017 - Daniel De Matteis
- *
- * RetroArch is free software: you can redistribute it and/or modify it under the terms
- * of the GNU General Public License as published by the Free Software Found-
- * ation, either version 3 of the License, or (at your option) any later version.
- *
- * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with RetroArch.
- * If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <stdint.h>
-#include <boolean.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "../../ui_companion_driver.h"
-
-static void* ui_application_null_initialize(void)
-{
-   return NULL;
-}
-
-static bool ui_application_null_pending_events(void)
-{
-   return true;
-}
-
-static void ui_application_null_process_events(void)
-{
-}
-
-ui_application_t ui_application_null = {
-   ui_application_null_initialize,
-   ui_application_null_pending_events,
-   ui_application_null_process_events,
-   NULL,
-   false,
-   "null"
-};
diff --git a/ui/drivers/null/ui_null_browser_window.c b/ui/drivers/null/ui_null_browser_window.c
deleted file mode 100644
index 548069f2f7..0000000000
--- a/ui/drivers/null/ui_null_browser_window.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/* RetroArch - A frontend for libretro.
- *  Copyright (C) 2011-2017 - Daniel De Matteis
- *
- * RetroArch is free software: you can redistribute it and/or modify it under the terms
- * of the GNU General Public License as published by the Free Software Found-
- * ation, either version 3 of the License, or (at your option) any later version.
- *
- * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with RetroArch.
- * If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <stdint.h>
-#include <boolean.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "../../ui_companion_driver.h"
-
-static bool ui_browser_window_null_open(ui_browser_window_state_t *state)
-{
-   return false;
-}
-
-static bool ui_browser_window_null_save(ui_browser_window_state_t *state)
-{
-   return false;
-}
-
-ui_browser_window_t ui_browser_window_null = {
-   ui_browser_window_null_open,
-   ui_browser_window_null_save,
-   "null"
-};
diff --git a/ui/drivers/null/ui_null_msg_window.c b/ui/drivers/null/ui_null_msg_window.c
deleted file mode 100644
index adc84ce467..0000000000
--- a/ui/drivers/null/ui_null_msg_window.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/* RetroArch - A frontend for libretro.
- *  Copyright (C) 2011-2017 - Daniel De Matteis
- *
- * RetroArch is free software: you can redistribute it and/or modify it under the terms
- * of the GNU General Public License as published by the Free Software Found-
- * ation, either version 3 of the License, or (at your option) any later version.
- *
- * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with RetroArch.
- * If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <stdint.h>
-#include <boolean.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "../../ui_companion_driver.h"
-
-static enum ui_msg_window_response ui_msg_window_null_error(ui_msg_window_state *state)
-{
-   return UI_MSG_RESPONSE_CANCEL;
-}
-
-static enum ui_msg_window_response ui_msg_window_null_information(ui_msg_window_state *state)
-{
-   return UI_MSG_RESPONSE_CANCEL;
-}
-
-static enum ui_msg_window_response ui_msg_window_null_question(ui_msg_window_state *state)
-{
-   return UI_MSG_RESPONSE_CANCEL;
-}
-
-static enum ui_msg_window_response ui_msg_window_null_warning(ui_msg_window_state *state)
-{
-   return UI_MSG_RESPONSE_CANCEL;
-}
-
-ui_msg_window_t ui_msg_window_null = {
-   ui_msg_window_null_error,
-   ui_msg_window_null_information,
-   ui_msg_window_null_question,
-   ui_msg_window_null_warning,
-   "null"
-};
diff --git a/ui/drivers/null/ui_null_window.c b/ui/drivers/null/ui_null_window.c
deleted file mode 100644
index 793019803d..0000000000
--- a/ui/drivers/null/ui_null_window.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/* RetroArch - A frontend for libretro.
- *  Copyright (C) 2011-2017 - Daniel De Matteis
- *
- * RetroArch is free software: you can redistribute it and/or modify it under the terms
- * of the GNU General Public License as published by the Free Software Found-
- * ation, either version 3 of the License, or (at your option) any later version.
- *
- * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with RetroArch.
- * If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <stdint.h>
-#include <boolean.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "../../ui_companion_driver.h"
-
-static void* ui_window_null_init(void)
-{
-   return NULL;
-}
-
-static void ui_window_null_destroy(void *data)
-{
-}
-
-static void ui_window_null_set_focused(void *data)
-{
-}
-
-static void ui_window_null_set_visible(void *data,
-        bool set_visible)
-{
-}
-
-static void ui_window_null_set_title(void *data, char *buf)
-{
-}
-
-static void ui_window_null_set_droppable(void *data, bool droppable)
-{
-}
-
-static bool ui_window_null_focused(void *data)
-{
-   return true;
-}
-
-ui_window_t ui_window_null = {
-   ui_window_null_init,
-   ui_window_null_destroy,
-   ui_window_null_set_focused,
-   ui_window_null_set_visible,
-   ui_window_null_set_title,
-   ui_window_null_set_droppable,
-   ui_window_null_focused,
-   "null"
-};
diff --git a/ui/drivers/ui_null.c b/ui/drivers/ui_null.c
deleted file mode 100644
index 6e901a63bd..0000000000
--- a/ui/drivers/ui_null.c
+++ /dev/null
@@ -1,99 +0,0 @@
-/* RetroArch - A frontend for libretro.
- * Copyright (C) 2011-2017 - Daniel De Matteis
- *
- * RetroArch is free software: you can redistribute it and/or modify it under the terms
- * of the GNU General Public License as published by the Free Software Found-
- * ation, either version 3 of the License, or (at your option) any later version.
- *
- * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with RetroArch.
- * If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <stdint.h>
-#include <boolean.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <file/file_path.h>
-#include "../ui_companion_driver.h"
-
-typedef struct ui_companion_null
-{
-   void *empty;
-} ui_companion_null_t;
-
-static void ui_companion_null_deinit(void *data)
-{
-   ui_companion_null_t *handle = (ui_companion_null_t*)data;
-
-   if (handle)
-      free(handle);
-}
-
-static void *ui_companion_null_init(void)
-{
-   ui_companion_null_t *handle = (ui_companion_null_t*)calloc(1, sizeof(*handle));
-
-   if (!handle)
-      return NULL;
-
-   return handle;
-}
-
-static int ui_companion_null_iterate(void *data, unsigned action)
-{
-   (void)data;
-   (void)action;
-
-   return 0;
-}
-
-static void ui_companion_null_notify_content_loaded(void *data)
-{
-   (void)data;
-}
-
-static void ui_companion_null_toggle(void *data, bool force)
-{
-   (void)data;
-   (void)force;
-}
-
-static void ui_companion_null_event_command(void *data, enum event_command cmd)
-{
-   (void)data;
-   (void)cmd;
-}
-
-static void ui_companion_null_notify_list_pushed(void *data,
-        file_list_t *list, file_list_t *menu_list)
-{
-    (void)data;
-    (void)list;
-    (void)menu_list;
-}
-
-ui_companion_driver_t ui_companion_null = {
-   ui_companion_null_init,
-   ui_companion_null_deinit,
-   ui_companion_null_iterate,
-   ui_companion_null_toggle,
-   ui_companion_null_event_command,
-   ui_companion_null_notify_content_loaded,
-   ui_companion_null_notify_list_pushed,
-   NULL,
-   NULL,
-   NULL,
-   NULL,
-   NULL,
-   &ui_browser_window_null,
-   &ui_msg_window_null,
-   &ui_window_null,
-   &ui_application_null,
-   "null",
-};