diff --git a/libsrc/include/incvis.hpp b/libsrc/include/incvis.hpp
index b43e0a3d..46dcc2dc 100644
--- a/libsrc/include/incvis.hpp
+++ b/libsrc/include/incvis.hpp
@@ -17,11 +17,15 @@
 
 #endif
 
+#  if defined(TOGL_AGL) || defined(TOGL_AGL_CLASSIC)
+#    include <OpenGL/gl.h>
+#    include <OpenGL/glu.h>
+#  else
+#    include <GL/gl.h>
+#    include <GL/glu.h>
+#  endif
 
 
-#include <GL/gl.h>
-#include <GL/glu.h>
-
 #ifndef WIN32
 // parallel
 #define GLX_GLXEXT_PROTOTYPES
diff --git a/libsrc/visualization/Makefile.am b/libsrc/visualization/Makefile.am
index b75c9ec3..b13074a8 100644
--- a/libsrc/visualization/Makefile.am
+++ b/libsrc/visualization/Makefile.am
@@ -3,7 +3,7 @@ visual.hpp vssolution.hpp
 
 include_HEADERS = soldata.hpp
 
-AM_CPPFLAGS =  $(MPI_INCLUDES) -I$(top_srcdir)/libsrc/include  -DOPENGL  $(OCCFLAGS)    $(TCL_INCLUDES)
+AM_CPPFLAGS =  $(MPI_INCLUDES) -I$(top_srcdir)/libsrc/include  -DOPENGL $(TOGL_WINDOWINGSYSTEM) $(OCCFLAGS)    $(TCL_INCLUDES)
 METASOURCES = AUTO
 noinst_LIBRARIES = libvisual.a
 libvisual_a_SOURCES = meshdoc.cpp mvdraw.cpp stlmeshing.cpp vscsg.cpp \
diff --git a/ng/Makefile.am b/ng/Makefile.am
index f64cd01d..a220f32a 100644
--- a/ng/Makefile.am
+++ b/ng/Makefile.am
@@ -1,6 +1,6 @@
 include_HEADERS = 
 
-AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include -I$(top_srcdir)/libsrc/interface -DOPENGL $(OCCFLAGS)  $(TCL_INCLUDES) $(MPI_INCLUDES) 
+AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include -I$(top_srcdir)/libsrc/interface -DOPENGL  $(TOGL_WINDOWINGSYSTEM) $(OCCFLAGS)  $(TCL_INCLUDES) $(MPI_INCLUDES) 
 
 bin_PROGRAMS = netgen
 netgen_SOURCES = demoview.cpp ngappinit.cpp ngpkg.cpp onetcl.cpp nginterface.cpp parallelfunc.cpp parallelinterface.cpp demoview.hpp parallelfunc.hpp togl_1_7.h