--- a/hedgewars/uMisc.pas	Wed Nov 17 22:21:29 2010 +0300
+++ b/hedgewars/uMisc.pas	Wed Nov 17 22:26:34 2010 +0300
@@ -67,7 +67,7 @@
 procedure freeModule;
 
 implementation
-uses uConsole, uStore, uIO, typinfo, sysutils, uVariables;
+uses uConsole, uIO, typinfo, sysutils, uVariables;
 
 var KBnum: Longword;
 {$IFDEF DEBUGFILE}

--- a/hedgewars/uScript.pas	Wed Nov 17 22:21:29 2010 +0300
+++ b/hedgewars/uScript.pas	Wed Nov 17 22:26:34 2010 +0300
@@ -49,7 +49,6 @@
     uWorld,
     uAmmos,
     uSound,
-    uKeys,
     uChat,
     uStats,
     uRandom,

--- a/hedgewars/uStore.pas	Wed Nov 17 22:21:29 2010 +0300
+++ b/hedgewars/uStore.pas	Wed Nov 17 22:26:34 2010 +0300
@@ -22,22 +22,6 @@
 interface
 uses sysutils, uConsts, SDLh, GLunit, uTypes;
 
-
-var PixelFormat: PSDL_PixelFormat;
-    SDLPrimSurface: PSDL_Surface;
-    PauseTexture,
-    SyncTexture,
-    ConfirmTexture: PTexture;
-    cScaleFactor: GLfloat;
-    SupportNPOTT: Boolean;
-    Step: LongInt;
-    squaresize : LongInt;
-    numsquares : LongInt;
-    ProgrTex: PTexture;
-    MissionIcons: PSDL_Surface;
-    ropeIconTex: PTexture;
-    rotationQt: GLfloat;
-
 procedure initModule;
 procedure freeModule;
 

--- a/hedgewars/uVariables.pas	Wed Nov 17 22:21:29 2010 +0300
+++ b/hedgewars/uVariables.pas	Wed Nov 17 22:26:34 2010 +0300
@@ -2038,6 +2038,65 @@
 {$ENDIF}
     cOffsetY: LongInt;
 
+    PixelFormat: PSDL_PixelFormat;
+    SDLPrimSurface: PSDL_Surface;
+    PauseTexture,
+    SyncTexture,
+    ConfirmTexture: PTexture;
+    cScaleFactor: GLfloat;
+    SupportNPOTT: Boolean;
+    Step: LongInt;
+    squaresize : LongInt;
+    numsquares : LongInt;
+    ProgrTex: PTexture;
+    MissionIcons: PSDL_Surface;
+    ropeIconTex: PTexture;
+    rotationQt: GLfloat;
+
+
+    VisualGearsList: PVisualGear;
+    vobFrameTicks, vobFramesCount, vobCount: Longword;
+    vobVelocity, vobFallSpeed: LongInt;
+
+
+    hideAmmoMenu: boolean;
+    wheelUp: boolean;
+    wheelDown: boolean;
+
+    ControllerNumControllers: Integer;
+    ControllerEnabled: Integer;
+    ControllerNumAxes: array[0..5] of Integer;
+    //ControllerNumBalls: array[0..5] of Integer;
+    ControllerNumHats: array[0..5] of Integer;
+    ControllerNumButtons: array[0..5] of Integer;
+    ControllerAxes: array[0..5] of array[0..19] of Integer;
+    //ControllerBalls: array[0..5] of array[0..19] of array[0..1] of Integer;
+    ControllerHats: array[0..5] of array[0..19] of Byte;
+    ControllerButtons: array[0..5] of array[0..19] of Byte;
+
+    DefaultBinds, CurrentBinds: TBinds;
+
+    coeff: LongInt;
+{$IFDEF HWLIBRARY}
+    leftClick: boolean;
+    middleClick: boolean;
+    rightClick: boolean;
+
+    upKey: boolean;
+    downKey: boolean;
+    rightKey: boolean;
+    leftKey: boolean;
+    preciseKey: boolean;
+
+    backspaceKey: boolean;
+    spaceKey: boolean;
+    enterKey: boolean;
+    tabKey: boolean;
+
+    chatAction: boolean;
+    pauseAction: boolean;
+{$ENDIF}
+
 procedure initModule;
 procedure freeModule;
 

--- a/hedgewars/uVisualGears.pas	Wed Nov 17 22:21:29 2010 +0300
+++ b/hedgewars/uVisualGears.pas	Wed Nov 17 22:26:34 2010 +0300
@@ -33,10 +33,6 @@
 procedure AddClouds;
 procedure AddDamageTag(X, Y, Damage, Color: LongWord);
 
-var VisualGearsList: PVisualGear;
-    vobFrameTicks, vobFramesCount, vobCount: Longword;
-    vobVelocity, vobFallSpeed: LongInt;
-
 implementation
 uses uWorld, uMisc, uStore, uSound, uMobile, uVariables;
 

--- a/hedgewars/uWorld.pas	Wed Nov 17 22:21:29 2010 +0300
+++ b/hedgewars/uWorld.pas	Wed Nov 17 22:26:34 2010 +0300
@@ -38,7 +38,6 @@
     uStore,
     uMisc,
     uIO,
-    uKeys,
     uLocale,
     uSound,
     uAmmos,