diff --git a/general.h b/general.h
index 76cfb71c5b..5eb4bb0927 100644
--- a/general.h
+++ b/general.h
@@ -73,10 +73,6 @@
 #include <pspthreadman.h>
 #endif
 
-#ifdef HAVE_NETPLAY
-#include "netplay.h"
-#endif
-
 #ifdef HAVE_COMMAND
 #include "command.h"
 #endif
diff --git a/libretro_version_1.c b/libretro_version_1.c
index d9b2c9c095..c391c88ea6 100644
--- a/libretro_version_1.c
+++ b/libretro_version_1.c
@@ -30,6 +30,10 @@
 #include "retroarch_logger.h"
 #include "intl/intl.h"
 
+#ifdef HAVE_NETPLAY
+#include "netplay.h"
+#endif
+
 static void video_frame(const void *data, unsigned width,
       unsigned height, size_t pitch)
 {
diff --git a/retroarch.c b/retroarch.c
index e8cef40ccd..3df580925e 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -44,6 +44,10 @@
 #include "frontend/menu/menu_input_line_cb.h"
 #endif
 
+#ifdef HAVE_NETPLAY
+#include "netplay.h"
+#endif
+
 #ifdef _WIN32
 #ifdef _XBOX
 #include <xtl.h>
diff --git a/runloop.c b/runloop.c
index 918e811101..76d5cf403a 100644
--- a/runloop.c
+++ b/runloop.c
@@ -24,6 +24,10 @@
 #include "frontend/menu/menu_common.h"
 #endif
 
+#ifdef HAVE_NETPLAY
+#include "netplay.h"
+#endif
+
 static void set_volume(float gain)
 {
    char msg[PATH_MAX];