diff --git a/source/gui/CGUI.h b/source/gui/CGUI.h
index c58b4138c0..f26943df03 100644
--- a/source/gui/CGUI.h
+++ b/source/gui/CGUI.h
@@ -47,6 +47,8 @@ CGUI
 
 #include "ps/XML/Xeromyces.h"
 
+#include <set>
+
 //--------------------------------------------------------
 //  Macros
 //--------------------------------------------------------
diff --git a/source/gui/GUIManager.h b/source/gui/GUIManager.h
index 6e38ecb69a..62673b87f4 100644
--- a/source/gui/GUIManager.h
+++ b/source/gui/GUIManager.h
@@ -6,6 +6,8 @@
 #include "ps/CStr.h"
 #include "scripting/SpiderMonkey.h"
 
+#include <set>
+
 class CGUI;
 struct JSObject;
 class IGUIObject;
diff --git a/source/sound/CPlayList.h b/source/sound/CPlayList.h
index 8ff56c6301..bc93cd83a2 100644
--- a/source/sound/CPlayList.h
+++ b/source/sound/CPlayList.h
@@ -19,7 +19,9 @@
 #define INCLUDED_CPLAYLIST
 
 #include <vector>
+
 #include "lib/file/vfs/vfs_path.h"
+#include "ps/CStr.h"
 
 class CPlayList
 {