diff --git a/Makefile b/Makefile
index e1407dc..8793d87 100644
--- a/Makefile
+++ b/Makefile
@@ -153,7 +153,7 @@ else ifeq ($(platform), psp1)
 		-fomit-frame-pointer -fgcse-sm -fgcse-las -fgcse-after-reload \
 		-fweb -fpeel-loops
 	DEFS   +=  -DPSP -D_PSP_FW_VERSION=371
-   INCLUDE     += -I$(shell psp-config --pspsdk-path)/include
+   INCFLAGS     += -I$(shell psp-config --pspsdk-path)/include
    STATIC_LINKING := 1
 
 # Vita
@@ -207,12 +207,6 @@ endif
 
 LDFLAGS += $(LIBM)
 
-DEFS   += -DSPC700_C -DEXECUTE_SUPERFX_PER_LINE -DSDD1_DECOMP \
-          -DVAR_CYCLES -DCPU_SHUTDOWN -DSPC700_SHUTDOWN \
-          -DNO_INLINE_SET_GET -DNOASM -DHAVE_MKSTEMP '-DACCEPT_SIZE_T=size_t' -DWANT_CHEATS
-
-DEFS  += -D__LIBRETRO__
-
 CORE_DIR     := ./source
 LIBRETRO_DIR := .
 
@@ -220,45 +214,10 @@ include Makefile.common
 
 OBJECTS := $(SOURCES_C:.c=.o)
 
-ifeq ($(DEBUG),1)
-FLAGS += -O0 -g
-else
-FLAGS += -O3 -DNDEBUG
-endif
-
-ifeq ($(PERF_TEST),1)
-FLAGS += -DPERF_TEST
-endif
-
-ifeq ($(USE_BLARGG_APU),1)
-FLAGS += -DUSE_BLARGG_APU
-endif
-
-ifeq ($(LOAD_FROM_MEMORY_TEST),1)
-FLAGS += -DLOAD_FROM_MEMORY_TEST
-endif
-
 LDFLAGS += $(fpic) $(SHARED)
-FLAGS += $(fpic) 
-FLAGS += $(INCFLAGS)
 
+FLAGS += $(fpic)
 
-ifeq ($(OLD_GCC), 1)
-WARNINGS := -Wall
-else ifeq ($(NO_GCC), 1)
-WARNINGS :=
-else
-WARNINGS := -Wall \
-	-Wno-sign-compare \
-	-Wno-unused-variable \
-	-Wno-unused-function \
-	-Wno-uninitialized \
-	-Wno-strict-aliasing \
-	-Wno-overflow \
-	-fno-strict-overflow
-endif
-
-FLAGS += -D__LIBRETRO__ $(WARNINGS) $(INCLUDE) $(DEFS)
 
 CXXFLAGS += $(FLAGS)
 CFLAGS += $(FLAGS)
diff --git a/Makefile.common b/Makefile.common
index 9dac061..1d5cbd8 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -44,3 +44,44 @@ SOURCES_C := \
 
 SOURCES_C += $(LIBRETRO_DIR)/libretro.c
 endif
+
+ifeq ($(DEBUG),1)
+FLAGS += -O0 -g
+else
+FLAGS += -O3 -DNDEBUG
+endif
+
+ifeq ($(PERF_TEST),1)
+FLAGS += -DPERF_TEST
+endif
+
+ifeq ($(USE_BLARGG_APU),1)
+FLAGS += -DUSE_BLARGG_APU
+endif
+
+ifeq ($(LOAD_FROM_MEMORY_TEST),1)
+FLAGS += -DLOAD_FROM_MEMORY_TEST
+endif
+
+DEFS   += -DSPC700_C -DEXECUTE_SUPERFX_PER_LINE -DSDD1_DECOMP \
+          -DVAR_CYCLES -DCPU_SHUTDOWN -DSPC700_SHUTDOWN \
+          -DNO_INLINE_SET_GET -DHAVE_MKSTEMP '-DACCEPT_SIZE_T=size_t' -DWANT_CHEATS
+
+DEFS  += -D__LIBRETRO__
+
+ifeq ($(OLD_GCC), 1)
+WARNINGS := -Wall
+else ifeq ($(NO_GCC), 1)
+WARNINGS :=
+else
+WARNINGS := -Wall \
+	-Wno-sign-compare \
+	-Wno-unused-variable \
+	-Wno-unused-function \
+	-Wno-uninitialized \
+	-Wno-strict-aliasing \
+	-Wno-overflow \
+	-fno-strict-overflow
+endif
+
+FLAGS += $(DEFS) $(WARNINGS) $(INCFLAGS)
\ No newline at end of file
diff --git a/jni/Android.mk b/jni/Android.mk
index d51b890..b584996 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -4,7 +4,13 @@ include $(CLEAR_VARS)
 
 CORE_DIR     := ../source
 LIBRETRO_DIR := ..
-HAVE_GRIFFIN := 1
+
+DEBUG                 = 0
+PERF_TEST             = 0
+HAVE_GRIFFIN          = 1
+LOAD_FROM_MEMORY_TEST = 1
+USE_BLARGG_APU        = 0
+
 
 LOCAL_MODULE    := retro
 
@@ -21,9 +27,10 @@ ifeq ($(TARGET_ARCH),mips)
 LOCAL_CFLAGS += -DANDROID_MIPS -D__mips__ -D__MIPSEL__
 endif
 
+
 include ../Makefile.common
 
-LOCAL_SRC_FILES    += $(SOURCES_C)
-LOCAL_CFLAGS += -O2 -std=gnu99 -ffast-math -DINLINE=inline -DPERF_TEST -D__LIBRETRO__ -DFRONTEND_SUPPORTS_RGB565 -DNDEBUG=1 $(INCFLAGS)
+LOCAL_SRC_FILES += $(SOURCES_C)
+LOCAL_CFLAGS    += -std=gnu99 -ffast-math -DINLINE=inline $(FLAGS)
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/source/port.h b/source/port.h
index 9dd2229..b39fcb8 100644
--- a/source/port.h
+++ b/source/port.h
@@ -140,11 +140,6 @@ int    strcasecmp(const char* s1, const char* s2);
 
 #endif /* TARGET_OS_MAC */
 
-#ifndef NOASM
-#define USE_X86_ASM
-#endif
-
-
 
 #include "pixform.h"