diff --git a/win32/pdcurses.def b/exp-base.def
similarity index 99%
rename from win32/pdcurses.def
rename to exp-base.def
index dc96afec..222b1339 100644
--- a/win32/pdcurses.def
+++ b/exp-base.def
@@ -1,5 +1,3 @@
-LIBRARY pdcurses
-EXPORTS
 LINES
 COLS
 stdscr
@@ -11,7 +9,6 @@ COLOR_PAIRS
 TABSIZE
 acs_map
 ttytype
-TERMINAL
 addch
 addchnstr
 addchstr
@@ -345,6 +342,20 @@ set_panel_userptr
 show_panel
 top_panel
 update_panels
+PDC_debug
+PDC_ungetch
+PDC_set_blink
+PDC_set_line_color
+PDC_set_title
+PDC_clearclipboard
+PDC_freeclipboard
+PDC_getclipboard
+PDC_setclipboard
+PDC_get_input_fd
+PDC_get_key_modifiers
+PDC_save_key_modifiers
+PDC_return_key_modifiers
+cur_term
 del_curterm
 putp
 restartterm
@@ -361,16 +372,3 @@ tigetnum
 tigetstr
 tparm
 tputs
-PDC_debug
-PDC_ungetch
-PDC_set_blink
-PDC_set_line_color
-PDC_set_title
-PDC_clearclipboard
-PDC_freeclipboard
-PDC_getclipboard
-PDC_setclipboard
-PDC_get_input_fd
-PDC_get_key_modifiers
-PDC_save_key_modifiers
-PDC_return_key_modifiers
diff --git a/exp-wide.def b/exp-wide.def
new file mode 100644
index 00000000..ebf6bc20
--- /dev/null
+++ b/exp-wide.def
@@ -0,0 +1,90 @@
+addnwstr
+addwstr
+add_wch
+add_wchnstr
+add_wchstr
+border_set
+box_set
+echo_wchar
+erasewchar
+getbkgrnd
+getcchar
+getn_wstr
+get_wch
+get_wstr
+hline_set
+innwstr
+ins_nwstr
+ins_wch
+ins_wstr
+inwstr
+in_wch
+in_wchnstr
+in_wchstr
+key_name
+killwchar
+mvaddnwstr
+mvaddwstr
+mvadd_wch
+mvadd_wchnstr
+mvadd_wchstr
+mvgetn_wstr
+mvget_wch
+mvget_wstr
+mvhline_set
+mvinnwstr
+mvins_nwstr
+mvins_wch
+mvins_wstr
+mvinwstr
+mvin_wch
+mvin_wchnstr
+mvin_wchstr
+mvvline_set
+mvwaddnwstr
+mvwaddwstr
+mvwadd_wch
+mvwadd_wchnstr
+mvwadd_wchstr
+mvwgetn_wstr
+mvwget_wch
+mvwget_wstr
+mvwhline_set
+mvwinnwstr
+mvwins_nwstr
+mvwins_wch
+mvwins_wstr
+mvwin_wch
+mvwin_wchnstr
+mvwin_wchstr
+mvwinwstr
+mvwvline_set
+pecho_wchar
+setcchar
+slk_wset
+unget_wch
+vline_set
+waddnwstr
+waddwstr
+wadd_wch
+wadd_wchnstr
+wadd_wchstr
+wbkgrnd
+wbkgrndset
+wborder_set
+wecho_wchar
+wgetbkgrnd
+wgetn_wstr
+wget_wch
+wget_wstr
+whline_set
+winnwstr
+wins_nwstr
+wins_wch
+wins_wstr
+winwstr
+win_wch
+win_wchnstr
+win_wchstr
+wunctrl
+wvline_set
diff --git a/os2/gccos2.mak b/os2/gccos2.mak
index 8a5ba654..729ab257 100644
--- a/os2/gccos2.mak
+++ b/os2/gccos2.mak
@@ -42,6 +42,12 @@ else
 	LDFLAGS =
 endif
 
+BASEDEF		= $(PDCURSES_SRCDIR)\exp-base.def
+
+DEFDEPS		= $(BASEDEF)
+
+DEFFILE		= pdcurses.def
+
 DLLTARGET	= pdcurses.dll
 DLLFLAGS 	= -Zdll -Zcrtdll -Zomf
 
