diff --git a/core/input_hw/input.c b/core/input_hw/input.c
index 3c690d3c..8f3e5a3b 100644
--- a/core/input_hw/input.c
+++ b/core/input_hw/input.c
@@ -480,4 +480,4 @@ void input_end_frame(unsigned int cycles)
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/sdl/Makefile.sdl2 b/sdl/Makefile.sdl2
index 1f27f34f..b30d548e 100644
--- a/sdl/Makefile.sdl2
+++ b/sdl/Makefile.sdl2
@@ -41,6 +41,14 @@ ifneq ($(OS),Windows_NT)
 DEFINES += -DHAVE_ALLOCA_H
 endif
 
+ifneq ($(findstring Darwin,$(shell uname -a)),)
+	platform = osx
+endif
+
+ifeq ($(platform), osx)
+	CFLAGS   += -Winvalid-utf8 -Wstrict-prototypes
+endif
+
 SRCDIR    = ../core
 INCLUDES  = -I$(SRCDIR) -I$(SRCDIR)/z80 -I$(SRCDIR)/m68k -I$(SRCDIR)/sound -I$(SRCDIR)/input_hw -I$(SRCDIR)/cart_hw -I$(SRCDIR)/cart_hw/svp -I$(SRCDIR)/cd_hw -I$(SRCDIR)/ntsc -I$(SRCDIR)/tremor -I$(SRCDIR)/../sdl -I$(SRCDIR)/../sdl/sdl2
 LIBS	  = `sdl2-config --libs` -lz -lm
diff --git a/sdl/config.h b/sdl/config.h
index 6c01bd32..6243d43b 100644
--- a/sdl/config.h
+++ b/sdl/config.h
@@ -2,7 +2,7 @@
 #ifndef _CONFIG_H_
 #define _CONFIG_H_
 
-#include "shared.h"
+#include "types.h"
 
 /****************************************************************************
  * Config Option