diff --git a/visualc/make-install-vngspice.bat b/visualc/make-install-vngspice.bat
index 1f20a5534..3ba99e009 100644
--- a/visualc/make-install-vngspice.bat
+++ b/visualc/make-install-vngspice.bat
@@ -1,13 +1,13 @@
 @echo off
 
-REM copy ngspice.exe, codemodels *.cm to C:\Spice or Spice64
+REM copy ngspice.exe, codemodels *.cm to d:\Spice64
 REM arguments to make-install-vngspiced:
 REM %1: path to ngspice.exe, %2, %3: fftw or 64 (64 bit)
 
 if "%2" == "64" goto b64
 if "%3" == "64" goto b64
 
-set dst=c:\Spice
+set dst=d:\Spice
 set cmsrc=.\codemodels\Win32\Release
 
 mkdir %dst%\bin
@@ -37,7 +37,7 @@ goto end
 
 :b64
 
-set dst=c:\Spice64
+set dst=d:\Spice64
 set cmsrc=.\codemodels\x64\Release
 
 mkdir %dst%\bin
diff --git a/visualc/spinitd b/visualc/spinitd
index 58a0767e3..04635e490 100644
--- a/visualc/spinitd
+++ b/visualc/spinitd
@@ -19,12 +19,12 @@ strcmp __flag $program "ngspice"
 if $__flag = 0
 
 * Load the codemodels
- codemodel C:/Spiced/lib/ngspice/spice2poly.cm
- codemodel C:/Spiced/lib/ngspice/analog.cm
- codemodel C:/Spiced/lib/ngspice/digital.cm
- codemodel C:/Spiced/lib/ngspice/xtradev.cm
- codemodel C:/Spiced/lib/ngspice/xtraevt.cm
- codemodel C:/Spiced/lib/ngspice/table.cm
+ codemodel D:/Spiced/lib/ngspice/spice2poly.cm
+ codemodel D:/Spiced/lib/ngspice/analog.cm
+ codemodel D:/Spiced/lib/ngspice/digital.cm
+ codemodel D:/Spiced/lib/ngspice/xtradev.cm
+ codemodel D:/Spiced/lib/ngspice/xtraevt.cm
+ codemodel D:/Spiced/lib/ngspice/table.cm
 
 
 end
diff --git a/visualc/spinitd64 b/visualc/spinitd64
index 64ba2bbff..1b2bebf10 100644
--- a/visualc/spinitd64
+++ b/visualc/spinitd64
@@ -19,12 +19,12 @@ strcmp __flag $program "ngspice"
 if $__flag = 0
 
 * Load the codemodels
- codemodel C:/Spice64d/lib/ngspice/spice2poly.cm
- codemodel C:/Spice64d/lib/ngspice/analog.cm
- codemodel C:/Spice64d/lib/ngspice/digital.cm
- codemodel C:/Spice64d/lib/ngspice/xtradev.cm
- codemodel C:/Spice64d/lib/ngspice/xtraevt.cm
- codemodel C:/Spice64d/lib/ngspice/table.cm
+ codemodel D:/Spice64d/lib/ngspice/spice2poly.cm
+ codemodel D:/Spice64d/lib/ngspice/analog.cm
+ codemodel D:/Spice64d/lib/ngspice/digital.cm
+ codemodel D:/Spice64d/lib/ngspice/xtradev.cm
+ codemodel D:/Spice64d/lib/ngspice/xtraevt.cm
+ codemodel D:/Spice64d/lib/ngspice/table.cm
 
 
 end
diff --git a/visualc/spinitr b/visualc/spinitr
index ebb06bc9a..cc9bdcd62 100644
--- a/visualc/spinitr
+++ b/visualc/spinitr
@@ -19,12 +19,12 @@ strcmp __flag $program "ngspice"
 if $__flag = 0
 
 * Load the codemodels