@@ -56,12 +62,14 @@ ifeq ($(DLL),Y)
 	CFLAGS += -Zdll -Zcrtdll -Zomf
 	LDFLAGS += -Zlinker /PM:VIO -Zomf -Zcrtdll
 	LIBCURSES = pdcurses.lib
+	LIBDEPS = $(LIBOBJS) $(PDCOBJS) $(DEFFILE)
 	PDCLIBS = $(DLLTARGET)
 	EXEPOST =
 	TUIPOST =
-	CLEAN = *.dll *.lib
+	CLEAN = *.dll *.lib $(DEFFILE)
 else
 	LIBCURSES = pdcurses.a
+	LIBDEPS = $(LIBOBJS) $(PDCOBJS)
 	PDCLIBS = $(LIBCURSES)
 	EXEPOST = $(EMXBIND) $* $(BINDFLAGS)
 	TUIPOST = $(EMXBIND) tuidemo $(BINDFLAGS)
@@ -84,14 +92,23 @@ demos:	$(DEMOS)
 DEMOOBJS = testcurs.o newdemo.o xmas.o tui.o tuidemo.o firework.o \
 ptest.o rain.o worm.o
 
-$(LIBCURSES) : $(LIBOBJS) $(PDCOBJS)
+$(DEFFILE) : $(DEFDEPS)
+	echo LIBRARY PDCURSES > $@
+	echo DESCRIPTION 'PDCurses 3.4 Dynamic Linking library' >> $@
+	echo PROTMODE >>$@
+	echo DATA MULTIPLE READWRITE LOADONCALL >> $@
+	echo CODE LOADONCALL >> $@
+	echo EXPORTS >> $@
+	type $(BASEDEF) >> $@
+
+$(LIBCURSES) : $(LIBDEPS)
 	$(LIBEXE) $(LIBFLAGS) $@ $?
 	-copy $(LIBCURSES) panel.a
 
-$(DLLTARGET): $(LIBOBJS) $(PDCOBJS)
-	$(LINK) $(DLLFLAGS) -o $(DLLTARGET) $? $(osdir)\pdcurses.def
+$(DLLTARGET) : $(LIBDEPS)
+	$(LINK) $(DLLFLAGS) -o $(DLLTARGET) $? $(DEFFILE)
 #	lxlite $(DLLTARGET)
-	emximp -o $(LIBCURSES) $(osdir)\pdcurses.def
+	emximp -o $(LIBCURSES) $(DEFFILE)
 
 $(LIBOBJS) $(PDCOBJS) $(DEMOOBJS) : $(PDCURSES_HEADERS)
 $(PDCOBJS) : $(PDCURSES_OS2_H)
