diff --git a/Makefile.common b/Makefile.common
index 74bb2d092c..5c997e95f6 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -54,7 +54,7 @@ ifeq ($(TDM_GCC),)
 endif
 
 ifeq ($(HAVE_FILE_LOGGER), 1)
-   CFLAGS += -DHAVE_FILE_LOGGER -Ilogger/netlogger
+   CFLAGS += -DHAVE_FILE_LOGGER
 endif
 
 CFLAGS += -I./libretro-common/include
diff --git a/Makefile.griffin b/Makefile.griffin
index 6807fcc230..0fb319ce5f 100644
--- a/Makefile.griffin
+++ b/Makefile.griffin
@@ -231,7 +231,6 @@ INCLUDE += -I./libretro-common/include
 ifeq ($(HAVE_LOGGER), 1)
 CFLAGS		+= -DHAVE_LOGGER
 CFLAGS      += -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT)
-INCLUDE     += -Ilogger/netlogger
 endif
 
 ifeq ($(platform), wii)
@@ -276,7 +275,6 @@ endif
 
 ifeq ($(HAVE_FILE_LOGGER), 1)
 CFLAGS		+= -DHAVE_FILE_LOGGER
-INCLUDE     += -Ilogger/netlogger
 endif
 
 ifeq ($(HAVE_RARCH_EXEC), 1)
diff --git a/Makefile.ps3 b/Makefile.ps3
index 1e4c5e6e47..ddccfd75a8 100644
--- a/Makefile.ps3
+++ b/Makefile.ps3
@@ -116,7 +116,6 @@ endif
 
 ifeq ($(HAVE_LOGGER), 1)
 DEFINES			+= -DHAVE_LOGGER
-INCDIRS        +=  -Ilogger/netlogger
 endif
 
 PPU_CFLAGS := $(PPU_OPTIMIZE_LV) $(INCDIRS) $(DEFINES)
diff --git a/Makefile.ps3.cobra b/Makefile.ps3.cobra
index 753b171666..873cce5e8d 100644
--- a/Makefile.ps3.cobra
+++ b/Makefile.ps3.cobra
@@ -116,7 +116,6 @@ endif
 
 ifeq ($(HAVE_LOGGER), 1)
 DEFINES			+= -DHAVE_LOGGER
-INCDIRS        +=  -Ilogger/netlogger
 endif
 
 PPU_CFLAGS := $(PPU_OPTIMIZE_LV) $(INCDIRS) $(DEFINES)
diff --git a/Makefile.ps3.salamander b/Makefile.ps3.salamander
index 2842f195c9..b26af6d98a 100644
--- a/Makefile.ps3.salamander
+++ b/Makefile.ps3.salamander
@@ -32,8 +32,8 @@ PPU_SRCS		= frontend/frontend_salamander.c \
 				  libretro-common/file/config_file.c
 
 ifeq ($(HAVE_LOGGER), 1)
-PPU_CFLAGS		+= -DHAVE_LOGGER -Ilogger/netlogger
-PPU_SRCS		+= logger/netlogger/logger.c
+PPU_CFLAGS		+= -DHAVE_LOGGER 
+PPU_SRCS		   += logger/netlogger.c
 endif
 
 PPU_TARGET		= retroarch-salamander_ps3.elf
diff --git a/Makefile.wii.salamander b/Makefile.wii.salamander
index af395708f5..37a5d7a19d 100644
--- a/Makefile.wii.salamander
+++ b/Makefile.wii.salamander
@@ -56,13 +56,11 @@ OBJ = frontend/frontend_salamander.o \
 ifeq ($(HAVE_LOGGER), 1)
 CFLAGS		+= -DHAVE_LOGGER
 CFLAGS          += -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT)
-CFLAGS          += -Ilogger/netlogger
-OBJ             += logger/netlogger/logger.o
+OBJ             += logger/netlogger.o
 endif
 
 ifeq ($(HAVE_FILE_LOGGER), 1)
 CFLAGS		+= -DHAVE_FILE_LOGGER
-CFLAGS          += -Ilogger/netlogger
 endif
 
 CFLAGS += -std=gnu99 -DIS_SALAMANDER -DRARCH_CONSOLE -DHAVE_RARCH_EXEC -DGEKKO -Wno-char-subscripts 
diff --git a/griffin/griffin.c b/griffin/griffin.c
index a4f04bf194..1911a9b623 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -27,7 +27,7 @@
 #endif
 
 #if defined(HAVE_LOGGER) && !defined(ANDROID)
-#include "../logger/netlogger/logger.c"
+#include "../logger/netlogger.c"
 #endif
 
 /*============================================================
diff --git a/logger/netlogger/logger.c b/logger/netlogger.c
similarity index 100%
rename from logger/netlogger/logger.c
rename to logger/netlogger.c