2 files changed, 5 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 9e9bb3068..8982fe417 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -135,6 +135,8 @@
    [regress/cipher-speed.sh regress/forcecommand.sh regress/forwarding.sh]
    Sync regress tests to -current; include dtucker@'s new cfgmatch and 
    forcecommand tests. Add cipher-speed.sh test (not linked in yet)
+ - (dtucker) [cleanup.c] Since config.h defines _LARGE_FILES on AIX, including
+   system headers before defines.h will cause conflicting definitions.
 
 20060713
  - (dtucker) [auth-krb5.c auth-pam.c] Still more errno.h
@@ -5053,4 +5055,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.4436 2006/07/24 05:31:41 djm Exp $
+$Id: ChangeLog,v 1.4437 2006/07/24 13:19:40 dtucker Exp $
diff --git a/cleanup.c b/cleanup.c
index 4e6c79ce7..0d9f2a6d2 100644
--- a/cleanup.c
+++ b/cleanup.c
@@ -15,6 +15,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include "config.h"
+
 #include <unistd.h>
 
 #include "log.h"