diff --git a/src/target/target.c b/src/target/target.c
index 70130d912..740db0f18 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -33,15 +33,16 @@
 #include "config.h"
 #endif
 
+#include <helper/time_support.h>
+#include <jtag/jtag.h>
+
 #include "target.h"
 #include "target_type.h"
 #include "target_request.h"
 #include "breakpoints.h"
-#include <helper/time_support.h>
 #include "register.h"
 #include "trace.h"
 #include "image.h"
-#include <jtag/jtag.h>
 
 
 static int target_array2mem(Jim_Interp *interp, struct target *target, int argc, Jim_Obj *const *argv);
diff --git a/src/target/target.h b/src/target/target.h
index fededb956..4151c228b 100644
--- a/src/target/target.h
+++ b/src/target/target.h
@@ -27,7 +27,6 @@
 #define TARGET_H
 
 #include <helper/types.h>
-#include <helper/jim.h>
 
 struct reg;
 struct trace;
@@ -214,7 +213,7 @@ enum target_event
 
 struct target_event_action {
 	enum target_event event;
-	Jim_Interp *interp;
+	struct Jim_Interp *interp;
 	struct Jim_Obj *body;
 	int has_percent;
 	struct target_event_action *next;
diff --git a/src/target/target_request.c b/src/target/target_request.c
index fc0ba1ac0..d22b8a2b9 100644
--- a/src/target/target_request.c
+++ b/src/target/target_request.c
@@ -27,12 +27,13 @@
 #include "config.h"
 #endif
 
+#include <helper/log.h>
+#include <helper/binarybuffer.h>
+
 #include "target.h"
 #include "target_request.h"
 #include "target_type.h"
-#include <helper/binarybuffer.h>
 #include "trace.h"
-#include <helper/log.h>
 
 
 static int charmsg_mode = 0;
diff --git a/src/target/testee.c b/src/target/testee.c
index 991c64e85..280111a43 100644
--- a/src/target/testee.c
+++ b/src/target/testee.c
@@ -20,9 +20,11 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
+
+#include <helper/log.h>
+
 #include "target.h"
 #include "target_type.h"
-#include <helper/log.h>
 #include "hello.h"
 
 static const struct command_registration testee_command_handlers[] = {