- codemodel C:/Spice/lib/ngspice/spice2poly.cm
- codemodel C:/Spice/lib/ngspice/analog.cm
- codemodel C:/Spice/lib/ngspice/digital.cm
- codemodel C:/Spice/lib/ngspice/xtradev.cm
- codemodel C:/Spice/lib/ngspice/xtraevt.cm
- codemodel C:/Spice/lib/ngspice/table.cm
+ codemodel D:/Spice/lib/ngspice/spice2poly.cm
+ codemodel D:/Spice/lib/ngspice/analog.cm
+ codemodel D:/Spice/lib/ngspice/digital.cm
+ codemodel D:/Spice/lib/ngspice/xtradev.cm
+ codemodel D:/Spice/lib/ngspice/xtraevt.cm
+ codemodel D:/Spice/lib/ngspice/table.cm
 
 
 end
diff --git a/visualc/spinitr64 b/visualc/spinitr64
index 56ce63aad..8383abb80 100644
--- a/visualc/spinitr64
+++ b/visualc/spinitr64
@@ -19,12 +19,12 @@ strcmp __flag $program "ngspice"
 if $__flag = 0
 
 * Load the codemodels
- codemodel C:/Spice64/lib/ngspice/spice2poly.cm
- codemodel C:/Spice64/lib/ngspice/analog.cm
- codemodel C:/Spice64/lib/ngspice/digital.cm
- codemodel C:/Spice64/lib/ngspice/xtradev.cm
- codemodel C:/Spice64/lib/ngspice/xtraevt.cm
- codemodel C:/Spice64/lib/ngspice/table.cm
+ codemodel D:/Spice64/lib/ngspice/spice2poly.cm
+ codemodel D:/Spice64/lib/ngspice/analog.cm
+ codemodel D:/Spice64/lib/ngspice/digital.cm
+ codemodel D:/Spice64/lib/ngspice/xtradev.cm
+ codemodel D:/Spice64/lib/ngspice/xtraevt.cm
+ codemodel D:/Spice64/lib/ngspice/table.cm
 
 
 end
diff --git a/visualc/vngspice.sln b/visualc/vngspice.sln
index 5c06e6fb5..1be3b241c 100644
--- a/visualc/vngspice.sln
+++ b/visualc/vngspice.sln
@@ -12,6 +12,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vngspice", "vngspice.vcxpro
 		{8271FEA2-8AC0-4B6D-BAEA-A503D37B5DB2} = {8271FEA2-8AC0-4B6D-BAEA-A503D37B5DB2}
 		{B8DD41C5-70C6-4183-9018-C4B518E8D36A} = {B8DD41C5-70C6-4183-9018-C4B518E8D36A}
 		{9ABEC5F2-F6C6-41DE-88AB-02460A07F46E} = {9ABEC5F2-F6C6-41DE-88AB-02460A07F46E}
+		{7A6473F5-AFED-4910-88D2-6204DA829832} = {7A6473F5-AFED-4910-88D2-6204DA829832}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cmpp", "xspice\cmpp\cmpp.vcxproj", "{7C865696-FA10-43AE-A20B-22AE72A165E2}"
@@ -184,8 +185,8 @@ Global
 		{D701EA0E-B8B0-41D6-A90E-A0D8233F15FB}.ReleaseOMP|x64.Build.0 = Release|x64
 		{D701EA0E-B8B0-41D6-A90E-A0D8233F15FB}.ReleaseOMP|x86.ActiveCfg = Release|Win32
 		{D701EA0E-B8B0-41D6-A90E-A0D8233F15FB}.ReleaseOMP|x86.Build.0 = Release|Win32
-		{7A6473F5-AFED-4910-88D2-6204DA829832}.console_debug|x64.ActiveCfg = Release|x64
-		{7A6473F5-AFED-4910-88D2-6204DA829832}.console_debug|x64.Build.0 = Release|x64
+		{7A6473F5-AFED-4910-88D2-6204DA829832}.console_debug|x64.ActiveCfg = Debug|x64
+		{7A6473F5-AFED-4910-88D2-6204DA829832}.console_debug|x64.Build.0 = Debug|x64
 		{7A6473F5-AFED-4910-88D2-6204DA829832}.console_debug|x86.ActiveCfg = Release|Win32
 		{7A6473F5-AFED-4910-88D2-6204DA829832}.console_debug|x86.Build.0 = Release|Win32
 		{7A6473F5-AFED-4910-88D2-6204DA829832}.console_release_omp|x64.ActiveCfg = Release|x64
