diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 538d2185c..de17ae744 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+Tue Aug 22 11:08:11 2000  Christopher Faylor <cgf@cygnus.com>
+
+	* include/sys/cygwin.h: Declare some thread classes.
+	* include/mntent.h: Avoid declaring functions.
+
 Tue Aug 22 01:08:01 2000  Christopher Faylor <cgf@cygnus.com>
 
 	* winsup.h: Eliminate inclusion of most of the cygwin .h files.  Use .h
diff --git a/winsup/cygwin/include/mntent.h b/winsup/cygwin/include/mntent.h
index 0f0580a8e..eaab27031 100644
--- a/winsup/cygwin/include/mntent.h
+++ b/winsup/cygwin/include/mntent.h
@@ -15,11 +15,13 @@ struct mntent
   int mnt_passno;
 };
 
+#ifndef _NOMNTENT_FUNCS
 FILE *setmntent (const char *__filep, const char *__type);
 struct mntent *getmntent (FILE *__filep);
 int addmntent (FILE *__filep, const struct mntent *__mnt);
 int endmntent (FILE *__filep);
 char *hasmntopt (const struct mntent *__mnt, const char *__opt);
+#endif
 
 /* This next file doesn't exist, it is in the registry,
    however applications need the define to pass to
diff --git a/winsup/cygwin/include/sys/cygwin.h b/winsup/cygwin/include/sys/cygwin.h
index 8d7b5d433..d6d83eb60 100644
--- a/winsup/cygwin/include/sys/cygwin.h
+++ b/winsup/cygwin/include/sys/cygwin.h
@@ -109,6 +109,9 @@ enum
    SIZEOF_PER_PROCESS) to make sure you remember to make the adjustment.
 */
 
+class ResourceLocks;
+class MTinterface;
+
 struct per_process
 {
   char *initial_sp;