diff --git a/Makefile.libretro b/Makefile.libretro
index 9171564..1b8521f 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -63,10 +63,6 @@ else
 endif
 endif
 
-ifeq ($(LAGFIX),1)
-	CFLAGS += -DLAGFIX
-endif
-
 # system platform
 system_platform = unix
 ifeq ($(shell uname -a),)
@@ -381,12 +377,11 @@ else
 	CFLAGS += -O3 -DNDEBUG -DGIT_VERSION=\"$(GIT_VERSION)\"
 endif
 
-
 include $(BUILD_DIR)/Makefile.common
 
 OBJECTS := $(SOURCES_C:.c=.o)
 
-DEFINES = -DHAVE_STRINGS_H -DHAVE_INTTYPES_H -D__LIBRETRO__ -DRIGHTSHIFT_IS_SAR -DINLINE=inline
+DEFINES = $(COREDEFINES) 
 
 ifeq ($(STATIC_LINKING),1)
 DEFINES += -DSTATIC_LINKING
diff --git a/build/Makefile.common b/build/Makefile.common
index 869a75e..f8c3f40 100644
--- a/build/Makefile.common
+++ b/build/Makefile.common
@@ -1,4 +1,9 @@
 INCFLAGS   := -I$(CORE_DIR)/libretro -I$(CORE_DIR)/src
+COREDEFINES = -DHAVE_STRINGS_H -DHAVE_INTTYPES_H -D__LIBRETRO__ -DRIGHTSHIFT_IS_SAR -DINLINE=inline
+
+ifeq ($(LAGFIX),1)
+	COREDEFINES += -DLAGFIX
+endif
 
 ifeq ($(HAVE_GRIFFIN), 1)
 SOURCES_C := $(CORE_DIR)/src/snes9x_griffin.c $(CORE_DIR)/src/sa1.c
diff --git a/build/Makefile.windows_msvc2010_x64 b/build/Makefile.windows_msvc2010_x64
index 5b7c59a..a27769f 100644
--- a/build/Makefile.windows_msvc2010_x64
+++ b/build/Makefile.windows_msvc2010_x64
@@ -55,7 +55,7 @@ SOEXT  = .dll
 STATIC_LINKING = 0
 platform       = win
 PLATDEFS       = 
-PLATCFLAGS     = -DWIN32 -DCORRECT_VRAM_READS -D_WINDOWS -DINLINE=_inline -D_USRDLL -DRIGHTSHIFT_IS_SAR -DCORRECT_VRAM_READS -D_CRT_SECURE_NO_WARNINGS -DMSVC2010_EXPORTS -DFRONTEND_SUPPORTS_RGB565 -DGIT_VERSION=\"$(GIT_VERSION)\"
+PLATCFLAGS     = -DWIN32 -DCORRECT_VRAM_READS -D_WINDOWS -D_USRDLL -D_CRT_SECURE_NO_WARNINGS -DMSVC2010_EXPORTS -DFRONTEND_SUPPORTS_RGB565 -DGIT_VERSION=\"$(GIT_VERSION)\"
 PLATCXXFLAGS   = $(PLATCFLAGS)
 #PLATLDFLAGS   = -shared -lm
 #PLATLDXFLAGS   = -shared -lm
diff --git a/build/Makefile.windows_msvc2010_x86 b/build/Makefile.windows_msvc2010_x86
index ca27af1..e5dffd4 100644
--- a/build/Makefile.windows_msvc2010_x86
+++ b/build/Makefile.windows_msvc2010_x86
@@ -55,7 +55,7 @@ SOEXT  = .dll
 STATIC_LINKING = 0
 platform       = win
 PLATDEFS       = 
-PLATCFLAGS     = -DWIN32 -DCORRECT_VRAM_READS -D_WINDOWS -DINLINE=_inline -D_USRDLL -DRIGHTSHIFT_IS_SAR -DCORRECT_VRAM_READS -D_CRT_SECURE_NO_WARNINGS -DMSVC2010_EXPORTS -DFRONTEND_SUPPORTS_RGB565 -DGIT_VERSION=\"$(GIT_VERSION)\"
+PLATCFLAGS     = -DWIN32 -DCORRECT_VRAM_READS -D_WINDOWS -D_USRDLL -D_CRT_SECURE_NO_WARNINGS -DMSVC2010_EXPORTS -DFRONTEND_SUPPORTS_RGB565 -DGIT_VERSION=\"$(GIT_VERSION)\"
 PLATCXXFLAGS   = $(PLATCFLAGS)
 #PLATLDFLAGS   = -shared -lm
 #PLATLDXFLAGS   = -shared -lm
diff --git a/build/Makefile.windows_msvc2015_x64 b/build/Makefile.windows_msvc2015_x64
index 707c6d7..9a41f51 100644
--- a/build/Makefile.windows_msvc2015_x64
+++ b/build/Makefile.windows_msvc2015_x64
@@ -63,7 +63,7 @@ SOEXT  = .dll
 STATIC_LINKING = 0
 platform       = win
 PLATDEFS       = 
-PLATCFLAGS     = -DWIN32 -DCORRECT_VRAM_READS -D_WINDOWS -DINLINE=_inline -D_USRDLL -DRIGHTSHIFT_IS_SAR -DCORRECT_VRAM_READS -D_CRT_SECURE_NO_WARNINGS -DMSVC2010_EXPORTS -DFRONTEND_SUPPORTS_RGB565 -DGIT_VERSION=\"$(GIT_VERSION)\"
+PLATCFLAGS     = -DWIN32 -DCORRECT_VRAM_READS -D_WINDOWS -D_USRDLL -D_CRT_SECURE_NO_WARNINGS -DMSVC2010_EXPORTS -DFRONTEND_SUPPORTS_RGB565 -DGIT_VERSION=\"$(GIT_VERSION)\"
 PLATCXXFLAGS   = $(PLATCFLAGS)
 #PLATLDFLAGS   = -shared -lm
 #PLATLDXFLAGS   = -shared -lm