diff --git a/os2/pdcurses.def b/os2/pdcurses.def
deleted file mode 100644
index 5962636d..00000000
--- a/os2/pdcurses.def
+++ /dev/null
@@ -1,385 +0,0 @@
-LIBRARY		PDCURSES
-
-DESCRIPTION	'PDCurses 3.4 Dynamic Linking library'
-
-PROTMODE
-
-DATA		MULTIPLE READWRITE LOADONCALL
-
-CODE		LOADONCALL
-
-EXPORTS
-		LINES
-		COLS
-		stdscr
-		curscr
-		SP
-		Mouse_status
-		COLORS
-		COLOR_PAIRS
-		TABSIZE
-		acs_map
-		ttytype
-		TERMINAL
-		addch
-		addchnstr
-		addchstr
-		addnstr
-		addstr
-		attroff
-		attron
-		attrset
-		attr_get
-		attr_off
-		attr_on
-		attr_set
-		baudrate
-		beep
-		bkgd
-		bkgdset
-		border
-		box
-		can_change_color
-		cbreak
-		chgat
-		clearok
-		clear
-		clrtobot
-		clrtoeol
-		color_content
-		color_set
-		copywin
-		curs_set
-		def_prog_mode
-		def_shell_mode
-		delay_output
-		delch
-		deleteln
-		delscreen
-		delwin
-		derwin
-		doupdate
-		dupwin
-		echochar
-		echo
-		endwin
-		erasechar
-		erase
-		filter
-		flash
-		flushinp
-		getbkgd
-		getnstr
-		getstr
-		getwin
-		halfdelay
-		has_colors
-		has_ic
-		has_il
-		hline
-		idcok
-		idlok
-		immedok
-		inchnstr
-		inchstr
-		inch
-		init_color
-		init_pair
-		initscr
-		innstr
-		insch
-		insdelln
-		insertln
-		insnstr
-		insstr
-		instr
-		intrflush
-		isendwin
-		is_linetouched
-		is_wintouched
-		keyname
-		keypad
-		killchar
-		leaveok
-		longname
-		meta
-		move
-		mvaddch
-		mvaddchnstr
-		mvaddchstr
-		mvaddnstr
-		mvaddstr
-		mvchgat
-		mvcur
-		mvdelch
-		mvderwin
-		mvgetch
-		mvgetnstr
-		mvgetstr
-		mvhline
-		mvinch
-		mvinchnstr
-		mvinchstr
-		mvinnstr
-		mvinsch
-		mvinsnstr
-		mvinsstr
-		mvinstr
-		mvprintw
-		mvscanw
-		mvvline
-		mvwaddchnstr
-		mvwaddchstr
-		mvwaddch
-		mvwaddnstr
-		mvwaddstr
-		mvwchgat
-		mvwdelch
-		mvwgetch
-		mvwgetnstr
-		mvwgetstr
-		mvwhline
-		mvwinchnstr
-		mvwinchstr
-		mvwinch
-		mvwinnstr
-		mvwinsch
-		mvwinsnstr
-		mvwinsstr
-		mvwinstr
-		mvwin
-		mvwprintw
-		mvwscanw
-		mvwvline
-		napms
-		newpad
-		newterm
-		newwin
-		nl
-		nocbreak
-		nodelay
-		noecho
-		nonl
-		noqiflush
-		noraw
-		notimeout
-		overlay
-		overwrite
-		pair_content
-		pechochar
-		pnoutrefresh
-		prefresh
-		printw
-		putwin
-		qiflush
-		raw
-		redrawwin
-		refresh
-		reset_prog_mode
-		reset_shell_mode
-		resetty
-		ripoffline
-		savetty
-		scanw
-		scr_dump
-		scr_init
-		scrl
-		scrollok
-		scroll
-		scr_restore
-		scr_set
-		setscrreg
-		setsyx
-		set_term
-		slk_attroff
-		slk_attr_off
-		slk_attron
-		slk_attr_on
-		slk_attrset
-		slk_attr_set
-		slk_clear
-		slk_color
-		slk_init
-		slk_label
-		slk_noutrefresh
-		slk_refresh
-		slk_restore
-		slk_set
-		slk_touch
-		standend
-		standout
-		start_color
-		subpad
-		subwin
-		syncok
-		termattrs
-		term_attrs
-		termname
-		timeout
-		touchline
-		touchwin
-		typeahead
-		untouchwin
-		use_env
-		vidattr
-		vid_attr
-		vidputs
-		vid_puts
-		vline
-		vw_printw
-		vwprintw
-		vw_scanw
-		vwscanw
-		waddchnstr
-		waddchstr
-		waddch
-		waddnstr
-		waddstr
-		wattroff
-		wattron
-		wattrset
-		wattr_get
-		wattr_off
-		wattr_on
-		wattr_set
-		wbkgdset
-		wbkgd
-		wborder
-		wchgat
-		wclear
-		wclrtobot
-		wclrtoeol
-		wcolor_set
-		wcursyncup
-		wdelch
-		wdeleteln
-		wechochar
-		werase
-		wgetch
-		wgetnstr
-		wgetstr
-		whline
-		winchnstr
-		winchstr
-		winch
-		winnstr
-		winsch
-		winsdelln
-		winsertln
-		winsnstr
-		winsstr
-		winstr
-		wmove
-		wnoutrefresh
-		wprintw
-		wredrawln
-		wrefresh
-		wscanw
-		wscrl
-		wsetscrreg
-		wstandend
-		wstandout
-		wsyncdown
-		wsyncup
-		wtimeout
-		wtouchln
-		wvline
-		getattrs
-		getbegx
-		getbegy
-		getmaxx
-		getmaxy
-		getparx
-		getpary
-		getcurx
-		getcury
-		traceoff
-		traceon
-		unctrl
-		crmode
-		nocrmode
-		draino
-		resetterm
-		fixterm
-		saveterm
-		mouse_set
-		mouse_on
-		mouse_off
-		request_mouse_pos
-		map_button
-		wmouse_position
-		getmouse
-		getbmap
-		assume_default_colors
-		curses_version
-		has_key
-		use_default_colors
-		wresize
-		mouseinterval
-		mousemask
-		mouse_trafo
-		nc_getmouse
-		ungetmouse
-		wenclose
-		wmouse_trafo
-		addrawch
-		insrawch
-		is_termresized
-		mvaddrawch
-		mvdeleteln
-		mvinsertln
-		mvinsrawch
-		mvwaddrawch
-		mvwdeleteln
-		mvwinsertln
-		mvwinsrawch
-		raw_output
-		resize_term
-		resize_window
-		waddrawch
-		winsrawch
-		wordchar
-		bottom_panel
-		del_panel
-		hide_panel
-		move_panel
-		new_panel
-		panel_above
-		panel_below
-		panel_hidden
-		panel_userptr
-		panel_window
-		replace_panel
-		set_panel_userptr
-		show_panel
-		top_panel
-		update_panels
-		del_curterm
-		putp
-		restartterm
-		set_curterm
-		setterm
-		setupterm
-		tgetent
-		tgetflag
-		tgetnum
-		tgetstr
-		tgoto
-		tigetflag
-		tigetnum
-		tigetstr
-		tparm
-		tputs
-		PDC_debug
-		PDC_ungetch
-		PDC_set_blink
-		PDC_set_line_color
-		PDC_set_title
-		PDC_clearclipboard
-		PDC_freeclipboard
-		PDC_getclipboard
-		PDC_setclipboard
-		PDC_get_input_fd
-		PDC_get_key_modifiers
-		PDC_save_key_modifiers
-		PDC_return_key_modifiers
diff --git a/sdl1/Makefile b/sdl1/Makefile
index b0551571..a8393f0b 100644
--- a/sdl1/Makefile
+++ b/sdl1/Makefile
@@ -18,7 +18,13 @@ SLIBS		= $(shell sdl-config --libs)
 # If your system doesn't have these, remove the defines here
 SFLAGS		+= -DHAVE_VSNPRINTF -DHAVE_VSSCANF
 
