diff --git a/visualc/sharedspice.vcxproj b/visualc/sharedspice.vcxproj
index 008b5940c..c8e3a325d 100644
--- a/visualc/sharedspice.vcxproj
+++ b/visualc/sharedspice.vcxproj
@@ -199,7 +199,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;..\src\spicelib\parser;src\include;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;SHARED_MODULE;CONFIG64;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);NGDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>RFSPICE;_CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;SHARED_MODULE;CONFIG64;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);NGDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessToFile>false</PreprocessToFile>
       <PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers>
       <MinimalRebuild>false</MinimalRebuild>
@@ -248,7 +248,7 @@
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>true</WholeProgramOptimization>
       <AdditionalIncludeDirectories>..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;..\src\spicelib\parser;src\include;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;SHARED_MODULE;CONFIG64;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>RFSPICE;_CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;SHARED_MODULE;CONFIG64;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <ExceptionHandling>
       </ExceptionHandling>
@@ -337,7 +337,7 @@
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>true</WholeProgramOptimization>
       <AdditionalIncludeDirectories>..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;..\src\spicelib\parser;src\include;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;SHARED_MODULE;CONFIG64;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);USE_OMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>RFSPICE;_CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;SHARED_MODULE;CONFIG64;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);USE_OMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <ExceptionHandling>
       </ExceptionHandling>
@@ -591,6 +591,7 @@
     <ClInclude Include="..\src\include\ngspice\sharedspice.h" />
     <ClInclude Include="..\src\include\ngspice\sim.h" />
     <ClInclude Include="..\src\include\ngspice\smpdefs.h" />
+    <ClInclude Include="..\src\include\ngspice\spdefs.h" />
     <ClInclude Include="..\src\include\ngspice\sperror.h" />
     <ClInclude Include="..\src\include\ngspice\spmatrix.h" />
     <ClInclude Include="..\src\include\ngspice\stringutil.h" />
@@ -611,6 +612,7 @@
     <ClInclude Include="..\src\maths\cmaths\cmath2.h" />
     <ClInclude Include="..\src\maths\cmaths\cmath3.h" />
     <ClInclude Include="..\src\maths\cmaths\cmath4.h" />
+    <ClInclude Include="..\src\maths\dense\dense.h" />
     <ClInclude Include="..\src\maths\fft\fftlib.h" />
     <ClInclude Include="..\src\maths\fft\matlib.h" />
     <ClInclude Include="..\src\maths\misc\accuracy.h" />
@@ -1098,6 +1100,7 @@
     <ClCompile Include="..\src\maths\cmaths\cmath2.c" />
     <ClCompile Include="..\src\maths\cmaths\cmath3.c" />
     <ClCompile Include="..\src\maths\cmaths\cmath4.c" />
+    <ClCompile Include="..\src\maths\dense\dense.c" />
     <ClCompile Include="..\src\maths\deriv\atander.c" />
     <ClCompile Include="..\src\maths\deriv\cosderiv.c" />
     <ClCompile Include="..\src\maths\deriv\cubeder.c" />
@@ -1219,6 +1222,7 @@
     <ClCompile Include="..\src\spicelib\analysis\cktsetup.c" />
     <ClCompile Include="..\src\spicelib\analysis\cktsgen.c" />
     <ClCompile Include="..\src\spicelib\analysis\cktsopt.c" />
+    <ClCompile Include="..\src\spicelib\analysis\cktspdum.c" />
     <ClCompile Include="..\src\spicelib\analysis\ckttemp.c" />
     <ClCompile Include="..\src\spicelib\analysis\cktterr.c" />
     <ClCompile Include="..\src\spicelib\analysis\ckttroub.c" />
@@ -1252,6 +1256,9 @@
     <ClCompile Include="..\src\spicelib\analysis\pzsetp.c" />
     <ClCompile Include="..\src\spicelib\analysis\sensaskq.c" />
     <ClCompile Include="..\src\spicelib\analysis\senssetp.c" />
