diff --git a/Makefile.common b/Makefile.common
index c8d865a..5770cb5 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -1,8 +1,9 @@
-INCFLAGS      := -I$(CORE_DIR)/drivers/libretro -I$(CORE_DIR)/drivers/libretro/libretro-common/include -I$(CORE_DIR) -I$(CORE_DIR)/input -I$(CORE_DIR)/boards -I$(CORE_DIR)/mappers
+LIBRETRO_COMM_DIR := $(CORE_DIR)/libretro-common
+INCFLAGS      := -I$(CORE_DIR)/drivers/libretro -I$(LIBRETRO_COMM_DIR)/include -I$(CORE_DIR) -I$(CORE_DIR)/input -I$(CORE_DIR)/boards -I$(CORE_DIR)/mappers
 COREDEFINES    = -D__LIBRETRO__ -DSOUND_QUALITY=0 -DPATH_MAX=1024 -DFCEU_VERSION_NUMERIC=9813 -DFRONTEND_SUPPORTS_RGB565 
 
 ifneq (,$(findstring msvc2003,$(platform)))
-INCFLAGS += -I$(CORE_DIR)/drivers/libretro/libretro-common/include/compat/msvc
+INCFLAGS += -I$(LIBRETRO_COMM_DIR)/include/compat/msvc
 endif
 
 ifneq (,$(findstring msvc,$(platform)))