diff --git a/aom_mem/aom_mem.c b/aom_mem/aom_mem.c
index 48e59228339d6a73827943190249a932e73e520f..88427717a5f19ba2d633bf39f8c223630ec1edc5 100644
--- a/aom_mem/aom_mem.c
+++ b/aom_mem/aom_mem.c
@@ -18,21 +18,21 @@
 #include "include/aom_mem_intrnl.h"
 #include "aom/aom_integer.h"
 
-static inline size_t GetAlignedMallocSize(size_t size, size_t align) {
+static INLINE size_t GetAlignedMallocSize(size_t size, size_t align) {
   return size + align - 1 + ADDRESS_STORAGE_SIZE;
 }
 
-static inline size_t *GetMallocAddressLocation(const void *const mem) {
+static INLINE size_t *GetMallocAddressLocation(const void *const mem) {
   return ((size_t *)mem) - 1;
 }
 
-static inline void SetActualMallocAddress(void *const mem,
+static INLINE void SetActualMallocAddress(void *const mem,
                                           const void *const malloc_addr) {
   size_t *const malloc_addr_location = GetMallocAddressLocation(mem);
   *malloc_addr_location = (size_t)malloc_addr;
 }
 
-static inline void *GetActualMallocAddress(const void *const mem) {
+static INLINE void *GetActualMallocAddress(const void *const mem) {
   const size_t *const malloc_addr_location = GetMallocAddressLocation(mem);
   return (void *)(*malloc_addr_location);
 }
diff --git a/av1/encoder/rd.c b/av1/encoder/rd.c
index 9db4f071bab17b7f1ebb8d6bd1bd077e939d1d94..f2698b223288e1706f80b9b82b393afe0ee26a09 100644
--- a/av1/encoder/rd.c
+++ b/av1/encoder/rd.c
@@ -601,7 +601,7 @@ YV12_BUFFER_CONFIG *av1_get_scaled_ref_frame(const AV1_COMP *cpi,
              : NULL;
 }
 
-int av1_get_switchable_rate(const AV1_COMP *cpi, const MACROBLOCKD *const xd) {
+int av1_get_switchable_rate(const AV1_COMP *cpi, const MACROBLOCKD *xd) {
   const AV1_COMMON *const cm = &cpi->common;
   if (cm->interp_filter == SWITCHABLE) {
 #if CONFIG_EXT_INTERP