--- a/src/elrail.cpp	Thu Dec 20 22:45:56 2007 +0000
+++ b/src/elrail.cpp	Fri Dec 21 07:38:36 2007 +0000
@@ -63,7 +63,7 @@
 #include "table/elrail_data.h"
 #include "vehicle.h"
 #include "train.h"
-#include "gui.h"
+#include "rail_gui.h"
 #include "transparency.h"
 #include "tunnelbridge_map.h"
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/group_gui.h	Fri Dec 21 07:38:36 2007 +0000
@@ -0,0 +1,12 @@
+/* $Id$ */
+
+/** @file group_gui.h Functions/definitions that have something to do with groups. */
+
+#ifndef GROUP_GUI_H
+#define GROUP_GUI_H
+
+#include "vehicle_type.h"
+
+void ShowPlayerGroup(PlayerID player, VehicleType veh);
+
+#endif /* GROUP_GUI_H */

--- a/src/gui.h	Thu Dec 20 22:45:56 2007 +0000
+++ b/src/gui.h	Fri Dec 21 07:38:36 2007 +0000
@@ -7,9 +7,6 @@
 
 #include "string.h"
 #include "window_type.h"
-#include "rail_type.h"
-#include "road_type.h"
-#include "vehicle_type.h"
 
 /* main_gui.cpp */
 void CcPlaySound10(bool success, TileIndex tile, uint32 p1, uint32 p2);
@@ -37,18 +34,9 @@
 void ShowMessageOptions();
 void ShowMessageHistory();
 
-/* rail_gui.cpp */
-void ShowBuildRailToolbar(RailType railtype, int button);
-void PlaceProc_BuyLand(TileIndex tile);
-void ReinitGuiAfterToggleElrail(bool disable);
-
 /* train_gui.cpp */
 void ShowOrdersWindow(const Vehicle *v);
 
-/* road_gui.cpp */
-void ShowBuildRoadToolbar(RoadType roadtype);
-void ShowBuildRoadScenToolbar();
-
 /* dock_gui.cpp */
 void ShowBuildDocksToolbar();
 
@@ -64,6 +52,7 @@
 
 void PlaceProc_DemolishArea(TileIndex tile);
 void PlaceProc_LevelLand(TileIndex tile);
+void PlaceProc_BuyLand(TileIndex tile);
 bool GUIPlaceProcDragXY(const WindowEvent *e);
 
 /** Drag and drop selection process, or, what to do with an area of land when
@@ -132,9 +121,6 @@
 VARDEF bool _station_show_coverage;
 VARDEF PlaceProc *_place_proc;
 
-/* vehicle_gui.cpp */
 void InitializeGUI();
 
-void ShowPlayerGroup(PlayerID player, VehicleType veh);
-
 #endif /* GUI_H */

--- a/src/main_gui.cpp	Thu Dec 20 22:45:56 2007 +0000
+++ b/src/main_gui.cpp	Fri Dec 21 07:38:36 2007 +0000
@@ -42,6 +42,8 @@
 #include "vehicle_gui.h"
 #include "transparency_gui.h"
 #include "newgrf_config.h"
+#include "rail_gui.h"
+#include "road_gui.h"
 
 #include "network/network_data.h"
 #include "network/network_client.h"

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/rail_gui.h	Fri Dec 21 07:38:36 2007 +0000
@@ -0,0 +1,13 @@
+/* $Id$ */
+
+/** @file rail_gui.h Functions/types etc. related to the rail GUI. */
+
+#ifndef RAIL_GUI_H
+#define RAIL_GUI_H
+
+#include "rail_type.h"
+
+void ShowBuildRailToolbar(RailType railtype, int button);
+void ReinitGuiAfterToggleElrail(bool disable);
+
+#endif /* RAIL_GUI_H */

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/road_gui.h	Fri Dec 21 07:38:36 2007 +0000
@@ -0,0 +1,13 @@
+/* $Id$ */
+
+/** @file road_gui.h Functions/types related to the road GUIs. */
+
+#ifndef ROAD_GUI_H
+#define ROAD_GUI_H
+
+#include "road_type.h"
+
+void ShowBuildRoadToolbar(RoadType roadtype);
+void ShowBuildRoadScenToolbar();
+
+#endif /* ROAD_GUI_H */

--- a/src/vehicle_gui.cpp	Thu Dec 20 22:45:56 2007 +0000
+++ b/src/vehicle_gui.cpp	Fri Dec 21 07:38:36 2007 +0000
@@ -33,6 +33,7 @@
 #include "helpers.hpp"
 #include "cargotype.h"
 #include "group.h"
+#include "group_gui.h"
 
 struct Sorting {
 	Listing aircraft;