@@ -256,8 +257,8 @@ Global
 		{13500662-AF0B-4AB6-9AF9-BC3E07B5C1C6}.ReleaseOMP|x64.Build.0 = Release|x64
 		{13500662-AF0B-4AB6-9AF9-BC3E07B5C1C6}.ReleaseOMP|x86.ActiveCfg = Release|Win32
 		{13500662-AF0B-4AB6-9AF9-BC3E07B5C1C6}.ReleaseOMP|x86.Build.0 = Release|Win32
-		{B8DD41C5-70C6-4183-9018-C4B518E8D36A}.console_debug|x64.ActiveCfg = Release|x64
-		{B8DD41C5-70C6-4183-9018-C4B518E8D36A}.console_debug|x64.Build.0 = Release|x64
+		{B8DD41C5-70C6-4183-9018-C4B518E8D36A}.console_debug|x64.ActiveCfg = Debug|x64
+		{B8DD41C5-70C6-4183-9018-C4B518E8D36A}.console_debug|x64.Build.0 = Debug|x64
 		{B8DD41C5-70C6-4183-9018-C4B518E8D36A}.console_debug|x86.ActiveCfg = Release|Win32
 		{B8DD41C5-70C6-4183-9018-C4B518E8D36A}.console_debug|x86.Build.0 = Release|Win32
 		{B8DD41C5-70C6-4183-9018-C4B518E8D36A}.console_release_omp|x64.ActiveCfg = Release|x64
diff --git a/visualc/vngspice.vcxproj b/visualc/vngspice.vcxproj
index 255554700..496290c0b 100644
--- a/visualc/vngspice.vcxproj
+++ b/visualc/vngspice.vcxproj
@@ -340,7 +340,7 @@
       </DataExecutionPrevention>
       <TargetMachine>MachineX64</TargetMachine>
       <LargeAddressAware>true</LargeAddressAware>
-      <AdditionalLibraryDirectories>C:\Program Files (x86)\Visual Leak Detector\lib\Win64;KLU\x64\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>KLU\x64\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
     <PostBuildEvent>
       <Command>
@@ -542,7 +542,7 @@
       </DataExecutionPrevention>
       <TargetMachine>MachineX64</TargetMachine>
       <LargeAddressAware>true</LargeAddressAware>
-      <AdditionalLibraryDirectories>C:\Program Files (x86)\Visual Leak Detector\lib\Win64;KLU\x64\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>KLU\x64\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
     <PostBuildEvent>
       <Command>
@@ -2052,8 +2052,6 @@
     <ClCompile Include="..\src\spicelib\devices\cap\capacld.c" />
     <ClCompile Include="..\src\spicelib\devices\cap\capask.c" />
     <ClCompile Include="..\src\spicelib\devices\cap\capbindCSC.c" />
-    <ClCompile Include="..\src\spicelib\devices\cap\capdel.c" />
-    <ClCompile Include="..\src\spicelib\devices\cap\capdest.c" />
     <ClCompile Include="..\src\spicelib\devices\cap\capgetic.c" />
     <ClCompile Include="..\src\spicelib\devices\cap\capinit.c" />
     <ClCompile Include="..\src\spicelib\devices\cap\capload.c" />
@@ -2073,8 +2071,6 @@
     <ClCompile Include="..\src\spicelib\devices\cccs\cccs.c" />
     <ClCompile Include="..\src\spicelib\devices\cccs\cccsask.c" />
     <ClCompile Include="..\src\spicelib\devices\cccs\cccsbindCSC.c" />
-    <ClCompile Include="..\src\spicelib\devices\cccs\cccsdel.c" />
-    <ClCompile Include="..\src\spicelib\devices\cccs\cccsdest.c" />
     <ClCompile Include="..\src\spicelib\devices\cccs\cccsinit.c" />
     <ClCompile Include="..\src\spicelib\devices\cccs\cccsload.c" />
     <ClCompile Include="..\src\spicelib\devices\cccs\cccspar.c" />
@@ -2087,8 +2083,6 @@
     <ClCompile Include="..\src\spicelib\devices\ccvs\ccvs.c" />
     <ClCompile Include="..\src\spicelib\devices\ccvs\ccvsask.c" />
     <ClCompile Include="..\src\spicelib\devices\ccvs\ccvsbindCSC.c" />
