diff --git a/visualc-shared/sharedspice.vcproj b/visualc-shared/sharedspice.vcproj
index 9ed79f2a9..e202fba1c 100644
--- a/visualc-shared/sharedspice.vcproj
+++ b/visualc-shared/sharedspice.vcproj
@@ -594,10 +594,6 @@
 				RelativePath="..\src\frontend\outitf.h"
 				>
 			</File>
-			<File
-				RelativePath="..\src\frontend\parse-bison.h"
-				>
-			</File>
 			<File
 				RelativePath="..\src\frontend\parse.h"
 				>
@@ -2306,10 +2302,6 @@
 				RelativePath="..\src\spicelib\parser\inppas3.h"
 				>
 			</File>
-			<File
-				RelativePath="..\src\spicelib\parser\inpptree-parser.h"
-				>
-			</File>
 			<File
 				RelativePath="..\src\spicelib\parser\inpxx.h"
 				>
@@ -2330,6 +2322,14 @@
 				RelativePath=".\include\stdint.h"
 				>
 			</File>
+			<File
+				RelativePath="inpptree-parser.h"
+				>
+			</File>
+			<File
+				RelativePath="parse-bison.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
@@ -2934,10 +2934,6 @@
 				RelativePath="..\src\frontend\outitf.c"
 				>
 			</File>
-			<File
-				RelativePath="..\src\frontend\parse-bison.c"
-				>
-			</File>
 			<File
 				RelativePath="..\src\frontend\parse.c"
 				>
@@ -7982,10 +7978,6 @@
 				RelativePath="..\src\spicelib\parser\inppname.c"
 				>
 			</File>
-			<File
-				RelativePath="..\src\spicelib\parser\inpptree-parser.c"
-				>
-			</File>
 			<File
 				RelativePath="..\src\spicelib\parser\inpptree.c"
 				>
@@ -8186,6 +8178,14 @@
 				RelativePath="..\visualc\msvc-compat.c"
 				>
 			</File>
+			<File
+				RelativePath="inpptree-parser.c"
+				>
+			</File>
+			<File
+				RelativePath="parse-bison.c"
+				>
+			</File>
 		</Filter>
 		<File
 			RelativePath="..\src\sharedspice.map"
diff --git a/visualc/vngspice.vcproj b/visualc/vngspice.vcproj
index 2ac72001b..b79d2562e 100644
--- a/visualc/vngspice.vcproj
+++ b/visualc/vngspice.vcproj
@@ -1404,10 +1404,6 @@
 				RelativePath="..\src\frontend\outitf.h"
 				>
 			</File>
-			<File
-				RelativePath="..\src\frontend\parse-bison.h"
-				>
-			</File>
 			<File
 				RelativePath="..\src\frontend\parse.h"
 				>
@@ -3112,10 +3108,6 @@
 				RelativePath="..\src\spicelib\parser\inppas3.h"
 				>
 			</File>
-			<File
-				RelativePath="..\src\spicelib\parser\inpptree-parser.h"
-				>
-			</File>
 			<File
 				RelativePath="..\src\spicelib\parser\inpxx.h"
 				>
@@ -3140,6 +3132,14 @@
 				RelativePath=".\include\stdint.h"
 				>
 			</File>
+			<File
+				RelativePath="inpptree-parser.h"
+				>
+			</File>
+			<File
+				RelativePath="parse-bison.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
@@ -3744,10 +3744,6 @@
 				RelativePath="..\src\frontend\outitf.c"
 				>
 			</File>
-			<File
-				RelativePath="..\src\frontend\parse-bison.c"
-				>
-			</File>
 			<File
 				RelativePath="..\src\frontend\parse.c"
 				>
@@ -8780,10 +8776,6 @@
 				RelativePath="..\src\spicelib\parser\inppname.c"
 				>
 			</File>
-			<File
-				RelativePath="..\src\spicelib\parser\inpptree-parser.c"
-				>
-			</File>
 			<File
 				RelativePath="..\src\spicelib\parser\inpptree.c"
 				>
@@ -8984,10 +8976,18 @@
 				RelativePath="..\src\xspice\mif\mif_inp2.c"
 				>
 			</File>
+			<File
+				RelativePath="inpptree-parser.c"
+				>
+			</File>
 			<File
 				RelativePath="msvc-compat.c"
 				>
 			</File>
