#ifndef __SG_EXTENSIONS_HXX
#define __SG_EXTENSIONS_HXX 1
-#if defined(__CYGWIN__) && !defined(WIN32) /* && !defined(USING_X) */
-#define WIN32
-#endif
-
-#if defined(WIN32) /* MINGW and MSC predefine WIN32 */
+#ifdef WIN32
# include <windows.h>
#endif
#include <simgear/compiler.h>
-#if !defined(WIN32)
-# include SG_GLX_H
-#endif
-#include SG_GL_H
+#include <osg/GL>
+#if !defined(__APPLE__) && !defined(WIN32)
+# include <GL/glx.h>
+#endif
#if defined(__cplusplus)
extern "C" {