diff --git a/Makefile b/Makefile
index f2e61c0..8fff64b 100644
--- a/Makefile
+++ b/Makefile
@@ -95,10 +95,10 @@ ifeq ($(IOSSDK),)
 endif
 
 ifeq ($(platform),ios-arm64)
-	CC = cc -arch arm64 -isysroot $(IOSSDK)
+	CC = clang -arch arm64 -isysroot $(IOSSDK)
 	CXX = clang++ -arch arm64 -isysroot $(IOSSDK)
 else
-	CC = cc -arch armv7 -isysroot $(IOSSDK)
+	CC = clang -arch armv7 -isysroot $(IOSSDK)
 	CXX = clang++ -arch armv7 -isysroot $(IOSSDK)
 endif
 ifeq ($(platform),$(filter $(platform),ios9 ios-arm64))
@@ -117,8 +117,8 @@ else ifeq ($(platform), tvos-arm64)
 		IOSSDK := $(shell xcodebuild -version -sdk appletvos Path)
 	endif
 
-        CC = cc -arch arm64 -isysroot $(IOSSDK)
-        CCX = c++ -arch arm64 -isysroot $(IOSSDK)
+        CC = clang -arch arm64 -isysroot $(IOSSDK)
+        CCX = clang++ -arch arm64 -isysroot $(IOSSDK)
 
 else ifeq ($(platform), theos_ios)
 DEPLOYMENT_IOSVERSION = 5.0
diff --git a/Makefile.common b/Makefile.common
index d2d60d3..06b1156 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -1,12 +1,12 @@
 LIBRETRO_COMM_DIR = $(CORE_DIR)/../libretro-common
 INCFLAGS := -I. \
-				-I$(CORE_DIR) \
-				-I$(CORE_DIR)/src \
-				-I$(CORE_DIR)/stubs \
-				-I$(CORE_DIR)/src/emucore \
-				-I$(CORE_DIR)/src/common \
-				-I$(CORE_DIR)/src/gui \
-				-I$(LIBRETRO_COMM_DIR)/include
+	    -I$(CORE_DIR) \
+	    -I$(CORE_DIR)/src \
+	    -I$(CORE_DIR)/stubs \
+	    -I$(CORE_DIR)/src/emucore \
+	    -I$(CORE_DIR)/src/common \
+	    -I$(CORE_DIR)/src/gui \
+	    -I$(LIBRETRO_COMM_DIR)/include
 
 ifneq (,$(findstring msvc2003,$(platform)))
 INCFLAGS += -I$(LIBRETRO_COMM_DIR)/include/compat/msvc
diff --git a/jni/Android.mk b/jni/Android.mk
index 3958fbf..4dffad6 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -16,6 +16,7 @@ endif
 include $(CLEAR_VARS)
 LOCAL_MODULE       := retro
 LOCAL_SRC_FILES    := $(SOURCES_CXX) $(SOURCES_C)
+LOCAL_CFLAGS       := $(COREFLAGS)
 LOCAL_CXXFLAGS     := $(COREFLAGS)
 LOCAL_LDFLAGS      := -Wl,-version-script=$(LIBRETRO_DIR)/link.T
 LOCAL_CPP_FEATURES := exceptions