+			<File
+				RelativePath="parse-bison.c"
+				>
+			</File>
 		</Filter>
 	</Files>
 	<Globals>
diff --git a/visualc/vngspice.vcxproj b/visualc/vngspice.vcxproj
index 8f50d3785..4820dbcc7 100644
--- a/visualc/vngspice.vcxproj
+++ b/visualc/vngspice.vcxproj
@@ -914,7 +914,6 @@
     <ClInclude Include="..\src\frontend\nutmegif.h" />
     <ClInclude Include="..\src\frontend\options.h" />
     <ClInclude Include="..\src\frontend\outitf.h" />
-    <ClInclude Include="..\src\frontend\parse-bison.h" />
     <ClInclude Include="..\src\frontend\parse.h" />
     <ClInclude Include="..\src\frontend\parser\backq.h" />
     <ClInclude Include="..\src\frontend\parser\complete.h" />
@@ -1341,12 +1340,13 @@
     <ClInclude Include="..\src\spicelib\parser\inppas1.h" />
     <ClInclude Include="..\src\spicelib\parser\inppas2.h" />
     <ClInclude Include="..\src\spicelib\parser\inppas3.h" />
-    <ClInclude Include="..\src\spicelib\parser\inpptree-parser.h" />
     <ClInclude Include="..\src\spicelib\parser\inpxx.h" />
     <ClInclude Include="..\src\winmain.h" />
     <ClInclude Include="include\inttypes.h" />
     <ClInclude Include="include\ngspice\config.h" />
     <ClInclude Include="include\stdint.h" />
+    <ClInclude Include="inpptree-parser.h" />
+    <ClInclude Include="parse-bison.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\src\xspice\icm\objects.inc" />
@@ -1500,7 +1500,6 @@
     <ClCompile Include="..\src\frontend\nutmegif.c" />
     <ClCompile Include="..\src\frontend\options.c" />
     <ClCompile Include="..\src\frontend\outitf.c" />
-    <ClCompile Include="..\src\frontend\parse-bison.c" />
     <ClCompile Include="..\src\frontend\parse.c" />
     <ClCompile Include="..\src\frontend\parser\backq.c" />
     <ClCompile Include="..\src\frontend\parser\complete.c" />
@@ -2759,7 +2758,6 @@
     <ClCompile Include="..\src\spicelib\parser\inppas2.c" />
     <ClCompile Include="..\src\spicelib\parser\inppas3.c" />
     <ClCompile Include="..\src\spicelib\parser\inppname.c" />
-    <ClCompile Include="..\src\spicelib\parser\inpptree-parser.c" />
     <ClCompile Include="..\src\spicelib\parser\inpptree.c" />
     <ClCompile Include="..\src\spicelib\parser\inpsymt.c" />
     <ClCompile Include="..\src\spicelib\parser\inptyplk.c" />
@@ -2810,7 +2808,9 @@
     <ClCompile Include="..\src\xspice\mif\miftrunc.c" />
     <ClCompile Include="..\src\xspice\mif\mifutil.c" />
     <ClCompile Include="..\src\xspice\mif\mif_inp2.c" />
+    <ClCompile Include="inpptree-parser.c" />
     <ClCompile Include="msvc-compat.c" />
+    <ClCompile Include="parse-bison.c" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/visualc/vngspice_fftw.vcproj b/visualc/vngspice_fftw.vcproj
index 237b567f4..a429eff0d 100644
--- a/visualc/vngspice_fftw.vcproj
+++ b/visualc/vngspice_fftw.vcproj
@@ -1427,10 +1427,6 @@
 				RelativePath="..\src\frontend\outitf.h"
 				>
 			</File>
-			<File
-				RelativePath="..\src\frontend\parse-bison.h"
-				>
-			</File>
 			<File
 				RelativePath="..\src\frontend\parse.h"
 				>
@@ -3135,10 +3131,6 @@
 				RelativePath="..\src\spicelib\parser\inppas3.h"
 				>
 			</File>
-			<File
-				RelativePath="..\src\spicelib\parser\inpptree-parser.h"
-				>
-			</File>
 			<File
 				RelativePath="..\src\spicelib\parser\inpxx.h"
 				>
@@ -3163,6 +3155,14 @@
 				RelativePath=".\include\stdint.h"
 				>
 			</File>
