--- a/hedgewars/hwengine.pas	Sun Oct 25 15:55:49 2009 +0000
+++ b/hedgewars/hwengine.pas	Sun Oct 25 16:35:09 2009 +0000
@@ -20,6 +20,8 @@
 {$ERROR Only Free Pascal supported!}
 {$ENDIF}
 
+{$INCLUDE options.inc}
+
 program hwengine;
 uses
 	SDLh in 'SDLh.pas',
@@ -58,8 +60,6 @@
 	uChat in 'uChat.pas',
 	uLandTexture in 'uLandTexture.pas';
 
-{$INCLUDE options.inc}
-
 // also: GSHandlers.inc
 //       CCHandlers.inc
 //       HHHandlers.inc

--- a/hedgewars/uAIMisc.pas	Sun Oct 25 15:55:49 2009 +0000
+++ b/hedgewars/uAIMisc.pas	Sun Oct 25 16:35:09 2009 +0000
@@ -16,10 +16,11 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  *)
 
+{$INCLUDE options.inc}
+
 unit uAIMisc;
 interface
 uses SDLh, uConsts, uGears, uFloat;
-{$INCLUDE options.inc}
 
 type TTarget = record
                Point: TPoint;

--- a/hedgewars/uConsts.pas	Sun Oct 25 15:55:49 2009 +0000
+++ b/hedgewars/uConsts.pas	Sun Oct 25 16:35:09 2009 +0000
@@ -16,6 +16,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  *)
 
+{$INCLUDE options.inc}
+
 unit uConsts;
 interface
 
@@ -28,7 +30,6 @@
 {$ENDIF}
 	uLocale;
 
-{$INCLUDE options.inc}
 {$INCLUDE proto.inc}
 type
 

--- a/hedgewars/uFloat.pas	Sun Oct 25 15:55:49 2009 +0000
+++ b/hedgewars/uFloat.pas	Sun Oct 25 16:35:09 2009 +0000
@@ -29,14 +29,14 @@
                0: (Frac, Round: Longword);
                1: (QWordValue : QWord);
                end;
-{$else FPC_LITTLE_ENDIAN}
+{$else}
 type hwFloat = record
                isNegative: boolean;
                case byte of
                0: (Round, Frac: Longword);
                1: (QWordValue : QWord);
                end;
-{$endif FPC_LITTLE_ENDIAN}
+{$endif}
 
 function int2hwFloat (const i: LongInt) : hwFloat;
 

--- a/hedgewars/uLand.pas	Sun Oct 25 15:55:49 2009 +0000
+++ b/hedgewars/uLand.pas	Sun Oct 25 16:35:09 2009 +0000
@@ -16,6 +16,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  *)
 
+{$include options.inc}
+
 unit uLand;
 interface
 uses SDLh, uLandTemplates, uFloat,
@@ -25,7 +27,6 @@
 	GL,
 {$ENDIF}
 	uConsts;
-{$include options.inc}
 type TLandArray = packed array[0 .. LAND_HEIGHT - 1, 0 .. LAND_WIDTH - 1] of LongWord;
 TCollisionArray = packed array[0 .. LAND_HEIGHT - 1, 0 .. LAND_WIDTH - 1] of Word;
 	TPreview  = packed array[0..127, 0..31] of byte;

--- a/hedgewars/uLandTexture.pas	Sun Oct 25 15:55:49 2009 +0000
+++ b/hedgewars/uLandTexture.pas	Sun Oct 25 16:35:09 2009 +0000
@@ -16,6 +16,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  *)
 
+{$include options.inc}
+
 unit uLandTexture;
 interface
 uses SDLh;

--- a/hedgewars/uMisc.pas	Sun Oct 25 15:55:49 2009 +0000
+++ b/hedgewars/uMisc.pas	Sun Oct 25 16:35:09 2009 +0000
@@ -18,6 +18,7 @@
 
 unit uMisc;
 interface
+{$INCLUDE options.inc}
 uses uConsts, SDLh,
 {$IFDEF GLES11}
 	gles11,
@@ -25,7 +26,6 @@
 	GL,
 {$ENDIF}
 	uFloat;
-{$INCLUDE options.inc}
 var
 	isCursorVisible : boolean = false;
 	isTerminated    : boolean = false;

--- a/hedgewars/uStore.pas	Sun Oct 25 15:55:49 2009 +0000
+++ b/hedgewars/uStore.pas	Sun Oct 25 16:35:09 2009 +0000
@@ -18,6 +18,7 @@
 
 unit uStore;
 interface
+{$INCLUDE options.inc}
 uses sysutils, uConsts, uTeams, SDLh,
 {$IFDEF GLES11}
 	gles11,
@@ -25,7 +26,6 @@
 	GL, GLext,
 {$ENDIF}
 uFloat;
-{$INCLUDE options.inc}
 
 procedure StoreInit;
 procedure StoreLoad;

--- a/hedgewars/uTeams.pas	Sun Oct 25 15:55:49 2009 +0000
+++ b/hedgewars/uTeams.pas	Sun Oct 25 16:35:09 2009 +0000
@@ -16,6 +16,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  *)
 
+{$INCLUDE options.inc}
+
 unit uTeams;
 interface
 uses SDLh, uConsts, uKeys, uGears, uRandom, uFloat, uStats, uVisualGears,
@@ -25,7 +27,6 @@
 	GL,
 {$ENDIF}
 	uSound;
-{$INCLUDE options.inc}
 
 type PHHAmmo = ^THHAmmo;
 	THHAmmo = array[0..cMaxSlotIndex, 0..cMaxSlotAmmoIndex] of TAmmo;

--- a/hedgewars/uVisualGears.pas	Sun Oct 25 15:55:49 2009 +0000
+++ b/hedgewars/uVisualGears.pas	Sun Oct 25 16:35:09 2009 +0000
@@ -16,6 +16,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  *)
 
+{$INCLUDE options.inc}
+
 unit uVisualGears;
 interface
 uses SDLh, uConsts,
@@ -25,7 +27,6 @@
 	GL,
 {$ENDIF}
 	uFloat;
-{$INCLUDE options.inc}
 
 type PVisualGear = ^TVisualGear;
 	TVGearStepProcedure = procedure (Gear: PVisualGear; Steps: Longword);