diff --git a/ChangeLog b/ChangeLog
index 4b2a76585..e00c31d5a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,6 +26,11 @@
    - stevesk@cvs.openbsd.org 2006/02/07 03:59:20
      [deattack.c]
      duplicate #include
+   - stevesk@cvs.openbsd.org 2006/02/08 12:15:27
+     [auth.c clientloop.c includes.h misc.c monitor.c readpass.c]
+     [session.c sftp.c ssh-agent.c ssh-keysign.c ssh.c sshconnect.c]
+     [sshd.c sshpty.c]
+     move #include <paths.h> out of includes.h; ok markus@
 
 20060313
  - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong)
@@ -3927,4 +3932,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.4147 2006/03/15 00:12:38 djm Exp $
+$Id: ChangeLog,v 1.4148 2006/03/15 00:16:59 djm Exp $
diff --git a/auth.c b/auth.c
index 2dc5c2be6..94c4a3eb8 100644
--- a/auth.c
+++ b/auth.c
@@ -23,8 +23,11 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: auth.c,v 1.60 2005/06/17 02:44:32 djm Exp $");
+RCSID("$OpenBSD: auth.c,v 1.61 2006/02/08 12:15:27 stevesk Exp $");
 
+#ifdef HAVE_PATHS_H
+#  include <paths.h>
+#endif
 #ifdef HAVE_LOGIN_H
 #include <login.h>
 #endif
diff --git a/clientloop.c b/clientloop.c
index c43a50b25..893ba30ff 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -59,8 +59,9 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: clientloop.c,v 1.150 2006/02/07 01:42:00 stevesk Exp $");
+RCSID("$OpenBSD: clientloop.c,v 1.151 2006/02/08 12:15:27 stevesk Exp $");
 
+#include <paths.h>
 #include <termios.h>
 
 #include "ssh.h"
diff --git a/includes.h b/includes.h
index db2f2f5a2..85a907ceb 100644
--- a/includes.h
+++ b/includes.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: includes.h,v 1.25 2006/02/07 01:42:00 stevesk Exp $	*/
+/*	$OpenBSD: includes.h,v 1.26 2006/02/08 12:15:27 stevesk Exp $	*/
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -90,9 +90,6 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "\100(#)" msg }
 #ifdef HAVE_LASTLOG_H
 #  include <lastlog.h>
 #endif
-#ifdef HAVE_PATHS_H
-#  include <paths.h> /* For _PATH_XXX */
-#endif
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/misc.c b/misc.c
index 29e928886..a80eedb1c 100644
--- a/misc.c
+++ b/misc.c
@@ -24,8 +24,11 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: misc.c,v 1.42 2006/01/31 10:19:02 djm Exp $");
+RCSID("$OpenBSD: misc.c,v 1.43 2006/02/08 12:15:27 stevesk Exp $");
 
+#ifdef HAVE_PATHS_H
+#  include <paths.h>
+#endif
 #ifdef SSH_TUN_OPENBSD
 #include <net/if.h>
 #endif
diff --git a/monitor.c b/monitor.c
index e6f648b0b..1d6fcf1d8 100644
--- a/monitor.c
+++ b/monitor.c
@@ -25,14 +25,16 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: monitor.c,v 1.64 2005/10/13 22:24:31 stevesk Exp $");
+RCSID("$OpenBSD: monitor.c,v 1.65 2006/02/08 12:15:27 stevesk Exp $");
 
-#include <openssl/dh.h>
+#include <paths.h>
 
 #ifdef SKEY
 #include <skey.h>
 #endif
 
+#include <openssl/dh.h>
+
 #include "ssh.h"
 #include "auth.h"
 #include "kex.h"
diff --git a/readpass.c b/readpass.c
index 7914799a4..a9b99617a 100644
--- a/readpass.c
+++ b/readpass.c
@@ -23,7 +23,11 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: readpass.c,v 1.33 2005/05/02 21:13:22 markus Exp $");
+RCSID("$OpenBSD: readpass.c,v 1.34 2006/02/08 12:15:27 stevesk Exp $");
+
+#ifdef HAVE_PATHS_H
+#  include <paths.h>
+#endif
 
 #include "xmalloc.h"
 #include "misc.h"
