From 2e3113b5f2f23550a45ff5d5e074ef1b76ba4d4d Mon Sep 17 00:00:00 2001
From: Raul Tambre <raul.tambre@gmail.com>
Date: Tue, 14 Jul 2015 18:59:10 +0300
Subject: [PATCH] Fix Travis compiling

---
 rpcs3/Emu/SysCalls/Modules/sceNp.cpp  | 16 ----------------
 rpcs3/Emu/SysCalls/Modules/sceNp.h    | 18 ++++++++++++++++++
 rpcs3/Emu/SysCalls/Modules/sceNp2.cpp |  2 +-
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/rpcs3/Emu/SysCalls/Modules/sceNp.cpp b/rpcs3/Emu/SysCalls/Modules/sceNp.cpp
index 8b921e77ff..7d69bbf725 100644
--- a/rpcs3/Emu/SysCalls/Modules/sceNp.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/sceNp.cpp
@@ -12,22 +12,6 @@
 
 extern Module sceNp;
 
-struct sceNpInternal
-{
-	bool m_bSceNpInitialized;
-	bool m_bScoreInitialized;
-	bool m_bLookupInitialized;
-	bool m_bSceNpUtilBandwidthTestInitialized;
-
-	sceNpInternal()
-		: m_bSceNpInitialized(false),
-		  m_bScoreInitialized(false),
-		  m_bLookupInitialized(false),
-		  m_bSceNpUtilBandwidthTestInitialized(false)
-	{
-	}
-};
-
 sceNpInternal sceNpInstance;
 
 s32 sceNpInit(u32 poolsize, vm::ptr<u32> poolptr)
diff --git a/rpcs3/Emu/SysCalls/Modules/sceNp.h b/rpcs3/Emu/SysCalls/Modules/sceNp.h
index 90530bc7d5..eee17a67b8 100644
--- a/rpcs3/Emu/SysCalls/Modules/sceNp.h
+++ b/rpcs3/Emu/SysCalls/Modules/sceNp.h
@@ -219,6 +219,24 @@ enum
 
 using SceNpBasicEventHandler = func_def<s32(s32 event, s32 retCode, u32 reqId, vm::ptr<void> arg)>;
 
+struct sceNpInternal
+{
+	bool m_bSceNpInitialized;
+	bool m_bScoreInitialized;
+	bool m_bLookupInitialized;
+	bool m_bSceNpUtilBandwidthTestInitialized;
+
+	sceNpInternal()
+		: m_bSceNpInitialized(false),
+		m_bScoreInitialized(false),
+		m_bLookupInitialized(false),
+		m_bSceNpUtilBandwidthTestInitialized(false)
+	{
+	}
+};
+
+extern sceNpInternal sceNpInstance;
+
 // NP Manager Utility statuses
 enum
 {
diff --git a/rpcs3/Emu/SysCalls/Modules/sceNp2.cpp b/rpcs3/Emu/SysCalls/Modules/sceNp2.cpp
index 784e42deb7..9299293258 100644
--- a/rpcs3/Emu/SysCalls/Modules/sceNp2.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/sceNp2.cpp
@@ -2,7 +2,7 @@
 #include "Emu/Memory/Memory.h"
 #include "Emu/SysCalls/Modules.h"
 
-#include "sceNp.cpp"
+#include "sceNp.h"
 
 extern Module sceNp2;