diff --git a/griffin/griffin.c b/griffin/griffin.c
index 019a59f164..9538eaf072 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -905,10 +905,12 @@ NETPLAY
 #include "../network/netplay/netplay_sync.c"
 #include "../network/netplay/netplay_discovery.c"
 #include "../network/netplay/netplay_buf.c"
+#include "../network/netplay/netplay_room_parse.c"
 #include "../libretro-common/net/net_compat.c"
 #include "../libretro-common/net/net_socket.c"
 #include "../libretro-common/net/net_http.c"
 #include "../libretro-common/net/net_natt.c"
+#include "../libretro-common/formats/json/jsonsax_full.c"
 #ifndef HAVE_SOCKET_LEGACY
 #include "../libretro-common/net/net_ifinfo.c"
 #endif
diff --git a/libretro-common/formats/json/jsonsax_full.c b/libretro-common/formats/json/jsonsax_full.c
index 335523c3a9..879ce7bd8d 100644
--- a/libretro-common/formats/json/jsonsax_full.c
+++ b/libretro-common/formats/json/jsonsax_full.c
@@ -1490,7 +1490,7 @@ static JSON_Status JSON_Parser_HandleInvalidEncodingSequence(JSON_Parser parser,
            instead of an invalid sequence. If the content is valid,
            this will fail with JSON_Error_StoppedAfterEmbeddedDocument;
            otherwise, it will fail with an appropriate error. */
-        return JSON_Parser_FlushLexer(parser) && JSON_Parser_FlushParser(parser);
+        return (JSON_Status)(JSON_Parser_FlushLexer(parser) && JSON_Parser_FlushParser(parser));
     }
     JSON_Parser_SetErrorAtCodepoint(parser, JSON_Error_InvalidEncodingSequence);
     return JSON_Failure;