diff --git a/ChangeLog b/ChangeLog
index d361e71f2..c30c0e399 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -258,6 +258,12 @@
  - (djm) [ssh-agent.c] Restore dropped stat.h
  - (djm) [openbsd-compat/sha2.h openbsd-compat/sha2.c] Comment out 
    SHA384, which we don't need and doesn't compile without tweaks
+ - (djm) [auth-pam.c clientloop.c includes.h monitor.c session.c]
+   [sftp-client.c ssh-keysign.c ssh.c sshconnect.c sshconnect2.c]
+   [sshd.c openbsd-compat/bsd-misc.c openbsd-compat/bsd-openpty.c]
+   [openbsd-compat/glob.c openbsd-compat/mktemp.c]
+   [openbsd-compat/readpassphrase.c] Lots of include fixes for
+   OpenSolaris
 
 20060313
  - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong)
@@ -4159,4 +4165,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.4217 2006/03/15 03:37:48 djm Exp $
+$Id: ChangeLog,v 1.4218 2006/03/15 03:42:54 djm Exp $
diff --git a/auth-pam.c b/auth-pam.c
index fb9ae954a..49cf32369 100644
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -47,7 +47,12 @@
 
 /* Based on $FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.11 2003/03/31 13:48:18 des Exp $ */
 #include "includes.h"
-RCSID("$Id: auth-pam.c,v 1.128 2006/01/29 05:46:13 dtucker Exp $");
+RCSID("$Id: auth-pam.c,v 1.129 2006/03/15 03:42:55 djm Exp $");
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+#include <signal.h>
 
 #ifdef USE_PAM
 #if defined(HAVE_SECURITY_PAM_APPL_H)
diff --git a/clientloop.c b/clientloop.c
index dba3e96c3..83706c297 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -68,7 +68,9 @@ RCSID("$OpenBSD: clientloop.c,v 1.155 2006/02/22 00:04:44 stevesk Exp $");
 #include <sys/ioctl.h>
 
 #include <ctype.h>
+#ifdef HAVE_PATHS_H
 #include <paths.h>
+#endif
 #include <signal.h>
 #include <termios.h>
 
diff --git a/includes.h b/includes.h
index 800d23e90..431fa2d13 100644
--- a/includes.h
+++ b/includes.h
@@ -103,6 +103,7 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "\100(#)" msg }
 #ifdef HAVE_STDINT_H
 # include <stdint.h>
 #endif
+#include <termios.h>
 #ifdef HAVE_SYS_BITYPES_H
 # include <sys/bitypes.h> /* For u_intXX_t */
 #endif
diff --git a/monitor.c b/monitor.c
index 30849a371..502d54efa 100644
--- a/monitor.c
+++ b/monitor.c
@@ -30,7 +30,9 @@ RCSID("$OpenBSD: monitor.c,v 1.69 2006/03/07 09:07:40 djm Exp $");
 #include <sys/types.h>
 #include <sys/wait.h>
 
+#ifdef HAVE_PATHS_H
 #include <paths.h>
+#endif
 #include <signal.h>
 
 #ifdef SKEY
diff --git a/openbsd-compat/bsd-misc.c b/openbsd-compat/bsd-misc.c
index d32b054d7..00482616d 100644
--- a/openbsd-compat/bsd-misc.c
+++ b/openbsd-compat/bsd-misc.c
@@ -16,9 +16,12 @@
  */
 
 #include "includes.h"
+
+#include <signal.h>
+
 #include "xmalloc.h"
 
-RCSID("$Id: bsd-misc.c,v 1.28 2005/11/01 22:07:31 dtucker Exp $");
+RCSID("$Id: bsd-misc.c,v 1.29 2006/03/15 03:42:57 djm Exp $");
 
 #ifndef HAVE___PROGNAME
 char *__progname;
diff --git a/openbsd-compat/bsd-openpty.c b/openbsd-compat/bsd-openpty.c
index 8eb62b7a8..28929de67 100644
--- a/openbsd-compat/bsd-openpty.c
+++ b/openbsd-compat/bsd-openpty.c
@@ -46,6 +46,8 @@
 # include <sys/stropts.h>
 #endif
 
+#include <signal.h>
+
 #ifndef O_NOCTTY
 #define O_NOCTTY 0
 #endif
diff --git a/openbsd-compat/glob.c b/openbsd-compat/glob.c
index f6a04ea3f..fd3d86c4c 100644
--- a/openbsd-compat/glob.c
+++ b/openbsd-compat/glob.c
@@ -34,6 +34,9 @@
 /* OPENBSD ORIGINAL: lib/libc/gen/glob.c */
 
 #include "includes.h"
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <dirent.h>
 #include <ctype.h>
 
 static long
