diff --git a/curses.h b/curses.h
index 30c473a2..b08efe48 100644
--- a/curses.h
+++ b/curses.h
@@ -11,7 +11,7 @@
  * See the file maintain.er for details of the current maintainer.	*
  ************************************************************************/
 
-/* $Id: curses.h,v 1.265 2006/12/28 09:39:55 wmcbrine Exp $ */
+/* $Id: curses.h,v 1.266 2006/12/29 11:21:32 wmcbrine Exp $ */
 
 /*----------------------------------------------------------------------*
  *				PDCurses				*
@@ -557,7 +557,7 @@ typedef struct
 # ifdef CURSES_LIBRARY
 #  define PDCEX __declspec(dllexport) extern
 # else
-#  define PDCEX __declspec(dllimport)
+#  define PDCEX __declspec(dllimport) extern
 # endif
 #else
 # define PDCEX extern
@@ -572,6 +572,7 @@ PDCEX	MOUSE_STATUS	Mouse_status;
 PDCEX	int		COLORS;
 PDCEX	int		COLOR_PAIRS;
 PDCEX	int		TABSIZE;
+PDCEX	chtype		acs_map[];
 
 #undef PDCEX
 
@@ -694,9 +695,6 @@ bits), 8 bits for other attributes, and 16 bits for character data.
 	 available for A_ALTCHARSET */
 
 #ifdef CHTYPE_LONG
-
-extern chtype acs_map[];
-
 # define ACS_PICK(w, n)	((chtype)w | A_ALTCHARSET)
 #else
 # define ACS_PICK(w, n)	((chtype)n)
diff --git a/win32/curses.def b/win32/curses.def
index a36a34e9..d1a949b8 100644
--- a/win32/curses.def
+++ b/win32/curses.def
@@ -15,6 +15,7 @@ EXPORTS Mouse_status
 EXPORTS COLORS
 EXPORTS COLOR_PAIRS
 EXPORTS TABSIZE
+EXPORTS acs_map
 EXPORTS addch
 EXPORTS addchnstr
 EXPORTS addchstr
@@ -41,7 +42,6 @@ EXPORTS clear
 EXPORTS clrtobot
 EXPORTS clrtoeol
 EXPORTS color_content
-EXPORTS COLOR_PAIR
 EXPORTS color_set
 EXPORTS copywin
 EXPORTS curs_set
@@ -63,14 +63,6 @@ EXPORTS erase
 EXPORTS filter
 EXPORTS flash
 EXPORTS flushinp
-EXPORTS getbegx
-EXPORTS getbegy
-EXPORTS getcurx
-EXPORTS getcury
-EXPORTS getmaxx
-EXPORTS getmaxy
-EXPORTS getparx
-EXPORTS getpary
 EXPORTS getbkgd
 EXPORTS getnstr
 EXPORTS getstr
@@ -99,7 +91,6 @@ EXPORTS instr
 EXPORTS intrflush
 EXPORTS isendwin
 EXPORTS is_linetouched
-EXPORTS is_termresized
 EXPORTS is_wintouched
 EXPORTS keyname
 EXPORTS keypad
@@ -170,7 +161,6 @@ EXPORTS notimeout
 EXPORTS overlay
 EXPORTS overwrite
 EXPORTS pair_content
-EXPORTS PAIR_NUMBER
 EXPORTS pechochar
 EXPORTS pnoutrefresh
 EXPORTS prefresh
@@ -289,6 +279,16 @@ EXPORTS wtimeout
 EXPORTS wtouchln
 EXPORTS wvline
 EXPORTS getattrs
+EXPORTS getbegx
+EXPORTS getbegy
+EXPORTS getmaxx
+EXPORTS getmaxy
+EXPORTS getparx
+EXPORTS getpary
+EXPORTS getcurx
+EXPORTS getcury
+EXPORTS traceoff
+EXPORTS traceon
 EXPORTS unctrl
 EXPORTS mouse_set
 EXPORTS mouse_on
@@ -298,20 +298,45 @@ EXPORTS map_button
 EXPORTS wmouse_position
 EXPORTS getmouse
 EXPORTS getbmap
+EXPORTS assume_default_colors
+EXPORTS curses_version
 EXPORTS has_key
