diff --git a/gnu/usr.bin/gdb/libgdb/fbsd-threads.c b/gnu/usr.bin/gdb/libgdb/fbsd-threads.c
index 51890eb48fa0..129f4f53e35b 100644
--- a/gnu/usr.bin/gdb/libgdb/fbsd-threads.c
+++ b/gnu/usr.bin/gdb/libgdb/fbsd-threads.c
@@ -42,6 +42,10 @@
 #include "gdbcmd.h"
 #include "solib-svr4.h"
 
+#include "gregset.h"
+#ifdef PT_GETXMMREGS
+#include "i387-tdep.h"
+#endif
 
 #define LIBTHREAD_DB_SO "libthread_db.so"
 
@@ -1660,7 +1664,7 @@ ps_lsetregs (struct ps_prochandle *ph, lwpid_t lwpid, const prgregset_t gregset)
 
   old_chain = save_inferior_ptid ();
   inferior_ptid = BUILD_LWP (lwpid, PIDGET (inferior_ptid));
-  supply_gregset (gregset);
+  supply_gregset ((gdb_gregset_t *) gregset);
   target_store_registers (-1);
   do_cleanups (old_chain);
   return PS_OK;
@@ -1687,7 +1691,7 @@ ps_lsetfpregs (struct ps_prochandle *ph, lwpid_t lwpid,
 
   old_chain = save_inferior_ptid ();
   inferior_ptid = BUILD_LWP (lwpid, PIDGET (inferior_ptid));
-  supply_fpregset (fpregset);
+  supply_fpregset ((gdb_fpregset_t *) fpregset);
   target_store_registers (-1);
   do_cleanups (old_chain);
   return PS_OK;