diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index ed10cf0132..5703caf5a6 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2009-06-07  Pedro Alves  <pedro@codesourcery.com>
+
+	* inferior.h (procfs_first_available): Move declaration to...
+	* proc-utils.h: ... here.
+	* sol-thread.c: Include procfs.h and proc-utils.h.
+
 2009-06-07  Pedro Alves  <pedro@codesourcery.com>
 
 	* inferior.h (proc_iterate_over_mappings): Delete declaration.
diff --git a/gdb/inferior.h b/gdb/inferior.h
index c924e49266..60d59137ba 100644
--- a/gdb/inferior.h
+++ b/gdb/inferior.h
@@ -196,10 +196,6 @@ extern void terminal_init_inferior (void);
 
 extern void terminal_init_inferior_with_pgrp (int pgrp);
 
-/* From procfs.c */
-
-extern ptid_t procfs_first_available (void);
-
 /* From fork-child.c */
 
 extern int fork_inferior (char *, char *, char **,
diff --git a/gdb/proc-utils.h b/gdb/proc-utils.h
index d951f04d88..cf52ff60cd 100644
--- a/gdb/proc-utils.h
+++ b/gdb/proc-utils.h
@@ -16,6 +16,7 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
+/* From proc-why.c */
 
 /*
  * Pretty-print functions for /proc data 
@@ -53,6 +54,9 @@ extern void proc_prettyfprint_syscalls (FILE *file, sysset_t *sysset,
 
 extern void proc_prettyfprint_status (long, int, int, int);
 
+
+/* From proc-api.c */
+
 /*
  * Trace functions for /proc api.
  */
@@ -92,3 +96,8 @@ typedef PROC_CTL_WORD_TYPE procfs_ctl_t;
 #else
 typedef long procfs_ctl_t;
 #endif
+
+
+/* From procfs.c */
+
+extern ptid_t procfs_first_available (void);
diff --git a/gdb/sol-thread.c b/gdb/sol-thread.c
index 028e036eb6..8c7865b0cf 100644
--- a/gdb/sol-thread.c
+++ b/gdb/sol-thread.c
@@ -65,8 +65,9 @@
 #include "solib.h"
 #include "symfile.h"
 #include "observer.h"
-
 #include "gdb_string.h"
+#include <sys/procfs.h>
+#include "proc-utils.h"
 
 struct target_ops sol_thread_ops;