--- Imakefile.orig	2003-03-08 15:55:18.000000000 +0100
+++ Imakefile	2004-11-30 13:55:17.309633685 +0100
@@ -11,18 +11,18 @@
 XCOMM For scrollbars with arrows, define ARROW_SCROLLBARS:
 #undef ARROW_SCROLLBARS
 
-#define DoNormalLib NormalLibXaw
-#define DoSharedLib SharedLibXaw
-#define DoDebugLib DebugLibXaw 
-#define DoProfileLib ProfileLibXaw 
+#define DoNormalLib NormalLibXaw7
+#define DoSharedLib SharedLibXaw7
+#define DoDebugLib DebugLibXaw7 
+#define DoProfileLib ProfileLibXaw7 
 #define HasSharedData YES
 #define LibName Xaw3d
-#define SoRev SOXAWREV
+#define SoRev SOXAW7REV
 #define IncSubdir X11
 #define IncSubSubdir Xaw3d
 
 XCOMM When building outside an X11 source tree:
-XCOMM EXTRA_INCLUDES = -I.
+EXTRA_INCLUDES = -I.
 
 #ifdef SharedXawReqs
 REQUIREDLIBS = SharedXawReqs