diff --git a/session.c b/session.c
index 0cbd5fbb2..88e0a04d2 100644
--- a/session.c
+++ b/session.c
@@ -33,7 +33,9 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: session.c,v 1.191 2005/12/24 02:27:41 djm Exp $");
+RCSID("$OpenBSD: session.c,v 1.192 2006/02/08 12:15:27 stevesk Exp $");
+
+#include <paths.h>
 
 #include "ssh.h"
 #include "ssh1.h"
diff --git a/sftp.c b/sftp.c
index a2e3f6aad..877632ec3 100644
--- a/sftp.c
+++ b/sftp.c
@@ -16,8 +16,11 @@
 
 #include "includes.h"
 
-RCSID("$OpenBSD: sftp.c,v 1.70 2006/01/31 10:19:02 djm Exp $");
+RCSID("$OpenBSD: sftp.c,v 1.71 2006/02/08 12:15:27 stevesk Exp $");
 
+#ifdef HAVE_PATHS_H
+#  include <paths.h>
+#endif
 #ifdef USE_LIBEDIT
 #include <histedit.h>
 #else
diff --git a/ssh-agent.c b/ssh-agent.c
index cfeeebb50..87381f09f 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -35,8 +35,11 @@
 
 #include "includes.h"
 #include "openbsd-compat/sys-queue.h"
-RCSID("$OpenBSD: ssh-agent.c,v 1.125 2006/02/07 01:18:09 stevesk Exp $");
+RCSID("$OpenBSD: ssh-agent.c,v 1.126 2006/02/08 12:15:27 stevesk Exp $");
 
+#ifdef HAVE_PATHS_H
+#  include <paths.h>
+#endif
 #include <openssl/evp.h>
 #include <openssl/md5.h>
 
diff --git a/ssh-keysign.c b/ssh-keysign.c
index dae3a2e8c..f2ee214e1 100644
--- a/ssh-keysign.c
+++ b/ssh-keysign.c
@@ -22,7 +22,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "includes.h"
-RCSID("$OpenBSD: ssh-keysign.c,v 1.19 2005/09/13 23:40:07 djm Exp $");
+RCSID("$OpenBSD: ssh-keysign.c,v 1.20 2006/02/08 12:15:27 stevesk Exp $");
+
+#include <paths.h>
 
 #include <openssl/evp.h>
 #include <openssl/rand.h>
diff --git a/ssh.c b/ssh.c
index 3940dabfd..b248c0280 100644
--- a/ssh.c
+++ b/ssh.c
@@ -40,7 +40,9 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh.c,v 1.257 2005/12/20 04:41:07 dtucker Exp $");
+RCSID("$OpenBSD: ssh.c,v 1.258 2006/02/08 12:15:27 stevesk Exp $");
+
+#include <paths.h>
 
 #include <openssl/evp.h>
 #include <openssl/err.h>
diff --git a/sshconnect.c b/sshconnect.c
index 64ffec240..9da911c4c 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -13,7 +13,9 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshconnect.c,v 1.171 2005/12/06 22:38:27 reyk Exp $");
+RCSID("$OpenBSD: sshconnect.c,v 1.172 2006/02/08 12:15:27 stevesk Exp $");
+
+#include <paths.h>
 
 #include <openssl/bn.h>
 
diff --git a/sshd.c b/sshd.c
index def90d827..10f9f52a5 100644
--- a/sshd.c
+++ b/sshd.c
@@ -42,7 +42,9 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshd.c,v 1.318 2005/12/24 02:27:41 djm Exp $");
+RCSID("$OpenBSD: sshd.c,v 1.319 2006/02/08 12:15:27 stevesk Exp $");
+
+#include <paths.h>
 
 #include <openssl/dh.h>
 #include <openssl/bn.h>
diff --git a/sshpty.c b/sshpty.c
index 8ce8ee469..6b0ad1f2a 100644
--- a/sshpty.c
+++ b/sshpty.c
@@ -12,10 +12,12 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshpty.c,v 1.13 2006/02/07 01:42:00 stevesk Exp $");
- 
-#include <termios.h>
+RCSID("$OpenBSD: sshpty.c,v 1.14 2006/02/08 12:15:27 stevesk Exp $");
 
+#ifdef HAVE_PATHS_H
+#  include <paths.h>
+#endif
+#include <termios.h>
 #ifdef HAVE_UTIL_H
 # include <util.h>
 #endif /* HAVE_UTIL_H */