-    <ClCompile Include="..\src\spicelib\devices\ccvs\ccvsdel.c" />
-    <ClCompile Include="..\src\spicelib\devices\ccvs\ccvsdest.c" />
     <ClCompile Include="..\src\spicelib\devices\ccvs\ccvsfbr.c" />
     <ClCompile Include="..\src\spicelib\devices\ccvs\ccvsinit.c" />
     <ClCompile Include="..\src\spicelib\devices\ccvs\ccvsload.c" />
@@ -2109,8 +2103,6 @@
     <ClCompile Include="..\src\spicelib\devices\cpl\cpl.c" />
     <ClCompile Include="..\src\spicelib\devices\cpl\cplask.c" />
     <ClCompile Include="..\src\spicelib\devices\cpl\cplbindCSC.c" />
-    <ClCompile Include="..\src\spicelib\devices\cpl\cpldel.c" />
-    <ClCompile Include="..\src\spicelib\devices\cpl\cpldest.c" />
     <ClCompile Include="..\src\spicelib\devices\cpl\cplinit.c" />
     <ClCompile Include="..\src\spicelib\devices\cpl\cplload.c" />
     <ClCompile Include="..\src\spicelib\devices\cpl\cplmask.c" />
@@ -2121,8 +2113,6 @@
     <ClCompile Include="..\src\spicelib\devices\csw\cswacld.c" />
     <ClCompile Include="..\src\spicelib\devices\csw\cswask.c" />
     <ClCompile Include="..\src\spicelib\devices\csw\cswbindCSC.c" />
-    <ClCompile Include="..\src\spicelib\devices\csw\cswdel.c" />
-    <ClCompile Include="..\src\spicelib\devices\csw\cswdest.c" />
     <ClCompile Include="..\src\spicelib\devices\csw\cswinit.c" />
     <ClCompile Include="..\src\spicelib\devices\csw\cswload.c" />
     <ClCompile Include="..\src\spicelib\devices\csw\cswmask.c" />
@@ -2162,8 +2152,6 @@
     <ClCompile Include="..\src\spicelib\devices\hfet1\hfetacl.c" />
     <ClCompile Include="..\src\spicelib\devices\hfet1\hfetask.c" />
     <ClCompile Include="..\src\spicelib\devices\hfet1\hfetbindCSC.c" />
-    <ClCompile Include="..\src\spicelib\devices\hfet1\hfetdel.c" />
-    <ClCompile Include="..\src\spicelib\devices\hfet1\hfetdest.c" />
     <ClCompile Include="..\src\spicelib\devices\hfet1\hfetgetic.c" />
     <ClCompile Include="..\src\spicelib\devices\hfet1\hfetinit.c" />
     <ClCompile Include="..\src\spicelib\devices\hfet1\hfetload.c" />
@@ -2178,8 +2166,6 @@
     <ClCompile Include="..\src\spicelib\devices\hfet2\hfet2acl.c" />
     <ClCompile Include="..\src\spicelib\devices\hfet2\hfet2ask.c" />
     <ClCompile Include="..\src\spicelib\devices\hfet2\hfet2bindCSC.c" />
-    <ClCompile Include="..\src\spicelib\devices\hfet2\hfet2del.c" />
-    <ClCompile Include="..\src\spicelib\devices\hfet2\hfet2dest.c" />
     <ClCompile Include="..\src\spicelib\devices\hfet2\hfet2getic.c" />
     <ClCompile Include="..\src\spicelib\devices\hfet2\hfet2init.c" />
     <ClCompile Include="..\src\spicelib\devices\hfet2\hfet2load.c" />
@@ -2251,8 +2237,6 @@
     <ClCompile Include="..\src\spicelib\devices\ind\indacld.c" />
     <ClCompile Include="..\src\spicelib\devices\ind\indask.c" />
     <ClCompile Include="..\src\spicelib\devices\ind\indbindCSC.c" />
