diff --git a/tasks.c b/tasks.c
index 038a2b4cc..4d2ddf1b1 100644
--- a/tasks.c
+++ b/tasks.c
@@ -1805,7 +1805,7 @@ static void prvAddNewTaskToReadyList( TCB_t * pxNewTCB )
     static BaseType_t prvTaskIsTaskSuspended( const TaskHandle_t xTask )
     {
         BaseType_t xReturn = pdFALSE;
-        const TCB_t * const pxTCB = xTask;
+        const TCB_t * const pxTCB = ( TCB_t * ) xTask;
 
         /* Accesses xPendingReadyList so must be called from a critical
          * section. */
@@ -1850,7 +1850,7 @@ static void prvAddNewTaskToReadyList( TCB_t * pxNewTCB )
 
     void vTaskResume( TaskHandle_t xTaskToResume )
     {
-        TCB_t * const pxTCB = xTaskToResume;
+        TCB_t * const pxTCB = ( TCB_t * ) xTaskToResume;
 
         /* It does not make sense to resume the calling task. */
         configASSERT( xTaskToResume );
@@ -1861,7 +1861,7 @@ static void prvAddNewTaskToReadyList( TCB_t * pxNewTCB )
         {
             taskENTER_CRITICAL();
             {
-                if( prvTaskIsTaskSuspended( pxTCB ) != pdFALSE )
+                if( prvTaskIsTaskSuspended( ( TaskHandle_t ) pxTCB ) != pdFALSE )
                 {
                     traceTASK_RESUME( pxTCB );
 
@@ -1905,7 +1905,7 @@ static void prvAddNewTaskToReadyList( TCB_t * pxNewTCB )
     BaseType_t xTaskResumeFromISR( TaskHandle_t xTaskToResume )
     {
         BaseType_t xYieldRequired = pdFALSE;
-        TCB_t * const pxTCB = xTaskToResume;
+        TCB_t * const pxTCB = ( TCB_t * ) xTaskToResume;
         UBaseType_t uxSavedInterruptStatus;
 
         configASSERT( xTaskToResume );
@@ -1930,7 +1930,7 @@ static void prvAddNewTaskToReadyList( TCB_t * pxNewTCB )
 
         uxSavedInterruptStatus = portSET_INTERRUPT_MASK_FROM_ISR();
         {
-            if( prvTaskIsTaskSuspended( pxTCB ) != pdFALSE )
+            if( prvTaskIsTaskSuspended( ( TaskHandle_t ) pxTCB ) != pdFALSE )
             {
                 traceTASK_RESUME_FROM_ISR( pxTCB );
 
@@ -3999,7 +3999,7 @@ static void prvResetNextTaskUnblockTime( void )
         /* A critical section is not required as this is not called from
          * an interrupt and the current TCB will always be the same for any
          * individual execution thread. */
-        xReturn = pxCurrentTCB;
+        xReturn = ( TaskHandle_t ) pxCurrentTCB;
 
         return xReturn;
     }
@@ -4039,7 +4039,7 @@ static void prvResetNextTaskUnblockTime( void )
 
     BaseType_t xTaskPriorityInherit( TaskHandle_t const pxMutexHolder )
     {
-        TCB_t * const pxMutexHolderTCB = pxMutexHolder;
+        TCB_t * const pxMutexHolderTCB = ( TCB_t * ) pxMutexHolder;
         BaseType_t xReturn = pdFALSE;
 
         /* If the mutex was given back by an interrupt while the queue was
@@ -4129,7 +4129,7 @@ static void prvResetNextTaskUnblockTime( void )
 
     BaseType_t xTaskPriorityDisinherit( TaskHandle_t const pxMutexHolder )
     {
-        TCB_t * const pxTCB = pxMutexHolder;
+        TCB_t * const pxTCB = ( TCB_t * ) pxMutexHolder;
         BaseType_t xReturn = pdFALSE;
 
         if( pxMutexHolder != NULL )
@@ -4210,7 +4210,7 @@ static void prvResetNextTaskUnblockTime( void )
     void vTaskPriorityDisinheritAfterTimeout( TaskHandle_t const pxMutexHolder,
                                               UBaseType_t uxHighestPriorityWaitingTask )
     {
-        TCB_t * const pxTCB = pxMutexHolder;
+        TCB_t * const pxTCB = ( TCB_t * ) pxMutexHolder;
         UBaseType_t uxPriorityUsedOnEntry, uxPriorityToUse;
         const UBaseType_t uxOnlyOneMutexHeld = ( UBaseType_t ) 1;
 
@@ -4657,7 +4657,7 @@ TickType_t uxTaskResetEventItemValue( void )
             ( pxCurrentTCB->uxMutexesHeld )++;
         }
 
-        return pxCurrentTCB;
+        return ( TaskHandle_t ) pxCurrentTCB;
     }
 
 #endif /* configUSE_MUTEXES */
@@ -4835,7 +4835,7 @@ TickType_t uxTaskResetEventItemValue( void )
 
         configASSERT( uxIndexToNotify < configTASK_NOTIFICATION_ARRAY_ENTRIES );
         configASSERT( xTaskToNotify );
-        pxTCB = xTaskToNotify;
+        pxTCB = ( TCB_t * ) xTaskToNotify;
 
         taskENTER_CRITICAL();
         {
@@ -4979,7 +4979,7 @@ TickType_t uxTaskResetEventItemValue( void )
          * https://www.FreeRTOS.org/RTOS-Cortex-M3-M4.html */
         portASSERT_IF_INTERRUPT_PRIORITY_INVALID();
 
-        pxTCB = xTaskToNotify;
+        pxTCB = ( TCB_t * ) xTaskToNotify;
 
         uxSavedInterruptStatus = portSET_INTERRUPT_MASK_FROM_ISR();
         {
@@ -5114,7 +5114,7 @@ TickType_t uxTaskResetEventItemValue( void )
          * https://www.FreeRTOS.org/RTOS-Cortex-M3-M4.html */
         portASSERT_IF_INTERRUPT_PRIORITY_INVALID();
 
-        pxTCB = xTaskToNotify;
+        pxTCB = ( TCB_t * ) xTaskToNotify;
 
         uxSavedInterruptStatus = portSET_INTERRUPT_MASK_FROM_ISR();
         {