--- vegastrike-source-0.5.0/src/cmd/ai/aggressive.cpp	2008-04-26 12:00:20.000000000 +0200
+++ vegastrike-source-0.5.0.new/src/cmd/ai/aggressive.cpp	2011-02-10 16:08:34.094259977 +0100
@@ -25,6 +25,9 @@
 #include "cmd/unit_find.h"
 #include "faction_generic.h"
 #include "docking.h"
+
+extern double aggfire;
+
 using namespace Orders;
 using stdext::hash_map;
 const EnumMap::Pair element_names[] = {
@@ -1565,7 +1568,6 @@
       printf ("kewl");
     }
 
-  extern double aggfire;
   jump_time_check++;//just so we get a nicely often wrapping var;
   jump_time_check%=5;
   Flightgroup * fg=parent->getFlightgroup();
--- vegastrike-source-0.5.0/src/cmd/ai/fire.cpp	2008-04-26 12:00:20.000000000 +0200
+++ vegastrike-source-0.5.0.new/src/cmd/ai/fire.cpp	2011-02-10 16:10:06.123260024 +0100
@@ -14,6 +14,10 @@
 #include "vs_random.h"
 #include "lin_time.h" //DEBUG ONLY
 #include "cmd/pilot.h"
+
+extern int numprocessed;
+extern double targetpick;
+
 static bool NoDockWithClear() {
 	static bool nodockwithclear = XMLSupport::parse_bool (vs_config->getVariable ("physics","dock_with_clear_planets","true"));
 	return nodockwithclear;
@@ -385,8 +389,6 @@
 void FireAt::ChooseTargets (int numtargs, bool force) {
   float gunspeed,gunrange,missilerange;
   parent->getAverageGunSpeed(gunspeed,gunrange,missilerange);
-  extern int numprocessed;
-  extern double targetpick;
   static float targettimer =UniverseUtil::GetGameTime(); // timer used to determine passage of physics frames
   static float mintimetoswitch = XMLSupport::parse_float(vs_config->getVariable ("AI","Targetting","MinTimeToSwitchTargets","3"));
   static float minnulltimetoswitch = XMLSupport::parse_float(vs_config->getVariable ("AI","Targetting","MinNullTimeToSwitchTargets","5"));
--- vegastrike-source-0.5.0/src/cmd/collide_map.cpp	2008-04-26 12:00:24.000000000 +0200
+++ vegastrike-source-0.5.0.new/src/cmd/collide_map.cpp	2011-02-10 13:22:53.765260020 +0100
@@ -1,5 +1,6 @@
 #include <algorithm>
 #include <assert.h>
+#include <cstddef>
 #include "collide_map.h"
 #include "unit_generic.h"
 #include "bolt.h"
--- vegastrike-source-0.5.0/src/gfxlib.h	2008-04-26 12:00:34.000000000 +0200
+++ vegastrike-source-0.5.0.new/src/gfxlib.h	2011-02-10 14:57:53.296260099 +0100
@@ -38,6 +38,7 @@
 #endif
 #endif*/
 #include <vector>
+#include <cstddef>
 class Matrix;
 
 using std::vector;