X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Fcortex_m3.h;h=7ce89014bbbc8eec7ca5705ed769892203f543a5;hp=82a7d4139ffb485b73b748886a2c0ba65779fd6f;hb=71cde5e359f273585880ea8986709b950ba85b08;hpb=cdd2d9c2d0dee319ba5d2f419ac78aa6490bb74b

diff --git a/src/target/cortex_m3.h b/src/target/cortex_m3.h
index 82a7d4139f..7ce89014bb 100644
--- a/src/target/cortex_m3.h
+++ b/src/target/cortex_m3.h
@@ -26,8 +26,6 @@
 #ifndef CORTEX_M3_H
 #define CORTEX_M3_H
 
-#include "register.h"
-#include "target.h"
 #include "armv7m.h"
 
 
@@ -127,14 +125,14 @@ struct cortex_m3_fp_comparator
 	uint32_t fpcr_address;
 };
 
-typedef struct  cortex_m3_dwt_comparator_s
+struct cortex_m3_dwt_comparator
 {
 	int used;
 	uint32_t comp;
 	uint32_t mask;
 	uint32_t function;
 	uint32_t dwt_comparator_address;
-} cortex_m3_dwt_comparator_t;
+};
 
 struct cortex_m3_common
 {
@@ -157,14 +155,14 @@ struct cortex_m3_common
 	/* Data Watchpoint and Trace (DWT) */
 	int dwt_num_comp;
 	int dwt_comp_available;
-	cortex_m3_dwt_comparator_t *dwt_comparator_list;
+	struct cortex_m3_dwt_comparator *dwt_comparator_list;
 	struct reg_cache *dwt_cache;
 
 	struct armv7m_common armv7m;
 };
 
 static inline struct cortex_m3_common *
-target_to_cm3(struct target_s *target)
+target_to_cm3(struct target *target)
 {
 	return container_of(target->arch_info,
 			struct cortex_m3_common, armv7m);