diff --git a/gdb/nat/linux-btrace.c b/gdb/nat/linux-btrace.c
index b32d04c..9d9f8f9 100644
--- a/gdb/nat/linux-btrace.c
+++ b/gdb/nat/linux-btrace.c
@@ -19,15 +19,9 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see . */
-#ifdef GDBSERVER
-#include "server.h"
-#else
-#include "defs.h"
-#endif
-
+#include "common-defs.h"
#include "linux-btrace.h"
#include "regcache.h"
-#include "gdbthread.h"
#include "gdb_wait.h"
#include "i386-cpuid.h"
#include "common-regcache.h"
diff --git a/gdb/nat/linux-btrace.h b/gdb/nat/linux-btrace.h
index 28a7176..e4b2604 100644
--- a/gdb/nat/linux-btrace.h
+++ b/gdb/nat/linux-btrace.h
@@ -30,6 +30,8 @@
# include
#endif
+struct target_ops;
+
/* Branch trace target information per thread. */
struct btrace_target_info
{