diff --git a/core/core.mk b/core/core.mk
index 0a4499273..77abfc71e 100755
--- a/core/core.mk
+++ b/core/core.mk
@@ -52,31 +52,33 @@ RZDCY_FILES += $(foreach dir,$(addprefix $(RZDCY_SRC_DIR)/,$(RZDCY_MODULES)),$(w
 RZDCY_FILES += $(foreach dir,$(addprefix $(RZDCY_SRC_DIR)/,$(RZDCY_MODULES)),$(wildcard $(dir)*.S))
 	
 ifdef FOR_PANDORA
-RZDCY_CXXFLAGS	:= \
+RZDCY_CFLAGS	:= \
 	$(CFLAGS) -c -g -O3 -I$(RZDCY_SRC_DIR) -I$(RZDCY_SRC_DIR)/deps \
 	-DRELEASE -DPANDORA\
 	-march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp \
 	-frename-registers -fsingle-precision-constant -ffast-math \
-	-ftree-vectorize -fomit-frame-pointer -fno-exceptions -fno-rtti -std=gnu++11
+	-ftree-vectorize -fomit-frame-pointer
 else
-RZDCY_CXXFLAGS	:= \
+RZDCY_CFLAGS	:= \
 	$(CFLAGS) -c -g -O3 -I$(RZDCY_SRC_DIR) -I$(RZDCY_SRC_DIR)/deps \
 	-D_ANDROID -DRELEASE\
 	-frename-registers -fsingle-precision-constant -ffast-math \
-	-ftree-vectorize -fomit-frame-pointer -fno-exceptions -fno-rtti -std=gnu++11
+	-ftree-vectorize -fomit-frame-pointer
 	
 	ifndef NOT_ARM
-		RZDCY_CXXFLAGS += -march=armv7-a -mtune=cortex-a9 -mfpu=vfpv3-d16
-		RZDCY_CXXFLAGS += -DTARGET_LINUX_ARMELv7
+		RZDCY_CFLAGS += -march=armv7-a -mtune=cortex-a9 -mfpu=vfpv3-d16
+		RZDCY_CFLAGS += -DTARGET_LINUX_ARMELv7
 	else
 	  ifndef ISMIPS
-      RZDCY_CXXFLAGS += -DTARGET_LINUX_x86
+      RZDCY_CFLAGS += -DTARGET_LINUX_x86
 		else
-      RZDCY_CXXFLAGS += -DTARGET_LINUX_MIPS
+      RZDCY_CFLAGS += -DTARGET_LINUX_MIPS
 		endif
 	endif
 endif
 
 ifdef NO_REC
-  RZDCY_CXXFLAGS += -DHOST_NO_REC
+  RZDCY_CFLAGS += -DHOST_NO_REC
 endif
+
+RZDCY_CXXFLAGS := $(RZDCY_CFLAGS) -fno-exceptions -fno-rtti -std=gnu++11
\ No newline at end of file
diff --git a/core/deps/chdpsr/cdipsr.cpp b/core/deps/chdpsr/cdipsr.cpp
index dbc13b845..33456fd5c 100644
--- a/core/deps/chdpsr/cdipsr.cpp
+++ b/core/deps/chdpsr/cdipsr.cpp
@@ -42,8 +42,8 @@ unsigned long track_mode;
 void CDI_read_track (FILE *fsource, image_s *image, track_s *track)
 {
 
-     char TRACK_START_MARK[10] = { 0, 0, 0x01, 0, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF };
-     char current_start_mark[10];
+     unsigned char TRACK_START_MARK[10] = { 0, 0, 0x01, 0, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF };
+     unsigned char current_start_mark[10];
 
          fread(&temp_value, 4, 1, fsource);
          if (temp_value != 0)
diff --git a/core/hw/sh4/sh4_rom.cpp b/core/hw/sh4/sh4_rom.cpp
index 71678682c..d5998f611 100644
--- a/core/hw/sh4/sh4_rom.cpp
+++ b/core/hw/sh4/sh4_rom.cpp
@@ -1,4 +1,3 @@
-#pragma once
 #include "types.h"
 #include "sh4_rom.h"
 
diff --git a/core/rend/gles/gldraw.cpp b/core/rend/gles/gldraw.cpp
index 01041cd38..0d9342822 100644
--- a/core/rend/gles/gldraw.cpp
+++ b/core/rend/gles/gldraw.cpp
@@ -713,7 +713,7 @@ void GenSorted()
 
 		if (idx!=pid /* && !PP_EQ(&pp_base[pid],&pp_base[idx]) */ )
 		{
-			SortTrigDrawParam stdp={pp_base + pid, i*3, 0};
+			SortTrigDrawParam stdp={pp_base + pid, (u16)(i*3), 0};
 			
 			if (idx!=-1)
 			{
diff --git a/shell/android/jni/Android.mk b/shell/android/jni/Android.mk
index 1f9101c46..6997cb708 100644
--- a/shell/android/jni/Android.mk
+++ b/shell/android/jni/Android.mk
@@ -36,13 +36,13 @@ include $(LOCAL_PATH)/../../core/core.mk
 LOCAL_SRC_FILES := $(RZDCY_FILES)
 LOCAL_SRC_FILES += $(wildcard $(LOCAL_PATH)/jni/src/Android.cpp)
 LOCAL_SRC_FILES += $(wildcard $(LOCAL_PATH)/jni/src/utils.cpp)
+LOCAL_CFLAGS  := $(RZDCY_CFLAGS)
 LOCAL_CXXFLAGS  := $(RZDCY_CXXFLAGS)
 
 LOCAL_SHARED_LIBRARIES:= libcutils libutils
 LOCAL_PRELINK_MODULE  := false
 
 LOCAL_MODULE	:= dc
-LOCAL_CFLAGS	:= $(LOCAL_CXXFLAGS) -DHAS_VMU
 LOCAL_DISABLE_FORMAT_STRING_CHECKS=true
 LOCAL_ASFLAGS := -fvisibility=hidden
 LOCAL_LDLIBS	:= -llog -lGLESv2 -lEGL -lz