3 files changed, 8 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index f1b2c891c..674d2b9e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,11 @@
    - stevesk@cvs.openbsd.org 2006/08/06 01:13:32
      [compress.c monitor.c monitor_wrap.c]
      "zlib.h" can be <zlib.h>; ok djm@ markus@
+   - miod@cvs.openbsd.org 2006/08/12 20:46:46
+     [monitor.c monitor_wrap.c]
+     Revert previous include file ordering change, for ssh to compile under
+     gcc2 (or until openssl include files are cleaned of parameter names
+     in function prototypes)
 
 20060817
  - (dtucker) [openbsd-compat/fake-rfc2553.c openbsd-compat/setproctitle.c]
@@ -5230,4 +5235,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.4487 2006/08/18 14:21:46 djm Exp $
+$Id: ChangeLog,v 1.4488 2006/08/18 14:22:40 djm Exp $
diff --git a/monitor.c b/monitor.c
index 9e6bcc85f..83b3765a0 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: monitor.c,v 1.87 2006/08/06 01:13:32 stevesk Exp $ */
+/* $OpenBSD: monitor.c,v 1.88 2006/08/12 20:46:46 miod Exp $ */
 /*
  * Copyright 2002 Niels Provos <provos@citi.umich.edu>
  * Copyright 2002 Markus Friedl <markus@openbsd.org>
@@ -42,7 +42,6 @@
 #include <signal.h>
 #include <stdlib.h>
 #include <string.h>
-#include <zlib.h>
 
 #ifdef SKEY
 #include <skey.h>
diff --git a/monitor_wrap.c b/monitor_wrap.c
index 5d6ad25f4..431b3e495 100644
--- a/monitor_wrap.c
+++ b/monitor_wrap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: monitor_wrap.c,v 1.53 2006/08/06 01:13:32 stevesk Exp $ */
+/* $OpenBSD: monitor_wrap.c,v 1.54 2006/08/12 20:46:46 miod Exp $ */
 /*
  * Copyright 2002 Niels Provos <provos@citi.umich.edu>
  * Copyright 2002 Markus Friedl <markus@openbsd.org>
@@ -36,7 +36,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
-#include <zlib.h>
 
 #include <openssl/bn.h>
 #include <openssl/dh.h>