6 files changed, 4 insertions, 7 deletions
diff --git a/xen/common/Makefile b/xen/common/Makefile
index 372b259a11..9f2e0d612e 100644
--- a/xen/common/Makefile
+++ b/xen/common/Makefile
@@ -61,5 +61,3 @@ subdir-$(ia64) += hvm
 
 subdir-y += libelf
 subdir-$(HAS_DEVICE_TREE) += libfdt
-
-CFLAGS += -Ilibfdt
diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c
index d50cb9cc6b..140d34297a 100644
--- a/xen/common/device_tree.c
+++ b/xen/common/device_tree.c
@@ -14,13 +14,12 @@
 #include <xen/device_tree.h>
 #include <xen/kernel.h>
 #include <xen/lib.h>
+#include <xen/libfdt/libfdt.h>
 #include <xen/mm.h>
 #include <xen/stdarg.h>
 #include <xen/string.h>
 #include <asm/early_printk.h>
 
-#include <libfdt.h>
-
 struct dt_early_info __initdata early_info;
 void *device_tree_flattened;
 
diff --git a/xen/common/libfdt/Makefile b/xen/common/libfdt/Makefile
index 0e65bc06b8..7578fe9c50 100644
--- a/xen/common/libfdt/Makefile
+++ b/xen/common/libfdt/Makefile
@@ -2,4 +2,4 @@ include Makefile.libfdt
 
 obj-y += $(LIBFDT_OBJS)
 
-CFLAGS += -I.
+CFLAGS += -I$(BASEDIR)/include/xen/libfdt/
diff --git a/xen/common/libfdt/fdt.h b/xen/include/xen/libfdt/fdt.h
index 48ccfd9100..48ccfd9100 100644
--- a/xen/common/libfdt/fdt.h
+++ b/xen/include/xen/libfdt/fdt.h
diff --git a/xen/common/libfdt/libfdt.h b/xen/include/xen/libfdt/libfdt.h
index 55f3eb3042..608604738c 100644
--- a/xen/common/libfdt/libfdt.h
+++ b/xen/include/xen/libfdt/libfdt.h
@@ -51,8 +51,8 @@
  *     EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <libfdt_env.h>
-#include <fdt.h>
+#include <xen/libfdt/libfdt_env.h>
+#include <xen/libfdt/fdt.h>
 
 #define FDT_FIRST_SUPPORTED_VERSION	0x10
 #define FDT_LAST_SUPPORTED_VERSION	0x11
diff --git a/xen/common/libfdt/libfdt_env.h b/xen/include/xen/libfdt/libfdt_env.h
index 8c0c03034b..8c0c03034b 100644
--- a/xen/common/libfdt/libfdt_env.h
+++ b/xen/include/xen/libfdt/libfdt_env.h