-BUILD		= $(CC) -O2 -Wall -I$(PDCURSES_SRCDIR)
+ifeq ($(DEBUG),Y)
+	CFLAGS  = -g -Wall -DPDCDEBUG
+else
+	CFLAGS  = -O2 -Wall
+endif
+
+BUILD		= $(CC) $(CFLAGS) -I$(PDCURSES_SRCDIR)
 
 ifeq ($(shell uname),Darwin)
 	DEMOFLAGS = -Dmain=SDL_main
diff --git a/sdl1/Makefile.mng b/sdl1/Makefile.mng
index 9e2f9d3a..427edc67 100644
--- a/sdl1/Makefile.mng
+++ b/sdl1/Makefile.mng
@@ -22,12 +22,18 @@ CC		= gcc
 BUILD		= $(CC) $(CFLAGS) -I$(PDCURSES_SRCDIR)
 LDFLAGS		= -mwindows $(LIBCURSES)
 
+BASEDEF		= $(PDCURSES_SRCDIR)\exp-base.def
+
+DEFDEPS		= $(BASEDEF)
+
+DEFFILE		= pdcurses.def
+
 ifeq ($(DLL),Y)
 	BUILD += -DPDC_DLL_BUILD
-	LIBEXE = gcc pdcurses.def
+	LIBEXE = gcc $(DEFFILE)
 	LIBFLAGS = -Wl,--out-implib,libpdcurses.a -shared -o
 	LIBCURSES = pdcurses.dll
-	CLEAN = $(LIBCURSES) *.a pdcurses.def
+	CLEAN = $(LIBCURSES) *.a $(DEFFILE)
 	POST = -lSDL
 else
 	LIBEXE = ar
@@ -51,10 +57,12 @@ clean:
 demos:	$(DEMOS)
 	strip *.exe
 
-pdcurses.dll: pdcurses.def
+pdcurses.dll: $(DEFFILE)
 
-pdcurses.def: $(PDCURSES_SRCDIR)\win32\pdcurses.def
-	copy $? $@
+$(DEFFILE): $(DEFDEPS)
+	echo LIBRARY pdcurses > $@        
+	echo EXPORTS >> $@        
+	type $(BASEDEF) >> $@ 
 	echo pdc_screen >> $@
 	echo pdc_font >> $@
 	echo pdc_icon >> $@
