diff --git a/include/FreeRTOS.h b/include/FreeRTOS.h
index 6c3e826..87c67d7 100644
--- a/include/FreeRTOS.h
+++ b/include/FreeRTOS.h
@@ -896,11 +896,6 @@
     #define configSUPPORT_DYNAMIC_ALLOCATION    1
 #endif
 
-#ifndef configSTACK_ALLOCATION_FROM_SEPARATE_HEAP
-    /* Defaults to 0 for backward compatibility. */
-    #define configSTACK_ALLOCATION_FROM_SEPARATE_HEAP   0
-#endif
-
 #ifndef configSTACK_DEPTH_TYPE
 
 /* Defaults to uint16_t for backward compatibility, but can be overridden
diff --git a/include/mpu_wrappers.h b/include/mpu_wrappers.h
index 6550c1e..841b51a 100644
--- a/include/mpu_wrappers.h
+++ b/include/mpu_wrappers.h
@@ -177,7 +177,6 @@
     #define PRIVILEGED_FUNCTION
     #define PRIVILEGED_DATA
     #define FREERTOS_SYSTEM_CALL
-    #define portUSING_MPU_WRAPPERS    0
 
 #endif /* portUSING_MPU_WRAPPERS */
 
diff --git a/include/portable.h b/include/portable.h
index f836747..3768e2c 100644
--- a/include/portable.h
+++ b/include/portable.h
@@ -79,6 +79,10 @@
     #error "Invalid portBYTE_ALIGNMENT definition"
 #endif
 
+#ifndef portUSING_MPU_WRAPPERS
+    #define portUSING_MPU_WRAPPERS 0
+#endif
+
 #ifndef portNUM_CONFIGURABLE_REGIONS
     #define portNUM_CONFIGURABLE_REGIONS    1
 #endif
@@ -91,6 +95,11 @@
     #define portARCH_NAME    NULL
 #endif
 
+#ifndef configSTACK_ALLOCATION_FROM_SEPARATE_HEAP
+    /* Defaults to 0 for backward compatibility. */
+    #define configSTACK_ALLOCATION_FROM_SEPARATE_HEAP 0
+#endif
+
 /* *INDENT-OFF* */
 #ifdef __cplusplus
     extern "C" {