3 files changed, 7 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 079660174..e22c22b1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,7 @@
      move checking of hostkey into own function.
    - [version.h]
      OpenSSH-1.2.1
+ - Clean up broken includes in pty.c
 
 19991211
  - Fix compilation on systems with AFS. Reported by 
diff --git a/Makefile.in b/Makefile.in
index f72867470..3c0891440 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -26,7 +26,7 @@ GNOME_LIBS=`gnome-config --libs gnome gnomeui`
 
 OBJS= atomicio.o authfd.o authfile.o auth-krb4.o auth-passwd.o \
   auth-rhosts.o auth-rh-rsa.o auth-rsa.o auth-skey.o bsd-daemon.o \
-  bsd-login.o bsd-mktemp.o bsd-snprintf.o bsd-strlcat.o bsd-strlcpy.o 
+  bsd-login.o bsd-mktemp.o bsd-snprintf.o bsd-strlcat.o bsd-strlcpy.o \
   bufaux.o buffer.o canohost.o channels.o cipher.o clientloop.o \
   compress.o crc32.o deattack.o helper.o helper.o hostfile.o \
   log-client.o login.o log-server.o match.o md5crypt.o mpaux.o \
diff --git a/pty.c b/pty.c
index f7ef19ca7..06b43bb84 100644
--- a/pty.c
+++ b/pty.c
@@ -14,16 +14,15 @@
  */
 
 #include "includes.h"
-RCSID("$Id: pty.c,v 1.9 1999/12/13 23:47:16 damien Exp $");
+RCSID("$Id: pty.c,v 1.10 1999/12/13 23:54:47 damien Exp $");
+
+#ifdef HAVE_UTIL_H
+# include <util.h>
+#endif /* HAVE_UTIL_H */
 
-#include <util.h>
 #include "pty.h"
 #include "ssh.h"
 
-#ifdef HAVE_DEV_PTMX
-#include <sys/stropts.h>
-#endif /* HAVE_DEV_PTMX */
-
 /* Pty allocated with _getpty gets broken if we do I_PUSH:es to it. */
 #if defined(HAVE__GETPTY) || defined(HAVE_OPENPTY)
 #undef HAVE_DEV_PTMX