diff --git a/win32/gccwin32.mak b/win32/gccwin32.mak
index a5b0b57f..7504bb34 100644
--- a/win32/gccwin32.mak
+++ b/win32/gccwin32.mak
@@ -30,27 +30,36 @@ endif
 
 CFLAGS += -I$(PDCURSES_SRCDIR)
 
+BASEDEF		= $(PDCURSES_SRCDIR)/exp-base.def
+WIDEDEF		= $(PDCURSES_SRCDIR)/exp-wide.def
+
+DEFDEPS		= $(BASEDEF)
+
 ifeq ($(WIDE),Y)
 	CFLAGS += -DPDC_WIDE
-	W = w
+	DEFDEPS += $(WIDEDEF)
 endif
 
 ifeq ($(UTF8),Y)
 	CFLAGS += -DPDC_FORCE_UTF8
 endif
 
+DEFFILE		= pdcurses.def
+
 LINK		= gcc
 
 ifeq ($(DLL),Y)
 	CFLAGS += -DPDC_DLL_BUILD
-	LIBEXE = gcc $(osdir)/pdcurses$(W).def
+	LIBEXE = gcc $(DEFFILE)
 	LIBFLAGS = -Wl,--out-implib,pdcurses.a -shared -o
 	LIBCURSES = pdcurses.dll
-	CLEAN = $(LIBCURSES) *.a
+	LIBDEPS = $(LIBOBJS) $(PDCOBJS) $(DEFFILE)
+	CLEAN = $(LIBCURSES) *.a $(DEFFILE)
 else
 	LIBEXE = ar
 	LIBFLAGS = rcv
 	LIBCURSES = pdcurses.a
+	LIBDEPS = $(LIBOBJS) $(PDCOBJS)
 	CLEAN = *.a
 endif
 
@@ -68,7 +77,15 @@ clean:
 demos:	$(DEMOS)
 	strip *.exe
 
-$(LIBCURSES) : $(LIBOBJS) $(PDCOBJS)
+$(DEFFILE): $(DEFDEPS)
+	echo LIBRARY pdcurses > $@
+	echo EXPORTS >> $@
+	cat $(BASEDEF) >> $@
+ifeq ($(WIDE),Y)
+	cat $(WIDEDEF) >> $@
+endif
+
+$(LIBCURSES) : $(LIBDEPS)
 	$(LIBEXE) $(LIBFLAGS) $@ $?
 	-cp pdcurses.a panel.a
 
@@ -106,7 +123,6 @@ dist: $(PDCLIBS)
 	echo Public Domain. >> file_id.diz
 	zip -9jX pdc$(VER)_cyg_w32 \
 	$(PDCURSES_SRCDIR)/README $(PDCURSES_SRCDIR)/HISTORY \
-	$(PDCURSES_SRCDIR)/curses.h $(PDCURSES_SRCDIR)/curspriv.h \
-	$(PDCURSES_SRCDIR)/panel.h $(PDCURSES_SRCDIR)/term.h \
+	$(PDCURSES_SRCDIR)/curses.h $(PDCURSES_SRCDIR)/panel.h \
 	$(LIBCURSES) $(LIBPANEL) file_id.diz
 	rm file_id.diz
diff --git a/win32/mingwin32.mak b/win32/mingwin32.mak
index 9f25b7c2..7fb17e8f 100644
--- a/win32/mingwin32.mak
+++ b/win32/mingwin32.mak
@@ -30,27 +30,36 @@ endif
 
 CFLAGS += -I$(PDCURSES_SRCDIR)
 
+BASEDEF		= $(PDCURSES_SRCDIR)\exp-base.def
+WIDEDEF		= $(PDCURSES_SRCDIR)\exp-wide.def
+
+DEFDEPS		= $(BASEDEF)
+
 ifeq ($(WIDE),Y)
 	CFLAGS += -DPDC_WIDE
-	W = w
+	DEFDEPS += $(WIDEDEF)
 endif
 
 ifeq ($(UTF8),Y)
 	CFLAGS += -DPDC_FORCE_UTF8
 endif
 
+DEFFILE		= pdcurses.def
+
 LINK		= gcc
 
 ifeq ($(DLL),Y)
 	CFLAGS += -DPDC_DLL_BUILD
