diff --git a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Tasking/.cproject b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Tasking/.cproject
index 39f11253b0..e8167188d0 100644
--- a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Tasking/.cproject
+++ b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Tasking/.cproject
@@ -89,11 +89,12 @@
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/RTOSDemo/Common_Demo_Source/include}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/RTOSDemo}&quot;"/>
 								</option>
-								<option id="com.tasking.arm.cc.optimize.77246374" name="Optimization level:" superClass="com.tasking.arm.cc.optimize" value="com.tasking.arm.cc.optimize.0" valueType="enumerated"/>
+								<option id="com.tasking.arm.cc.optimize.77246374" name="Optimization level:" superClass="com.tasking.arm.cc.optimize" value="com.tasking.arm.cc.optimize.3" valueType="enumerated"/>
 								<option id="com.tasking.arm.cc.globalTypeChecking.398868236" name="Perform global type checking on C code" superClass="com.tasking.arm.cc.globalTypeChecking" value="false" valueType="boolean"/>
 								<option id="com.tasking.arm.cc.definedSymbols.1743352277" name="Defined symbols" superClass="com.tasking.arm.cc.definedSymbols" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="PART_XMC4400"/>
 								</option>
+								<option id="com.tasking.arm.cc.tradeoff.1789020205" name="Trade-off between speed and size:" superClass="com.tasking.arm.cc.tradeoff" value="com.tasking.arm.cc.tradeoff.2" valueType="enumerated"/>
 								<inputType id="com.tasking.arm.cppInputType.2081187907" name="C++" superClass="com.tasking.arm.cppInputType"/>
 								<inputType id="com.tasking.arm.cpp.cInputType.644784868" name="C" superClass="com.tasking.arm.cpp.cInputType"/>
 								<inputType id="com.tasking.arm.cc.msInputType.1449709495" name="MS" superClass="com.tasking.arm.cc.msInputType"/>
diff --git a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Tasking/FreeRTOSConfig.h b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Tasking/FreeRTOSConfig.h
index 9c0b368edf..6f2c947fea 100644
--- a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Tasking/FreeRTOSConfig.h
+++ b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Tasking/FreeRTOSConfig.h
@@ -85,7 +85,7 @@
  * executed from within the IDE!  Once it has been executed, re-open or refresh 
  * the Eclipse project and remove the #error line below.
  */
-//#error Ensure CreateProjectDirectoryStructure.bat has been executed before building.  See comment immediately above.
+#error Ensure CreateProjectDirectoryStructure.bat has been executed before building.  See comment immediately above.
 
 #include <stdint.h>
 extern uint32_t SystemCoreClock;
@@ -131,6 +131,7 @@ to exclude the API function. */
 #define INCLUDE_vTaskSuspend			1
 #define INCLUDE_vTaskDelayUntil			1
 #define INCLUDE_vTaskDelay				1
+#define INCLUDE_eTaskGetState 			1
 
 /* Cortex-M specific definitions. */
 #ifdef __NVIC_PRIO_BITS