diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 148b1876de..ed039e6270 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2018-04-01  Simon Marchi  <simon.marchi@polymtl.ca>
+
+	* common/gdb_vecs.h (char_ptr): Remove.
+	* tracepoint.c (encode_actions_1): Remove usage of char_ptr.
+
 2018-03-30  Simon Marchi  <simon.marchi@polymtl.ca>
 
 	* guile/scm-utils.c (gdbscm_parse_function_args): Replace VEC
diff --git a/gdb/common/gdb_vecs.h b/gdb/common/gdb_vecs.h
index 8bb70158f4..141d05e018 100644
--- a/gdb/common/gdb_vecs.h
+++ b/gdb/common/gdb_vecs.h
@@ -22,7 +22,6 @@
 
 #include "vec.h"
 
-typedef char *char_ptr;
 typedef const char *const_char_ptr;
 
 DEF_VEC_P (const_char_ptr);
diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c
index 954d039caf..24bb91418a 100644
--- a/gdb/tracepoint.c
+++ b/gdb/tracepoint.c
@@ -1382,7 +1382,7 @@ encode_actions_1 (struct command_line *action,
 		    case OP_VAR_VALUE:
 		      {
 			struct symbol *sym = exp->elts[2].symbol;
-			char_ptr name = (char_ptr) SYMBOL_NATURAL_NAME (sym);
+			const char *name = SYMBOL_NATURAL_NAME (sym);
 
 			collect->collect_symbol (exp->elts[2].symbol,
 						 target_gdbarch (),