-	LIBEXE = gcc $(osdir)/pdcurses$(W).def
+	LIBEXE = gcc $(DEFFILE)
 	LIBFLAGS = -Wl,--out-implib,pdcurses.a -shared -o
 	LIBCURSES = pdcurses.dll
-	CLEAN = $(LIBCURSES) *.a
+	LIBDEPS = $(LIBOBJS) $(PDCOBJS) $(DEFFILE)
+	CLEAN = $(LIBCURSES) *.a $(DEFFILE)
 else
 	LIBEXE = ar
 	LIBFLAGS = rcv
 	LIBCURSES = pdcurses.a
+	LIBDEPS = $(LIBOBJS) $(PDCOBJS)
 	CLEAN = *.a
 endif
 
@@ -68,7 +77,15 @@ clean:
 demos:	$(DEMOS)
 	strip *.exe
 
-$(LIBCURSES) : $(LIBOBJS) $(PDCOBJS)
+$(DEFFILE): $(DEFDEPS)
+	echo LIBRARY pdcurses > $@
+	echo EXPORTS >> $@
+	type $(BASEDEF) >> $@
+ifeq ($(WIDE),Y)
+	type $(WIDEDEF) >> $@
+endif
+
+$(LIBCURSES) : $(LIBDEPS)
 	$(LIBEXE) $(LIBFLAGS) $@ $?
 	-copy pdcurses.a panel.a
 
