diff --git a/src/soc/amd/common/BiosCallOuts.h b/src/soc/amd/common/BiosCallOuts.h
index a2c719f2f5..5237d52b6a 100644
--- a/src/soc/amd/common/BiosCallOuts.h
+++ b/src/soc/amd/common/BiosCallOuts.h
@@ -17,9 +17,7 @@
 #ifndef __CALLOUTS_AMD_AGESA_H__
 #define __CALLOUTS_AMD_AGESA_H__
 
-#include <Porting.h>
-#include <AGESA.h>
-#include <FchPlatform.h>
+#include "agesawrapper.h"
 
 #define BIOS_HEAP_START_ADDRESS		0x010000000
 #define BIOS_HEAP_SIZE			0x30000
diff --git a/src/soc/amd/common/agesawrapper.c b/src/soc/amd/common/agesawrapper.c
index 17f2e76464..80887ab091 100644
--- a/src/soc/amd/common/agesawrapper.c
+++ b/src/soc/amd/common/agesawrapper.c
@@ -13,14 +13,11 @@
  * GNU General Public License for more details.
  */
 
-#include <AGESA.h>
+#include "agesawrapper.h"
 #include <cbfs.h>
 #include <cbmem.h>
 #include <delay.h>
 #include <cpu/x86/mtrr.h>
-#include <FchPlatform.h>
-#include <heapManager.h>
-#include <agesawrapper.h>
 #include <BiosCallOuts.h>
 #include <string.h>
 
diff --git a/src/soc/amd/common/agesawrapper_call.h b/src/soc/amd/common/agesawrapper_call.h
index 21a1e23d54..01e2620961 100644
--- a/src/soc/amd/common/agesawrapper_call.h
+++ b/src/soc/amd/common/agesawrapper_call.h
@@ -14,9 +14,9 @@
 #ifndef __AGESAWRAPPER_CALL_H__
 #define __AGESAWRAPPER_CALL_H__
 
+#include "agesawrapper.h"
 #include <stdint.h>
 #include <console/console.h>
-#include <AGESA.h>
 
 /*
  * Possible AGESA_STATUS values:
diff --git a/src/soc/amd/common/block/include/amdblocks/psp.h b/src/soc/amd/common/block/include/amdblocks/psp.h
index 74ea73f7f7..57ba64945b 100644
--- a/src/soc/amd/common/block/include/amdblocks/psp.h
+++ b/src/soc/amd/common/block/include/amdblocks/psp.h
@@ -16,11 +16,10 @@
 #ifndef __AMD_PSP_H__
 #define __AMD_PSP_H__
 
+#include <agesawrapper.h>
 #include <soc/pci_devs.h>
 #include <stdint.h>
 #include <compiler.h>
-#include <Porting.h>
-#include <Proc/Psp/PspBaseLib/PspBaseLib.h>
 
 /* x86 to PSP commands */
 #define MBOX_BIOS_CMD_DRAM_INFO    0x01
diff --git a/src/soc/amd/common/def_callouts.c b/src/soc/amd/common/def_callouts.c
index 9cea9658fa..e8d404e465 100644
--- a/src/soc/amd/common/def_callouts.c
+++ b/src/soc/amd/common/def_callouts.c
@@ -15,12 +15,9 @@
  */
 
 #include <cbfs.h>
-
-#include <AGESA.h>
 #include <amdlib.h>
-#include <Ids.h>
-#include <agesawrapper.h>
 #include <BiosCallOuts.h>
+#include "agesawrapper.h"
 #include <soc/southbridge.h>
 
 #if ENV_BOOTBLOCK
diff --git a/src/soc/amd/common/heapmanager.c b/src/soc/amd/common/heapmanager.c
index 5e4fbb4166..b99151487d 100644
--- a/src/soc/amd/common/heapmanager.c
+++ b/src/soc/amd/common/heapmanager.c
@@ -12,12 +12,11 @@
  */
 
 
-#include <AGESA.h>
+#include "agesawrapper.h"
 #include <amdlib.h>
 #include <arch/acpi.h>
 #include <BiosCallOuts.h>
 #include <cbmem.h>
-#include <heapManager.h>
 #include <string.h>
 
 static void *GetHeapBase(void)