diff --git a/src/vendorcode/intel/fsp/fsp2_0/IntelFspPkg/Include/FspInfoHeader.h b/src/vendorcode/intel/fsp/fsp2_0/IntelFspPkg/Include/FspInfoHeader.h
new file mode 100644
index 0000000000..496b8d4572
--- /dev/null
+++ b/src/vendorcode/intel/fsp/fsp2_0/IntelFspPkg/Include/FspInfoHeader.h
@@ -0,0 +1,18 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#ifndef _FSP_INFO_HEADER_H_
+#define _FSP_INFO_HEADER_H_
+
+#if CONFIG_UDK_VERSION == CONFIG_UDK_2017_VERSION
+#include <vendorcode/intel/edk2/UDK2017/IntelFsp2Pkg/Include/Guid/FspHeaderFile.h>
+#elif CONFIG_UDK_VERSION == CONFIG_UDK_202005_VERSION
+#include <vendorcode/intel/edk2/edk2-stable202005/IntelFsp2Pkg/Include/Guid/FspHeaderFile.h>
+#elif CONFIG_UDK_VERSION == CONFIG_UDK_202111_VERSION
+#include <vendorcode/intel/edk2/edk2-stable202111/IntelFsp2Pkg/Include/Guid/FspHeaderFile.h>
+#elif CONFIG_UDK_VERSION == CONFIG_UDK_202302_VERSION
+#include <vendorcode/intel/edk2/edk2-stable202302/IntelFsp2Pkg/Include/Guid/FspHeaderFile.h>
+#else
+#error "Unknown UDK_VESION!"
+#endif
+
+#endif /* _FSP_INFO_HEADER_H_ */
diff --git a/src/vendorcode/intel/fsp/fsp_header.h b/src/vendorcode/intel/fsp/fsp_header.h
new file mode 100644
index 0000000000..148e8d5405
--- /dev/null
+++ b/src/vendorcode/intel/fsp/fsp_header.h
@@ -0,0 +1,22 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#ifndef _FSP_HEADER_H_
+#define _FSP_HEADER_H_
+
+/*
+ * Intel's code does not have a handle on changing global packing state.
+ * Therefore, one needs to protect against packing policies that are set
+ * globally for a compilation unit just by including a header file.
+ */
+#pragma pack(push)
+/* Default bind edk2 UEFI 2.4 types. */
+#include <vendorcode/intel/edk2/uefi_2.4/uefi_types.h>
+
+#if CONFIG_UDK_VERSION >= CONFIG_UDK_2017_VERSION
+#include <vendorcode/intel/fsp/fsp2_0/IntelFspPkg/Include/FspInfoHeader.h>
+#else
+#include <vendorcode/intel/fsp/fsp1_1/IntelFspPkg/Include/FspInfoHeader.h>
+#endif
+#pragma pack(pop)
+
+#endif /* _FSP_HEADER_H_ */