+			<File
+				RelativePath="inpptree-parser.h"
+				>
+			</File>
+			<File
+				RelativePath="parse-bison.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
@@ -3767,10 +3767,6 @@
 				RelativePath="..\src\frontend\outitf.c"
 				>
 			</File>
-			<File
-				RelativePath="..\src\frontend\parse-bison.c"
-				>
-			</File>
 			<File
 				RelativePath="..\src\frontend\parse.c"
 				>
@@ -8803,10 +8799,6 @@
 				RelativePath="..\src\spicelib\parser\inppname.c"
 				>
 			</File>
-			<File
-				RelativePath="..\src\spicelib\parser\inpptree-parser.c"
-				>
-			</File>
 			<File
 				RelativePath="..\src\spicelib\parser\inpptree.c"
 				>
@@ -9007,10 +8999,18 @@
 				RelativePath="..\src\xspice\mif\mif_inp2.c"
 				>
 			</File>
+			<File
+				RelativePath="inpptree-parser.c"
+				>
+			</File>
 			<File
 				RelativePath="msvc-compat.c"
 				>
 			</File>
+			<File
+				RelativePath="parse-bison.c"
+				>
+			</File>
 		</Filter>
 	</Files>
 	<Globals>
diff --git a/visualc/vngspice_fftw_vc10.vcxproj b/visualc/vngspice_fftw_vc10.vcxproj
index 046ff2bb4..b3cc78008 100644
--- a/visualc/vngspice_fftw_vc10.vcxproj
+++ b/visualc/vngspice_fftw_vc10.vcxproj
@@ -897,7 +897,6 @@
     <ClInclude Include="..\src\frontend\nutmegif.h" />
     <ClInclude Include="..\src\frontend\options.h" />
     <ClInclude Include="..\src\frontend\outitf.h" />
-    <ClInclude Include="..\src\frontend\parse-bison.h" />
     <ClInclude Include="..\src\frontend\parse.h" />
     <ClInclude Include="..\src\frontend\parser\backq.h" />
     <ClInclude Include="..\src\frontend\parser\complete.h" />
@@ -1324,12 +1323,13 @@
     <ClInclude Include="..\src\spicelib\parser\inppas1.h" />
     <ClInclude Include="..\src\spicelib\parser\inppas2.h" />
     <ClInclude Include="..\src\spicelib\parser\inppas3.h" />
-    <ClInclude Include="..\src\spicelib\parser\inpptree-parser.h" />
     <ClInclude Include="..\src\spicelib\parser\inpxx.h" />
     <ClInclude Include="..\src\winmain.h" />
     <ClInclude Include="include\inttypes.h" />
     <ClInclude Include="include\ngspice\config.h" />
     <ClInclude Include="include\stdint.h" />
+    <ClInclude Include="inpptree-parser.h" />
+    <ClInclude Include="parse-bison.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\src\xspice\icm\objects.inc" />
@@ -1483,7 +1483,6 @@
     <ClCompile Include="..\src\frontend\nutmegif.c" />
     <ClCompile Include="..\src\frontend\options.c" />
     <ClCompile Include="..\src\frontend\outitf.c" />
-    <ClCompile Include="..\src\frontend\parse-bison.c" />
     <ClCompile Include="..\src\frontend\parse.c" />
     <ClCompile Include="..\src\frontend\parser\backq.c" />
     <ClCompile Include="..\src\frontend\parser\complete.c" />
@@ -2742,7 +2741,6 @@
     <ClCompile Include="..\src\spicelib\parser\inppas2.c" />
     <ClCompile Include="..\src\spicelib\parser\inppas3.c" />
     <ClCompile Include="..\src\spicelib\parser\inppname.c" />
-    <ClCompile Include="..\src\spicelib\parser\inpptree-parser.c" />
     <ClCompile Include="..\src\spicelib\parser\inpptree.c" />
     <ClCompile Include="..\src\spicelib\parser\inpsymt.c" />
     <ClCompile Include="..\src\spicelib\parser\inptyplk.c" />
@@ -2793,7 +2791,9 @@
     <ClCompile Include="..\src\xspice\mif\miftrunc.c" />
     <ClCompile Include="..\src\xspice\mif\mifutil.c" />
     <ClCompile Include="..\src\xspice\mif\mif_inp2.c" />
+    <ClCompile Include="inpptree-parser.c" />
     <ClCompile Include="msvc-compat.c" />
+    <ClCompile Include="parse-bison.c" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">