diff --git a/FreeRTOS/Demo/Common/Full/dynamic.c b/FreeRTOS/Demo/Common/Full/dynamic.c
index ee295869d..5618cc25a 100644
--- a/FreeRTOS/Demo/Common/Full/dynamic.c
+++ b/FreeRTOS/Demo/Common/Full/dynamic.c
@@ -168,7 +168,7 @@ static portBASE_TYPE xSuspendedQueueReceiveError = pdFALSE;
 static portBASE_TYPE xPriorityRaiseWhenSuspendedError = pdFALSE;
 
 /* Queue used by the second test. */
-QueueHandle_t xSuspendedTestQueue;
+static QueueHandle_t xSuspendedTestQueue;
 
 /*-----------------------------------------------------------*/
 
diff --git a/FreeRTOS/Demo/Common/Minimal/AbortDelay.c b/FreeRTOS/Demo/Common/Minimal/AbortDelay.c
index 581fcbe8a..178174475 100644
--- a/FreeRTOS/Demo/Common/Minimal/AbortDelay.c
+++ b/FreeRTOS/Demo/Common/Minimal/AbortDelay.c
@@ -124,13 +124,13 @@
     static const char * pcControllingTaskName = "AbtCtrl", * pcBlockingTaskName = "AbtBlk";
 
 /* The maximum amount of time a task will block for. */
-    const TickType_t xMaxBlockTime = pdMS_TO_TICKS( 100 );
-    const TickType_t xHalfMaxBlockTime = pdMS_TO_TICKS( 50 );
+    static const TickType_t xMaxBlockTime = pdMS_TO_TICKS( 100 );
+    static const TickType_t xHalfMaxBlockTime = pdMS_TO_TICKS( 50 );
 
 /* The actual block time is dependent on the priority of other tasks in the
  * system so the actual block time might be greater than that expected, but it
  * should be within an acceptable upper bound. */
-    const TickType_t xAllowableMargin = pdMS_TO_TICKS( 7 );
+    static const TickType_t xAllowableMargin = pdMS_TO_TICKS( 7 );
 
 /*-----------------------------------------------------------*/
 
diff --git a/FreeRTOS/Demo/Common/Minimal/EventGroupsDemo.c b/FreeRTOS/Demo/Common/Minimal/EventGroupsDemo.c
index 4806e74fc..ebc752500 100644
--- a/FreeRTOS/Demo/Common/Minimal/EventGroupsDemo.c
+++ b/FreeRTOS/Demo/Common/Minimal/EventGroupsDemo.c
@@ -78,9 +78,6 @@
 /* A block time of zero simply means "don't block". */
 #define ebDONT_BLOCK                             ( 0 )
 
-/* A 5ms delay. */
-#define ebSHORT_DELAY                            pdMS_TO_TICKS( ( TickType_t ) 5 )
-
 /* Used in the selective bits test which checks no, one or both tasks blocked on
  *  event bits in a group are unblocked as appropriate as different bits get set. */
 #define ebSELECTIVE_BITS_1                       0x03
diff --git a/FreeRTOS/Demo/Common/Minimal/IntSemTest.c b/FreeRTOS/Demo/Common/Minimal/IntSemTest.c
index e4be9b83c..a9b01aea5 100644
--- a/FreeRTOS/Demo/Common/Minimal/IntSemTest.c
+++ b/FreeRTOS/Demo/Common/Minimal/IntSemTest.c
@@ -123,7 +123,7 @@ static SemaphoreHandle_t xMasterSlaveMutex = NULL;
 static BaseType_t xOkToGiveMutex = pdFALSE, xOkToGiveCountingSemaphore = pdFALSE;
 
 /* Used to coordinate timing between tasks and the interrupt. */
-const TickType_t xInterruptGivePeriod = pdMS_TO_TICKS( intsemINTERRUPT_MUTEX_GIVE_PERIOD_MS );
+static const TickType_t xInterruptGivePeriod = pdMS_TO_TICKS( intsemINTERRUPT_MUTEX_GIVE_PERIOD_MS );
 
 /*-----------------------------------------------------------*/
 
