diff --git a/test/vs2017/etl.vcxproj b/test/vs2017/etl.vcxproj
index e2eddc14..72989d79 100644
--- a/test/vs2017/etl.vcxproj
+++ b/test/vs2017/etl.vcxproj
@@ -128,6 +128,10 @@
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\src\fsm.h" />
+    <ClInclude Include="..\..\src\fsm_generator.h" />
+    <ClInclude Include="..\..\src\message_router.h" />
+    <ClInclude Include="..\..\src\message_router_generator.h" />
     <ClInclude Include="..\..\unittest-cpp\UnitTest++\AssertException.h" />
     <ClInclude Include="..\..\unittest-cpp\UnitTest++\CheckMacros.h" />
     <ClInclude Include="..\..\unittest-cpp\UnitTest++\Checks.h" />
@@ -329,6 +333,7 @@
     </ClCompile>
     <ClCompile Include="..\test_fnv_1.cpp" />
     <ClCompile Include="..\test_forward_list.cpp" />
+    <ClCompile Include="..\test_fsm.cpp" />
     <ClCompile Include="..\test_function.cpp" />
     <ClCompile Include="..\test_functional.cpp" />
     <ClCompile Include="..\test_hash.cpp" />
@@ -364,6 +369,7 @@
     </ClCompile>
     <ClCompile Include="..\test_maths.cpp" />
     <ClCompile Include="..\test_memory.cpp" />
+    <ClCompile Include="..\test_message_router.cpp" />
     <ClCompile Include="..\test_multimap.cpp" />
     <ClCompile Include="..\test_multiset.cpp" />
     <ClCompile Include="..\test_murmur3.cpp" />
@@ -410,6 +416,8 @@
   <ItemGroup>
     <None Include="..\..\Doxyfile" />
     <None Include="..\..\library.properties" />
+    <None Include="..\..\src\CreateFSM.bat" />
+    <None Include="..\..\src\CreateMessageRouter.bat" />
   </ItemGroup>
   <ItemGroup>
     <Text Include="..\..\src\file_error_numbers.txt" />
diff --git a/test/vs2017/etl.vcxproj.filters b/test/vs2017/etl.vcxproj.filters
index 6c40bcc4..815eb6b3 100644
--- a/test/vs2017/etl.vcxproj.filters
+++ b/test/vs2017/etl.vcxproj.filters
@@ -438,6 +438,18 @@
     <ClInclude Include="..\..\unittest-cpp\UnitTest++\XmlTestReporter.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\fsm.h">
+      <Filter>ETL\Patterns</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\fsm_generator.h">
+      <Filter>ETL\Patterns</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\message_router.h">
+      <Filter>ETL\Patterns</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\message_router_generator.h">
+      <Filter>ETL\Patterns</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\main.cpp">
@@ -761,6 +773,12 @@
     <ClCompile Include="..\..\unittest-cpp\UnitTest++\XmlTestReporter.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\test_fsm.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_message_router.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\Doxyfile">
@@ -769,8 +787,11 @@
     <None Include="..\..\library.properties">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="..\..\src\CreateMessageProcessor.bat">
-      <Filter>Source Files</Filter>
+    <None Include="..\..\src\CreateFSM.bat">
+      <Filter>ETL\Patterns</Filter>
+    </None>
+    <None Include="..\..\src\CreateMessageRouter.bat">
+      <Filter>ETL\Patterns</Filter>
     </None>
   </ItemGroup>
   <ItemGroup>