diff --git a/rpcs3/Emu/Cell/Modules/cellVdec.cpp b/rpcs3/Emu/Cell/Modules/cellVdec.cpp
index c87bfee25c..e8587fd2eb 100644
--- a/rpcs3/Emu/Cell/Modules/cellVdec.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellVdec.cpp
@@ -780,7 +780,7 @@ static error_code vdecQueryAttr(s32 type, u32 profile, u32 spec_addr /* may be 0
 
 		if (sinfo)
 		{
-			if (sinfo->thisSize != sizeof(CellVdecDivxSpecificInfo2))
+			if (sinfo->thisSize != sizeof(CellVdecDivxSpecificInfo) && sinfo->thisSize != sizeof(CellVdecDivxSpecificInfo2))
 			{
 				return CELL_VDEC_ERROR_ARG;
 			}
@@ -790,7 +790,7 @@ static error_code vdecQueryAttr(s32 type, u32 profile, u32 spec_addr /* may be 0
 
 		//const u32 maxDecH = sinfo ? +sinfo->maxDecodedFrameHeight : 0;
 		//const u32 maxDecW = sinfo ? +sinfo->maxDecodedFrameWidth : 0;
-		u32 nrOfBuf       = sinfo ? +sinfo->numberOfDecodedFrameBuffer : 0;
+		u32 nrOfBuf = sinfo && sinfo->thisSize == sizeof(CellVdecDivxSpecificInfo2) ? +sinfo->numberOfDecodedFrameBuffer : 0;
 
 		if (nrOfBuf == 0)
 		{
diff --git a/rpcs3/rpcs3qt/flow_widget.h b/rpcs3/rpcs3qt/flow_widget.h
index 4f0a7dd453..1a4bcfb90d 100644
--- a/rpcs3/rpcs3qt/flow_widget.h
+++ b/rpcs3/rpcs3qt/flow_widget.h
@@ -4,6 +4,7 @@
 #include "flow_widget_item.h"
 #include "flow_layout.h"
 
+#include <set>
 #include <QWidget>
 #include <QScrollArea>
 #include <QPaintEvent>
diff --git a/rpcs3/rpcs3qt/gui_game_info.h b/rpcs3/rpcs3qt/gui_game_info.h
index 3b19d27458..08483fa7fb 100644
--- a/rpcs3/rpcs3qt/gui_game_info.h
+++ b/rpcs3/rpcs3qt/gui_game_info.h
@@ -5,6 +5,7 @@
 
 #include "Emu/GameInfo.h"
 
+#include <set>
 #include <QPixmap>
 
 /* Having the icons associated with the game info simplifies logic internally */