diff --git a/src/include/port/qnx4.h b/src/include/port/qnx4.h
index 94ae9a87c17c3605addedaa24767f721f46e3555..d47f6d97d54a03872b034f34d1b9f8f3cf692deb 100644
--- a/src/include/port/qnx4.h
+++ b/src/include/port/qnx4.h
@@ -7,8 +7,6 @@
 
 #undef HAVE_GETRUSAGE
 
-typedef u_short ushort;
-
 extern int	isnan(double dsrc);
 extern long random(void);
 extern void srandom(unsigned int seed);
diff --git a/src/include/port/win32.h b/src/include/port/win32.h
index 7c85043e70531b5918284d33f1a42361a985a3e1..4b04e0925764fdd77db2d4805675f3cd24e36b6a 100644
--- a/src/include/port/win32.h
+++ b/src/include/port/win32.h
@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/src/include/port/win32.h,v 1.34 2004/09/27 23:24:40 momjian Exp $ */
+/* $PostgreSQL: pgsql/src/include/port/win32.h,v 1.35 2004/10/05 13:48:35 momjian Exp $ */
 
 /* undefine and redefine after #include */
 #undef mkdir
@@ -191,18 +191,12 @@ struct itimerval
 int			setitimer(int which, const struct itimerval * value, struct itimerval * ovalue);
 
 
-/* FROM SRA */
-
 /*
  * Supplement to <sys/types.h>.
  */
-#define uid_t int
-#define gid_t int
-#define pid_t unsigned long
-#define ssize_t int
-#define mode_t int
-#define key_t long
-#define ushort unsigned short
+typedef int uid_t;
+typedef int gid_t;
+typdef long key_t;
 
 /*
  * Supplement to <sys/stat.h>.