diff --git a/ArmPkg/Library/BdsLib/BdsLinuxFdt.c b/ArmPkg/Library/BdsLib/BdsLinuxFdt.c
index 58db0bdd66..ae302aff8a 100644
--- a/ArmPkg/Library/BdsLib/BdsLinuxFdt.c
+++ b/ArmPkg/Library/BdsLib/BdsLinuxFdt.c
@@ -25,7 +25,7 @@
 #define PALIGN(p, a)    ((void *)(ALIGN((unsigned long)(p), (a))))
 #define GET_CELL(p)     (p += 4, *((const UINT32 *)(p-4)))
 
-STATIC inline
+STATIC
 UINTN
 cpu_to_fdtn (UINTN x) {
   if (sizeof (UINTN) == sizeof (UINT32)) {
diff --git a/ArmPlatformPkg/Drivers/SP805WatchdogDxe/SP805Watchdog.c b/ArmPlatformPkg/Drivers/SP805WatchdogDxe/SP805Watchdog.c
index d1da60b5ac..799ead9686 100644
--- a/ArmPlatformPkg/Drivers/SP805WatchdogDxe/SP805Watchdog.c
+++ b/ArmPlatformPkg/Drivers/SP805WatchdogDxe/SP805Watchdog.c
@@ -1,6 +1,6 @@
 /** @file
 *
-*  Copyright (c) 2011-2012, ARM Limited. All rights reserved.
+*  Copyright (c) 2011-2013, ARM Limited. All rights reserved.
 *
 *  This program and the accompanying materials
 *  are licensed and made available under the terms and conditions of the BSD License
@@ -36,7 +36,7 @@ EFI_EVENT                           EfiExitBootServicesEvent = (EFI_EVENT)NULL;
   i.e. it inhibits all writes to avoid rogue software accidentally
   corrupting their contents.
 **/
-inline
+STATIC
 VOID
 SP805Unlock (
   VOID
@@ -54,7 +54,7 @@ SP805Unlock (
   i.e. it inhibits all writes to avoid rogue software accidentally
   corrupting their contents.
 **/
-inline
+STATIC
 VOID
 SP805Lock (
   VOID
@@ -69,7 +69,7 @@ SP805Lock (
 /**
   Stop the SP805 watchdog timer from counting down by disabling interrupts.
 **/
-inline
+STATIC
 VOID
 SP805Stop (
   VOID
@@ -86,7 +86,7 @@ SP805Stop (
   The count down will start from the value stored in the Load register,
   not from the value where it was previously stopped.
 **/
-inline
+STATIC
 VOID
 SP805Start (
   VOID