diff --git a/ase/awk/msw-cl.mak b/ase/awk/msw-cl.mak
index 8ddfd706..e58e9a84 100644
--- a/ase/awk/msw-cl.mak
+++ b/ase/awk/msw-cl.mak
@@ -1,9 +1,6 @@
 NAME = aseawk
 MODE = release
 
-JNI_INC = \
-	-I"$(JAVA_HOME)\include" \
-	-I"$(JAVA_HOME)\include\win32" 
 
 !if !defined(CPU) || "$(CPU)" == ""
 CPU = $(PROCESSOR_ARCHITECTURE)
@@ -29,8 +26,8 @@ LDFLAGS = /subsystem:windows
 LIBS=
 
 !IF "$(MODE)" == "debug"
-CFLAGS = $(CFLAGS) -D_DEBUG -DDEBUG /MTd
-CXXFLAGS = $(CXXFLAGS) -D_DEBUG -DDEBUG /MTd
+CFLAGS = $(CFLAGS) -D_DEBUG -DDEBUG /MTd /Zi
+CXXFLAGS = $(CXXFLAGS) -D_DEBUG -DDEBUG /MTd /Zi
 !ELSEIF "$(MODE)" == "release"
 CFLAGS = $(CFLAGS) -DNDEBUG /MT /O2
 CXXFLAGS = $(CXXFLAGS) -DNDEBUG /MT /O2
@@ -91,11 +88,10 @@ LIBS_JNIDLL=user32.lib $(OUT_FILE_LIB) asecmn.lib aseutl.lib
 LIBS_JNIDLL = $(LIBS_JNIDLL) bufferoverflowu.lib
 !endif
 
-
 TARGETS = lib
-
 !if "$(JAVA_HOME)" != ""
 TARGETS = $(TARGETS) jnidll jar
+JNI_INC = -I"$(JAVA_HOME)\include" -I"$(JAVA_HOME)\include\win32" 
 !endif
 
 all: $(TARGETS)
diff --git a/ase/cmn/msw-cl.mak b/ase/cmn/msw-cl.mak
index 4cf4bd29..818dd3f1 100644
--- a/ase/cmn/msw-cl.mak
+++ b/ase/cmn/msw-cl.mak
@@ -8,7 +8,7 @@ AR = link
 CFLAGS = /nologo /W3 -I..\..
 
 !IF "$(MODE)" == "debug"
-CFLAGS = $(CFLAGS) -D_DEBUG -DDEBUG /MTd
+CFLAGS = $(CFLAGS) -D_DEBUG -DDEBUG /MTd /Zi
 !ELSEIF "$(MODE)" == "release"
 CFLAGS = $(CFLAGS) -DNDEBUG /MT /O2
 !ELSE
diff --git a/ase/test/awk/msw-cl.mak b/ase/test/awk/msw-cl.mak
index 254638e6..1c5d7d7a 100644
--- a/ase/test/awk/msw-cl.mak
+++ b/ase/test/awk/msw-cl.mak
@@ -16,8 +16,8 @@ LIBS = asecmn.lib aseawk.lib aseutl.lib kernel32.lib user32.lib
 LIBS_CXX = $(LIBS) aseawk++.lib
 
 !IF "$(MODE)" == "debug"
-CFLAGS = $(CFLAGS) -D_DEBUG -DDEBUG /MTd
-CXXFLAGS = $(CXXFLAGS) -D_DEBUG -DDEBUG /MTd
+CFLAGS = $(CFLAGS) -D_DEBUG -DDEBUG /MTd /Zi
+CXXFLAGS = $(CXXFLAGS) -D_DEBUG -DDEBUG /MTd /Zi
 !ELSEIF "$(MODE)" == "release"
 CFLAGS = $(CFLAGS) -DNDEBUG /MT /O2
 CXXFLAGS = $(CXXFLAGS) -DNDEBUG /MT /O2
diff --git a/ase/utl/msw-cl.mak b/ase/utl/msw-cl.mak
index 0918ea9c..ea54195c 100644
--- a/ase/utl/msw-cl.mak
+++ b/ase/utl/msw-cl.mak
@@ -8,7 +8,7 @@ AR = link
 CFLAGS = /nologo /W3 -I..\..
 
 !IF "$(MODE)" == "debug"
-CFLAGS = $(CFLAGS) -D_DEBUG -DDEBUG /MTd
+CFLAGS = $(CFLAGS) -D_DEBUG -DDEBUG /MTd /Zi
 !ELSEIF "$(MODE)" == "release"
 CFLAGS = $(CFLAGS) -DNDEBUG /MT /O2
 !ELSE