#include <stdlib.h>
#include <simgear/compiler.h>
-#include <simgear/misc/exception.hxx>
+#include <simgear/structure/exception.hxx>
#include <simgear/debug/logstream.hxx>
#include STL_IOSTREAM
# include <float.h>
#endif
-#include GLUT_H
+#include FG_GLUT_H
#ifdef macintosh
# include <console.h> // -dw- for command line dialog
#endif
// Keyboard focus hack
-#ifdef __APPLE__
+#if defined(__APPLE__) && !defined(OSX_BUNDLE)
{
PSN psn;