diff --git a/win32/pdcursesw.def b/win32/pdcursesw.def
deleted file mode 100644
index 7335fe6f..00000000
--- a/win32/pdcursesw.def
+++ /dev/null
@@ -1,466 +0,0 @@
-LIBRARY pdcurses
-EXPORTS
-LINES
-COLS
-stdscr
-curscr
-SP
-Mouse_status
-COLORS
-COLOR_PAIRS
-TABSIZE
-acs_map
-ttytype
-TERMINAL
-addch
-addchnstr
-addchstr
-addnstr
-addstr
-attroff
-attron
-attrset
-attr_get
-attr_off
-attr_on
-attr_set
-baudrate
-beep
-bkgd
-bkgdset
-border
-box
-can_change_color
-cbreak
-chgat
-clearok
-clear
-clrtobot
-clrtoeol
-color_content
-color_set
-copywin
-curs_set
-def_prog_mode
-def_shell_mode
-delay_output
-delch
-deleteln
-delscreen
-delwin
-derwin
-doupdate
-dupwin
-echochar
-echo
-endwin
-erasechar
-erase
-filter
-flash
-flushinp
-getbkgd
-getnstr
-getstr
-getwin
-halfdelay
-has_colors
-has_ic
-has_il
-hline
-idcok
-idlok
-immedok
-inchnstr
-inchstr
-inch
-init_color
-init_pair
-initscr
-innstr
-insch
-insdelln
-insertln
-insnstr
-insstr
-instr
-intrflush
-isendwin
-is_linetouched
-is_wintouched
-keyname
-keypad
-killchar
-leaveok
-longname
-meta
-move
-mvaddch
-mvaddchnstr
-mvaddchstr
-mvaddnstr
-mvaddstr
-mvchgat
-mvcur
-mvdelch
-mvderwin
-mvgetch
-mvgetnstr
-mvgetstr
-mvhline
-mvinch
-mvinchnstr
-mvinchstr
-mvinnstr
-mvinsch
-mvinsnstr
-mvinsstr
-mvinstr
-mvprintw
-mvscanw
-mvvline
-mvwaddchnstr
-mvwaddchstr
-mvwaddch
-mvwaddnstr
-mvwaddstr
-mvwchgat
-mvwdelch
-mvwgetch
-mvwgetnstr
-mvwgetstr
-mvwhline
-mvwinchnstr
-mvwinchstr
-mvwinch
-mvwinnstr
-mvwinsch
-mvwinsnstr
-mvwinsstr
-mvwinstr
-mvwin
-mvwprintw
-mvwscanw
-mvwvline
-napms
-newpad
-newterm
-newwin
-nl
-nocbreak
-nodelay
-noecho
-nonl
-noqiflush
-noraw
-notimeout
-overlay
-overwrite
-pair_content
-pechochar
-pnoutrefresh
-prefresh
-printw
-putwin
-qiflush
-raw
-redrawwin
-refresh
-reset_prog_mode
-reset_shell_mode
-resetty
-ripoffline
-savetty
-scanw
-scr_dump
-scr_init
-scrl
-scrollok
-scroll
-scr_restore
-scr_set
-setscrreg
-setsyx
-set_term
-slk_attroff
-slk_attr_off
-slk_attron
-slk_attr_on
-slk_attrset
-slk_attr_set
-slk_clear
-slk_color
-slk_init
-slk_label
-slk_noutrefresh
-slk_refresh
-slk_restore
-slk_set
-slk_touch
-standend
-standout
-start_color
-subpad
-subwin
-syncok
-termattrs
-term_attrs
-termname
-timeout
-touchline
-touchwin
-typeahead
-untouchwin
-use_env
-vidattr
-vid_attr
-vidputs
-vid_puts
-vline
-vw_printw
-vwprintw
-vw_scanw
-vwscanw
-waddchnstr
-waddchstr
-waddch
-waddnstr
-waddstr
-wattroff
-wattron
-wattrset
-wattr_get
-wattr_off
-wattr_on
-wattr_set
-wbkgdset
-wbkgd
-wborder
-wchgat
-wclear
-wclrtobot
-wclrtoeol
-wcolor_set
-wcursyncup
-wdelch
-wdeleteln
-wechochar
-werase
-wgetch
-wgetnstr
-wgetstr
-whline
-winchnstr
-winchstr
-winch
-winnstr
-winsch
-winsdelln
-winsertln
-winsnstr
-winsstr
-winstr
-wmove
-wnoutrefresh
-wprintw
-wredrawln
-wrefresh
-wscanw
-wscrl
-wsetscrreg
-wstandend
-wstandout
-wsyncdown
-wsyncup
-wtimeout
-wtouchln
-wvline
-addnwstr
-addwstr
-add_wch
-add_wchnstr
-add_wchstr
-border_set
-box_set
-echo_wchar
-erasewchar
-getbkgrnd
-getcchar
-getn_wstr
-get_wch
-get_wstr
-hline_set
-innwstr
-ins_nwstr
-ins_wch
-ins_wstr
-inwstr
-in_wch
-in_wchnstr
-in_wchstr
-key_name
-killwchar
-mvaddnwstr
-mvaddwstr
-mvadd_wch
-mvadd_wchnstr
-mvadd_wchstr
-mvgetn_wstr
-mvget_wch
-mvget_wstr
-mvhline_set
-mvinnwstr
-mvins_nwstr
-mvins_wch
-mvins_wstr
-mvinwstr
-mvin_wch
-mvin_wchnstr
-mvin_wchstr
-mvvline_set
-mvwaddnwstr
-mvwaddwstr
-mvwadd_wch
-mvwadd_wchnstr
-mvwadd_wchstr
-mvwgetn_wstr
-mvwget_wch
-mvwget_wstr
-mvwhline_set
-mvwinnwstr
-mvwins_nwstr
-mvwins_wch
-mvwins_wstr
-mvwin_wch
-mvwin_wchnstr
-mvwin_wchstr
-mvwinwstr
-mvwvline_set
-pecho_wchar
-setcchar
-slk_wset
-unget_wch
-vline_set
-waddnwstr
-waddwstr
-wadd_wch
-wadd_wchnstr
-wadd_wchstr
-wbkgrnd
-wbkgrndset
-wborder_set
-wecho_wchar
-wgetbkgrnd
-wgetn_wstr
-wget_wch
-wget_wstr
-whline_set
-winnwstr
-wins_nwstr
-wins_wch
-wins_wstr
-winwstr
-win_wch
-win_wchnstr
-win_wchstr
-wunctrl
-wvline_set
-getattrs
-getbegx
-getbegy
-getmaxx
-getmaxy
-getparx
-getpary
-getcurx
-getcury
-traceoff
-traceon
-unctrl
-crmode
-nocrmode
-draino
-resetterm
-fixterm
-saveterm
-mouse_set
-mouse_on
-mouse_off
-request_mouse_pos
-map_button
-wmouse_position
-getmouse
-getbmap
-assume_default_colors
-curses_version
-has_key
-use_default_colors
-wresize
-mouseinterval
-mousemask
-mouse_trafo
-nc_getmouse
-ungetmouse
-wenclose
-wmouse_trafo
-addrawch
-insrawch
-is_termresized
-mvaddrawch
-mvdeleteln
-mvinsertln
-mvinsrawch
-mvwaddrawch
-mvwdeleteln
-mvwinsertln
-mvwinsrawch
-raw_output
-resize_term
-resize_window
-waddrawch
-winsrawch
-wordchar
-bottom_panel
-del_panel
-hide_panel
-move_panel
-new_panel
-panel_above
-panel_below
-panel_hidden
-panel_userptr
-panel_window
-replace_panel
-set_panel_userptr
-show_panel
-top_panel
-update_panels
-del_curterm
-putp
-restartterm
-set_curterm
-setterm
-setupterm
-tgetent
-tgetflag
-tgetnum
-tgetstr
-tgoto
-tigetflag
-tigetnum
-tigetstr
-tparm
-tputs
-PDC_debug
-PDC_ungetch
-PDC_set_blink
-PDC_set_line_color
-PDC_set_title
-PDC_clearclipboard
-PDC_freeclipboard
-PDC_getclipboard
-PDC_setclipboard
-PDC_get_input_fd
-PDC_get_key_modifiers
-PDC_save_key_modifiers
-PDC_return_key_modifiers
diff --git a/win32/vcwin32.mak b/win32/vcwin32.mak
index c805b56d..b8dc4043 100644
--- a/win32/vcwin32.mak
+++ b/win32/vcwin32.mak
@@ -28,17 +28,21 @@ CFLAGS		= -O1
 LDFLAGS		=
 !endif
 