+    <ClCompile Include="..\src\spicelib\analysis\span.c" />
+    <ClCompile Include="..\src\spicelib\analysis\spaskq.c" />
+    <ClCompile Include="..\src\spicelib\analysis\spsetp.c" />
     <ClCompile Include="..\src\spicelib\analysis\tfanal.c" />
     <ClCompile Include="..\src\spicelib\analysis\tfaskq.c" />
     <ClCompile Include="..\src\spicelib\analysis\tfsetp.c" />
diff --git a/visualc/vngspice-fftw.vcxproj b/visualc/vngspice-fftw.vcxproj
index ada1fa9ef..8eefd5f49 100644
--- a/visualc/vngspice-fftw.vcxproj
+++ b/visualc/vngspice-fftw.vcxproj
@@ -306,7 +306,7 @@ lib /machine:x64 /def:..\..\fftw-3.3-dll64\libfftw3-3.def /out:$(IntDir)libfftw3
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\spicelib\parser;..\src\include;..\src\include\cppduals;.;..\..\fftw-3.3-dll64;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;NGDEBUG;CONFIG64;HAVE_LIBFFTW3;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>RFSPICE;_CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;NGDEBUG;CONFIG64;HAVE_LIBFFTW3;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <ExceptionHandling>
       </ExceptionHandling>
@@ -357,7 +357,7 @@ lib /machine:x64 /def:..\..\fftw-3.3-dll64\libfftw3-3.def /out:$(IntDir)libfftw3
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>true</WholeProgramOptimization>
       <AdditionalIncludeDirectories>..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\spicelib\parser;..\src\include;..\src\include\cppduals;.;..\..\fftw-3.3-dll64;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;CONFIG64;HAVE_LIBFFTW3;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>RFSPICE;_CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;CONFIG64;HAVE_LIBFFTW3;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <ExceptionHandling>
       </ExceptionHandling>
@@ -506,7 +506,7 @@ lib /machine:x64 /def:..\..\fftw-3.3-dll64\libfftw3-3.def /out:$(IntDir)libfftw3
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\spicelib\parser;..\src\include;..\src\include\cppduals;.;..\..\fftw-3.3-dll64;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;NGDEBUG;CONSOLE;CONFIG64;HAVE_LIBFFTW3;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>RFSPICE;_CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;NGDEBUG;CONSOLE;CONFIG64;HAVE_LIBFFTW3;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <ExceptionHandling>
       </ExceptionHandling>
@@ -557,7 +557,7 @@ lib /machine:x64 /def:..\..\fftw-3.3-dll64\libfftw3-3.def /out:$(IntDir)libfftw3
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>true</WholeProgramOptimization>
       <AdditionalIncludeDirectories>..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\spicelib\parser;..\src\include;..\src\include\cppduals;.;..\..\fftw-3.3-dll64;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;CONSOLE;CONFIG64;HAVE_LIBFFTW3;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>RFSPICE;_CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;CONSOLE;CONFIG64;HAVE_LIBFFTW3;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <ExceptionHandling>
       </ExceptionHandling>
@@ -663,7 +663,7 @@ lib /machine:x64 /def:..\..\fftw-3.3-dll64\libfftw3-3.def /out:$(IntDir)libfftw3
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>true</WholeProgramOptimization>
       <AdditionalIncludeDirectories>..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\spicelib\parser;..\src\include;..\src\include\cppduals;.;..\..\fftw-3.3-dll32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;USE_OMP;CONFIG64;HAVE_LIBFFTW3;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>RFSPICE;_CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;USE_OMP;CONFIG64;HAVE_LIBFFTW3;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <ExceptionHandling>
       </ExceptionHandling>
@@ -772,7 +772,7 @@ lib /machine:x64 /def:..\..\fftw-3.3-dll64\libfftw3-3.def /out:$(IntDir)libfftw3
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>true</WholeProgramOptimization>
       <AdditionalIncludeDirectories>..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\spicelib\parser;..\src\include;..\src\include\cppduals;.;..\..\fftw-3.3-dll64;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;CONSOLE;CONFIG64;USE_OMP;HAVE_LIBFFTW3;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>RFSPICE;_CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;CONSOLE;CONFIG64;USE_OMP;HAVE_LIBFFTW3;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <ExceptionHandling>
       </ExceptionHandling>
