diff --git a/ChangeLog b/ChangeLog
index f859f08ab..57c9d0225 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -86,6 +86,9 @@
      [monitor.c session.c ssh-agent.c]
      spaces
  - (djm) [auth-pam.c defines.h] Move PAM related bits to auth-pam.c
+ - (djm) [auth-pam.c auth.c bufaux.h entropy.c openbsd-compat/port-tun.c]
+   remove last traces of bufaux.h - it was merged into buffer.h in the big
+   includes.h commit
 
 20060804
  - (dtucker) [configure.ac] The "crippled AES" test does not work on recent
@@ -5156,4 +5159,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.4454 2006/08/05 02:43:32 djm Exp $
+$Id: ChangeLog,v 1.4455 2006/08/05 02:49:30 djm Exp $
diff --git a/auth-pam.c b/auth-pam.c
index a67eaa309..695198493 100644
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -81,7 +81,6 @@
 #include "auth.h"
 #include "auth-pam.h"
 #include "buffer.h"
-#include "bufaux.h"
 #include "canohost.h"
 #include "log.h"
 #include "monitor_wrap.h"
diff --git a/auth.c b/auth.c
index fba32eb96..f2aee8fdb 100644
--- a/auth.c
+++ b/auth.c
@@ -60,7 +60,6 @@
 #include "canohost.h"
 #include "uidswap.h"
 #include "misc.h"
-#include "bufaux.h"
 #include "packet.h"
 #include "loginrec.h"
 #ifdef GSSAPI
diff --git a/entropy.c b/entropy.c
index b98e3c859..f0331a84e 100644
--- a/entropy.c
+++ b/entropy.c
@@ -46,7 +46,6 @@
 #include "pathnames.h"
 #include "log.h"
 #include "buffer.h"
-#include "bufaux.h"
 
 /*
  * Portable OpenSSH PRNG seeding:
diff --git a/openbsd-compat/port-tun.c b/openbsd-compat/port-tun.c
index f6a6aa9e1..d2ea03874 100644
--- a/openbsd-compat/port-tun.c
+++ b/openbsd-compat/port-tun.c
@@ -28,7 +28,7 @@
 
 #include "log.h"
 #include "misc.h"
-#include "bufaux.h"
+#include "buffer.h"
 
 /*
  * This is the portable version of the SSH tunnel forwarding, it