diff --git a/common/cmd_fdt.c b/common/cmd_fdt.c
index 5c3a0bb750..97b9dd76ca 100644
--- a/common/cmd_fdt.c
+++ b/common/cmd_fdt.c
@@ -45,6 +45,11 @@ static int fdt_valid(void);
 static int fdt_parse_prop(char **newval, int count, char *data, int *len);
 static int fdt_print(const char *pathp, char *prop, int depth);
 
+/*
+ * The working_fdt points to our working flattened device tree.
+ */
+struct fdt_header *working_fdt;
+
 /*
  * Flattened Device Tree command, see the help for parameter definitions.
  */
diff --git a/common/fdt_support.c b/common/fdt_support.c
index e8aa3e9818..e58b294ee5 100644
--- a/common/fdt_support.c
+++ b/common/fdt_support.c
@@ -35,11 +35,6 @@
  */
 DECLARE_GLOBAL_DATA_PTR;
 
-/*
- * fdt points to our working device tree.
- */
-struct fdt_header *working_fdt;
-
 
 /**
  * fdt_find_and_setprop: Find a node and set it's property