diff --git a/doc/intro.man b/doc/intro.man
index 6b3247f9..d68880f4 100644
--- a/doc/intro.man
+++ b/doc/intro.man
@@ -324,7 +324,7 @@ FUNCTIONS
 		mvwscanw                 scanw
 		napms                    kernel
 		newpad                   pad
-	***	newterm                   initscr
+		newterm                  initscr
 		newwin                   window
 		nl                       outopts
 		nocbreak                 inopts
diff --git a/os2/pdcurses.def b/os2/pdcurses.def
index 9c522289..77112b09 100644
--- a/os2/pdcurses.def
+++ b/os2/pdcurses.def
@@ -46,6 +46,7 @@ EXPORTS
             filter
             flash                          
             flushinp                       
+            getwin
             has_colors                     
             has_ic                         
             has_il                         
@@ -84,6 +85,7 @@ EXPORTS
             pnoutrefresh                   
             prefresh                       
             printw                         
+            putwin
             qiflush
             raw                            
             raw_output                     
diff --git a/pdcurses/initscr.c b/pdcurses/initscr.c
index dd10ca0d..74218a47 100644
--- a/pdcurses/initscr.c
+++ b/pdcurses/initscr.c
@@ -61,7 +61,7 @@
 #endif
 
 #ifdef PDCDEBUG
-char *rcsid_initscr  = "$Id: initscr.c,v 1.8 2005/11/24 18:50:40 wmcbrine Exp $";
+char *rcsid_initscr  = "$Id: initscr.c,v 1.9 2005/12/17 01:03:16 wmcbrine Exp $";
 #else
 char* _curses_notice = "PDCurses 2.2 - Public Domain 1994";
 #endif
@@ -165,7 +165,7 @@ extern void (*PDC_initial_slk)();
    WINDOW *Xinitscr(int argc, char *argv[]);
    int endwin(void);
    int isendwin(void);
-  *** SCREEN *newterm(char *type, FILE *outfd, FILE *infd);
+   SCREEN *newterm(char *type, FILE *outfd, FILE *infd);
    SCREEN *set_term(SCREEN *new);
   *** void delscreen(SCREEN *sp);
 
diff --git a/pdcurses/terminfo.c b/pdcurses/terminfo.c
index 9ca510eb..b5a16f93 100644
--- a/pdcurses/terminfo.c
+++ b/pdcurses/terminfo.c
@@ -33,7 +33,7 @@
 #endif
 
 #ifdef PDCDEBUG
-char *rcsid_terminfo  = "$Id: terminfo.c,v 1.2 2005/12/17 00:26:17 wmcbrine Exp $";
+char *rcsid_terminfo  = "$Id: terminfo.c,v 1.3 2005/12/17 01:03:16 wmcbrine Exp $";
 #endif
 
 /*man-start*********************************************************************
@@ -97,9 +97,9 @@ int newcol;
 }
 /***********************************************************************/
 #ifdef HAVE_PROTO
-int vidattr(chtype attr)
+int	PDC_CDECL	vidattr(chtype attr)
 #else
-int vidattr(attr)
+int	PDC_CDECL	vidattr(attr)
 chtype attr;
 #endif
 /***********************************************************************/
@@ -111,9 +111,9 @@ chtype attr;
 }
 /***********************************************************************/
 #ifdef HAVE_PROTO
-int vidputs(chtype attr, int (*putfunc)(int))
+int	PDC_CDECL	vidputs(chtype attr, int (*putfunc)(int))
 #else
-int vidputs(attr, putfunc)
+int	PDC_CDECL	vidputs(attr, putfunc)
 chtype attr;
 int (*putfunc)();
 #endif
diff --git a/pdcurses/util.c b/pdcurses/util.c
index 9d20897a..6e8e0334 100644
--- a/pdcurses/util.c
+++ b/pdcurses/util.c
@@ -53,10 +53,11 @@
 /* undefine any macros for functions defined in this module */
 #undef	unctrl
 #undef	keyname
+#undef	has_key
 #undef	filter
 #undef	use_env