-    <ClCompile Include="..\src\spicelib\devices\ind\inddel.c" />
-    <ClCompile Include="..\src\spicelib\devices\ind\inddest.c" />
     <ClCompile Include="..\src\spicelib\devices\ind\indinit.c" />
     <ClCompile Include="..\src\spicelib\devices\ind\indload.c" />
     <ClCompile Include="..\src\spicelib\devices\ind\indmask.c" />
@@ -2270,9 +2254,6 @@
     <ClCompile Include="..\src\spicelib\devices\ind\mutacld.c" />
     <ClCompile Include="..\src\spicelib\devices\ind\mutask.c" />
     <ClCompile Include="..\src\spicelib\devices\ind\mutbindCSC.c" />
-    <ClCompile Include="..\src\spicelib\devices\ind\mutdel.c" />
-    <ClCompile Include="..\src\spicelib\devices\ind\mutdest.c" />
-    <ClCompile Include="..\src\spicelib\devices\ind\mutmdel.c" />
     <ClCompile Include="..\src\spicelib\devices\ind\mutparam.c" />
     <ClCompile Include="..\src\spicelib\devices\ind\mutpzld.c" />
     <ClCompile Include="..\src\spicelib\devices\ind\mutsetup.c" />
@@ -2292,8 +2273,6 @@
     <ClCompile Include="..\src\spicelib\devices\jfet2\jfet2acld.c" />
     <ClCompile Include="..\src\spicelib\devices\jfet2\jfet2ask.c" />
     <ClCompile Include="..\src\spicelib\devices\jfet2\jfet2bindCSC.c" />
-    <ClCompile Include="..\src\spicelib\devices\jfet2\jfet2del.c" />
-    <ClCompile Include="..\src\spicelib\devices\jfet2\jfet2dest.c" />
     <ClCompile Include="..\src\spicelib\devices\jfet2\jfet2ic.c" />
     <ClCompile Include="..\src\spicelib\devices\jfet2\jfet2init.c" />
     <ClCompile Include="..\src\spicelib\devices\jfet2\jfet2load.c" />
@@ -2309,8 +2288,6 @@
     <ClCompile Include="..\src\spicelib\devices\jfet\jfetacld.c" />
     <ClCompile Include="..\src\spicelib\devices\jfet\jfetask.c" />
     <ClCompile Include="..\src\spicelib\devices\jfet\jfetbindCSC.c" />
-    <ClCompile Include="..\src\spicelib\devices\jfet\jfetdel.c" />
-    <ClCompile Include="..\src\spicelib\devices\jfet\jfetdest.c" />
     <ClCompile Include="..\src\spicelib\devices\jfet\jfetdist.c" />
     <ClCompile Include="..\src\spicelib\devices\jfet\jfetdset.c" />
     <ClCompile Include="..\src\spicelib\devices\jfet\jfetic.c" />
@@ -2330,8 +2307,6 @@
     <ClCompile Include="..\src\spicelib\devices\ltra\ltraacld.c" />
     <ClCompile Include="..\src\spicelib\devices\ltra\ltraask.c" />
     <ClCompile Include="..\src\spicelib\devices\ltra\ltrabindCSC.c" />
-    <ClCompile Include="..\src\spicelib\devices\ltra\ltradel.c" />
-    <ClCompile Include="..\src\spicelib\devices\ltra\ltradest.c" />
     <ClCompile Include="..\src\spicelib\devices\ltra\ltrainit.c" />
     <ClCompile Include="..\src\spicelib\devices\ltra\ltraload.c" />
     <ClCompile Include="..\src\spicelib\devices\ltra\ltramask.c" />
@@ -2345,8 +2320,6 @@
     <ClCompile Include="..\src\spicelib\devices\mesa\mesaacl.c" />
     <ClCompile Include="..\src\spicelib\devices\mesa\mesaask.c" />
     <ClCompile Include="..\src\spicelib\devices\mesa\mesabindCSC.c" />
-    <ClCompile Include="..\src\spicelib\devices\mesa\mesadel.c" />
-    <ClCompile Include="..\src\spicelib\devices\mesa\mesadest.c" />
     <ClCompile Include="..\src\spicelib\devices\mesa\mesagetic.c" />
     <ClCompile Include="..\src\spicelib\devices\mesa\mesainit.c" />
     <ClCompile Include="..\src\spicelib\devices\mesa\mesaload.c" />
