diff --git a/lcl/interfaces/gtk2/dragicons.inc b/lcl/interfaces/gtk2/dragicons.inc
index 90c8123345..d1d8da67d8 100644
--- a/lcl/interfaces/gtk2/dragicons.inc
+++ b/lcl/interfaces/gtk2/dragicons.inc
@@ -1,4 +1,4 @@
-// included by gtkglobals.pp
+{%MainUnit gtkglobals.pp}
 {
  *****************************************************************************
   This file is part of the Lazarus Component Library (LCL)
diff --git a/lcl/interfaces/gtk2/gtk2cellrenderer.pas b/lcl/interfaces/gtk2/gtk2cellrenderer.pas
index 183ffe5e33..c2a6fe6ef2 100644
--- a/lcl/interfaces/gtk2/gtk2cellrenderer.pas
+++ b/lcl/interfaces/gtk2/gtk2cellrenderer.pas
@@ -25,8 +25,12 @@ unit Gtk2CellRenderer;
 interface
 
 uses
-  Classes, SysUtils, LCLType, LCLProc, Controls, StdCtrls, ComCtrls, LMessages,
-  Gtk2Int, gtk2, gdk2, glib2, Gtk2Proc, Gtk2Def;
+  // RTL
+  Classes, SysUtils,
+  gtk2, gdk2, glib2,
+  // LCL
+  LCLType, LCLProc, Controls, StdCtrls, ComCtrls, LMessages,
+  Gtk2Int, Gtk2Proc, Gtk2Def;
   
 type
   PLCLIntfCellRenderer = ^TLCLIntfCellRenderer;
@@ -65,7 +69,9 @@ procedure LCLIntfCellRenderer_CellDataFunc(cell_layout:PGtkCellLayout;
                                            data: gpointer); cdecl;
 
 implementation
-uses Gtk2Extra;
+
+uses
+  Gtk2Extra;
 
 type
   TCustomListViewAccess = class(TCustomListView);
diff --git a/lcl/interfaces/gtk2/gtk2debug.pp b/lcl/interfaces/gtk2/gtk2debug.pp
index c392bce1d8..e7d0385622 100644
--- a/lcl/interfaces/gtk2/gtk2debug.pp
+++ b/lcl/interfaces/gtk2/gtk2debug.pp
@@ -25,6 +25,7 @@ unit Gtk2Debug;
 interface 
 
 uses
+  // RTL
   gdk2pixbuf, gdk2, gtk2,
   sysutils;
 
diff --git a/lcl/interfaces/gtk2/gtk2def.pp b/lcl/interfaces/gtk2/gtk2def.pp
index ce3808fcb9..bf772d6b16 100644
--- a/lcl/interfaces/gtk2/gtk2def.pp
+++ b/lcl/interfaces/gtk2/gtk2def.pp
@@ -25,9 +25,11 @@ unit Gtk2Def;
 interface
 
 uses
-  glib2, gdk2pixbuf, pango, gdk2, gtk2,
+  // RTL
+  Classes, SysUtils, glib2, gdk2pixbuf, pango, gdk2, gtk2,
+  // LCL
   Gtk2Extra,
-  Classes, SysUtils, LCLIntf, LCLProc, LCLType, LCLMemManager, DynHashArray,
+  LCLIntf, LCLProc, LCLType, LCLMemManager, DynHashArray,
   GraphType, Gtk2Globals;
 
 {$ifdef TraceGdiCalls}
diff --git a/lcl/interfaces/gtk2/gtk2extra.pp b/lcl/interfaces/gtk2/gtk2extra.pp
index 22bde46f35..f2eb98ea5e 100644
--- a/lcl/interfaces/gtk2/gtk2extra.pp
+++ b/lcl/interfaces/gtk2/gtk2extra.pp
@@ -1,4 +1,3 @@
-{ $Id$ }
 {
  ---------------------------------------------------------------------------
  gtk2extra.pp  -  GTK(2) widgetset - additional gdk/gtk functions
diff --git a/lcl/interfaces/gtk2/gtk2fontcache.pas b/lcl/interfaces/gtk2/gtk2fontcache.pas
index 6b878be396..93d4ae0105 100644
--- a/lcl/interfaces/gtk2/gtk2fontcache.pas
+++ b/lcl/interfaces/gtk2/gtk2fontcache.pas
@@ -13,8 +13,10 @@ unit Gtk2FontCache;
 interface
 
 uses
-  Classes, SysUtils, LCLProc, LCLType, AvgLvlTree, Gtk2Def,
-  glib2, pango,
+  // RTL
+  Classes, SysUtils, glib2, pango,
+  // LCL
+  LCLProc, LCLType, AvgLvlTree, Gtk2Def,
   LCLResCache;
   
 type
diff --git a/lcl/interfaces/gtk2/gtk2globals.pp b/lcl/interfaces/gtk2/gtk2globals.pp
index 00ec854bf2..ef1aa72b6b 100644
--- a/lcl/interfaces/gtk2/gtk2globals.pp
+++ b/lcl/interfaces/gtk2/gtk2globals.pp
@@ -13,8 +13,11 @@ unit Gtk2Globals;
 interface
 
 uses
-  SysUtils, Classes, InterfaceBase,
+  // RTL
+  SysUtils, Classes,
   Pango, glib2, gdk2, gtk2,
+  // LCL
+  InterfaceBase,
   LMessages, LCLProc, Controls, ComCtrls, Forms, LCLIntf, LCLType,
   DynHashArray;
 
diff --git a/lcl/interfaces/gtk2/gtk2int.pas b/lcl/interfaces/gtk2/gtk2int.pas
index cc66740275..f981d48b3a 100644
--- a/lcl/interfaces/gtk2/gtk2int.pas
+++ b/lcl/interfaces/gtk2/gtk2int.pas
@@ -27,19 +27,19 @@ interface
 {$I gtk2defines.inc}
 
 uses
+  // RTL
   {$ifdef Unix}
   BaseUnix, Unix,
   {$endif}
-  Types, Classes, SysUtils, Math, maps,
+  Types, Classes, SysUtils, Math,
   {$IfNDef GTK2_2}
     {$IfDef HasX}
      XLib, xatom, X, gdk2x, //XUtil,
     {$EndIf}
   {$EndIf}
-
-
+  gdk2pixbuf, gtk2, gdk2, glib2, Pango,
   // LCL
-  FileUtil, Dialogs, Controls, Forms, LCLStrConsts,
+  Maps, FileUtil, Dialogs, Controls, Forms, LCLStrConsts,
   LMessages, LCLProc, LCLIntf, LCLType, DynHashArray, GraphType, GraphMath,
   Graphics, Menus, Themes, WSLCLClasses,
 
@@ -47,7 +47,6 @@ uses
   ComCtrls, Spin,
   ExtCtrls, LResources,
 
-  gdk2pixbuf, gtk2, gdk2, glib2, Pango,
   InterfaceBase,
   Gtk2WinApiWindow,
   Gtk2Globals, Gtk2Proc,
diff --git a/lcl/interfaces/gtk2/gtk2listslh.inc b/lcl/interfaces/gtk2/gtk2listslh.inc
index de1f92df4c..772632dd28 100644
--- a/lcl/interfaces/gtk2/gtk2listslh.inc
+++ b/lcl/interfaces/gtk2/gtk2listslh.inc
@@ -1,3 +1,4 @@
+{%MainUnit gtk2int.pp}
 {******************************************************************************
                                  gtklistslh.inc
                  TGtkListStringList and TGtkCListStringList
diff --git a/lcl/interfaces/gtk2/gtk2memostrings.inc b/lcl/interfaces/gtk2/gtk2memostrings.inc
index 10a3dfee5e..d70c404ba3 100644
--- a/lcl/interfaces/gtk2/gtk2memostrings.inc
+++ b/lcl/interfaces/gtk2/gtk2memostrings.inc
@@ -1,3 +1,4 @@
+{%MainUnit gtk2wsstdctrls.pp}
 {$IFDEF MEMOHEADER}
 
 type
diff --git a/lcl/interfaces/gtk2/gtk2msgqueue.pp b/lcl/interfaces/gtk2/gtk2msgqueue.pp
index ac21aef33c..59c47aa84a 100644
--- a/lcl/interfaces/gtk2/gtk2msgqueue.pp
+++ b/lcl/interfaces/gtk2/gtk2msgqueue.pp
@@ -20,7 +20,10 @@ unit Gtk2MsgQueue;
 
 interface
 
-uses LazLinkedList, LCLType, LMessages, Gtk2Globals, DynHashArray, Gtk2Proc
+uses
+  // RTL
+  // LCL
+  LazLinkedList, LCLType, LMessages, Gtk2Globals, DynHashArray, Gtk2Proc
 {$IFNDEF USE_GTK_MAIN_OLD_ITERATION}
 , glib2
 {$ENDIF}
diff --git a/lcl/interfaces/gtk2/gtk2winapiwindow.pp b/lcl/interfaces/gtk2/gtk2winapiwindow.pp
index 6f5d5ef719..2fd178efa8 100644
--- a/lcl/interfaces/gtk2/gtk2winapiwindow.pp
+++ b/lcl/interfaces/gtk2/gtk2winapiwindow.pp
@@ -28,9 +28,10 @@ unit Gtk2WinapiWindow;
 interface
 
 uses
-  SysUtils, LCLProc,
-  Gtk2Extra, glib2, gdk2, gtk2,
-  Controls, Gtk2Proc, Gtk2Def;
+  // RTL
+  SysUtils, glib2, gdk2, gtk2,
+  // LCL
+  LCLProc, Gtk2Extra, Controls, Gtk2Proc, Gtk2Def;
 
 { $Define VerboseCaret}
 // the gtk has a function to draw the cursor, but it does not support xor
diff --git a/lcl/interfaces/gtk2/gtk2wsbuttons.pp b/lcl/interfaces/gtk2/gtk2wsbuttons.pp
index 70199b9b8b..7d54ecb8c9 100644
--- a/lcl/interfaces/gtk2/gtk2wsbuttons.pp
+++ b/lcl/interfaces/gtk2/gtk2wsbuttons.pp
@@ -20,7 +20,9 @@ unit Gtk2WSButtons;
 interface
 
 uses
+  // RTL
   glib2, gtk2, gdk2, gdk2pixbuf,
+  // LCL
 ////////////////////////////////////////////////////
   LCLType, Controls, Buttons, Graphics, GraphType,
 ////////////////////////////////////////////////////
diff --git a/lcl/interfaces/gtk2/gtk2wscalendar.pp b/lcl/interfaces/gtk2/gtk2wscalendar.pp
index ab04d6a848..c46f8b0783 100644
--- a/lcl/interfaces/gtk2/gtk2wscalendar.pp
+++ b/lcl/interfaces/gtk2/gtk2wscalendar.pp
@@ -21,10 +21,10 @@ unit Gtk2WSCalendar;
 interface
 
 uses
-  // Bindings
-  glib2, gdk2, gtk2,
+  // RTL
+  glib2, gdk2, gtk2, SysUtils, Types, Classes,
   // RTL, FCL, LCL
-  SysUtils, Types, Classes, Controls, Calendar, LCLType, LMessages,
+  Controls, Calendar, LCLType, LMessages,
   InterfaceBase, LCLProc,
   // Widgetset
   Gtk2Proc, Gtk2Def, Gtk2Int, Gtk2WsControls,
diff --git a/lcl/interfaces/gtk2/gtk2wschecklst.pp b/lcl/interfaces/gtk2/gtk2wschecklst.pp
index c4d55fc6e6..ed1fc624af 100644
--- a/lcl/interfaces/gtk2/gtk2wschecklst.pp
+++ b/lcl/interfaces/gtk2/gtk2wschecklst.pp
@@ -21,15 +21,17 @@ unit Gtk2WSCheckLst;
 interface
 
 uses
-
-Gtk2, GLib2, Gtk2Def,
+  // RTL
+  SysUtils, Classes,
+  Gtk2, GLib2, Gtk2Def,
+  // LCL
 ////////////////////////////////////////////////////
 // I M P O R T A N T                                
 ////////////////////////////////////////////////////
 // To get as little as posible circles,
 // uncomment only when needed for registration
 ////////////////////////////////////////////////////
-  CheckLst, StdCtrls, Controls, LCLType, SysUtils, Classes, LMessages, LCLProc,
+  CheckLst, StdCtrls, Controls, LCLType, LMessages, LCLProc,
 ////////////////////////////////////////////////////
   WSCheckLst, WSLCLClasses;
 
diff --git a/lcl/interfaces/gtk2/gtk2wscontrols.pp b/lcl/interfaces/gtk2/gtk2wscontrols.pp
index 8660f6205c..05c985f335 100644
--- a/lcl/interfaces/gtk2/gtk2wscontrols.pp
+++ b/lcl/interfaces/gtk2/gtk2wscontrols.pp
@@ -21,6 +21,10 @@ unit Gtk2WSControls;
 interface
 
 uses
+  // RTL
+  Classes, SysUtils,
+  Gtk2, Gdk2, Glib2, gdk2pixbuf,
+  // LCL
 ////////////////////////////////////////////////////
 // I M P O R T A N T                                
 ////////////////////////////////////////////////////
@@ -29,11 +33,9 @@ uses
 ////////////////////////////////////////////////////
   Controls, ComCtrls,
 ////////////////////////////////////////////////////
-  Classes, SysUtils,
   Graphics,
 
-  gdk2pixbuf,
-  Gtk2, Gdk2, Glib2, Gtk2Globals, Gtk2Def,
+  Gtk2Globals, Gtk2Def,
   Gtk2Proc, LCLType, LCLProc,
   WSControls, WSProc, Gtk2WinapiWindow;
   
diff --git a/lcl/interfaces/gtk2/gtk2wsdialogs.pp b/lcl/interfaces/gtk2/gtk2wsdialogs.pp
index a753d774e8..f6781e1dba 100644
--- a/lcl/interfaces/gtk2/gtk2wsdialogs.pp
+++ b/lcl/interfaces/gtk2/gtk2wsdialogs.pp
@@ -21,10 +21,12 @@ unit Gtk2WSDialogs;
 interface
 
 uses
-  // Bindings
-  Gtk2, Glib2, gdk2, pango, Gtk2Extra,
-  // RTL, FCL and LCL
-  SysUtils, Classes, Graphics, Controls, Dialogs, ExtDlgs, LCLType,
+  // RTL
+  Gtk2, Glib2, gdk2, pango,
+  SysUtils, Classes,
+  // LCL
+  Gtk2Extra,
+  Graphics, Controls, Dialogs, ExtDlgs, LCLType,
   FileUtil, LCLStrConsts, LCLProc, InterfaceBase,
   // Widgetset
   Gtk2Int, Gtk2Globals, Gtk2Def, Gtk2Proc,
diff --git a/lcl/interfaces/gtk2/gtk2wsextctrls.pp b/lcl/interfaces/gtk2/gtk2wsextctrls.pp
index 2ec8f796ee..a949285ea3 100644
--- a/lcl/interfaces/gtk2/gtk2wsextctrls.pp
+++ b/lcl/interfaces/gtk2/gtk2wsextctrls.pp
@@ -25,11 +25,13 @@ unit Gtk2WSExtCtrls;
 interface
 
 uses
-  // libs
-  GLib2, Gtk2, Gdk2, Gdk2Pixbuf, Gtk2Int, Gtk2Def,
-  {$ifdef UseStatusIcon}Gtk2Ext, {$endif}
+  // RTL
+  GLib2, Gtk2, Gdk2, Gdk2Pixbuf,
+  Classes, SysUtils, Types,
   // LCL
-  LCLProc, ExtCtrls, Classes, Controls, SysUtils, types, Graphics, LCLType,
+  Gtk2Int, Gtk2Def,
+  {$ifdef UseStatusIcon}Gtk2Ext, {$endif}
+  LCLProc, ExtCtrls, Controls, Graphics, LCLType,
   // widgetset
   WSExtCtrls, WSLCLClasses,
   Gtk2WSControls, Gtk2Proc, Gtk2Globals;
diff --git a/lcl/interfaces/gtk2/gtk2wsfactory.pas b/lcl/interfaces/gtk2/gtk2wsfactory.pas
index 188b909793..e034b8fc2d 100644
--- a/lcl/interfaces/gtk2/gtk2wsfactory.pas
+++ b/lcl/interfaces/gtk2/gtk2wsfactory.pas
@@ -3,8 +3,12 @@ unit Gtk2WSFactory;
 {$mode objfpc}{$H+}
 
 interface
+
 uses
-  Classes, Controls, ComCtrls, Calendar, StdCtrls, Spin,
+  // RTL
+  Classes,
+  // LCL
+  Controls, ComCtrls, Calendar, StdCtrls, Spin,
   Dialogs, ExtCtrls, ExtDlgs, Buttons, CheckLst, Forms, Grids, Menus,
   PairSplitter, WSLCLClasses;
 
@@ -99,6 +103,7 @@ function RegisterCustomRubberBand: Boolean;
 function RegisterLazDeviceAPIs: Boolean;
 
 implementation
+
 uses
   Gtk2WSButtons,
   Gtk2WSCalendar,
diff --git a/lcl/interfaces/gtk2/gtk2wsforms.pp b/lcl/interfaces/gtk2/gtk2wsforms.pp
index e6b5caa3bb..086cada099 100644
--- a/lcl/interfaces/gtk2/gtk2wsforms.pp
+++ b/lcl/interfaces/gtk2/gtk2wsforms.pp
@@ -21,12 +21,14 @@ unit Gtk2WSForms;
 interface
 
 uses
-  // Bindings
+  // RTL
   Gtk2, Glib2, Gdk2, Gdk2Pixbuf,
   {$IFDEF HASX}
   Gdk2x, X, XLib,
   {$ENDIF}
-  Math, types, Classes, LazLogger, LCLType, Controls, LMessages, InterfaceBase,
+  Math, types, Classes,
+  // LCL
+  LazLogger, LCLType, Controls, LMessages, InterfaceBase,
   Graphics, Forms, WSForms, WSProc,
   Gtk2Int, Gtk2Proc, Gtk2Def, Gtk2Extra, Gtk2Globals, Gtk2WSControls;
 
diff --git a/lcl/interfaces/gtk2/gtk2wsmenus.pp b/lcl/interfaces/gtk2/gtk2wsmenus.pp
index 92a90fa2d3..1bcf1c1ce2 100644
--- a/lcl/interfaces/gtk2/gtk2wsmenus.pp
+++ b/lcl/interfaces/gtk2/gtk2wsmenus.pp
@@ -21,9 +21,12 @@ unit Gtk2WSMenus;
 interface
 
 uses
+  // RTL
   glib2, gdk2, gtk2,
+  Classes,
+  // LCL
   Gtk2Int, Gtk2Proc, Gtk2Globals, Gtk2Def, Gtk2Extra,
-  Classes, InterfaceBase, Types, LCLProc, LCLType, WSMenus, WSLCLClasses,
+  InterfaceBase, Types, LCLProc, LCLType, WSMenus, WSLCLClasses,
   LMessages, Graphics, Menus, Forms, LCLIntf;
 
 type
diff --git a/lcl/interfaces/gtk2/gtk2wsprivate.pp b/lcl/interfaces/gtk2/gtk2wsprivate.pp
index 6187e03bd0..8fc2faa7d6 100644
--- a/lcl/interfaces/gtk2/gtk2wsprivate.pp
+++ b/lcl/interfaces/gtk2/gtk2wsprivate.pp
@@ -27,8 +27,9 @@ interface
 uses
   // libs
   Gtk2, Glib2, Gdk2,
+  Classes, SysUtils,
   // LCL
-  LCLType, LMessages, LCLProc, Controls, Classes, SysUtils, Forms,
+  LCLType, LMessages, LCLProc, Controls, Forms,
   // widgetset
   WSControls, WSLCLClasses, WSProc,
   // interface
diff --git a/lcl/interfaces/gtk2/gtk2wsspin.pp b/lcl/interfaces/gtk2/gtk2wsspin.pp
index faa42e2626..32a9f37478 100644
--- a/lcl/interfaces/gtk2/gtk2wsspin.pp
+++ b/lcl/interfaces/gtk2/gtk2wsspin.pp
@@ -21,10 +21,10 @@ unit Gtk2WSSpin;
 interface
 
 uses
-  // Bindings
-  glib2, gtk2,
-  // RTL, FCL, LCL
-  SysUtils, Math, Controls, LCLType, LCLProc, Spin, StdCtrls,
+  // RTL
+  glib2, gtk2, SysUtils, Math,
+  // LCL
+  Controls, LCLType, LCLProc, Spin, StdCtrls,
   // Widgetset
   Gtk2Extra, Gtk2Def, Gtk2WSStdCtrls,
   Gtk2Proc, WSLCLClasses, WSProc, WSSpin;
diff --git a/lcl/interfaces/gtk2/gtk2wsstdctrls.pp b/lcl/interfaces/gtk2/gtk2wsstdctrls.pp
index 0990a48bba..ead0a22290 100644
--- a/lcl/interfaces/gtk2/gtk2wsstdctrls.pp
+++ b/lcl/interfaces/gtk2/gtk2wsstdctrls.pp
@@ -21,11 +21,11 @@ unit Gtk2WSStdCtrls;
 interface
 
 uses
-  // Bindings
+  // RTL
   glib2,  gdk2, gtk2,
-  // RTL, FCL, LCL
-  Classes, SysUtils, Math, Controls, Graphics,
-  StdCtrls, LMessages, LCLType, LCLProc,
+  Classes, SysUtils, Math,
+  // LCL
+  Controls, Graphics, StdCtrls, LMessages, LCLType, LCLProc,
   // Widgetset
   WSControls, WSProc, WSStdCtrls, Gtk2Int, Gtk2Def,
   Gtk2CellRenderer, Gtk2Globals, Gtk2Proc, InterfaceBase,