diff -rwd v8.0.0/Source/include/freertos/semphr.h v8.0.0orig/Source/include/freertos/semphr.h
73c73
< #include <freertos/queue.h>
---
> #include "queue.h"
diff -rwd v8.0.0/Source/include/freertos/task.h v8.0.0orig/Source/include/freertos/task.h
74c74
< #include <freertos/list.h>
---
> #include "list.h"
diff -rwd v8.0.0/Source/include/freertos/timers.h v8.0.0orig/Source/include/freertos/timers.h
76,77c76
< #include <freertos/task.h>
< 
---
> #include "task.h"
diff -rwd v8.0.0/Source/list.c v8.0.0orig/Source/list.c
68,69c68,69
< #include <freertos/FreeRTOS.h>
< #include <freertos/list.h>
---
> #include "FreeRTOS.h"
> #include "list.h"
diff -rwd v8.0.0/Source/portable/GCC/ARM_CM4F/port.c v8.0.0orig/Source/portable/GCC/ARM_CM4F/port.c
71,73c71,72
< #include <freertos/FreeRTOS.h>
< #include <freertos/task.h>
< 
---
> #include "FreeRTOS.h"
> #include "task.h"
141c140
< static UBaseType_t portRAM_ATTRIBUTEINIT(uxCriticalNesting) = 0xaaaaaaaa;
---
> static UBaseType_t uxCriticalNesting = 0xaaaaaaaa;
diff -rwd v8.0.0/Source/portable/MemMang/heap_2.c v8.0.0orig/Source/portable/MemMang/heap_2.c
82,84c82,83
< #include <freertos/FreeRTOS.h>
< #include <freertos/task.h>
< 
---
> #include "FreeRTOS.h"
> #include "task.h"
97,98c96
< //static uint8_t ucHeap[ configTOTAL_HEAP_SIZE ];
< static uint8_t portRAM_ATTRIBUTESIZE(ucHeap,configTOTAL_HEAP_SIZE);
---
> static uint8_t ucHeap[ configTOTAL_HEAP_SIZE ];
113,114c111
< //static BlockLink_t xStart, xEnd;
< static BlockLink_t portRAM_ATTRIBUTE(xStart), portRAM_ATTRIBUTE(xEnd);
---
> static BlockLink_t xStart, xEnd;
118,119c115
< //static size_t xFreeBytesRemaining = configADJUSTED_HEAP_SIZE;
< static size_t portRAM_ATTRIBUTEINIT(xFreeBytesRemaining) = configADJUSTED_HEAP_SIZE;
---
> static size_t xFreeBytesRemaining = configADJUSTED_HEAP_SIZE;
152c148
< static BaseType_t portRAM_ATTRIBUTEINIT(xHeapHasBeenInitialised) = pdFALSE;
---
> static BaseType_t xHeapHasBeenInitialised = pdFALSE;
diff -rwd v8.0.0/Source/queue.c v8.0.0orig/Source/queue.c
74,76c74,76
< #include <freertos/FreeRTOS.h>
< #include <freertos/task.h>
< #include <freertos/queue.h>
---
> #include "FreeRTOS.h"
> #include "task.h"
> #include "queue.h"
diff -rwd v8.0.0/Source/tasks.c v8.0.0orig/Source/tasks.c
76,79c76,79
< #include <freertos/FreeRTOS.h>
< #include <freertos/task.h>
< #include <freertos/timers.h>
< #include <freertos/StackMacros.h>
---
> #include "FreeRTOS.h"
> #include "task.h"
> #include "timers.h"
> #include "StackMacros.h"
187c187
< PRIVILEGED_DATA TCB_t * volatile portRAM_ATTRIBUTEINIT(pxCurrentTCB) = NULL;
---
> PRIVILEGED_DATA TCB_t * volatile pxCurrentTCB = NULL;
190,195c190,195
< PRIVILEGED_DATA static List_t portRAM_ATTRIBUTESIZE(pxReadyTasksLists,configMAX_PRIORITIES);/*< Prioritised ready tasks. */
< PRIVILEGED_DATA static List_t portRAM_ATTRIBUTE(xDelayedTaskList1);						/*< Delayed tasks. */
< PRIVILEGED_DATA static List_t portRAM_ATTRIBUTE(xDelayedTaskList2);						/*< Delayed tasks (two lists are used - one for delays that have overflowed the current tick count. */
< PRIVILEGED_DATA static List_t * volatile portRAM_ATTRIBUTE(pxDelayedTaskList);				/*< Points to the delayed task list currently being used. */
< PRIVILEGED_DATA static List_t * volatile portRAM_ATTRIBUTE(pxOverflowDelayedTaskList);		/*< Points to the delayed task list currently being used to hold tasks that have overflowed the current tick count. */
< PRIVILEGED_DATA static List_t portRAM_ATTRIBUTE(xPendingReadyList);						/*< Tasks that have been readied while the scheduler was suspended.  They will be moved to the ready list when the scheduler is resumed. */
---
> PRIVILEGED_DATA static List_t pxReadyTasksLists[ configMAX_PRIORITIES ];/*< Prioritised ready tasks. */
> PRIVILEGED_DATA static List_t xDelayedTaskList1;						/*< Delayed tasks. */
> PRIVILEGED_DATA static List_t xDelayedTaskList2;						/*< Delayed tasks (two lists are used - one for delays that have overflowed the current tick count. */
> PRIVILEGED_DATA static List_t * volatile pxDelayedTaskList;				/*< Points to the delayed task list currently being used. */
> PRIVILEGED_DATA static List_t * volatile pxOverflowDelayedTaskList;		/*< Points to the delayed task list currently being used to hold tasks that have overflowed the current tick count. */
> PRIVILEGED_DATA static List_t xPendingReadyList;						/*< Tasks that have been readied while the scheduler was suspended.  They will be moved to the ready list when the scheduler is resumed. */
199,200c199,200
< 	PRIVILEGED_DATA static List_t portRAM_ATTRIBUTE(xTasksWaitingTermination);				/*< Tasks that have been deleted - but their memory not yet freed. */
< 	PRIVILEGED_DATA static volatile UBaseType_t portRAM_ATTRIBUTEINIT(uxTasksDeleted) = ( UBaseType_t ) 0U;
---
> 	PRIVILEGED_DATA static List_t xTasksWaitingTermination;				/*< Tasks that have been deleted - but their memory not yet freed. */
> 	PRIVILEGED_DATA static volatile UBaseType_t uxTasksDeleted = ( UBaseType_t ) 0U;
206c206
< 	PRIVILEGED_DATA static List_t portRAM_ATTRIBUTE(xSuspendedTaskList);					/*< Tasks that are currently suspended. */
---
> 	PRIVILEGED_DATA static List_t xSuspendedTaskList;					/*< Tasks that are currently suspended. */
212c212
< 	PRIVILEGED_DATA static TaskHandle_t portRAM_ATTRIBUTEINIT(xIdleTaskHandle) = NULL;			/*< Holds the handle of the idle task.  The idle task is created automatically when the scheduler is started. */
---
> 	PRIVILEGED_DATA static TaskHandle_t xIdleTaskHandle = NULL;			/*< Holds the handle of the idle task.  The idle task is created automatically when the scheduler is started. */
217,225c217,225
< PRIVILEGED_DATA static volatile UBaseType_t portRAM_ATTRIBUTEINIT(uxCurrentNumberOfTasks) 	= ( UBaseType_t ) 0U;
< PRIVILEGED_DATA static volatile TickType_t  portRAM_ATTRIBUTEINIT(xTickCount) 				= ( TickType_t ) 0U;
< PRIVILEGED_DATA static volatile UBaseType_t portRAM_ATTRIBUTEINIT(uxTopReadyPriority) 		= tskIDLE_PRIORITY;
< PRIVILEGED_DATA static volatile BaseType_t  portRAM_ATTRIBUTEINIT(xSchedulerRunning) 		= pdFALSE;
< PRIVILEGED_DATA static volatile UBaseType_t portRAM_ATTRIBUTEINIT(uxPendedTicks) 			= ( UBaseType_t ) 0U;
< PRIVILEGED_DATA static volatile BaseType_t  portRAM_ATTRIBUTEINIT(xYieldPending) 			= pdFALSE;
< PRIVILEGED_DATA static volatile BaseType_t  portRAM_ATTRIBUTEINIT(xNumOfOverflows) 			= ( BaseType_t ) 0;
< PRIVILEGED_DATA static UBaseType_t          portRAM_ATTRIBUTEINIT(uxTaskNumber) 			= ( UBaseType_t ) 0U;
< PRIVILEGED_DATA static volatile TickType_t  portRAM_ATTRIBUTEINIT(xNextTaskUnblockTime)		= portMAX_DELAY;
---
> PRIVILEGED_DATA static volatile UBaseType_t uxCurrentNumberOfTasks 	= ( UBaseType_t ) 0U;
> PRIVILEGED_DATA static volatile TickType_t xTickCount 				= ( TickType_t ) 0U;
> PRIVILEGED_DATA static volatile UBaseType_t uxTopReadyPriority 		= tskIDLE_PRIORITY;
> PRIVILEGED_DATA static volatile BaseType_t xSchedulerRunning 		= pdFALSE;
> PRIVILEGED_DATA static volatile UBaseType_t uxPendedTicks 			= ( UBaseType_t ) 0U;
> PRIVILEGED_DATA static volatile BaseType_t xYieldPending 			= pdFALSE;
> PRIVILEGED_DATA static volatile BaseType_t xNumOfOverflows 			= ( BaseType_t ) 0;
> PRIVILEGED_DATA static UBaseType_t uxTaskNumber 					= ( UBaseType_t ) 0U;
> PRIVILEGED_DATA static volatile TickType_t xNextTaskUnblockTime		= portMAX_DELAY;
235c235
< PRIVILEGED_DATA static volatile UBaseType_t portRAM_ATTRIBUTEINIT(uxSchedulerSuspended)	= ( UBaseType_t ) pdFALSE;
---
> PRIVILEGED_DATA static volatile UBaseType_t uxSchedulerSuspended	= ( UBaseType_t ) pdFALSE;
239,240c239,240
< 	PRIVILEGED_DATA static uint32_t portRAM_ATTRIBUTEINIT(ulTaskSwitchedInTime) = 0UL;	/*< Holds the value of a timer/counter the last time a task was switched in. */
< 	PRIVILEGED_DATA static uint32_t portRAM_ATTRIBUTEINIT(ulTotalRunTime) = 0UL;		/*< Holds the total amount of execution time as defined by the run time counter clock. */
---
> 	PRIVILEGED_DATA static uint32_t ulTaskSwitchedInTime = 0UL;	/*< Holds the value of a timer/counter the last time a task was switched in. */
> 	PRIVILEGED_DATA static uint32_t ulTotalRunTime = 0UL;		/*< Holds the total amount of execution time as defined by the run time counter clock. */
414c414
< //static BaseType_t prvTaskIsTaskSuspended( const TaskHandle_t xTask ) PRIVILEGED_FUNCTION;
---
> static BaseType_t prvTaskIsTaskSuspended( const TaskHandle_t xTask ) PRIVILEGED_FUNCTION;
diff -rwd v8.0.0/Source/timers.c v8.0.0orig/Source/timers.c
74,77c74,77
< #include <freertos/FreeRTOS.h>
< #include <freertos/task.h>
< #include <freertos/timers.h>
< #include <freertos/queue.h>
---
> #include "FreeRTOS.h"
> #include "task.h"
> #include "queue.h"
> #include "timers.h"
