diff --git a/tools/env/Makefile b/tools/env/Makefile
index 4633e0e72ba..b627796e949 100644
--- a/tools/env/Makefile
+++ b/tools/env/Makefile
@@ -9,7 +9,8 @@
 override HOSTCC = $(CC)
 
 # Compile for a hosted environment on the target
-HOST_EXTRACFLAGS  = $(patsubst -I%,-idirafter%, $(filter -I%, $(UBOOTINCLUDE))) \
+HOST_EXTRACFLAGS  = -I$(srctree)/tools \
+		$(patsubst -I%,-idirafter%, $(filter -I%, $(UBOOTINCLUDE))) \
 		-idirafter $(srctree)/tools/env \
 		-DUSE_HOSTCC \
 		-DTEXT_BASE=$(TEXT_BASE)
diff --git a/tools/version.h b/tools/version.h
new file mode 120000
index 00000000000..bb576071e84
--- /dev/null
+++ b/tools/version.h
@@ -0,0 +1 @@
+../include/version.h
\ No newline at end of file