diff --git a/Demo/WIN32-MSVC/WIN32.suo b/Demo/WIN32-MSVC/WIN32.suo
index a6a78775b..84fd5718c 100644
Binary files a/Demo/WIN32-MSVC/WIN32.suo and b/Demo/WIN32-MSVC/WIN32.suo differ
diff --git a/Demo/WIN32-MSVC/WIN32.vcxproj b/Demo/WIN32-MSVC/WIN32.vcxproj
index a92b9185f..ee994e1da 100644
--- a/Demo/WIN32-MSVC/WIN32.vcxproj
+++ b/Demo/WIN32-MSVC/WIN32.vcxproj
@@ -161,7 +161,7 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="Board.h" />
+    <ClInclude Include="..\..\Source\portable\MSVC-MingW\portmacro.h" />
     <ClInclude Include="FreeRTOSConfig.h" />
     <ClInclude Include="..\..\Source\include\croutine.h" />
     <ClInclude Include="..\..\Source\include\FreeRTOS.h" />
diff --git a/Demo/WIN32-MSVC/WIN32.vcxproj.filters b/Demo/WIN32-MSVC/WIN32.vcxproj.filters
index 3d075c58a..1a088b2ed 100644
--- a/Demo/WIN32-MSVC/WIN32.vcxproj.filters
+++ b/Demo/WIN32-MSVC/WIN32.vcxproj.filters
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{19ff1a34-36de-4c48-9d10-3fb1fa0d1fa4}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl</Extensions>
-    </Filter>
     <Filter Include="Resource Files">
       <UniqueIdentifier>{38712199-cebf-4124-bf15-398f7c3419ea}</UniqueIdentifier>
       <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
@@ -32,6 +28,10 @@
     <Filter Include="Demo App Source\Common Demo Tasks\ModifiedForLowTickRate">
       <UniqueIdentifier>{143cf5a3-f134-4439-9f71-a201ae23b44b}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Configuration Files">
+      <UniqueIdentifier>{19ff1a34-36de-4c48-9d10-3fb1fa0d1fa4}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl</Extensions>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="main.c">
@@ -81,11 +81,8 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="Board.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="FreeRTOSConfig.h">
-      <Filter>Header Files</Filter>
+      <Filter>Configuration Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\Source\include\croutine.h">
       <Filter>FreeRTOS Source\Include</Filter>
@@ -111,5 +108,8 @@
     <ClInclude Include="..\..\Source\include\task.h">
       <Filter>FreeRTOS Source\Include</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\Source\portable\MSVC-MingW\portmacro.h">
+      <Filter>FreeRTOS Source\Include</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Demo/WIN32-MSVC/main.c b/Demo/WIN32-MSVC/main.c
index a14753696..e0c63e274 100644
--- a/Demo/WIN32-MSVC/main.c
+++ b/Demo/WIN32-MSVC/main.c
@@ -96,7 +96,6 @@
 #include "QPeek.h"
 #include "recmutex.h"
 #include "flop.h"
-#include "death.h"
 
 /* Priorities at which the tasks are created. */
 #define mainCHECK_TASK_PRIORITY		( configMAX_PRIORITIES - 1 )
@@ -130,11 +129,6 @@ int main( void )
 	vStartMathTasks( mainFLOP_TASK_PRIORITY );
 	vStartRecursiveMutexTasks();
 
-	/* The suicide tasks must be created last as they need to know how many
-	tasks were running prior to their creation in order to ascertain whether
-	or not the correct/expected number of tasks are running at any given time. */
-	vCreateSuicidalTasks( mainCREATOR_TASK_PRIORITY );
-
 	/* Start the scheduler itself. */
 	vTaskStartScheduler();
 
@@ -190,10 +184,6 @@ char *pcStatusMessage = "OK";
 		{
 			pcStatusMessage = "Error: Flop";
 		}
-		else if( xIsCreateTaskStillRunning() != pdPASS )
-		{
-			pcStatusMessage = "Error: Create";
-		}
 	    else if( xAreRecursiveMutexTasksStillRunning() != pdTRUE )
 	    {
 			pcStatusMessage = "Error: RecMutex";