-#include <msp/gbase/glcontext.h>
-#include <msp/gl/font.h>
-#include <msp/gltk/resources.h>
-#include <msp/gltk/root.h>
-#include "libmarklin/catalogue.h"
-#include "libmarklin/control.h"
-#include "libmarklin/locotype.h"
-#include "libmarklin/trafficmanager.h"
-#include "libmarklin/train.h"
+#include <msp/graphics/simplewindow.h>
+#include <msp/gl/camera.h>
+#include <msp/gl/light.h>
+#include <msp/gl/lighting.h>
+#include <msp/gl/pipeline.h>
+#include <msp/input/keyboard.h>
+#include <msp/input/mouse.h>
+#include "libr2c2/catalogue.h"
+#include "libr2c2/train.h"