From 508ee4bfcc0f8fb1373fb7af251c59c873ef896f Mon Sep 17 00:00:00 2001
From: Mikko Rasa <tdb@tdb.fi>
Date: Thu, 8 May 2014 18:27:10 +0300
Subject: [PATCH] Get rid of some obsolete #includes

---
 source/3d/catalogue.cpp         | 1 +
 source/3d/tracktype.cpp         | 1 +
 source/designer/svgexporter.cpp | 1 +
 source/libr2c2/beamgate.cpp     | 1 -
 source/libr2c2/block.cpp        | 1 -
 source/libr2c2/catalogue.cpp    | 3 +--
 source/libr2c2/catalogue.h      | 3 ---
 source/libr2c2/signal.h         | 1 -
 source/libr2c2/tracktype.h      | 1 -
 source/libr2c2/train.cpp        | 3 ---
 source/libr2c2/vehicle.cpp      | 1 +
 11 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/source/3d/catalogue.cpp b/source/3d/catalogue.cpp
index a767cf5..fb4c397 100644
--- a/source/3d/catalogue.cpp
+++ b/source/3d/catalogue.cpp
@@ -1,5 +1,6 @@
 #include <msp/core/maputils.h>
 #include <msp/gl/meshbuilder.h>
+#include "libr2c2/trackappearance.h"
 #include "catalogue.h"
 #include "signaltype.h"
 #include "tracktype.h"
diff --git a/source/3d/tracktype.cpp b/source/3d/tracktype.cpp
index 53064b7..a1ffc36 100644
--- a/source/3d/tracktype.cpp
+++ b/source/3d/tracktype.cpp
@@ -1,6 +1,7 @@
 #include <algorithm>
 #include <cmath>
 #include <msp/gl/technique.h>
+#include "libr2c2/trackappearance.h"
 #include "catalogue.h"
 #include "tracktype.h"
 
diff --git a/source/designer/svgexporter.cpp b/source/designer/svgexporter.cpp
index d099b73..05d1c8e 100644
--- a/source/designer/svgexporter.cpp
+++ b/source/designer/svgexporter.cpp
@@ -2,6 +2,7 @@
 #include <msp/strings/format.h>
 #include <msp/strings/utils.h>
 #include "libr2c2/catalogue.h"
+#include "libr2c2/trackappearance.h"
 #include "libr2c2/track.h"
 #include "libr2c2/tracktype.h"
 #include "svgexporter.h"
diff --git a/source/libr2c2/beamgate.cpp b/source/libr2c2/beamgate.cpp
index 20a218b..15c2b8e 100644
--- a/source/libr2c2/beamgate.cpp
+++ b/source/libr2c2/beamgate.cpp
@@ -1,5 +1,4 @@
 #include "beamgate.h"
-#include "catalogue.h"
 #include "layout.h"
 
 using namespace std;
diff --git a/source/libr2c2/block.cpp b/source/libr2c2/block.cpp
index e4292ea..a0d90f3 100644
--- a/source/libr2c2/block.cpp
+++ b/source/libr2c2/block.cpp
@@ -2,7 +2,6 @@
 #include <msp/strings/format.h>
 #include <msp/time/units.h>
 #include "block.h"
-#include "driver.h"
 #include "layout.h"
 #include "route.h"
 #include "trackcircuit.h"
diff --git a/source/libr2c2/catalogue.cpp b/source/libr2c2/catalogue.cpp
index a367799..7a78011 100644
--- a/source/libr2c2/catalogue.cpp
+++ b/source/libr2c2/catalogue.cpp
@@ -1,5 +1,3 @@
-#include <msp/core/maputils.h>
-#include <msp/core/refptr.h>
 #include <msp/datafile/directorysource.h>
 #include <msp/datafile/packsource.h>
 #include <msp/datafile/parser.h>
@@ -9,6 +7,7 @@
 #include "catalogue.h"
 #include "signaltype.h"
 #include "terraintype.h"
+#include "trackappearance.h"
 #include "tracktype.h"
 #include "vehicletype.h"
 
diff --git a/source/libr2c2/catalogue.h b/source/libr2c2/catalogue.h
index 5adbde0..46cdb5f 100644
--- a/source/libr2c2/catalogue.h
+++ b/source/libr2c2/catalogue.h
@@ -1,13 +1,10 @@
 #ifndef LIBR2C2_CATALOGUE_H_
 #define LIBR2C2_CATALOGUE_H_
 
-#include <map>
 #include <msp/datafile/collection.h>
 #include <msp/datafile/collectionsource.h>
 #include <msp/fs/path.h>
-#include "articlenumber.h"
 #include "layout.h"
-#include "trackappearance.h"
 
 namespace R2C2 {
 
diff --git a/source/libr2c2/signal.h b/source/libr2c2/signal.h
index d774e76..67aa77e 100644
--- a/source/libr2c2/signal.h
+++ b/source/libr2c2/signal.h
@@ -6,7 +6,6 @@
 #include "blockiter.h"
 #include "geometry.h"
 #include "signaltype.h"
-#include "track.h"
 #include "trackattachment.h"
 
 namespace R2C2 {
diff --git a/source/libr2c2/tracktype.h b/source/libr2c2/tracktype.h
index 267d5d0..c1963c4 100644
--- a/source/libr2c2/tracktype.h
+++ b/source/libr2c2/tracktype.h
@@ -2,7 +2,6 @@
 #define LIBR2C2_TRACKTYPE_H_
 
 #include <msp/datafile/objectloader.h>
-#include "articlenumber.h"
 #include "geometry.h"
 #include "objecttype.h"
 #include "trackpart.h"
diff --git a/source/libr2c2/train.cpp b/source/libr2c2/train.cpp
index 6ba8684..e9a539a 100644
--- a/source/libr2c2/train.cpp
+++ b/source/libr2c2/train.cpp
@@ -5,13 +5,11 @@
 #include <msp/strings/format.h>
 #include <msp/time/units.h>
 #include <msp/time/utils.h>
-#include "aicontrol.h"
 #include "beamgate.h"
 #include "block.h"
 #include "catalogue.h"
 #include "driver.h"
 #include "layout.h"
-#include "route.h"
 #include "simplecontroller.h"
 #include "speedquantizer.h"
 #include "timetable.h"
@@ -22,7 +20,6 @@
 #include "trainrouter.h"
 #include "vehicle.h"
 #include "vehicletype.h"
-#include "zone.h"
 
 using namespace std;
 using namespace Msp;
diff --git a/source/libr2c2/vehicle.cpp b/source/libr2c2/vehicle.cpp
index 6615fb2..62671fc 100644
--- a/source/libr2c2/vehicle.cpp
+++ b/source/libr2c2/vehicle.cpp
@@ -3,6 +3,7 @@
 #include "driver.h"
 #include "layout.h"
 #include "track.h"
+#include "trackappearance.h"
 #include "trackiter.h"
 #include "tracktype.h"
 #include "vehicle.h"
-- 
2.45.2