diff --git a/src/soc/amd/common/agesawrapper.h b/src/soc/amd/common/agesawrapper.h
index fff9ea2842..6ddc658981 100644
--- a/src/soc/amd/common/agesawrapper.h
+++ b/src/soc/amd/common/agesawrapper.h
@@ -17,8 +17,7 @@
 #define __AGESAWRAPPER_H__
 
 #include <stdint.h>
-#include <Porting.h>
-#include <AGESA.h>
+#include <agesa_headers.h>
 
 enum {
 	PICK_DMI,       /* DMI Interface */
diff --git a/src/vendorcode/amd/pi/00670F00/agesa_headers.h b/src/vendorcode/amd/pi/00670F00/agesa_headers.h
new file mode 100644
index 0000000000..d93b73f163
--- /dev/null
+++ b/src/vendorcode/amd/pi/00670F00/agesa_headers.h
@@ -0,0 +1,33 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2017 Google, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef __AGESA_HEADERS_H__
+#define __AGESA_HEADERS_H__
+
+#pragma pack(push)
+#include <Porting.h>
+#include "AGESA.h"
+#include "AMD.h"
+
+#include "Proc/Fch/Common/FchCommonCfg.h"
+#include "Proc/Fch/Fch.h"
+#include "Include/Ids.h"
+#include "Include/PlatformMemoryConfiguration.h"
+#include "Proc/Fch/FchPlatform.h"
+#include "Proc/CPU/heapManager.h"
+#include "Proc/Psp/PspBaseLib/PspBaseLib.h"
+#pragma pack(pop)
+
+#endif