@@ -2361,8 +2334,6 @@
     <ClCompile Include="..\src\spicelib\devices\mes\mesacl.c" />
     <ClCompile Include="..\src\spicelib\devices\mes\mesask.c" />
     <ClCompile Include="..\src\spicelib\devices\mes\mesbindCSC.c" />
-    <ClCompile Include="..\src\spicelib\devices\mes\mesdel.c" />
-    <ClCompile Include="..\src\spicelib\devices\mes\mesdest.c" />
     <ClCompile Include="..\src\spicelib\devices\mes\mesdisto.c" />
     <ClCompile Include="..\src\spicelib\devices\mes\mesdset.c" />
     <ClCompile Include="..\src\spicelib\devices\mes\mesgetic.c" />
@@ -2559,8 +2530,6 @@
     <ClCompile Include="..\src\spicelib\devices\res\res.c" />
     <ClCompile Include="..\src\spicelib\devices\res\resask.c" />
     <ClCompile Include="..\src\spicelib\devices\res\resbindCSC.c" />
-    <ClCompile Include="..\src\spicelib\devices\res\resdel.c" />
-    <ClCompile Include="..\src\spicelib\devices\res\resdest.c" />
     <ClCompile Include="..\src\spicelib\devices\res\resinit.c" />
     <ClCompile Include="..\src\spicelib\devices\res\resload.c" />
     <ClCompile Include="..\src\spicelib\devices\res\resmask.c" />
@@ -2595,8 +2564,6 @@
     <ClCompile Include="..\src\spicelib\devices\sw\swacload.c" />
     <ClCompile Include="..\src\spicelib\devices\sw\swask.c" />
     <ClCompile Include="..\src\spicelib\devices\sw\swbindCSC.c" />
-    <ClCompile Include="..\src\spicelib\devices\sw\swdelete.c" />
-    <ClCompile Include="..\src\spicelib\devices\sw\swdest.c" />
     <ClCompile Include="..\src\spicelib\devices\sw\swinit.c" />
     <ClCompile Include="..\src\spicelib\devices\sw\swload.c" />
     <ClCompile Include="..\src\spicelib\devices\sw\swmask.c" />
@@ -2611,8 +2578,6 @@
     <ClCompile Include="..\src\spicelib\devices\tra\traacld.c" />
     <ClCompile Include="..\src\spicelib\devices\tra\traask.c" />
     <ClCompile Include="..\src\spicelib\devices\tra\trabindCSC.c" />
-    <ClCompile Include="..\src\spicelib\devices\tra\tradel.c" />
-    <ClCompile Include="..\src\spicelib\devices\tra\tradest.c" />
     <ClCompile Include="..\src\spicelib\devices\tra\trainit.c" />
     <ClCompile Include="..\src\spicelib\devices\tra\traload.c" />
     <ClCompile Include="..\src\spicelib\devices\tra\traparam.c" />
@@ -2623,8 +2588,6 @@
     <ClCompile Include="..\src\spicelib\devices\txl\txlacct.c" />
     <ClCompile Include="..\src\spicelib\devices\txl\txlask.c" />
     <ClCompile Include="..\src\spicelib\devices\txl\txlbindCSC.c" />
-    <ClCompile Include="..\src\spicelib\devices\txl\txldel.c" />
-    <ClCompile Include="..\src\spicelib\devices\txl\txldest.c" />
     <ClCompile Include="..\src\spicelib\devices\txl\txlfbr.c" />
     <ClCompile Include="..\src\spicelib\devices\txl\txlinit.c" />
     <ClCompile Include="..\src\spicelib\devices\txl\txlload.c" />
@@ -2659,8 +2622,6 @@
     <ClCompile Include="..\src\spicelib\devices\vccs\vccs.c" />
     <ClCompile Include="..\src\spicelib\devices\vccs\vccsask.c" />
     <ClCompile Include="..\src\spicelib\devices\vccs\vccsbindCSC.c" />
