diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 90d989cf3..f656fbc44 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-05  Corinna Vinschen  <corinna@vinschen.de>
+
+	* include/cygwin/types.h: Fix preprocessor guards for vm_offset_t and
+	vm_size_t.  Add typedef for vm_object_t.
+
 2003-11-05  Christopher Faylor  <cgf@redhat.com>
 
 	* fhandler_disk_file.cc (fhandler_disk_file::opendir): Detect attempt
diff --git a/winsup/cygwin/include/cygwin/types.h b/winsup/cygwin/include/cygwin/types.h
index 9d810f5f4..103337457 100644
--- a/winsup/cygwin/include/cygwin/types.h
+++ b/winsup/cygwin/include/cygwin/types.h
@@ -107,16 +107,21 @@ typedef long long key_t;
 #ifndef __BIT_TYPES_DEFINED
 #define __BIT_TYPES_DEFINED__ 1
 
-#ifndef __vm_offset_t
+#ifndef __vm_offset_t_defined
 #define __vm_offset_t_defined
 typedef unsigned long vm_offset_t;
 #endif /*__vm_offset_t_defined*/
 
-#ifndef __vm_size_t
+#ifndef __vm_size_t_defined
 #define __vm_size_t_defined
 typedef unsigned long vm_size_t;
 #endif /*__vm_size_t_defined*/
 
+#ifndef __vm_object_t_defined
+#define __vm_object_t_defined
+typedef void *vm_object_t;
+#endif /* __vm_object_t_defined */
+
 #ifndef __u_int8_t_defined
 #define __u_int8_t_defined
 typedef unsigned char u_int8_t;