diff --git a/src/roken/Makefile.in b/src/roken/Makefile.in
index c16206fa6f..0d1f86bdd1 100644
--- a/src/roken/Makefile.in
+++ b/src/roken/Makefile.in
@@ -77,8 +77,8 @@ $(TOP_INCDIR)/roken-common.h: $(UPSTREAM)/roken-common.h
 err.h: ${UPSTREAM}/err.hin
 	$(INSTALL_DATA) $? $@
 
-roken.h: $(UPSTREAM)/roken.h.in roken-post.h
-	cat $(UPSTREAM)/roken.h.in $(srcdir)/roken-post.h >$@
+roken.h: $(UPSTREAM)/roken.h.in roken-pre.h roken-post.h
+	cat $(srcdir)/roken-pre.h $(UPSTREAM)/roken.h.in $(srcdir)/roken-post.h >$@
 
 # Here we have explicit rules for all the libtool objects we might need to
 # build.  The implicit rules don't work since the sources are in a different
diff --git a/src/roken/roken-post.h b/src/roken/roken-post.h
index 076eed3272..deff050a8a 100644
--- a/src/roken/roken-post.h
+++ b/src/roken/roken-post.h
@@ -6,3 +6,4 @@
 #ifdef __attribute__
 #undef __attribute__
 #endif
+#endif /* OPENAFS_ROKEN_H */
diff --git a/src/roken/roken-pre.h b/src/roken/roken-pre.h
new file mode 100644
index 0000000000..8809c9ea2a
--- /dev/null
+++ b/src/roken/roken-pre.h
@@ -0,0 +1,2 @@
+#ifndef OPENAFS_ROKEN_H
+#define OPENAFS_ROKEN_H