(svn r20632) -Cleanup: remove "a few" unneeded includes, and add them to some headers

8 files changed, 7 insertions, 7 deletions

diff --git a/src/script/script_info.cpp b/src/script/script_info.cpp
index 4f2f548a5..807c42bc1 100644
--- a/src/script/script_info.cpp
+++ b/src/script/script_info.cpp
@@ -11,8 +11,6 @@
 
 #include "../stdafx.h"
 
-#include <squirrel.h>
-#include "squirrel.hpp"
 #include "squirrel_helper.hpp"
 
 #include "script_info.hpp"
diff --git a/src/script/script_scanner.cpp b/src/script/script_scanner.cpp
index 5c6a73801..995b2e1c3 100644
--- a/src/script/script_scanner.cpp
+++ b/src/script/script_scanner.cpp
@@ -14,7 +14,6 @@
 #include "../fileio_func.h"
 #include <sys/stat.h>
 
-#include <squirrel.h>
 #include "../script/squirrel.hpp"
 #include "script_scanner.hpp"
 
diff --git a/src/script/squirrel.cpp b/src/script/squirrel.cpp
index dea7c6232..504f41a64 100644
--- a/src/script/squirrel.cpp
+++ b/src/script/squirrel.cpp
@@ -9,11 +9,9 @@
 
 /** @file squirrel.cpp the implementation of the Squirrel class. It handles all Squirrel-stuff and gives a nice API back to work with. */
 
-#include <squirrel.h>
 #include <stdarg.h>
 #include "../stdafx.h"
 #include "../debug.h"
-#include "squirrel.hpp"
 #include "squirrel_std.hpp"
 #include "../fileio_func.h"
 #include <sqstdaux.h>
diff --git a/src/script/squirrel.hpp b/src/script/squirrel.hpp
index ec9871d72..53a74eaaa 100644
--- a/src/script/squirrel.hpp
+++ b/src/script/squirrel.hpp
@@ -12,6 +12,8 @@
 #ifndef SQUIRREL_HPP
 #define SQUIRREL_HPP
 
+#include <squirrel.h>
+
 class Squirrel {
 private:
 	typedef void (SQPrintFunc)(bool error_msg, const SQChar *message);
diff --git a/src/script/squirrel_class.hpp b/src/script/squirrel_class.hpp
index 9faf4a68e..0a1ab73dc 100644
--- a/src/script/squirrel_class.hpp
+++ b/src/script/squirrel_class.hpp
@@ -12,6 +12,8 @@
 #ifndef SQUIRREL_CLASS_HPP
 #define SQUIRREL_CLASS_HPP
 
+#include "squirrel_helper.hpp"
+
 /**
  * The template to define classes in Squirrel. It takes care of the creation
  *  and calling of such classes, to make the AI Layer cleaner while having a
diff --git a/src/script/squirrel_helper.hpp b/src/script/squirrel_helper.hpp
index c1ecc64ad..a7d0bf7ba 100644
--- a/src/script/squirrel_helper.hpp
+++ b/src/script/squirrel_helper.hpp
@@ -12,7 +12,7 @@
 #ifndef SQUIRREL_HELPER_HPP
 #define SQUIRREL_HELPER_HPP
 
-#include <squirrel.h>
+#include "squirrel.hpp"
 #include "../core/math_func.hpp"
 #include "../core/smallvec_type.hpp"
 #include "../economy_type.h"
diff --git a/src/script/squirrel_std.cpp b/src/script/squirrel_std.cpp
index a95020fcc..21639ee10 100644
--- a/src/script/squirrel_std.cpp
+++ b/src/script/squirrel_std.cpp
@@ -13,7 +13,6 @@
 #include <sqstdmath.h>
 #include "../stdafx.h"
 #include "../debug.h"
-#include "squirrel.hpp"
 #include "squirrel_std.hpp"
 #include "../core/alloc_func.hpp"
 #include "../core/math_func.hpp"
diff --git a/src/script/squirrel_std.hpp b/src/script/squirrel_std.hpp
index b79166859..248b9773e 100644
--- a/src/script/squirrel_std.hpp
+++ b/src/script/squirrel_std.hpp
@@ -12,6 +12,8 @@
 #ifndef SQUIRREL_STD_HPP
 #define SQUIRREL_STD_HPP
 
+#include "squirrel.hpp"
+
 #if defined(__APPLE__)
 /* Which idiotic system makes 'require' a macro? :s Oh well.... */
 #undef require