diff --git a/rpcs3/Emu/SysCalls/Modules/sceNp.cpp b/rpcs3/Emu/SysCalls/Modules/sceNp.cpp
index 2cedce03ca..185849d6e5 100644
--- a/rpcs3/Emu/SysCalls/Modules/sceNp.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/sceNp.cpp
@@ -3,6 +3,7 @@
 #include "Emu/System.h"
 #include "Emu/SysCalls/Modules.h"
 #include "Emu/SysCalls/lv2/sys_process.h"
+#include "rpcs3/Ini.h"
 
 #include "Emu/FS/VFS.h"
 #include "Utilities/File.h"
diff --git a/rpcs3/Emu/SysCalls/Modules/sceNp2.h b/rpcs3/Emu/SysCalls/Modules/sceNp2.h
index bafc4e0026..5c40117983 100644
--- a/rpcs3/Emu/SysCalls/Modules/sceNp2.h
+++ b/rpcs3/Emu/SysCalls/Modules/sceNp2.h
@@ -607,7 +607,7 @@ struct SceNpMatching2World
 	be_t<u32> curNumOfTotalLobbyMember;
 	be_t<u32> curNumOfRoom;
 	be_t<u32> curNumOfTotalRoomMember;
-	bool withEntitlementId;
+	b8 withEntitlementId;
 	SceNpEntitlementId entitlementId;
 	u8 padding[3];
 };
@@ -710,9 +710,9 @@ struct SceNpMatching2GroupLabel
 struct SceNpMatching2RoomGroupConfig
 {
 	be_t<u32> slotNum;
-	bool withLabel;
+	b8 withLabel;
 	SceNpMatching2GroupLabel label;
-	bool withPassword;
+	b8 withPassword;
 	u8 padding[2];
 };
 
@@ -720,7 +720,7 @@ struct SceNpMatching2RoomGroupConfig
 struct SceNpMatching2RoomGroupPasswordConfig
 {
 	SceNpMatching2RoomGroupId groupId;
-	bool withPassword;
+	b8 withPassword;
 	u8 padding[1];
 };
 
@@ -728,8 +728,8 @@ struct SceNpMatching2RoomGroupPasswordConfig
 struct SceNpMatching2RoomGroup
 {
 	SceNpMatching2RoomGroupId groupId;
-	bool withPassword;
-	bool withLabel;
+	b8 withPassword;
+	b8 withLabel;
 	u8 padding[1];
 	SceNpMatching2GroupLabel label;
 	be_t<u32> slotNum;
@@ -1131,7 +1131,7 @@ struct SceNpMatching2SendRoomChatMessageRequest
 // Room chat message send request response data
 struct SceNpMatching2SendRoomChatMessageResponse
 {
-	bool filtered;
+	b8 filtered;
 };
 
 // Internal room data configuration request parameters
@@ -1257,7 +1257,7 @@ struct SceNpMatching2SendLobbyChatMessageRequest
 // Lobby chat message sending response data
 struct SceNpMatching2SendLobbyChatMessageResponse
 {
-	bool filtered;
+	b8 filtered;
 };
 
 // Lobby invitation message sending request parameter
@@ -1310,7 +1310,7 @@ struct SceNpMatching2GetLobbyMemberDataInternalListRequest
 	be_t<u32> memberIdNum;
 	vm::bcptr<SceNpMatching2AttributeId> attrId;
 	be_t<u32> attrIdNum;
-	bool extendedData;
+	b8 extendedData;
 	u8 padding[7];
 };
 
@@ -1404,7 +1404,7 @@ struct SceNpMatching2RoomMemberDataInternalUpdateInfo
 // Room message information
 struct SceNpMatching2RoomMessageInfo
 {
-	bool filtered;
+	b8 filtered;
 	SceNpMatching2CastType castType;
 	u8 padding[2];
 	vm::ptr<SceNpMatching2RoomMessageDestination> dst;
@@ -1447,7 +1447,7 @@ struct SceNpMatching2LobbyMemberDataInternalUpdateInfo
 // Lobby message information
 struct SceNpMatching2LobbyMessageInfo
 {
-	bool filtered;
+	b8 filtered;
 	SceNpMatching2CastType castType;
 	u8 padding[2];
 	vm::ptr<SceNpMatching2LobbyMessageDestination> dst;