diff --git a/configure.in b/configure.in
index fe8b09271..c4975bf7e 100644
--- a/configure.in
+++ b/configure.in
@@ -544,13 +544,19 @@ if test "$enable_xspice" = "yes"; then
     AC_PROG_YACC
     AM_PROG_LEX
     XSPICEDIR="xspice"
+    case $host_os in
+     *mingw* | *cygwin* )
+      DLLIBS="";;
+     * )
+      DLLIBS="-ldl";;
+    esac   
     XSPICELIB1="$XSPICEDIR/cm/libcmxsp.a \
     		$XSPICEDIR/mif/libmifxsp.a"
     XSPICELIB2="$XSPICEDIR/evt/libevtxsp.a \
                 $XSPICEDIR/enh/libenhxsp.a \
 	        $XSPICEDIR/ipc/libipcxsp.a \
 		$XSPICEDIR/idn/libidnxsp.a \
-		-ldl"
+		$DLLIBS"
     XSPICEINIT=""    
     XSPICETESTS=""		
 		
diff --git a/src/xspice/icm/analog/modpath.lst b/src/xspice/icm/analog/modpath.lst
index c38a4aff5..c5cb6eaf4 100644
--- a/src/xspice/icm/analog/modpath.lst
+++ b/src/xspice/icm/analog/modpath.lst
@@ -15,4 +15,3 @@ square
 summer
 s_xfer
 triangle
-
diff --git a/src/xspice/icm/digital/modpath.lst b/src/xspice/icm/digital/modpath.lst
index 65d9f32c9..075678bf3 100644
--- a/src/xspice/icm/digital/modpath.lst
+++ b/src/xspice/icm/digital/modpath.lst
@@ -24,4 +24,3 @@ d_tff
 d_tristate
 d_xnor
 d_xor
-
diff --git a/src/xspice/icm/makedefs.in b/src/xspice/icm/makedefs.in
index 83dd4ba5e..a4dc78dc7 100644
--- a/src/xspice/icm/makedefs.in
+++ b/src/xspice/icm/makedefs.in
@@ -17,7 +17,11 @@ CC = @CC@
 INCLUDES = -I$(TOPDIR)$(top_srcdir)/src/include -I$(TOPDIR)$(top_builddir)
 
 # CFLAGS to use here
+ifeq "$(strip $(uname))" "MINGW32_NT-5.0" 
+  CFLAGS = @CFLAGS@ -DCM_WINDOWS 
+else  
 CFLAGS = @CFLAGS@ -fPIC -DCM_LINUX
+endif
 
 # Path to the cmpp utility
 CMPP = $(TOPDIR)$(top_builddir)/src/xspice/cmpp/cmpp
diff --git a/src/xspice/icm/modpath.lst b/src/xspice/icm/modpath.lst
index 9ad9131c9..eba74545a 100644
--- a/src/xspice/icm/modpath.lst
+++ b/src/xspice/icm/modpath.lst
@@ -1,2 +1 @@
 icm_spice2poly
-
diff --git a/src/xspice/icm/xtradev/modpath.lst b/src/xspice/icm/xtradev/modpath.lst
index a07ee3372..8cd756308 100644
--- a/src/xspice/icm/xtradev/modpath.lst
+++ b/src/xspice/icm/xtradev/modpath.lst
@@ -7,4 +7,3 @@ lcouple
 lmeter
 potentiometer
 zener
-
diff --git a/src/xspice/icm/xtraevt/modpath.lst b/src/xspice/icm/xtraevt/modpath.lst
index 304d32f95..81dbd3ec7 100644
--- a/src/xspice/icm/xtraevt/modpath.lst
+++ b/src/xspice/icm/xtraevt/modpath.lst
@@ -2,5 +2,3 @@ d_to_real
 real_delay
 real_gain
 real_to_v
-
-
diff --git a/src/xspice/icm/xtraevt/udnpath.lst b/src/xspice/icm/xtraevt/udnpath.lst
index e1586dfaa..e5705e826 100644
--- a/src/xspice/icm/xtraevt/udnpath.lst
+++ b/src/xspice/icm/xtraevt/udnpath.lst
@@ -1,3 +1,2 @@
 int
 real
-