Index: branches/cleanup/src/lib/event/key_mapper.cc
===================================================================
--- branches/cleanup/src/lib/event/key_mapper.cc	(revision 10569)
+++ branches/cleanup/src/lib/event/key_mapper.cc	(revision 10571)
@@ -23,5 +23,5 @@
 #include "event_def.h"
 
-#include "globals.h"
+#include "orxonox_globals.h"
 #include "parser/ini_parser/ini_parser.h"
 #include "parser/preferences/preferences.h"
Index: branches/cleanup/src/lib/graphics/Makefile.am
===================================================================
--- branches/cleanup/src/lib/graphics/Makefile.am	(revision 10569)
+++ branches/cleanup/src/lib/graphics/Makefile.am	(revision 10571)
@@ -25,4 +25,5 @@
 
 noinst_HEADERS =\
+		glincl.h \
  		graphics_engine.h \
  		graphics_effect.h \
@@ -46,4 +47,5 @@
 
 
+
 SUBDIRS = 	importer \
           	spatial_separation
Index: branches/cleanup/src/lib/graphics/glincl.h
===================================================================
--- branches/cleanup/src/lib/graphics/glincl.h	(revision 10571)
+++ branches/cleanup/src/lib/graphics/glincl.h	(revision 10571)
@@ -0,0 +1,21 @@
+/*!
+  \file glincl.h
+  \brief This file includes gl Headers.
+
+  no Class is defined here, but the opengl Headers
+*/
+
+#ifndef _GLINCL_H
+#define _GLINCL_H
+
+#ifndef __APPLE__
+#include <GL/glew.h>
+#include <GL/gl.h>
+#include <GL/glu.h>
+#else
+#include <GL/glew.h>
+#include <OpenGL/gl.h>
+#include <OpenGL/glu.h>
+#endif
+
+#endif /* _GLINCL_H */
Index: branches/cleanup/src/lib/graphics/graphics_engine.cc
===================================================================
--- branches/cleanup/src/lib/graphics/graphics_engine.cc	(revision 10569)
+++ branches/cleanup/src/lib/graphics/graphics_engine.cc	(revision 10571)
@@ -31,5 +31,5 @@
 #include "text.h"
 
-#include "globals.h"
+#include "orxonox_globals.h"
 #include "texture.h"
 
Index: branches/cleanup/src/lib/gui/qt/gui_audio.cc
===================================================================
--- branches/cleanup/src/lib/gui/qt/gui_audio.cc	(revision 10569)
+++ branches/cleanup/src/lib/gui/qt/gui_audio.cc	(revision 10571)
@@ -30,5 +30,5 @@
 #include <QtGui/QLCDNumber>
 #include "debug.h"
-#include "globals.h"
+#include "orxonox_globals.h"
 
 #include "qt_gui_elements.h"
Index: branches/cleanup/src/lib/gui/qt/gui_control.cc
===================================================================
--- branches/cleanup/src/lib/gui/qt/gui_control.cc	(revision 10569)
+++ branches/cleanup/src/lib/gui/qt/gui_control.cc	(revision 10571)
@@ -35,5 +35,5 @@
 #include "lib/event/key_names.h"
 
-#include "globals.h"
+#include "orxonox_globals.h"
 #include "debug.h"
 #include "qt_gui_elements.h"
Index: branches/cleanup/src/lib/gui/qt/gui_general.cc
===================================================================
--- branches/cleanup/src/lib/gui/qt/gui_general.cc	(revision 10569)
+++ branches/cleanup/src/lib/gui/qt/gui_general.cc	(revision 10571)
@@ -31,5 +31,5 @@
 
 #include "debug.h"
-#include "globals.h"
+#include "orxonox_globals.h"
 
 #include "qt_gui_elements.h"
Index: branches/cleanup/src/lib/gui/qt/gui_video.cc
===================================================================
--- branches/cleanup/src/lib/gui/qt/gui_video.cc	(revision 10569)
+++ branches/cleanup/src/lib/gui/qt/gui_video.cc	(revision 10571)
@@ -28,5 +28,5 @@
 
 #include <QtGui/QLayout>
-#include "globals.h"
+#include "orxonox_globals.h"
 #include "debug.h"
 
Index: branches/cleanup/src/lib/physics/physics_interface.cc
===================================================================
--- branches/cleanup/src/lib/physics/physics_interface.cc	(revision 10569)
+++ branches/cleanup/src/lib/physics/physics_interface.cc	(revision 10571)
@@ -27,5 +27,4 @@
 
 #include "string.h"
-#include "stdincl.h"
 
 
Index: branches/cleanup/src/lib/sound/alincl.h
===================================================================
--- branches/cleanup/src/lib/sound/alincl.h	(revision 10571)
+++ branches/cleanup/src/lib/sound/alincl.h	(revision 10571)
@@ -0,0 +1,17 @@
+/*!
+ * This file includes openAL-Headers.
+ * @file alincl.h
+*/
+
+#ifndef _ALINCL_H
+#define _ALINCL_H
+
+#ifdef __APPLE__
+#include <OpenAL/al.h>
+#include <OpenAL/alc.h>
+#else
+#include <AL/al.h>
+#include <AL/alc.h>
+#endif
+
+#endif /* _ALINCL_H */
Index: branches/cleanup/src/lib/sound/sound_engine.cc
===================================================================
--- branches/cleanup/src/lib/sound/sound_engine.cc	(revision 10569)
+++ branches/cleanup/src/lib/sound/sound_engine.cc	(revision 10571)
@@ -24,5 +24,5 @@
 #include "debug.h"
 #include "parser/preferences/preferences.h"
-#include "globals.h"
+#include "orxonox_globals.h"
 #include "resource_sound_buffer.h"
 
Index: branches/cleanup/src/lib/util/loading/game_loader.cc
===================================================================
--- branches/cleanup/src/lib/util/loading/game_loader.cc	(revision 10569)
+++ branches/cleanup/src/lib/util/loading/game_loader.cc	(revision 10571)
@@ -23,4 +23,5 @@
 #include "debug.h"
 #include "campaign.h"
+#include "compiler.h"
 
 #include "key_mapper.h"
Index: branches/cleanup/src/lib/util/loading/game_loader.h
===================================================================
--- branches/cleanup/src/lib/util/loading/game_loader.h	(revision 10569)
+++ branches/cleanup/src/lib/util/loading/game_loader.h	(revision 10571)
@@ -9,5 +9,4 @@
 //#include "stdincl.h"
 #include "story_def.h"
-#include "comincl.h"
 #include "event_listener.h"
 
