--- a/hedgewars/uAI.pas	Wed Nov 17 22:07:03 2010 +0300
+++ b/hedgewars/uAI.pas	Wed Nov 17 22:14:41 2010 +0300
@@ -29,7 +29,7 @@
 procedure FreeActionsList;
 
 implementation
-uses uTeams, uConsts, SDLh, uAIMisc, uAIAmmoTests, uAIActions, uMisc,
+uses uConsts, SDLh, uAIMisc, uAIAmmoTests, uAIActions, uMisc,
      uAmmos, uConsole, SysUtils{$IFDEF UNIX}, cthreads{$ENDIF}, uTypes,
      uVariables;
 

--- a/hedgewars/uAIMisc.pas	Wed Nov 17 22:07:03 2010 +0300
+++ b/hedgewars/uAIMisc.pas	Wed Nov 17 22:14:41 2010 +0300
@@ -20,7 +20,7 @@
 
 unit uAIMisc;
 interface
-uses SDLh, uConsts, uGears, uFloat, uTypes;
+uses SDLh, uConsts, uFloat, uTypes;
 
 const MAXBONUS = 1024;
 
@@ -68,7 +68,7 @@
              end;
 
 implementation
-uses uTeams, uMisc, uCollisions, uVariables;
+uses uMisc, uCollisions, uVariables;
 
 
 const KillScore = 200;

--- a/hedgewars/uAmmos.pas	Wed Nov 17 22:07:03 2010 +0300
+++ b/hedgewars/uAmmos.pas	Wed Nov 17 22:14:41 2010 +0300
@@ -20,7 +20,7 @@
 
 unit uAmmos;
 interface
-uses uConsts, uTeams, uTypes;
+uses uConsts, uTypes;
 
 procedure initModule;
 procedure freeModule;
@@ -47,7 +47,7 @@
 var StoreCnt: Longword;
 
 implementation
-uses uMisc, uGears, uWorld, uLocale, uConsole, uMobile, uVariables;
+uses uMisc, uWorld, uLocale, uConsole, uMobile, uVariables;
 
 type TAmmoCounts = array[TAmmoType] of Longword;
 var StoresList: array[0..Pred(cMaxHHs)] of PHHAmmo;

--- a/hedgewars/uChat.pas	Wed Nov 17 22:07:03 2010 +0300
+++ b/hedgewars/uChat.pas	Wed Nov 17 22:14:41 2010 +0300
@@ -34,7 +34,7 @@
     showAll: boolean;
 
 implementation
-uses uMisc, uStore, SDLh, uConsole, uKeys, uTeams, uTypes, uVariables;
+uses uMisc, uStore, SDLh, uConsole, uKeys, uTypes, uVariables;
 
 const MaxStrIndex = 27;
 

--- a/hedgewars/uGears.pas	Wed Nov 17 22:07:03 2010 +0300
+++ b/hedgewars/uGears.pas	Wed Nov 17 22:14:41 2010 +0300
@@ -25,8 +25,6 @@
 
 var AllInactive: boolean;
     PrvInactive: boolean;
-    CurAmmoGear: PGear;
-    GearsList: PGear;
     KilledHHs: Longword;
     SuddenDeathDmg: Boolean;
     SpeechType: Longword;

--- a/hedgewars/uKeys.pas	Wed Nov 17 22:07:03 2010 +0300
+++ b/hedgewars/uKeys.pas	Wed Nov 17 22:14:41 2010 +0300
@@ -82,7 +82,7 @@
 {$ENDIF}
 {$ENDIF}
 implementation
-uses uTeams, uConsole, uMisc, uVariables, uConsts;
+uses uConsole, uMisc, uVariables, uConsts;
 //const KeyNumber = 1024;
 
 var tkbd, tkbdn: TKeyboardState;

--- a/hedgewars/uLand.pas	Wed Nov 17 22:07:03 2010 +0300
+++ b/hedgewars/uLand.pas	Wed Nov 17 22:14:41 2010 +0300
@@ -35,7 +35,7 @@
 procedure CheckLandDigest(s: shortstring);
 
 implementation
-uses uConsole, uStore, uMisc, uRandom, uTeams, uLandObjects, Adler32, uIO, uLandTexture, sysutils,
+uses uConsole, uStore, uMisc, uRandom, uLandObjects, Adler32, uIO, uLandTexture, sysutils,
      uVariables;
 
 operator=(const a, b: direction) c: Boolean;

