--- Imakefile.orig	Wed May 29 10:38:40 1996
+++ Imakefile	Thu Aug 20 01:39:40 1998
@@ -7,7 +7,7 @@
 #define HasSharedData YES
 #define LibName Xaw3d
 #define SoRev SOXAWREV
-#define IncSubdir Xaw3d
+#define IncSubdir X11/Xaw3d
 
 #ifdef LinuxArchitecture
 JUMP_ROOT_Xaw3d = $(AWIDGETSRC)3d
@@ -38,9 +38,9 @@
 
        LINTLIBS = $(LINTXLIB) $(LINTXTOOL)
 
-#  EXTRA_DEFINES = -DARROW_SCROLLBAR -DUSEGRAY
+  EXTRA_DEFINES = -DARROW_SCROLLBAR -DUSEGRAY
 
-#  EXTRA_INCLUDES = -I.
+  EXTRA_INCLUDES = -I.
 
 HEADERS = \
 	AllWidgets.h \
@@ -221,6 +221,12 @@
 #endif
 #ifdef YaccCmd
 YACC=YaccCmd
+#endif
+
+/* gcc 2.8.1 bug workaround */
+#ifdef AlphaArchitecture
+    CXXDEBUGFLAGS = -O0
+      CDEBUGFLAGS = -O0
 #endif
 
 all::