diff --git a/FreeRTOS/Demo/Common/Minimal/MessageBufferAMP.c b/FreeRTOS/Demo/Common/Minimal/MessageBufferAMP.c
index 7159adb68..94fad49b4 100644
--- a/FreeRTOS/Demo/Common/Minimal/MessageBufferAMP.c
+++ b/FreeRTOS/Demo/Common/Minimal/MessageBufferAMP.c
@@ -121,7 +121,7 @@ static uint32_t ulCycleCounters[ mbaNUMBER_OF_CORE_B_TASKS ];
 
 /* Set to pdFALSE if any errors are detected.  Used to inform the check task
  * that something might be wrong. */
-BaseType_t xDemoStatus = pdPASS;
+static BaseType_t xDemoStatus = pdPASS;
 
 /*-----------------------------------------------------------*/
 
diff --git a/FreeRTOS/Demo/Common/Minimal/QPeek.c b/FreeRTOS/Demo/Common/Minimal/QPeek.c
index ba33723f8..4bda840fb 100644
--- a/FreeRTOS/Demo/Common/Minimal/QPeek.c
+++ b/FreeRTOS/Demo/Common/Minimal/QPeek.c
@@ -74,7 +74,7 @@ static volatile BaseType_t xErrorDetected = pdFALSE;
 static volatile uint32_t ulLoopCounter = 0;
 
 /* Handles to the test tasks. */
-TaskHandle_t xMediumPriorityTask, xHighPriorityTask, xHighestPriorityTask;
+static TaskHandle_t xMediumPriorityTask, xHighPriorityTask, xHighestPriorityTask;
 /*-----------------------------------------------------------*/
 
 void vStartQueuePeekTasks( void )
diff --git a/FreeRTOS/Demo/Common/Minimal/QueueSet.c b/FreeRTOS/Demo/Common/Minimal/QueueSet.c
index 9bdfb7310..54dec2a4a 100644
--- a/FreeRTOS/Demo/Common/Minimal/QueueSet.c
+++ b/FreeRTOS/Demo/Common/Minimal/QueueSet.c
@@ -203,7 +203,7 @@
     static size_t uxNextRand = 0;
 
 /* The task handles are stored so their priorities can be changed. */
-    TaskHandle_t xQueueSetSendingTask, xQueueSetReceivingTask;
+    static TaskHandle_t xQueueSetSendingTask, xQueueSetReceivingTask;
 
 /*-----------------------------------------------------------*/
 
diff --git a/FreeRTOS/Demo/Common/Minimal/death.c b/FreeRTOS/Demo/Common/Minimal/death.c
index 1b195d1a4..6c75c03bb 100644
--- a/FreeRTOS/Demo/Common/Minimal/death.c
+++ b/FreeRTOS/Demo/Common/Minimal/death.c
@@ -80,7 +80,7 @@ static const UBaseType_t uxMaxNumberOfExtraTasksRunning = 3;
 
 /* Used to store a handle to the task that should be killed by a suicidal task,
  * before it kills itself. */
-TaskHandle_t xCreatedTask;
+static TaskHandle_t xCreatedTask;
 
 /*-----------------------------------------------------------*/
 
diff --git a/FreeRTOS/Demo/Common/Minimal/dynamic.c b/FreeRTOS/Demo/Common/Minimal/dynamic.c
index 001685583..832016880 100644
--- a/FreeRTOS/Demo/Common/Minimal/dynamic.c
+++ b/FreeRTOS/Demo/Common/Minimal/dynamic.c
@@ -133,7 +133,7 @@ static volatile BaseType_t xSuspendedQueueSendError = pdFALSE;
 static volatile BaseType_t xSuspendedQueueReceiveError = pdFALSE;
 
 /* Queue used by the second test. */
-QueueHandle_t xSuspendedTestQueue;
+static QueueHandle_t xSuspendedTestQueue;
 
 /* The value the queue receive task expects to receive next.  This is file
  * scope so xAreDynamicPriorityTasksStillRunning() can ensure it is still