From df36e937f088964217532c9ef2d7193f7d79c498 Mon Sep 17 00:00:00 2001
From: Ykkrosh <philip@wildfiregames.com>
Date: Thu, 16 Jul 2009 16:53:55 +0000
Subject: [PATCH] Patch from #258: [FreeBSD compat] add some missing includes

This was SVN commit r7001.
---
 source/lib/debug_stl.cpp                    | 1 +
 source/lib/file/vfs/vfs_tree.h              | 2 ++
 source/lib/sysdep/arch/x86_x64/topology.cpp | 2 ++
 source/network/fsm.h                        | 1 +
 source/simulation/Formation.h               | 3 +--
 source/simulation/Projectile.h              | 2 ++
 6 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/source/lib/debug_stl.cpp b/source/lib/debug_stl.cpp
index 4fa52c9e43..4fb5fe0c5d 100644
--- a/source/lib/debug_stl.cpp
+++ b/source/lib/debug_stl.cpp
@@ -26,6 +26,7 @@
 #include <map>
 #include <set>
 #include <cassert>
+#include <list>
 
 #include "regex.h"
 
diff --git a/source/lib/file/vfs/vfs_tree.h b/source/lib/file/vfs/vfs_tree.h
index 3954aa709e..04e4005f9c 100644
--- a/source/lib/file/vfs/vfs_tree.h
+++ b/source/lib/file/vfs/vfs_tree.h
@@ -22,6 +22,8 @@
 #ifndef INCLUDED_VFS_TREE
 #define INCLUDED_VFS_TREE
 
+#include <map>
+
 #include "lib/file/file_system.h"	// FileInfo
 #include "lib/file/common/file_loader.h"	// PIFileLoader
 #include "lib/file/common/real_directory.h"	// PRealDirectory
diff --git a/source/lib/sysdep/arch/x86_x64/topology.cpp b/source/lib/sysdep/arch/x86_x64/topology.cpp
index 89cfb7f2e3..51d8cd77fc 100644
--- a/source/lib/sysdep/arch/x86_x64/topology.cpp
+++ b/source/lib/sysdep/arch/x86_x64/topology.cpp
@@ -19,6 +19,8 @@
  * detection of CPU and cache topology
  */
 
+#include <set>
+
 #include "precompiled.h"
 #include "topology.h"
 
diff --git a/source/network/fsm.h b/source/network/fsm.h
index 01f99c2da1..dd0487b9a8 100644
--- a/source/network/fsm.h
+++ b/source/network/fsm.h
@@ -29,6 +29,7 @@
 // INCLUDES
 #include <vector>
 #include <set>
+#include <map>
 
 // DECLARATIONS
 #define	FSM_INVALID_STATE	( unsigned int )( ~0 )
diff --git a/source/simulation/Formation.h b/source/simulation/Formation.h
index c89966be7f..f3e28eaf76 100644
--- a/source/simulation/Formation.h
+++ b/source/simulation/Formation.h
@@ -23,8 +23,7 @@
 #include <vector>
 #include <map>
 #include "ps/XML/Xeromyces.h"
-
-class CStr;
+#include "ps/CStr.h"
 
 class CFormation
 {
diff --git a/source/simulation/Projectile.h b/source/simulation/Projectile.h
index 85d518b671..6367662cac 100644
--- a/source/simulation/Projectile.h
+++ b/source/simulation/Projectile.h
@@ -22,6 +22,8 @@
 #ifndef INCLUDED_PROJECTILE
 #define INCLUDED_PROJECTILE
 
+#include <list>
+
 #include "maths/Vector3D.h"
 #include "ps/Vector2D.h"
 #include "scripting/ScriptableObject.h"