-    <ClCompile Include="..\src\spicelib\devices\vccs\vccsdel.c" />
-    <ClCompile Include="..\src\spicelib\devices\vccs\vccsdest.c" />
     <ClCompile Include="..\src\spicelib\devices\vccs\vccsinit.c" />
     <ClCompile Include="..\src\spicelib\devices\vccs\vccsload.c" />
     <ClCompile Include="..\src\spicelib\devices\vccs\vccspar.c" />
@@ -2673,8 +2634,6 @@
     <ClCompile Include="..\src\spicelib\devices\vcvs\vcvs.c" />
     <ClCompile Include="..\src\spicelib\devices\vcvs\vcvsask.c" />
     <ClCompile Include="..\src\spicelib\devices\vcvs\vcvsbindCSC.c" />
-    <ClCompile Include="..\src\spicelib\devices\vcvs\vcvsdel.c" />
-    <ClCompile Include="..\src\spicelib\devices\vcvs\vcvsdest.c" />
     <ClCompile Include="..\src\spicelib\devices\vcvs\vcvsfbr.c" />
     <ClCompile Include="..\src\spicelib\devices\vcvs\vcvsinit.c" />
     <ClCompile Include="..\src\spicelib\devices\vcvs\vcvsload.c" />
@@ -2834,4 +2793,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/visualc/xspice/cmpp/cmpp.vcxproj b/visualc/xspice/cmpp/cmpp.vcxproj
index f14055b33..8f8efa9f4 100644
--- a/visualc/xspice/cmpp/cmpp.vcxproj
+++ b/visualc/xspice/cmpp/cmpp.vcxproj
@@ -146,6 +146,7 @@
       <ExceptionHandling>false</ExceptionHandling>
       <CompileAs>CompileAsC</CompileAs>
       <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\src\xspice\cmpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <WholeProgramOptimization>false</WholeProgramOptimization>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -155,16 +156,26 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <CustomBuild Include="..\..\..\src\xspice\cmpp\ifs_yacc.y;..\..\..\src\xspice\cmpp\mod_yacc.y">
+    <CustomBuild Include="..\..\..\src\xspice\cmpp\ifs_lex.l">
+      <Message>invoke win_flex.exe for %(Identity)</Message>
+      <Command>..\..\..\..\flex-bison\win_flex.exe --outfile=.\tmp-bison\%(Filename).c --header-file=.\tmp-bison\%(Filename).h %(Identity) || exit 1</Command>
+      <Outputs>.\tmp-bison\%(Filename).c;.\tmp-bison\%(Filename).h</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\..\..\src\xspice\cmpp\ifs_yacc.y">
       <Message>invoke win_bison.exe for %(Identity)</Message>
       <Command>..\..\..\..\flex-bison\win_bison.exe --output=.\tmp-bison\%(Filename).c --defines=.\tmp-bison\%(Filename).h %(Identity) || exit 1</Command>
       <Outputs>.\tmp-bison\%(Filename).c;.\tmp-bison\%(Filename).h</Outputs>
     </CustomBuild>
-    <CustomBuild Include="..\..\..\src\xspice\cmpp\ifs_lex.l;..\..\..\src\xspice\cmpp\mod_lex.l">
+    <CustomBuild Include="..\..\..\src\xspice\cmpp\mod_lex.l">
       <Message>invoke win_flex.exe for %(Identity)</Message>
       <Command>..\..\..\..\flex-bison\win_flex.exe --outfile=.\tmp-bison\%(Filename).c --header-file=.\tmp-bison\%(Filename).h %(Identity) || exit 1</Command>
       <Outputs>.\tmp-bison\%(Filename).c;.\tmp-bison\%(Filename).h</Outputs>
     </CustomBuild>
+    <CustomBuild Include="..\..\..\src\xspice\cmpp\mod_yacc.y">
+      <Message>invoke win_bison.exe for %(Identity)</Message>
+      <Command>..\..\..\..\flex-bison\win_bison.exe --output=.\tmp-bison\%(Filename).c --defines=.\tmp-bison\%(Filename).h %(Identity) || exit 1</Command>
+      <Outputs>.\tmp-bison\%(Filename).c;.\tmp-bison\%(Filename).h</Outputs>
+    </CustomBuild>
     <None Include="..\src\xspice\icm\objects.inc" />
   </ItemGroup>
   <ItemGroup>