Index: ddd/ScrolleGEP.h
===================================================================
--- ddd/ScrolleGEP.h	(revision 8065)
+++ ddd/ScrolleGEP.h	(working copy)
@@ -33,9 +33,11 @@
 // Superclasses
 #define new new_w
 #define class class_w
+extern "C" {
 #include <Xm/XmP.h>
 #include <X11/CoreP.h>
 #include <Xm/ScrolledWP.h>
+}
 #undef new
 #undef class
 
Index: ddd/converters.C
===================================================================
--- ddd/converters.C	(revision 8065)
+++ ddd/converters.C	(working copy)
@@ -94,12 +94,12 @@
 // Decl of XmIsSlowSubclass in Motif 1.1 is not C++-aware, hence extern "C"
 extern "C" {
 #include <Xm/XmP.h>
-}
 
 // <Xm/PrimitiveP.h> only exists in Motif 1.2 and later
 #if XmVersion >= 1002
 #include <Xm/PrimitiveP.h>
 #endif
+}
 
 #undef new
 #undef class