diff --git a/openbsd-compat/mktemp.c b/openbsd-compat/mktemp.c
index 88e04c520..53a50c512 100644
--- a/openbsd-compat/mktemp.c
+++ b/openbsd-compat/mktemp.c
@@ -35,6 +35,10 @@
 
 #include "includes.h"
 
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <ctype.h>
+
 #if !defined(HAVE_MKDTEMP) || defined(HAVE_STRICT_MKSTEMP)
 
 static int _gettemp(char *, int *, int, int);
diff --git a/openbsd-compat/readpassphrase.c b/openbsd-compat/readpassphrase.c
index 919c0174a..95e26dcd4 100644
--- a/openbsd-compat/readpassphrase.c
+++ b/openbsd-compat/readpassphrase.c
@@ -27,6 +27,8 @@
 #ifndef HAVE_READPASSPHRASE
 
 #include <termios.h>
+#include <signal.h>
+#include <ctype.h>
 #include <readpassphrase.h>
 
 #ifdef TCSASOFT
diff --git a/session.c b/session.c
index 6fb63d3ad..8eb1a03e5 100644
--- a/session.c
+++ b/session.c
@@ -42,7 +42,9 @@ RCSID("$OpenBSD: session.c,v 1.197 2006/02/28 01:10:21 djm Exp $");
 #include <sys/wait.h>
 #include <sys/un.h>
 
+#ifdef HAVE_PATHS_H
 #include <paths.h>
+#endif
 #include <signal.h>
 
 #include "ssh.h"
diff --git a/sftp-client.c b/sftp-client.c
index 042ab8879..6637feca4 100644
--- a/sftp-client.c
+++ b/sftp-client.c
@@ -26,6 +26,7 @@ RCSID("$OpenBSD: sftp-client.c,v 1.60 2006/02/20 17:19:54 stevesk Exp $");
 #ifdef HAVE_SYS_STAT_H
 # include <sys/stat.h>
 #endif
+# include <signal.h>
 
 #include "openbsd-compat/sys-queue.h"
 
diff --git a/ssh-keysign.c b/ssh-keysign.c
index f2ee214e1..aa0260bf8 100644
--- a/ssh-keysign.c
+++ b/ssh-keysign.c
@@ -24,7 +24,9 @@
 #include "includes.h"
 RCSID("$OpenBSD: ssh-keysign.c,v 1.20 2006/02/08 12:15:27 stevesk Exp $");
 
+#ifdef HAVE_PATHS_H
 #include <paths.h>
+#endif
 
 #include <openssl/evp.h>
 #include <openssl/rand.h>
diff --git a/ssh.c b/ssh.c
index 6f185b4a7..911231a6c 100644
--- a/ssh.c
+++ b/ssh.c
@@ -51,7 +51,9 @@ RCSID("$OpenBSD: ssh.c,v 1.266 2006/03/12 04:23:07 djm Exp $");
 #include <sys/un.h>
 
 #include <ctype.h>
+#ifdef HAVE_PATHS_H
 #include <paths.h>
+#endif
 #include <signal.h>
 
 #include <openssl/evp.h>
diff --git a/sshconnect.c b/sshconnect.c
index 9d1c8593c..340270731 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -20,7 +20,9 @@ RCSID("$OpenBSD: sshconnect.c,v 1.176 2006/02/22 00:04:45 stevesk Exp $");
 #include <sys/stat.h>
 
 #include <ctype.h>
+#ifdef HAVE_PATHS_H
 #include <paths.h>
+#endif
 
 #include "ssh.h"
 #include "xmalloc.h"
diff --git a/sshconnect2.c b/sshconnect2.c
index b01a3ca5b..2467d235c 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -27,7 +27,6 @@ RCSID("$OpenBSD: sshconnect2.c,v 1.147 2006/03/07 09:07:40 djm Exp $");
 
 #include <sys/types.h>
 #include <sys/wait.h>
-#include <sys/queue.h>
 #include <sys/stat.h>
 
 #include "openbsd-compat/sys-queue.h"
diff --git a/sshd.c b/sshd.c
index 6f458eb3b..aef4db109 100644
--- a/sshd.c
+++ b/sshd.c
@@ -51,7 +51,9 @@ RCSID("$OpenBSD: sshd.c,v 1.325 2006/03/13 08:16:00 djm Exp $");
 #include <sys/ioctl.h>
 #include <sys/wait.h>
 
+#ifdef HAVE_PATHS_H
 #include <paths.h>
+#endif
 #include <signal.h>
 
 #include <openssl/dh.h>