diff --git a/src/helper/types.h b/src/helper/types.h
index e1a898e5a..ece562642 100644
--- a/src/helper/types.h
+++ b/src/helper/types.h
@@ -42,8 +42,8 @@ typedef unsigned short uint16_t;
 typedef unsigned int uint32_t;
 #endif
 
-#ifndef u64
-typedef unsigned long long u64;
+#ifndef uint64_t
+typedef unsigned long long uint64_t;
 #endif
 
 typedef struct jtag_tap_s jtag_tap_t;
diff --git a/src/target/trace.h b/src/target/trace.h
index 90bd60072..0a9ccc55f 100644
--- a/src/target/trace.h
+++ b/src/target/trace.h
@@ -28,7 +28,7 @@ struct command_context_s;
 typedef struct trace_point_s
 {
 	uint32_t address;
-	u64 hit_counter;
+	uint64_t hit_counter;
 } trace_point_t;
 
 typedef struct trace_s