diff --git a/Makefile.common b/Makefile.common
index 3f52a65899..6b016603d6 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -105,7 +105,7 @@ endif
 
 ifneq ($(findstring BSD,$(OS)),)
    BSD_LOCAL_INC += -I/usr/local/include
-   OBJ += frontend/drivers/platform_bsd.o
+	HAVE_UNIX = 1
 endif
 
 ifneq ($(findstring Darwin,$(OS)),)
@@ -119,10 +119,13 @@ ifneq ($(findstring Linux,$(OS)),)
    LIBS += -lrt
    OBJ += input/drivers/linuxraw_input.o \
           input/common/linux_common.o \
-          input/drivers_joypad/linuxraw_joypad.o \
-          frontend/drivers/platform_linux.o
+          input/drivers_joypad/linuxraw_joypad.o
+	HAVE_UNIX = 1
 endif
 
+ifeq ($(HAVE_UNIX), 1)
+	OBJ += frontend/drivers/platform_unix.o
+endif
 
 ifeq ($(findstring Haiku,$(OS)),)
    LIBS += -lm
diff --git a/frontend/drivers/platform_bsd.c b/frontend/drivers/platform_bsd.c
deleted file mode 100644
index 6b7484677f..0000000000
--- a/frontend/drivers/platform_bsd.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/* RetroArch - A frontend for libretro.
- * Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- * Copyright (C) 2011-2017 - Daniel De Matteis
- * Copyright (C) 2012-2015 - Jason Fetters
- *
- * 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 <string.h>
-#include <signal.h>
-#include <stdlib.h>
-
-#include "../frontend_driver.h"
-
-static volatile sig_atomic_t bsd_sighandler_quit;
-
-static void frontend_bsd_sighandler(int sig)
-{
-   (void)sig;
-   if (bsd_sighandler_quit)
-      exit(1);
-   bsd_sighandler_quit = 1;
-}
-
-static void frontend_bsd_install_signal_handlers(void)
-{
-   struct sigaction sa;
-
-   sa.sa_sigaction = NULL;
-   sa.sa_handler   = frontend_bsd_sighandler;
-   sa.sa_flags     = SA_RESTART;
-   sigemptyset(&sa.sa_mask);
-   sigaction(SIGINT, &sa, NULL);
-   sigaction(SIGTERM, &sa, NULL);
-}
-
-static int frontend_bsd_get_signal_handler_state(void)
-{
-   return (int)bsd_sighandler_quit;
-}
-
-static void frontend_bsd_set_signal_handler_state(int value)
-{
-   bsd_sighandler_quit = value;
-}
-
-static void frontend_bsd_destroy_signal_handler_state(void)
-{
-   bsd_sighandler_quit = 0;
-}
-
-frontend_ctx_driver_t frontend_ctx_bsd = {
-   NULL,                         /* environment_get */
-   NULL,                         /* init */
-   NULL,                         /* deinit */
-   NULL,                         /* exitspawn */
-   NULL,                         /* process_args */
-   NULL,                         /* exec */
-   NULL,                         /* set_fork */
-   NULL,                         /* shutdown */
-   NULL,                         /* get_name */
-   NULL,                         /* get_os */
-   NULL,                         /* get_rating */
-   NULL,                         /* load_content */
-   NULL,                         /* get_architecture */
-   NULL,                         /* get_powerstate */
-   NULL,                         /* parse_drive_list */
-   NULL,                         /* get_mem_total */
-   NULL,                         /* get_mem_free */
-   frontend_bsd_install_signal_handlers,
-   frontend_bsd_get_signal_handler_state,
-   frontend_bsd_set_signal_handler_state,
-   frontend_bsd_destroy_signal_handler_state,
-   NULL,                         /* attach_console */
-   NULL,                         /* detach_console */
-   "bsd",
-};
diff --git a/frontend/drivers/platform_linux.c b/frontend/drivers/platform_unix.c
similarity index 94%
rename from frontend/drivers/platform_linux.c
rename to frontend/drivers/platform_unix.c
index 298ee7393d..9ecc3c2df6 100644
--- a/frontend/drivers/platform_linux.c
+++ b/frontend/drivers/platform_unix.c
@@ -58,7 +58,7 @@
 #include "../../retroarch.h"
 #include "../../verbosity.h"
 #include "../../paths.h"
-#include "platform_linux.h"
+#include "platform_unix.h"
 
 #ifdef HAVE_MENU
 #include "../../menu/menu_driver.h"
