-#include "button.h"
-#include "mousecursor.h"
-#include "app/globals.h"
-#include "video/font.h"
-#include "video/surface.h"
-
-using namespace SuperTux;
+#include "main.hpp"
+#include "button.hpp"
+#include "mousecursor.hpp"
+#include "video/font.hpp"
+#include "video/surface.hpp"