diff --git a/src/target/breakpoints.h b/src/target/breakpoints.h
index 800e6558e..946347ba5 100644
--- a/src/target/breakpoints.h
+++ b/src/target/breakpoints.h
@@ -20,7 +20,7 @@
 #ifndef BREAKPOINTS_H
 #define BREAKPOINTS_H
 
-#include "target.h"
+#include "types.h"
 
 struct target_s;
 
diff --git a/src/target/target.c b/src/target/target.c
index 29bf8337f..68fad2fe8 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -33,30 +33,16 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
 #include "target.h"
 #include "target_request.h"
-
-#include "log.h"
-#include "configuration.h"
-#include "binarybuffer.h"
+#include "time_support.h"
+#include "register.h"
+#include "trace.h"
+#include "image.h"
 #include "jtag.h"
 
-#include <string.h>
-#include <stdlib.h>
 #include <inttypes.h>
 
-#include <sys/stat.h>
-#include <unistd.h>
-#include <errno.h>
-
-#include <sys/time.h>
-#include <time.h>
-
-#include <time_support.h>
-
-#include <fileio.h>
-#include <image.h>
 
 static int handle_targets_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
 
diff --git a/src/target/target.h b/src/target/target.h
index 500a55198..a664dc34b 100644
--- a/src/target/target.h
+++ b/src/target/target.h
@@ -26,19 +26,16 @@
 #ifndef TARGET_H
 #define TARGET_H
 
-#include "register.h"
 #include "breakpoints.h"
 #include "algorithm.h"
-#include "trace.h"
-
 #include "command.h"
-#include "types.h"
 
-#include <sys/time.h>
-#include <time.h>
+#include "replacements.h"
 
 struct reg_s;
+struct trace_s;
 struct command_context_s;
+
 /*
  * TARGET_UNKNOWN = 0: we don't know anything about the target yet
  * TARGET_RUNNING = 1: the target is executing user code