@@ -1037,6 +1037,7 @@ lib /machine:x64 /def:..\..\fftw-3.3-dll64\libfftw3-3.def /out:$(IntDir)libfftw3
     <ClInclude Include="..\src\include\ngspice\sensgen.h" />
     <ClInclude Include="..\src\include\ngspice\sim.h" />
     <ClInclude Include="..\src\include\ngspice\smpdefs.h" />
+    <ClInclude Include="..\src\include\ngspice\spdefs.h" />
     <ClInclude Include="..\src\include\ngspice\sperror.h" />
     <ClInclude Include="..\src\include\ngspice\spmatrix.h" />
     <ClInclude Include="..\src\include\ngspice\stringutil.h" />
@@ -1057,6 +1058,7 @@ lib /machine:x64 /def:..\..\fftw-3.3-dll64\libfftw3-3.def /out:$(IntDir)libfftw3
     <ClInclude Include="..\src\maths\cmaths\cmath2.h" />
     <ClInclude Include="..\src\maths\cmaths\cmath3.h" />
     <ClInclude Include="..\src\maths\cmaths\cmath4.h" />
+    <ClInclude Include="..\src\maths\dense\dense.h" />
     <ClInclude Include="..\src\maths\fft\fftlib.h" />
     <ClInclude Include="..\src\maths\fft\matlib.h" />
     <ClInclude Include="..\src\maths\misc\accuracy.h" />
@@ -1553,6 +1555,7 @@ lib /machine:x64 /def:..\..\fftw-3.3-dll64\libfftw3-3.def /out:$(IntDir)libfftw3
     <ClCompile Include="..\src\maths\cmaths\cmath2.c" />
     <ClCompile Include="..\src\maths\cmaths\cmath3.c" />
     <ClCompile Include="..\src\maths\cmaths\cmath4.c" />
+    <ClCompile Include="..\src\maths\dense\dense.c" />
     <ClCompile Include="..\src\maths\deriv\atander.c" />
     <ClCompile Include="..\src\maths\deriv\cosderiv.c" />
     <ClCompile Include="..\src\maths\deriv\cubeder.c" />
@@ -1673,6 +1676,7 @@ lib /machine:x64 /def:..\..\fftw-3.3-dll64\libfftw3-3.def /out:$(IntDir)libfftw3
     <ClCompile Include="..\src\spicelib\analysis\cktsetup.c" />
     <ClCompile Include="..\src\spicelib\analysis\cktsgen.c" />
     <ClCompile Include="..\src\spicelib\analysis\cktsopt.c" />
+    <ClCompile Include="..\src\spicelib\analysis\cktspdum.c" />
     <ClCompile Include="..\src\spicelib\analysis\ckttemp.c" />
     <ClCompile Include="..\src\spicelib\analysis\cktterr.c" />
     <ClCompile Include="..\src\spicelib\analysis\ckttroub.c" />
@@ -1706,6 +1710,9 @@ lib /machine:x64 /def:..\..\fftw-3.3-dll64\libfftw3-3.def /out:$(IntDir)libfftw3
     <ClCompile Include="..\src\spicelib\analysis\pzsetp.c" />
     <ClCompile Include="..\src\spicelib\analysis\sensaskq.c" />
     <ClCompile Include="..\src\spicelib\analysis\senssetp.c" />
+    <ClCompile Include="..\src\spicelib\analysis\span.c" />
+    <ClCompile Include="..\src\spicelib\analysis\spaskq.c" />
+    <ClCompile Include="..\src\spicelib\analysis\spsetp.c" />
     <ClCompile Include="..\src\spicelib\analysis\tfanal.c" />
     <ClCompile Include="..\src\spicelib\analysis\tfaskq.c" />
     <ClCompile Include="..\src\spicelib\analysis\tfsetp.c" />