4 files changed, 9 insertions, 18 deletions
diff --git a/lib/libthread_db/arch/alpha/libpthread_md.c b/lib/libthread_db/arch/alpha/libpthread_md.c
index 6d15c91..7553ed1 100644
--- a/lib/libthread_db/arch/alpha/libpthread_md.c
+++ b/lib/libthread_db/arch/alpha/libpthread_md.c
@@ -27,12 +27,8 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <string.h>
-#include <sys/types.h>
-#include <proc_service.h>
-#include <thread_db.h>
-
-#include "libpthread_db.h"
+#include <sys/procfs.h>
+#include <ucontext.h>
 
 void
 pt_reg_to_ucontext(const struct reg *r, ucontext_t *uc)
diff --git a/lib/libthread_db/arch/amd64/libpthread_md.c b/lib/libthread_db/arch/amd64/libpthread_md.c
index 4959387..7553ed1 100644
--- a/lib/libthread_db/arch/amd64/libpthread_md.c
+++ b/lib/libthread_db/arch/amd64/libpthread_md.c
@@ -27,6 +27,9 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include <sys/procfs.h>
+#include <ucontext.h>
+
 void
 pt_reg_to_ucontext(const struct reg *r, ucontext_t *uc)
 {
diff --git a/lib/libthread_db/arch/ia64/libpthread_md.c b/lib/libthread_db/arch/ia64/libpthread_md.c
index 6d15c91..7553ed1 100644
--- a/lib/libthread_db/arch/ia64/libpthread_md.c
+++ b/lib/libthread_db/arch/ia64/libpthread_md.c
@@ -27,12 +27,8 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <string.h>
-#include <sys/types.h>
-#include <proc_service.h>
-#include <thread_db.h>
-
-#include "libpthread_db.h"
+#include <sys/procfs.h>
+#include <ucontext.h>
 
 void
 pt_reg_to_ucontext(const struct reg *r, ucontext_t *uc)
diff --git a/lib/libthread_db/arch/sparc64/libpthread_md.c b/lib/libthread_db/arch/sparc64/libpthread_md.c
index 6d15c91..7553ed1 100644
--- a/lib/libthread_db/arch/sparc64/libpthread_md.c
+++ b/lib/libthread_db/arch/sparc64/libpthread_md.c
@@ -27,12 +27,8 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <string.h>
-#include <sys/types.h>
-#include <proc_service.h>
-#include <thread_db.h>
-
-#include "libpthread_db.h"
+#include <sys/procfs.h>
+#include <ucontext.h>
 
 void
 pt_reg_to_ucontext(const struct reg *r, ucontext_t *uc)