+EXPORTS use_default_colors
+EXPORTS wresize
+EXPORTS mouseinterval
+EXPORTS mousemask
+EXPORTS mouse_trafo
+EXPORTS nc_getmouse
+EXPORTS ungetmouse
+EXPORTS wenclose
+EXPORTS wmouse_trafo
+EXPORTS addrawch
+EXPORTS insrawch
+EXPORTS is_termresized
+EXPORTS mvaddrawch
+EXPORTS mvdeleteln
+EXPORTS mvinsertln
+EXPORTS mvinsrawch
+EXPORTS mvwaddrawch
+EXPORTS mvwdeleteln
 EXPORTS mvwinsertln
+EXPORTS mvwinsrawch
 EXPORTS raw_output
 EXPORTS resize_term
 EXPORTS resize_window
-EXPORTS traceoff
-EXPORTS traceon
+EXPORTS waddrawch
+EXPORTS winsrawch
 EXPORTS wordchar
+EXPORTS PDC_debug
 EXPORTS PDC_ungetch
+EXPORTS PDC_set_blink
+EXPORTS PDC_set_line_color
 EXPORTS PDC_set_title
+EXPORTS PDC_clearclipboard
+EXPORTS PDC_freeclipboard
 EXPORTS PDC_getclipboard
 EXPORTS PDC_setclipboard
-EXPORTS PDC_freeclipboard
-EXPORTS PDC_clearclipboard
 EXPORTS PDC_get_input_fd
 EXPORTS PDC_get_key_modifiers
-EXPORTS PDC_set_line_color
+EXPORTS PDC_save_key_modifiers
+EXPORTS PDC_return_key_modifiers
diff --git a/win32/vcwin32.mak b/win32/vcwin32.mak
index d63fcc01..67367345 100644
--- a/win32/vcwin32.mak
+++ b/win32/vcwin32.mak
@@ -2,7 +2,7 @@
 #
 # Visual C++ NMakefile for PDCurses library - Win32 VC++ 2.0+
 #
-# Usage: nmake -f [path\]vcwin32.mak [DEBUG=] [DLLBUILD=] [target]
+# Usage: nmake -f [path\]vcwin32.mak [DEBUG=] [DLL=] [WIDE=] [target]
 #
 # where target can be any of:
 # [all|demos|pdcurses.lib|panel.lib|testcurs.exe...]
@@ -33,13 +33,19 @@ CC		= cl.exe -nologo
 CFLAGS		= -Z7 -DPDCDEBUG
 LDFLAGS		= -debug -pdb:none
 !else
-CFLAGS		=  -Ox
+CFLAGS		= -Ox
 LDFLAGS		=
 !endif
 
-SHL_LD = link $(LDFLAGS) /NOLOGO /DLL /OUT:pdcurses.dll /DEF:$(osdir)\curses.def
+!ifdef WIDE
+DEFFILE		= $(osdir)\cursesw.def
+CPPFLAGS	= -I$(PDCURSES_HOME) -DPDC_WIDE
+!else
+DEFFILE		= $(osdir)\curses.def
+CPPFLAGS	= -I$(PDCURSES_HOME)
+!endif
 
-CPPFLAGS	= -I$(PDCURSES_HOME) #-DPDC_WIDE
+SHL_LD = link $(LDFLAGS) /NOLOGO /DLL /OUT:pdcurses.dll /DEF:$(DEFFILE)
 
 LINK		= link.exe -nologo
 
@@ -53,7 +59,7 @@ LIBCURSES	= pdcurses.lib
 CURSESDLL	= pdcurses.dll
 LIBPANEL	= panel.lib
 
-!ifdef DLLBUILD
+!ifdef DLL
 BUILD		= $(CC) -c $(CFLAGS) $(CPPFLAGS) -DPDC_DLL_BUILD
 PDCLIBS		= $(CURSESDLL) $(LIBPANEL)
 !else
@@ -84,8 +90,10 @@ $(PANOBJS) : $(PANEL_HEADER)
 terminfo.obj: $(TERM_HEADER)
 $(DEMOS) : $(LIBCURSES)
 
+!ifndef DLL
 $(LIBCURSES) : $(LIBOBJS) $(PDCOBJS)
 	$(LIBEXE) -out:$@ $(LIBOBJS) $(PDCOBJS)
+!endif
 
 $(CURSESDLL) : $(LIBOBJS) $(PDCOBJS) $(osdir)\curses.def pdcurses.obj
 	$(SHL_LD) $(LIBOBJS) $(PDCOBJS) pdcurses.obj $(CCLIBS)