@@ -95,10 +95,10 @@ static const char *proc_acpi_sysfs_battery_path    = "/sys/class/power_supply";
 static const char *proc_acpi_ac_adapter_path       = "/proc/acpi/ac_adapter";
 #endif
 
-static volatile sig_atomic_t linux_sighandler_quit;
+static volatile sig_atomic_t unix_sighandler_quit;
 
 #ifndef HAVE_DYNAMIC
-static enum frontend_fork linux_fork_mode = FRONTEND_FORK_NONE;
+static enum frontend_fork unix_fork_mode = FRONTEND_FORK_NONE;
 #endif
 
 int system_property_get(const char *command,
@@ -911,7 +911,7 @@ static bool int_string(char *str, int *val)
    return ((*str != '\0') && (*endptr == '\0'));
 }
 
-static bool frontend_linux_powerstate_check_apm(
+static bool frontend_unix_powerstate_check_apm(
       enum frontend_powerstate *state,
       int *seconds, int *percent)
 {
@@ -1000,7 +1000,7 @@ error:
    return false;
 }
 
-static bool frontend_linux_powerstate_check_acpi(
+static bool frontend_unix_powerstate_check_acpi(
       enum frontend_powerstate *state,
       int *seconds, int *percent)
 {
@@ -1045,7 +1045,7 @@ static bool frontend_linux_powerstate_check_acpi(
    return true;
 }
 
-static bool frontend_linux_powerstate_check_acpi_sysfs(
+static bool frontend_unix_powerstate_check_acpi_sysfs(
       enum frontend_powerstate *state,
       int *seconds, int *percent)
 {
@@ -1099,7 +1099,7 @@ error:
 }
 #endif
 
-static int frontend_linux_get_rating(void)
+static int frontend_unix_get_rating(void)
 {
 #ifdef ANDROID
    char device_model[PROP_VALUE_MAX] = {0};
@@ -1117,42 +1117,42 @@ static int frontend_linux_get_rating(void)
    return -1;
 }
 
-static enum frontend_powerstate frontend_linux_get_powerstate(
+static enum frontend_powerstate frontend_unix_get_powerstate(
       int *seconds, int *percent)
 {
    enum frontend_powerstate ret = FRONTEND_POWERSTATE_NONE;
 
 #ifndef ANDROID
-   if (frontend_linux_powerstate_check_acpi_sysfs(&ret, seconds, percent))
+   if (frontend_unix_powerstate_check_acpi_sysfs(&ret, seconds, percent))
       return ret;
 
    ret = FRONTEND_POWERSTATE_NONE;
 
-   if (frontend_linux_powerstate_check_acpi(&ret, seconds, percent))
+   if (frontend_unix_powerstate_check_acpi(&ret, seconds, percent))
       return ret;
 
-   if (frontend_linux_powerstate_check_apm(&ret, seconds, percent))
+   if (frontend_unix_powerstate_check_apm(&ret, seconds, percent))
       return ret;
 #endif
 
    return ret;
 }
 
-#define LINUX_ARCH_X86_64     0x23dea434U
-#define LINUX_ARCH_X86        0x0b88b8cbU
-#define LINUX_ARCH_ARM        0x0b885ea5U
-#define LINUX_ARCH_PPC64      0x1028cf52U
-#define LINUX_ARCH_MIPS       0x7c9aa25eU
-#define LINUX_ARCH_TILE       0x7c9e7873U
-#define LINUX_ARCH_AARCH64    0x191bfc0eU
-#define LINUX_ARCH_ARMV7B     0xf27015f4U
-#define LINUX_ARCH_ARMV7L     0xf27015feU
-#define LINUX_ARCH_ARMV6L     0xf27015ddU
-#define LINUX_ARCH_ARMV6B     0xf27015d3U
-#define LINUX_ARCH_ARMV5TEB   0x28612995U
-#define LINUX_ARCH_ARMV5TEL   0x4ecca435U
+#define UNIX_ARCH_X86_64     0x23dea434U
+#define UNIX_ARCH_X86        0x0b88b8cbU
+#define UNIX_ARCH_ARM        0x0b885ea5U
+#define UNIX_ARCH_PPC64      0x1028cf52U
+#define UNIX_ARCH_MIPS       0x7c9aa25eU
+#define UNIX_ARCH_TILE       0x7c9e7873U
+#define UNIX_ARCH_AARCH64    0x191bfc0eU
+#define UNIX_ARCH_ARMV7B     0xf27015f4U
+#define UNIX_ARCH_ARMV7L     0xf27015feU
+#define UNIX_ARCH_ARMV6L     0xf27015ddU
+#define UNIX_ARCH_ARMV6B     0xf27015d3U
+#define UNIX_ARCH_ARMV5TEB   0x28612995U
+#define UNIX_ARCH_ARMV5TEL   0x4ecca435U
 
-static enum frontend_architecture frontend_linux_get_architecture(void)
+static enum frontend_architecture frontend_unix_get_architecture(void)
 {
    struct utsname buffer;
    uint32_t buffer_hash   = 0;
@@ -1166,34 +1166,34 @@ static enum frontend_architecture frontend_linux_get_architecture(void)
 
    switch (buffer_hash)
    {
-      case LINUX_ARCH_AARCH64:
+      case UNIX_ARCH_AARCH64:
          return FRONTEND_ARCH_ARMV8;
-      case LINUX_ARCH_ARMV7L:
-      case LINUX_ARCH_ARMV7B:
+      case UNIX_ARCH_ARMV7L:
+      case UNIX_ARCH_ARMV7B:
          return FRONTEND_ARCH_ARMV7;
-      case LINUX_ARCH_ARMV6L:
-      case LINUX_ARCH_ARMV6B:
-      case LINUX_ARCH_ARMV5TEB:
-      case LINUX_ARCH_ARMV5TEL:
+      case UNIX_ARCH_ARMV6L:
+      case UNIX_ARCH_ARMV6B:
+      case UNIX_ARCH_ARMV5TEB:
+      case UNIX_ARCH_ARMV5TEL:
          return FRONTEND_ARCH_ARM;
-      case LINUX_ARCH_X86_64:
+      case UNIX_ARCH_X86_64:
          return FRONTEND_ARCH_X86_64;
-      case LINUX_ARCH_X86:
+      case UNIX_ARCH_X86:
          return FRONTEND_ARCH_X86;
-      case LINUX_ARCH_ARM:
+      case UNIX_ARCH_ARM:
          return FRONTEND_ARCH_ARM;
-      case LINUX_ARCH_PPC64:
+      case UNIX_ARCH_PPC64:
          return FRONTEND_ARCH_PPC;
-      case LINUX_ARCH_MIPS:
+      case UNIX_ARCH_MIPS:
          return FRONTEND_ARCH_MIPS;
-      case LINUX_ARCH_TILE:
+      case UNIX_ARCH_TILE:
          return FRONTEND_ARCH_TILE;
    }
 
    return FRONTEND_ARCH_NONE;
 }
 
-static void frontend_linux_get_os(char *s,
+static void frontend_unix_get_os(char *s,
       size_t len, int *major, int *minor)
 {
 #ifdef ANDROID
@@ -1214,7 +1214,7 @@ static void frontend_linux_get_os(char *s,
 }
 
 #ifdef HAVE_LAKKA
-static void frontend_linux_get_lakka_version(char *s,
+static void frontend_unix_get_lakka_version(char *s,
       size_t len)
 {
    char version[128];
@@ -1233,7 +1233,7 @@ static void frontend_linux_get_lakka_version(char *s,
 }
 #endif
 
-static void frontend_linux_get_env(int *argc,
+static void frontend_unix_get_env(int *argc,
       char *argv[], void *data, void *params_data)
 {
    unsigned i;
@@ -1881,7 +1881,7 @@ static void android_app_destroy(struct android_app *android_app)
 }
 #endif
 
-static void frontend_linux_deinit(void *data)
+static void frontend_unix_deinit(void *data)
 {
 #ifdef ANDROID
    struct android_app *android_app = (struct android_app*)data;
@@ -1893,7 +1893,7 @@ static void frontend_linux_deinit(void *data)
 #endif
 }
 
-static void frontend_linux_init(void *data)
+static void frontend_unix_init(void *data)
 {
 #ifdef ANDROID
    JNIEnv                     *env = NULL;
@@ -1928,7 +1928,7 @@ static void frontend_linux_init(void *data)
    {
       if (!android_run_events(android_app))
       {
-         frontend_linux_deinit(android_app);
+         frontend_unix_deinit(android_app);
          frontend_android_shutdown(android_app);
          return;
       }
@@ -1957,7 +1957,7 @@ static void frontend_linux_init(void *data)
 
 }
 
-static int frontend_linux_parse_drive_list(void *data, bool load_content)
+static int frontend_unix_parse_drive_list(void *data, bool load_content)
 {
 #ifdef HAVE_MENU
    file_list_t *list = (file_list_t*)data;
@@ -2016,21 +2016,21 @@ static int frontend_linux_parse_drive_list(void *data, bool load_content)
 
 #ifndef HAVE_DYNAMIC
 
-static bool frontend_linux_set_fork(enum frontend_fork fork_mode)
+static bool frontend_unix_set_fork(enum frontend_fork fork_mode)
 {
    switch (fork_mode)
    {
       case FRONTEND_FORK_CORE:
          RARCH_LOG("FRONTEND_FORK_CORE\n");
-         linux_fork_mode  = fork_mode;
+         unix_fork_mode  = fork_mode;
          break;
       case FRONTEND_FORK_CORE_WITH_ARGS:
          RARCH_LOG("FRONTEND_FORK_CORE_WITH_ARGS\n");
-         linux_fork_mode  = fork_mode;
+         unix_fork_mode  = fork_mode;
          break;
       case FRONTEND_FORK_RESTART:
          RARCH_LOG("FRONTEND_FORK_RESTART\n");
-         linux_fork_mode  = FRONTEND_FORK_CORE;
+         unix_fork_mode  = FRONTEND_FORK_CORE;
 
          {
             char executable_path[PATH_MAX_LENGTH] = {0};
@@ -2048,7 +2048,7 @@ static bool frontend_linux_set_fork(enum frontend_fork fork_mode)
    return true;
 }
 
-static void frontend_linux_exec(const char *path, bool should_load_game)
+static void frontend_unix_exec(const char *path, bool should_load_game)
 {
    char *newargv[]    = { NULL, NULL };
    size_t len         = strlen(path);
@@ -2060,14 +2060,14 @@ static void frontend_linux_exec(const char *path, bool should_load_game)
    execv(path, newargv);
 }
 
-static void frontend_linux_exitspawn(char *core_path, size_t core_path_size)
+static void frontend_unix_exitspawn(char *core_path, size_t core_path_size)
 {
    bool should_load_game = false;
 
-   if (linux_fork_mode == FRONTEND_FORK_NONE)
+   if (unix_fork_mode == FRONTEND_FORK_NONE)
       return;
 
-   switch (linux_fork_mode)
+   switch (unix_fork_mode)
    {
       case FRONTEND_FORK_CORE_WITH_ARGS:
          should_load_game = true;
@@ -2077,11 +2077,11 @@ static void frontend_linux_exitspawn(char *core_path, size_t core_path_size)
          break;
    }
 
-   frontend_linux_exec(core_path, should_load_game);
+   frontend_unix_exec(core_path, should_load_game);
 }
 #endif
 
-static uint64_t frontend_linux_get_mem_total(void)
+static uint64_t frontend_unix_get_mem_total(void)
 {
    char line[256];
    uint64_t total = 0;
@@ -2103,7 +2103,7 @@ static uint64_t frontend_linux_get_mem_total(void)
    return 0;
 }
 
-static uint64_t frontend_linux_get_mem_used(void)
+static uint64_t frontend_unix_get_mem_used(void)
 {
    char line[256];
    uint64_t total    = 0;
@@ -2131,62 +2131,62 @@ static uint64_t frontend_linux_get_mem_used(void)
 }
 
 /*#include <valgrind/valgrind.h>*/
-static void frontend_linux_sighandler(int sig)
+static void frontend_unix_sighandler(int sig)
 {
 #ifdef VALGRIND_PRINTF_BACKTRACE
 VALGRIND_PRINTF_BACKTRACE("SIGINT");
 #endif
    (void)sig;
-   linux_sighandler_quit++;
-   if (linux_sighandler_quit == 1) {}
-   if (linux_sighandler_quit == 2) exit(1);
+   unix_sighandler_quit++;
+   if (unix_sighandler_quit == 1) {}
+   if (unix_sighandler_quit == 2) exit(1);
    /* in case there's a second deadlock in a C++ destructor or something */
-   if (linux_sighandler_quit >= 3) abort(); 
+   if (unix_sighandler_quit >= 3) abort(); 
 }
 
-static void frontend_linux_install_signal_handlers(void)
+static void frontend_unix_install_signal_handlers(void)
 {
    struct sigaction sa;
 
    sa.sa_sigaction = NULL;
-   sa.sa_handler   = frontend_linux_sighandler;
+   sa.sa_handler   = frontend_unix_sighandler;
    sa.sa_flags     = SA_RESTART;
    sigemptyset(&sa.sa_mask);
    sigaction(SIGINT, &sa, NULL);
    sigaction(SIGTERM, &sa, NULL);
 }
 
-static int frontend_linux_get_signal_handler_state(void)
+static int frontend_unix_get_signal_handler_state(void)
 {
-   return (int)linux_sighandler_quit;
+   return (int)unix_sighandler_quit;
 }
 
-static void frontend_linux_set_signal_handler_state(int value)
+static void frontend_unix_set_signal_handler_state(int value)
 {
-   linux_sighandler_quit = value;
+   unix_sighandler_quit = value;
 }
 
-static void frontend_linux_destroy_signal_handler_state(void)
+static void frontend_unix_destroy_signal_handler_state(void)
 {
-   linux_sighandler_quit = 0;
+   unix_sighandler_quit = 0;
 }
 
-frontend_ctx_driver_t frontend_ctx_linux = {
-   frontend_linux_get_env,       /* environment_get */
-   frontend_linux_init,          /* init */
-   frontend_linux_deinit,        /* deinit */
+frontend_ctx_driver_t frontend_ctx_unix = {
+   frontend_unix_get_env,       /* environment_get */
+   frontend_unix_init,          /* init */
+   frontend_unix_deinit,        /* deinit */
 #ifdef HAVE_DYNAMIC
    NULL,                         /* exitspawn */
 #else
-   frontend_linux_exitspawn,     /* exitspawn */
+   frontend_unix_exitspawn,     /* exitspawn */
 #endif
    NULL,                         /* process_args */
 #ifdef HAVE_DYNAMIC
    NULL,                         /* exec */
    NULL,                         /* set_fork */
 #else
-   frontend_linux_exec,          /* exec */
-   frontend_linux_set_fork,      /* set_fork */
+   frontend_unix_exec,          /* exec */
+   frontend_unix_set_fork,      /* set_fork */
 #endif
 #ifdef ANDROID
    frontend_android_shutdown,    /* shutdown */
@@ -2195,26 +2195,26 @@ frontend_ctx_driver_t frontend_ctx_linux = {
    NULL,                         /* shutdown */
    NULL,                         /* get_name */
 #endif
-   frontend_linux_get_os,
-   frontend_linux_get_rating,    /* get_rating */
+   frontend_unix_get_os,
+   frontend_unix_get_rating,    /* get_rating */
    NULL,                         /* load_content */
-   frontend_linux_get_architecture,
-   frontend_linux_get_powerstate,
-   frontend_linux_parse_drive_list,
-   frontend_linux_get_mem_total,
-   frontend_linux_get_mem_used,
-   frontend_linux_install_signal_handlers,
-   frontend_linux_get_signal_handler_state,
-   frontend_linux_set_signal_handler_state,
-   frontend_linux_destroy_signal_handler_state,
+   frontend_unix_get_architecture,
+   frontend_unix_get_powerstate,
+   frontend_unix_parse_drive_list,
+   frontend_unix_get_mem_total,
+   frontend_unix_get_mem_used,
+   frontend_unix_install_signal_handlers,
+   frontend_unix_get_signal_handler_state,
+   frontend_unix_set_signal_handler_state,
+   frontend_unix_destroy_signal_handler_state,
    NULL,                         /* attach_console */
    NULL,                         /* detach_console */
 #ifdef HAVE_LAKKA
-   frontend_linux_get_lakka_version,    /* get_lakka_version */
+   frontend_unix_get_lakka_version,    /* get_lakka_version */
 #endif
 #ifdef ANDROID
    "android"
 #else
-   "linux"
+   "unix"
 #endif
 };
diff --git a/frontend/drivers/platform_linux.h b/frontend/drivers/platform_unix.h
similarity index 99%
rename from frontend/drivers/platform_linux.h
rename to frontend/drivers/platform_unix.h
index 7fe9dc83f7..b447b4b6fb 100644
--- a/frontend/drivers/platform_linux.h
+++ b/frontend/drivers/platform_unix.h
@@ -15,8 +15,8 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _PLATFORM_LINUX_H
-#define _PLATFORM_LINUX_H
+#ifndef _PLATFORM_UNIX_H
+#define _PLATFORM_UNIX_H
 
 #include <stdint.h>
 #include <sys/cdefs.h>
@@ -336,7 +336,6 @@ extern JNIEnv *jni_thread_getenv(void);
 void android_app_write_cmd(struct android_app *android_app, int8_t cmd);
 
 extern struct android_app *g_android;
-#else
 #endif
 
 #endif
diff --git a/frontend/frontend_driver.c b/frontend/frontend_driver.c
index 9cc9e9ef2d..6ec6918999 100644
--- a/frontend/frontend_driver.c
+++ b/frontend/frontend_driver.c
@@ -46,11 +46,8 @@ static frontend_ctx_driver_t *frontend_ctx_drivers[] = {
 #if defined(__APPLE__) && defined(__MACH__)
    &frontend_ctx_darwin,
 #endif
-#if defined(__linux__)
-   &frontend_ctx_linux,
-#endif
-#if defined(BSD) && !defined(__MACH__)
-   &frontend_ctx_bsd,
+#if defined(__linux__) || (defined(BSD) && !defined(__MACH__))
+   &frontend_ctx_unix,
 #endif
 #if defined(PSP) || defined(VITA)
    &frontend_ctx_psp,
diff --git a/frontend/frontend_driver.h b/frontend/frontend_driver.h
index c7a2895ef6..0f90d5aafb 100644
--- a/frontend/frontend_driver.h
+++ b/frontend/frontend_driver.h
@@ -100,8 +100,7 @@ extern frontend_ctx_driver_t frontend_ctx_ps3;
 extern frontend_ctx_driver_t frontend_ctx_xdk;
 extern frontend_ctx_driver_t frontend_ctx_qnx;
 extern frontend_ctx_driver_t frontend_ctx_darwin;
-extern frontend_ctx_driver_t frontend_ctx_linux;
-extern frontend_ctx_driver_t frontend_ctx_bsd;
+extern frontend_ctx_driver_t frontend_ctx_unix;
 extern frontend_ctx_driver_t frontend_ctx_psp;
 extern frontend_ctx_driver_t frontend_ctx_ctr;
 extern frontend_ctx_driver_t frontend_ctx_win32;
diff --git a/gfx/drivers_context/android_ctx.c b/gfx/drivers_context/android_ctx.c
index 6d9229c180..d2212f94c9 100644
--- a/gfx/drivers_context/android_ctx.c
+++ b/gfx/drivers_context/android_ctx.c
@@ -36,7 +36,7 @@
 #include "../common/vulkan_common.h"
 #endif
 
-#include "../../frontend/drivers/platform_linux.h"
+#include "../../frontend/drivers/platform_unix.h"
 
 static enum gfx_ctx_api android_api           = GFX_CTX_NONE;
 
diff --git a/griffin/griffin.c b/griffin/griffin.c
index f1fdf34eed..86721e0a77 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -780,10 +780,8 @@ FRONTEND
 #include "../frontend/drivers/platform_xenon.c"
 #elif defined(__QNX__)
 #include "../frontend/drivers/platform_qnx.c"
-#elif defined(__linux__)
-#include "../frontend/drivers/platform_linux.c"
-#elif defined(BSD) && !defined(__MACH__)
-#include "../frontend/drivers/platform_bsd.c"
+#elif defined(__linux__) || (defined(BSD) && !defined(__MACH__))
+#include "../frontend/drivers/platform_unix.c"
 #elif defined(DJGPP)
 #include "../frontend/drivers/platform_dos.c"
 #endif
diff --git a/input/drivers/android_input.c b/input/drivers/android_input.c
index a7a67fc8e0..70f80f75b9 100644
--- a/input/drivers/android_input.c
+++ b/input/drivers/android_input.c
@@ -36,7 +36,7 @@
 #include "../input_config.h"
 #include "../input_driver.h"
 
-#include "../../frontend/drivers/platform_linux.h"
+#include "../../frontend/drivers/platform_unix.h"
 #include "../../gfx/video_driver.h"
 #include "../drivers_keyboard/keyboard_event_android.h"
 #include "../../tasks/tasks_internal.h"
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index 4401625197..d1ae159f9a 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -45,8 +45,8 @@
 #include "../network/netplay/netplay_discovery.h"
 #endif
 
-#ifdef __linux__
-#include "../frontend/drivers/platform_linux.h"
+#if defined(__linux__) || (defined(BSD) && !defined(__MACH__))
+#include "../frontend/drivers/platform_unix.h"
 #endif
 
 #include "menu_content.h"