6 files changed, 13 insertions, 7 deletions

diff --git a/lib/libthread_db/arch/amd64/libpthread_md.c b/lib/libthread_db/arch/amd64/libpthread_md.c
index 2a635c6d128a9..646d36d564fef 100644
--- a/lib/libthread_db/arch/amd64/libpthread_md.c
+++ b/lib/libthread_db/arch/amd64/libpthread_md.c
@@ -30,8 +30,11 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/procfs.h>
 #include <string.h>
+#include <thread_db.h>
 #include <ucontext.h>
 
+#include "libpthread_db.h"
+
 void
 pt_reg_to_ucontext(const struct reg *r, ucontext_t *uc)
 {
diff --git a/lib/libthread_db/arch/arm/libpthread_md.c b/lib/libthread_db/arch/arm/libpthread_md.c
index 88a804f060d71..74d21b45f1c02 100644
--- a/lib/libthread_db/arch/arm/libpthread_md.c
+++ b/lib/libthread_db/arch/arm/libpthread_md.c
@@ -27,9 +27,8 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <string.h>
 #include <sys/types.h>
-#include <proc_service.h>
+#include <string.h>
 #include <thread_db.h>
 
 #include "libpthread_db.h"
diff --git a/lib/libthread_db/arch/i386/libpthread_md.c b/lib/libthread_db/arch/i386/libpthread_md.c
index dc14e6080872a..d41865f521e39 100644
--- a/lib/libthread_db/arch/i386/libpthread_md.c
+++ b/lib/libthread_db/arch/i386/libpthread_md.c
@@ -27,11 +27,10 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <string.h>
 #include <sys/types.h>
-#include <proc_service.h>
-#include <thread_db.h>
 #include <machine/npx.h>
+#include <string.h>
+#include <thread_db.h>
 
 #include "libpthread_db.h"
 
diff --git a/lib/libthread_db/arch/ia64/libpthread_md.c b/lib/libthread_db/arch/ia64/libpthread_md.c
index 7553ed117eae4..3e85102a747e6 100644
--- a/lib/libthread_db/arch/ia64/libpthread_md.c
+++ b/lib/libthread_db/arch/ia64/libpthread_md.c
@@ -28,8 +28,11 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/procfs.h>
+#include <thread_db.h>
 #include <ucontext.h>
 
+#include "libpthread_db.h"
+
 void
 pt_reg_to_ucontext(const struct reg *r, ucontext_t *uc)
 {
diff --git a/lib/libthread_db/arch/powerpc/libpthread_md.c b/lib/libthread_db/arch/powerpc/libpthread_md.c
index 955cc8ed4800d..b5cccb573a917 100644
--- a/lib/libthread_db/arch/powerpc/libpthread_md.c
+++ b/lib/libthread_db/arch/powerpc/libpthread_md.c
@@ -27,9 +27,8 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <string.h>
 #include <sys/types.h>
-#include <proc_service.h>
+#include <string.h>
 #include <thread_db.h>
 
 #include "libpthread_db.h"
diff --git a/lib/libthread_db/arch/sparc64/libpthread_md.c b/lib/libthread_db/arch/sparc64/libpthread_md.c
index 7553ed117eae4..3e85102a747e6 100644
--- a/lib/libthread_db/arch/sparc64/libpthread_md.c
+++ b/lib/libthread_db/arch/sparc64/libpthread_md.c
@@ -28,8 +28,11 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/procfs.h>
+#include <thread_db.h>
 #include <ucontext.h>
 
+#include "libpthread_db.h"
+
 void
 pt_reg_to_ucontext(const struct reg *r, ucontext_t *uc)
 {