--- a/hedgewars/uScript.pas	Wed Nov 17 22:07:03 2010 +0300
+++ b/hedgewars/uScript.pas	Wed Nov 17 22:14:41 2010 +0300
@@ -49,7 +49,6 @@
     uWorld,
     uAmmos,
     uSound,
-    uTeams,
     uKeys,
     uChat,
     uStats,

--- a/hedgewars/uStore.pas	Wed Nov 17 22:07:03 2010 +0300
+++ b/hedgewars/uStore.pas	Wed Nov 17 22:14:41 2010 +0300
@@ -20,7 +20,7 @@
 
 unit uStore;
 interface
-uses sysutils, uConsts, uTeams, SDLh, GLunit, uTypes;
+uses sysutils, uConsts, SDLh, GLunit, uTypes;
 
 
 var PixelFormat: PSDL_PixelFormat;

--- a/hedgewars/uTeams.pas	Wed Nov 17 22:07:03 2010 +0300
+++ b/hedgewars/uTeams.pas	Wed Nov 17 22:14:41 2010 +0300
@@ -22,18 +22,6 @@
 interface
 uses uConsts, uKeys, uGears, uRandom, uFloat, uStats, uVisualGears, uCollisions, GLunit, uSound, uTypes;
 
-var CurrentTeam: PTeam;
-    PreviousTeam: PTeam;
-    CurrentHedgehog: PHedgehog;
-    TeamsArray: array[0..Pred(cMaxTeams)] of PTeam;
-    TeamsCount: Longword;
-    ClansArray: array[0..Pred(cMaxTeams)] of PClan;
-    ClansCount: Longword;
-    LocalClan: LongInt;  // last non-bot, non-extdriven clan
-    LocalAmmo: LongInt;  // last non-bot, non-extdriven clan's first team's ammo index
-    CurMinAngle, CurMaxAngle: Longword;
-    GameOver: boolean;
-
 procedure initModule;
 procedure freeModule;
 function  AddTeam(TeamColor: Longword): PTeam;

--- a/hedgewars/uVariables.pas	Wed Nov 17 22:07:03 2010 +0300
+++ b/hedgewars/uVariables.pas	Wed Nov 17 22:14:41 2010 +0300
@@ -1998,6 +1998,20 @@
     playHeight, playWidth, leftX, rightX, topY, MaxHedgehogs: Longword;  // idea is that a template can specify height/width.  Or, a map, a height/width by the dimensions of the image.  If the map has pixels near top of image, it triggers border.
     LandBackSurface: PSDL_Surface;
     digest: shortstring;
+    CurAmmoGear: PGear;
+    GearsList: PGear;
+
+    CurrentTeam: PTeam;
+    PreviousTeam: PTeam;
+    CurrentHedgehog: PHedgehog;
+    TeamsArray: array[0..Pred(cMaxTeams)] of PTeam;
+    TeamsCount: Longword;
+    ClansArray: array[0..Pred(cMaxTeams)] of PClan;
+    ClansCount: Longword;
+    LocalClan: LongInt;  // last non-bot, non-extdriven clan
+    LocalAmmo: LongInt;  // last non-bot, non-extdriven clan's first team's ammo index
+    CurMinAngle, CurMaxAngle: Longword;
+    GameOver: boolean;
 
 
 procedure initModule;

--- a/hedgewars/uVisualGears.pas	Wed Nov 17 22:07:03 2010 +0300
+++ b/hedgewars/uVisualGears.pas	Wed Nov 17 22:14:41 2010 +0300
@@ -38,7 +38,8 @@
     vobVelocity, vobFallSpeed: LongInt;
 
 implementation
-uses uWorld, uMisc, uStore, uTeams, uSound, uMobile, uVariables;
+uses uWorld, uMisc, uStore, uSound, uMobile, uVariables;
+
 const cExplFrameTicks = 110;
 
 {$INCLUDE "VGSHandlers.inc"}

--- a/hedgewars/uWorld.pas	Wed Nov 17 22:07:03 2010 +0300
+++ b/hedgewars/uWorld.pas	Wed Nov 17 22:14:41 2010 +0300
@@ -52,7 +52,6 @@
 uses
     uStore,
     uMisc,
-    uTeams,
     uIO,
     uKeys,
     uLocale,