diff --git a/Makefile.common b/Makefile.common
index 7fc1759ec3..6e6436d3d3 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -623,7 +623,7 @@ endif
 ifeq ($(HAVE_NETPLAY), 1)
    DEFINES += -DHAVE_NETPLAY -DHAVE_NETWORK_CMD
    OBJ += netplay.o \
-			netplay_compat.o \
+			net_compat.o \
 			net_http.o
    ifneq ($(findstring Win32,$(OS)),)
       LIBS += -lws2_32
diff --git a/command.c b/command.c
index 2fde7e1a26..8a7c4e6deb 100644
--- a/command.c
+++ b/command.c
@@ -16,8 +16,8 @@
 
 #include "command.h"
 
+#include "net_compat.h"
 #if defined(HAVE_NETWORK_CMD) && defined(HAVE_NETPLAY)
-#include "netplay_compat.h"
 #include "netplay.h"
 #endif
 
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 6a262568d4..785d52376e 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -661,7 +661,7 @@ NETPLAY
 ============================================================ */
 #ifdef HAVE_NETPLAY
 #include "../netplay.c"
-#include "../netplay_compat.c"
+#include "../net_compat.c"
 #include "../net_http.c"
 #endif
 
diff --git a/logger/netlogger/logger.c b/logger/netlogger/logger.c
index 753a557547..8710d68f1e 100644
--- a/logger/netlogger/logger.c
+++ b/logger/netlogger/logger.c
@@ -35,7 +35,7 @@
 #include <string.h>
 
 #ifndef GEKKO
-#include "../../netplay_compat.h"
+#include "../../net_compat.h"
 #endif
 
 #include "logger.h"
diff --git a/netplay_compat.c b/net_compat.c
similarity index 99%
rename from netplay_compat.c
rename to net_compat.c
index c8a29d6eb5..e2cb0d40be 100644
--- a/netplay_compat.c
+++ b/net_compat.c
@@ -14,7 +14,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "netplay_compat.h"
+#include "net_compat.h"
 #include "netplay.h"
 #include <stdlib.h>
 #include <string.h>
diff --git a/netplay_compat.h b/net_compat.h
similarity index 100%
rename from netplay_compat.h
rename to net_compat.h
diff --git a/net_http.c b/net_http.c
index 335fe52ccb..5e4a73e0d9 100644
--- a/net_http.c
+++ b/net_http.c
@@ -18,7 +18,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
-#include "netplay_compat.h"
+#include "net_compat.h"
 #include <compat/strl.h>
 
 enum
diff --git a/netplay.c b/netplay.c
index 3e7bab1eb6..16db644802 100644
--- a/netplay.c
+++ b/netplay.c
@@ -18,7 +18,7 @@
 #pragma comment(lib, "ws2_32")
 #endif
 
-#include "netplay_compat.h"
+#include "net_compat.h"
 #include "netplay.h"
 #include "general.h"
 #include "autosave.h"