diff --git a/hypervisor/Makefile b/hypervisor/Makefile
index bc68c15e8..7593afb17 100644
--- a/hypervisor/Makefile
+++ b/hypervisor/Makefile
@@ -347,6 +347,8 @@ $(VERSION):
 	sed 's/^/ * /' ../LICENSE >> $(VERSION); \
 	echo " */" >> $(VERSION); \
 	echo "" >> $(VERSION); \
+	echo "#ifndef VERSION_H" >> $(VERSION); \
+	echo "#define VERSION_H" >> $(VERSION); \
 	echo "#define HV_MAJOR_VERSION $(MAJOR_VERSION)" >> $(VERSION);\
 	echo "#define HV_MINOR_VERSION $(MINOR_VERSION)" >> $(VERSION);\
 	echo "#define HV_EXTRA_VERSION "\"$(EXTRA_VERSION)\""" >> $(VERSION);\
@@ -357,7 +359,8 @@ $(VERSION):
 	echo "#define HV_BUILD_VERSION "\""$$PATCH"\""" >> $(VERSION);\
 	echo "#define HV_BUILD_TYPE "\""$$BUILD_TYPE"\""" >> $(VERSION);\
 	echo "#define HV_BUILD_TIME "\""$$TIME"\""" >> $(VERSION);\
-	echo "#define HV_BUILD_USER "\""$$USER"\""" >> $(VERSION)
+	echo "#define HV_BUILD_USER "\""$$USER"\""" >> $(VERSION);\
+	echo "#endif" >> $(VERSION)
 
 -include $(C_OBJS:.o=.d)
 -include $(S_OBJS:.o=.d)
diff --git a/hypervisor/include/arch/x86/host_pm.h b/hypervisor/include/arch/x86/host_pm.h
index d1ce893b1..057138719 100644
--- a/hypervisor/include/arch/x86/host_pm.h
+++ b/hypervisor/include/arch/x86/host_pm.h
@@ -4,6 +4,7 @@
  */
 
 #ifndef	HOST_PM_H
+#define	HOST_PM_H
 
 #define	BIT_SLP_TYPx	10U
 #define	BIT_SLP_EN	13U