diff --git a/Makefile.common b/Makefile.common
index c3db100b44..93e1717611 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -192,10 +192,21 @@ OBJ += frontend/frontend.o \
        $(LIBRETRO_COMM_DIR)/string/stdstring.o \
        $(LIBRETRO_COMM_DIR)/memmap/memalign.o \
        list_special.o \
-       $(LIBRETRO_COMM_DIR)/file/nbio/nbio_stdio.o \
-       $(LIBRETRO_COMM_DIR)/file/nbio/nbio_linux.o \
-       $(LIBRETRO_COMM_DIR)/file/nbio/nbio_unixmmap.o \
-       $(LIBRETRO_COMM_DIR)/file/nbio/nbio_windowsmmap.o \
+       $(LIBRETRO_COMM_DIR)/file/nbio/nbio_stdio.o
+
+ifneq ($(findstring Linux,$(OS)),)
+	OBJ += $(LIBRETRO_COMM_DIR)/file/nbio/nbio_linux.o
+endif
+ifneq ($(findstring Win32,$(OS)),)
+   OBJ += $(LIBRETRO_COMM_DIR)/file/nbio/nbio_windowsmmap.o
+endif
+ifneq ($(findstring BSD,$(OS)),)
+	OBJ += $(LIBRETRO_COMM_DIR)/file/nbio/nbio_unixmmap.o
+else ifneq ($(findstring Darwin,$(OS)),)
+	OBJ += $(LIBRETRO_COMM_DIR)/file/nbio/nbio_unixmmap.o
+endif
+
+OBJ += \
        $(LIBRETRO_COMM_DIR)/file/nbio/nbio_orbis.o \
        $(LIBRETRO_COMM_DIR)/file/nbio/nbio_intf.o \
        $(LIBRETRO_COMM_DIR)/file/file_path.o \
@@ -258,6 +269,7 @@ OBJ += frontend/frontend.o \
        verbosity.o \
        midi/drivers/null_midi.o
 
+
 ifeq ($(HAVE_AUDIOMIXER), 1)
 	DEFINES += -DHAVE_AUDIOMIXER
 	OBJ += \
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 3e6c6310d5..fd8dcad732 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -966,10 +966,18 @@ FILE
 #include "../list_special.c"
 #include "../libretro-common/string/stdstring.c"
 #include "../libretro-common/file/nbio/nbio_stdio.c"
+#if defined(__linux__)
 #include "../libretro-common/file/nbio/nbio_linux.c"
+#endif
+#if defined(HAVE_MMAP) && defined(BSD)
 #include "../libretro-common/file/nbio/nbio_unixmmap.c"
+#endif
+#if defined(_WIN32) && !defined(_XBOX)
 #include "../libretro-common/file/nbio/nbio_windowsmmap.c"
+#endif
+#if defined(ORBIS)
 #include "../libretro-common/file/nbio/nbio_orbis.c"
+#endif
 #include "../libretro-common/file/nbio/nbio_intf.c"
 
 /*============================================================