-#undef	put_win
-#undef	get_win
+#undef	putwin
+#undef	getwin
 #undef	delay_output
 #undef	flushinp
 
@@ -65,7 +66,7 @@
 #endif
 
 #ifdef PDCDEBUG
-char *rcsid_util  = "$Id: util.c,v 1.8 2005/12/16 23:27:47 wmcbrine Exp $";
+char *rcsid_util  = "$Id: util.c,v 1.9 2005/12/17 01:03:16 wmcbrine Exp $";
 #endif
 
 /*man-start*********************************************************************
@@ -77,8 +78,8 @@ char *rcsid_util  = "$Id: util.c,v 1.8 2005/12/16 23:27:47 wmcbrine Exp $";
   	char *keyname(int key);
   	void filter(void);
   	void use_env(bool x);
-  ***	int putwin(WINDOW *win, FILE *filep);
-  ***	WINDOW *getwin(FILE *filep);
+  	int putwin(WINDOW *win, FILE *filep);
+  	WINDOW *getwin(FILE *filep);
   	int delay_output( int ms );
   	int flushinp(void);
 
@@ -113,7 +114,8 @@ char *rcsid_util  = "$Id: util.c,v 1.8 2005/12/16 23:27:47 wmcbrine Exp $";
  	If this is not true, then we will be unable to reliably flush
  	the typeahead.
 
- 	filter() and use_env() are no-ops on PDCurses.
+ 	filter() and use_env() are no-ops on PDCurses. getwin() and 
+ 	putwin() also do nothing yet.
 
   X/Open Return Value:
  	All functions return OK on success and ERR on error.
@@ -292,6 +294,35 @@ bool x;
 }
 /***********************************************************************/
 #ifdef HAVE_PROTO
+int	PDC_CDECL	putwin(WINDOW *win, FILE *filep)
+#else
+int	PDC_CDECL	putwin(win, filep)
+WINDOW *win;
+FILE *filep;
+#endif
+/***********************************************************************/
+{
+#ifdef PDCDEBUG
+	if (trace_on) PDC_debug("putwin() - called\n");
+#endif
+	return ERR;
+}
+/***********************************************************************/
+#ifdef HAVE_PROTO
+WINDOW*	PDC_CDECL	getwin(FILE *filep)
+#else
+WINDOW*	PDC_CDECL	getwin(filep)
+FILE *filep;
+#endif
+/***********************************************************************/
+{
+#ifdef PDCDEBUG
+	if (trace_on) PDC_debug("getwin() - called\n");
+#endif
+	return (WINDOW *)NULL;
+}
+/***********************************************************************/
+#ifdef HAVE_PROTO
 int	PDC_CDECL	delay_output( int ms )
 #else
 int	PDC_CDECL	delay_output(ms)
diff --git a/win32/curses.def b/win32/curses.def
index ff18615c..de87a1ed 100644
--- a/win32/curses.def
+++ b/win32/curses.def
@@ -48,6 +48,7 @@ EXPORTS filter
 EXPORTS flash
 EXPORTS flushinp
 EXPORTS getstr
+EXPORTS getwin
 EXPORTS halfdelay
 EXPORTS has_colors
 EXPORTS has_ic
@@ -137,6 +138,7 @@ EXPORTS pechochar
 EXPORTS pnoutrefresh
 EXPORTS prefresh
 EXPORTS printw
+EXPORTS putwin
 EXPORTS qiflush
 EXPORTS raw
 EXPORTS raw_output
diff --git a/win32/curses_lcc.def b/win32/curses_lcc.def
index c4a3b39b..7ed82cad 100644
--- a/win32/curses_lcc.def
+++ b/win32/curses_lcc.def
@@ -41,6 +41,7 @@ filter
 flash
 flushinp
 getstr
+getwin
 halfdelay
 has_colors
 has_ic
@@ -130,6 +131,7 @@ pechochar
 pnoutrefresh
 prefresh
 printw
+putwin
 qiflush
 raw
 raw_output