+BASEDEF		= $(PDCURSES_SRCDIR)\exp-base.def
+WIDEDEF		= $(PDCURSES_SRCDIR)\exp-wide.def
+
+DEFDEPS		= $(BASEDEF)
+
 !ifdef WIDE
-DEFFILE		= $(osdir)\pdcursesw.def
 WIDEOPT		= -DPDC_WIDE
-!else
-DEFFILE		= $(osdir)\pdcurses.def
+DEFDEPS		= $(DEFDEPS) $(WIDEDEF)
 !endif
 
 !ifdef UTF8
 UTF8OPT		= -DPDC_FORCE_UTF8
 !endif
 
+DEFFILE		= pdcurses.def
 SHL_LD = link $(LDFLAGS) /NOLOGO /DLL /OUT:pdcurses.dll /DEF:$(DEFFILE)
 
 LINK		= link.exe -nologo
@@ -71,6 +75,7 @@ clean:
 	-del *.dll
 	-del *.exp
 	-del *.res
+	-del *.def
 
 DEMOOBJS = $(DEMOS:.exe=.obj) tui.obj
 
@@ -87,6 +92,14 @@ $(LIBCURSES) : $(LIBOBJS) $(PDCOBJS)
 	-copy $(LIBCURSES) panel.lib
 !endif
 
+$(DEFFILE) : $(DEFDEPS)
+	echo LIBRARY pdcurses > $(DEFFILE)
+	echo EXPORTS >> $(DEFFILE)
+	type $(BASEDEF) >> $(DEFFILE)
+!ifdef WIDE
+	type $(WIDEDEF) >> $(DEFFILE)
+!endif
+
 $(CURSESDLL) : $(LIBOBJS) $(PDCOBJS) $(DEFFILE) pdcurses.obj
 	$(SHL_LD) $(LIBOBJS) $(PDCOBJS) pdcurses.obj $(CCLIBS)
 	-copy $(LIBCURSES) panel.lib
diff --git a/x11/Makefile.aix.in b/x11/Makefile.aix.in
index f12f67d2..0fe5db78 100644
--- a/x11/Makefile.aix.in
+++ b/x11/Makefile.aix.in
@@ -63,8 +63,8 @@ $(LIBOBJS) $(PDCOBJS) : $(PDCURSES_HEADERS)
 $(PDCOBJS) : $(PDCURSES_X11_H)
 terminfo.o: $(TERM_HEADER)
 
-curses.exp: ../win32/pdcurses.def
-	tail -n +3 ../win32/pdcurses.def > curses.exp
+curses.exp: ../exp-base.def
+	cat ../exp-base.def > curses.exp
 	echo Xinitscr >> curses.exp
 	echo XCursesExit >> curses.exp
 	echo sb_init >> curses.exp