diff --git a/src/target/etb.c b/src/target/etb.c
index 3b9004bb8..fb3112d70 100644
--- a/src/target/etb.c
+++ b/src/target/etb.c
@@ -454,12 +454,12 @@ static int etb_init(struct etm_context *etm_ctx)
 	return ERROR_OK;
 }
 
-static trace_status_t etb_status(struct etm_context *etm_ctx)
+static enum trace_status etb_status(struct etm_context *etm_ctx)
 {
 	struct etb *etb = etm_ctx->capture_driver_priv;
 	struct reg *control = &etb->reg_cache->reg_list[ETB_CTRL];
 	struct reg *status = &etb->reg_cache->reg_list[ETB_STATUS];
-	trace_status_t retval = 0;
+	enum trace_status retval = 0;
 	int etb_timeout = 100;
 
 	etb->etm_ctx = etm_ctx;
diff --git a/src/target/etm.c b/src/target/etm.c
index 53d5cb68c..d9a3cdc5e 100644
--- a/src/target/etm.c
+++ b/src/target/etm.c
@@ -1567,7 +1567,7 @@ COMMAND_HANDLER(handle_etm_status_command)
 	struct target *target;
 	struct arm *arm;
 	struct etm_context *etm;
-	trace_status_t trace_status;
+	enum trace_status trace_status;
 
 	target = get_current_target(CMD_CTX);
 	arm = target_to_arm(target);
diff --git a/src/target/etm.h b/src/target/etm.h
index 6c5b5e595..e18549dfe 100644
--- a/src/target/etm.h
+++ b/src/target/etm.h
@@ -126,7 +126,7 @@ struct etm_capture_driver {
 	const char *name;
 	const struct command_registration *commands;
 	int (*init)(struct etm_context *etm_ctx);
-	trace_status_t (*status)(struct etm_context *etm_ctx);
+	enum trace_status (*status)(struct etm_context *etm_ctx);
 	int (*read_trace)(struct etm_context *etm_ctx);
 	int (*start_capture)(struct etm_context *etm_ctx);
 	int (*stop_capture)(struct etm_context *etm_ctx);
@@ -153,7 +153,7 @@ struct etm_context {
 	struct reg_cache *reg_cache;		/* ETM register cache */
 	struct etm_capture_driver *capture_driver;	/* driver used to access ETM data */
 	void *capture_driver_priv;	/* capture driver private data */
-	trace_status_t capture_status;	/* current state of capture run */
+	enum trace_status capture_status;	/* current state of capture run */
 	struct etmv1_trace_data *trace_data;	/* trace data */
 	uint32_t trace_depth;		/* number of cycles to be analyzed, 0 if no data available */
 	uint32_t control;	/* shadow of ETM_CTRL */
diff --git a/src/target/etm_dummy.c b/src/target/etm_dummy.c
index 8deccf5f9..2709b6e9d 100644
--- a/src/target/etm_dummy.c
+++ b/src/target/etm_dummy.c
@@ -65,7 +65,7 @@ static int etm_dummy_init(struct etm_context *etm_ctx)
 	return ERROR_OK;
 }
 
-static trace_status_t etm_dummy_status(struct etm_context *etm_ctx)
+static enum trace_status etm_dummy_status(struct etm_context *etm_ctx)
 {
 	return TRACE_IDLE;
 }
diff --git a/src/target/trace.h b/src/target/trace.h
index e3d787edd..dc3ab5712 100644
--- a/src/target/trace.h
+++ b/src/target/trace.h
@@ -33,13 +33,13 @@ struct trace {
  * to *hardware* tracing ... split such "real" tracing out from
  * the contrib/libdcc support.
  */
-typedef enum trace_status {
+enum trace_status {
 	TRACE_IDLE = 0x0,
 	TRACE_RUNNING = 0x1,
 	TRACE_TRIGGERED = 0x2,
 	TRACE_COMPLETED = 0x4,
 	TRACE_OVERFLOWED = 0x8,
-} trace_status_t;
+};
 
 int trace_point(struct target *target, uint32_t number);
 int trace_register_commands(struct command_context *cmd_ctx);