--- src/Velvet/opengl.c.orig	Wed Mar 22 11:41:45 2000
+++ src/Velvet/opengl.c	Sun Jul 22 23:36:45 2007
@@ -35,7 +35,6 @@
 #include <X11/Shell.h>
 #include <X11/Xaw/Command.h>
 #include <X11/Xaw/Toggle.h>
-#include <GL/xmesa.h>
 #include <GL/gl.h>
 #include <GL/glu.h>
 #include <GL/GLwDrawA.h> 
@@ -789,7 +788,11 @@
                                    shell, args, n);
 
 
+#ifdef __GLX_MOTIF
+   mesa = XtVaCreateManagedWidget ("mesa", glwMDrawingAreaWidgetClass, layout,
+#else
    mesa = XtVaCreateManagedWidget ("mesa", glwDrawingAreaWidgetClass, layout,
+#endif
     				     GLwNvisualInfo, vi, 
 			  	     GLwNinstallColormap, True, 
 				     XtNheight, 500,