X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Ftrain.h;h=319119b93828fd745639a7a37b8c1ae3d6a69794;hb=59e4c75da550e96ae74162a5ed70e8b1999721d8;hp=e4458be82d7bfb47bf7a853b57e1ef6f8cb73298;hpb=2571c111ec85b0d6a56ae369c83b5763b1975f93;p=r2c2.git

diff --git a/source/libmarklin/train.h b/source/libmarklin/train.h
index e4458be..319119b 100644
--- a/source/libmarklin/train.h
+++ b/source/libmarklin/train.h
@@ -12,15 +12,14 @@ Distributed under the GPL
 #include <sigc++/trackable.h>
 #include <msp/time/timestamp.h>
 #include "block.h"
+#include "controller.h"
 
 namespace Marklin {
 
-class Controller;
 class Route;
 class Timetable;
 class Vehicle;
 class VehicleType;
-struct TrainControl;
 
 class Train: public sigc::trackable
 {
@@ -145,7 +144,7 @@ public:
 
 	void save(std::list<Msp::DataFile::Statement> &) const;
 private:
-	void control_changed(const TrainControl &);
+	void control_changed(const Controller::Control &);
 	void loco_speed_event(unsigned, unsigned, bool);
 	void loco_func_event(unsigned, unsigned, bool);
 	void sensor_event(unsigned, bool);