diff --git a/common/fdt_support.c b/common/fdt_support.c
index bcdc4154be9a4e7e7294b983f9c72500e6d2326b..15f133cec33f921c265eef79c914cf3e2e4033eb 100644
--- a/common/fdt_support.c
+++ b/common/fdt_support.c
@@ -37,6 +37,11 @@
  */
 DECLARE_GLOBAL_DATA_PTR;
 
+/*
+ * fdt points to our working device tree.
+ */
+struct fdt_header *fdt;
+
 
 /********************************************************************/
 
diff --git a/include/libfdt_env.h b/include/libfdt_env.h
index e746314b1e7522f0dcc9f8b5a46c9d9ba9e292ba..78f725830da8b1a22b9682355df9ec320617f1b0 100644
--- a/include/libfdt_env.h
+++ b/include/libfdt_env.h
@@ -26,7 +26,7 @@
 #include <asm/byteorder.h>
 #include <linux/string.h>
 
-struct fdt_header *fdt;         /* Pointer to the working fdt */
+extern struct fdt_header *fdt;  /* Pointer to the working fdt */
 
 #define fdt32_to_cpu(x)		__be32_to_cpu(x)
 #define cpu_to_fdt32(x)		__cpu_to_be32(x)