3 files changed, 2 insertions, 17 deletions
diff --git a/src/cpu/amd/agesa/heapmanager.c b/src/cpu/amd/agesa/heapmanager.c
index 087959dc61..9acd0bd6fc 100644
--- a/src/cpu/amd/agesa/heapmanager.c
+++ b/src/cpu/amd/agesa/heapmanager.c
@@ -17,7 +17,7 @@
 #include "heapManager.h"
 
 #include <cbmem.h>
-#include <cpu/amd/agesa/s3_resume.h>
+#include <northbridge/amd/agesa/agesa_helper.h>
 #include <northbridge/amd/agesa/BiosCallOuts.h>
 
 #include <arch/acpi.h>
diff --git a/src/cpu/amd/agesa/s3_resume.c b/src/cpu/amd/agesa/s3_resume.c
index 1e4aadbed7..f45ff3c3e1 100644
--- a/src/cpu/amd/agesa/s3_resume.c
+++ b/src/cpu/amd/agesa/s3_resume.c
@@ -25,6 +25,7 @@
 #include <string.h>
 #include <halt.h>
 #include "s3_resume.h"
+#include <northbridge/amd/agesa/agesa_helper.h>
 
 static void move_stack_high_mem(void)
 {
diff --git a/src/cpu/amd/agesa/s3_resume.h b/src/cpu/amd/agesa/s3_resume.h
index ff2396678b..b10489eeef 100644
--- a/src/cpu/amd/agesa/s3_resume.h
+++ b/src/cpu/amd/agesa/s3_resume.h
@@ -22,20 +22,4 @@ void prepare_for_resume(void);
 void backup_mtrr(void *mtrr_store, u32 *mtrr_store_size);
 const void *OemS3Saved_MTRR_Storage(void);
 
-void *GetHeapBase(void);
-void EmptyHeap(void);
-void ResumeHeap(void **heap, size_t *len);
-
-#define BSP_STACK_BASE_ADDR		0x30000
-
-#if 1
-/* This covers node 0 only. */
-#define HIGH_ROMSTAGE_STACK_SIZE	(0x48000 - BSP_STACK_BASE_ADDR)
-#else
-/* This covers total of 8 nodes. */
-#define HIGH_ROMSTAGE_STACK_SIZE	(0xA0000 - BSP_STACK_BASE_ADDR)
-#endif
-
-#define HIGH_MEMORY_SCRATCH		0x30000
-
 #endif