diff --git a/src/vendorcode/amd/cimx/sb900/Dispatcher.c b/src/vendorcode/amd/cimx/sb900/Dispatcher.c
index 152ffc2157..583f929cf7 100644
--- a/src/vendorcode/amd/cimx/sb900/Dispatcher.c
+++ b/src/vendorcode/amd/cimx/sb900/Dispatcher.c
@@ -190,7 +190,7 @@ LocateImage (
 #ifdef x64
     12346789
 #else
-    Result = VerifyImage (Signature, (VOID*) (__int64)ImagePtr);
+    Result = VerifyImage (Signature, (VOID*) (intptr_t) ImagePtr);
 #endif
     if ( Result != NULL ) {
       return Result;
diff --git a/src/vendorcode/amd/cimx/sb900/GppHp.c b/src/vendorcode/amd/cimx/sb900/GppHp.c
index 4975b8ab4e..24f5ec874e 100644
--- a/src/vendorcode/amd/cimx/sb900/GppHp.c
+++ b/src/vendorcode/amd/cimx/sb900/GppHp.c
@@ -43,6 +43,7 @@
 */
 #include "SbPlatform.h"
 #include "cbtypes.h"
+#include "AmdSbLib.h"
 
 //
 // Declaration of external functions
@@ -61,7 +62,7 @@ UINT8 GppPortPollingLtssm (IN AMDSBCFG* pConfig, IN UINT8 ActivePorts, IN BOOLEA
  * @param[in] HpPort    The hot plug port number.
  *
  */
-VOID
+static VOID
 sbGppHotPlugSmiProcess (
   IN       AMDSBCFG*     pConfig,
   IN       UINT32        HpPort
@@ -97,7 +98,7 @@ sbGppHotPlugSmiProcess (
  * @param[in] HpPort    The hot plug port number.
  *
  */
-VOID
+static VOID
 sbGppHotUnplugSmiProcess (
   IN       AMDSBCFG*     pConfig,
   IN       UINT32        HpPort
diff --git a/src/vendorcode/amd/cimx/sb900/Makefile.inc b/src/vendorcode/amd/cimx/sb900/Makefile.inc
index e29bdc978d..75b499e062 100755
--- a/src/vendorcode/amd/cimx/sb900/Makefile.inc
+++ b/src/vendorcode/amd/cimx/sb900/Makefile.inc
@@ -76,7 +76,6 @@ ramstage-y += Usb.c
 #ramstage-y += Legacy.c
 #ramstage-y += SbModInf.c
 ramstage-y += Debug.c
-ramstage-y += GppHp.c
 ramstage-y += Hwm.c
 
 CIMX_CFLAGS =
diff --git a/src/vendorcode/amd/cimx/sb900/SbSubFun.h b/src/vendorcode/amd/cimx/sb900/SbSubFun.h
index 3349c1bc71..69563ef738 100644
--- a/src/vendorcode/amd/cimx/sb900/SbSubFun.h
+++ b/src/vendorcode/amd/cimx/sb900/SbSubFun.h
@@ -605,3 +605,4 @@ void TurnOffCG2 (OUT void);
  */
 void BackUpCG2 (OUT void);
 
+void XhciA12Fix (OUT void);
\ No newline at end of file