diff --git a/arch/sparc/kernel/prom.h b/arch/sparc/kernel/prom.h
new file mode 100644
index 0000000000000000000000000000000000000000..dce53de274e8e4334c08274cf0a3511b8218ff4f
--- /dev/null
+++ b/arch/sparc/kernel/prom.h
@@ -0,0 +1,10 @@
+#ifndef __PROM_H
+#define __PROM_H
+
+#include <linux/spinlock.h>
+#include <asm/prom.h>
+
+extern struct device_node *allnodes;	/* temporary while merging */
+extern rwlock_t devtree_lock;	/* temporary while merging */
+
+#endif /* __PROM_H */
diff --git a/arch/sparc/kernel/prom_32.c b/arch/sparc/kernel/prom_32.c
index eee5efcfe50eea300a42d43e887bf4a7b5a54c6a..715455ba368981d731158676d465fe805fdab937 100644
--- a/arch/sparc/kernel/prom_32.c
+++ b/arch/sparc/kernel/prom_32.c
@@ -25,9 +25,7 @@
 #include <asm/prom.h>
 #include <asm/oplib.h>
 
-extern struct device_node *allnodes;	/* temporary while merging */
-
-extern rwlock_t devtree_lock;	/* temporary while merging */
+#include "prom.h"
 
 struct device_node *of_find_node_by_phandle(phandle handle)
 {
diff --git a/arch/sparc/kernel/prom_64.c b/arch/sparc/kernel/prom_64.c
index dbba82f9b142c3e950911bdcb4a0359707b1b5bd..651448d3cc5abdf4a77a17eab6a9599824dbfc03 100644
--- a/arch/sparc/kernel/prom_64.c
+++ b/arch/sparc/kernel/prom_64.c
@@ -30,9 +30,7 @@
 #include <asm/upa.h>
 #include <asm/smp.h>
 
-extern struct device_node *allnodes;	/* temporary while merging */
-
-extern rwlock_t devtree_lock;	/* temporary while merging */
+#include "prom.h"
 
 struct device_node *of_find_node_by_phandle(phandle handle)
 {