diff --git a/source/lib/res/graphics/unifont.h b/source/lib/res/graphics/unifont.h
index 0c7b5adacc..e82744a598 100644
--- a/source/lib/res/graphics/unifont.h
+++ b/source/lib/res/graphics/unifont.h
@@ -28,6 +28,7 @@
 #define INCLUDED_UNIFONT
 
 #include <stdarg.h>	// va_list
+#include <map>
 
 #include "lib/res/handle.h"
 #include "lib/file/vfs/vfs.h"
diff --git a/source/ps/CacheLoader.cpp b/source/ps/CacheLoader.cpp
index e76604984f..79f0f39414 100644
--- a/source/ps/CacheLoader.cpp
+++ b/source/ps/CacheLoader.cpp
@@ -43,7 +43,7 @@ Status CCacheLoader::TryLoadingCached(const VfsPath& sourcePath, const MD5& init
 	// Fail if no source or archive cache
 	// Note: this is not always an error case, because for instance there
 	//	are some uncached .pmd/psa files in the game with no source .dae.
-	//	This test fails (correctly) in that  valid situation, so it seems
+	//	This test fails (correctly) in that valid situation, so it seems
 	//	best to leave the error handling to the caller.
 	Status err = m_VFS->GetFileInfo(sourcePath, NULL);
 	if (err < 0)
diff --git a/source/ps/Font.h b/source/ps/Font.h
index 77a633638d..8c71f78e04 100644
--- a/source/ps/Font.h
+++ b/source/ps/Font.h
@@ -20,6 +20,8 @@
 
 #include "lib/res/handle.h"
 
+#include <map>
+
 class CStrW;
 struct UnifontGlyphData;