diff --git a/Makefile.common b/Makefile.common
index 12986c8..01d268f 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -1,7 +1,8 @@
-INCFLAGS := -I$(CORE_DIR)/drivers/libretro -I$(CORE_DIR) -I$(CORE_DIR)/input -I$(CORE_DIR)/boards -I$(CORE_DIR)/mappers
+INCFLAGS      := -I$(CORE_DIR)/drivers/libretro -I$(CORE_DIR) -I$(CORE_DIR)/input -I$(CORE_DIR)/boards -I$(CORE_DIR)/mappers
+COREDEFINES    = -D__LIBRETRO__ -DSOUND_QUALITY=0 -DPATH_MAX=1024 -DINLINE=inline -DFCEU_VERSION_NUMERIC=9813 -DFRONTEND_SUPPORTS_RGB565 
 
 FCEU_SRC_DIRS := $(CORE_DIR)/boards $(CORE_DIR)/input $(CORE_DIR)/mappers
-SOURCES_C := $(foreach dir,$(FCEU_SRC_DIRS),$(wildcard $(dir)/*.c))
+SOURCES_C     := $(foreach dir,$(FCEU_SRC_DIRS),$(wildcard $(dir)/*.c))
 
 ifeq ($(HAVE_GRIFFIN),1)
 SOURCES_C += $(CORE_DIR)/drivers/libretro/griffin.c
diff --git a/Makefile.libretro b/Makefile.libretro
index fd827c2..9fba713 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -307,7 +307,7 @@ CFLAGS += -DWANT_GRIFFIN
 
 OBJECTS := $(SOURCES_C:.c=.o)
 
-DEFINES := -D__LIBRETRO__ -DSOUND_QUALITY=0 -DPATH_MAX=1024 -DINLINE=inline -DFCEU_VERSION_NUMERIC=9813 -DFRONTEND_SUPPORTS_RGB565 $(PLATFORM_DEFINES)
+DEFINES := $(COREDEFINES) $(PLATFORM_DEFINES)
 
 ifeq ($(PSS_STYLE),2)
 DEFINES += -DPSS_STYLE=2
diff --git a/jni/Android.mk b/jni/Android.mk
index 6ef0135..8721a9f 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -26,7 +26,7 @@ include ../Makefile.common
 
 LOCAL_SRC_FILES  = $(SOURCES_C)
 
-LOCAL_CFLAGS += -DWANT_GRIFFIN -DINLINE=inline -DSOUND_QUALITY=0 -DPSS_STYLE=1 -D__LIBRETRO__ -DFCEU_VERSION_NUMERIC=9813 -DFRONTEND_SUPPORTS_RGB565
+LOCAL_CFLAGS += -DWANT_GRIFFIN $(COREDEFINES) -DPSS_STYLE=1
 LOCAL_C_INCLUDES = $(LOCAL_PATH)/$(CORE_DIR)
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(CORE_DIR)/drivers/libretro