diff --git a/Tools/Replay/Replay.cpp b/Tools/Replay/Replay.cpp
index 3cebc73eb3..9305f685d6 100644
--- a/Tools/Replay/Replay.cpp
+++ b/Tools/Replay/Replay.cpp
@@ -40,10 +40,6 @@ user_parameter *user_parameters;
 bool replay_force_ekf2;
 bool replay_force_ekf3;
 
-#define GSCALAR(v, name, def) { replayvehicle.g.v.vtype, name, Parameters::k_param_ ## v, &replayvehicle.g.v, {def_value : def} }
-#define GOBJECT(v, name, class) { AP_PARAM_GROUP, name, Parameters::k_param_ ## v, &replayvehicle.v, {group_info : class::var_info} }
-#define GOBJECTN(v, pname, name, class) { AP_PARAM_GROUP, name, Parameters::k_param_ ## pname, &replayvehicle.v, {group_info : class::var_info} }
-
 const AP_Param::Info ReplayVehicle::var_info[] = {
     GSCALAR(dummy,         "_DUMMY", 0),
 
diff --git a/Tools/Replay/Replay.h b/Tools/Replay/Replay.h
index 1efa1adbb3..623c1a4aa8 100644
--- a/Tools/Replay/Replay.h
+++ b/Tools/Replay/Replay.h
@@ -18,6 +18,8 @@
 
 #include "LogReader.h"
 
+#define AP_PARAM_VEHICLE_NAME replayvehicle
+
 struct user_parameter {
     struct user_parameter *next;
     char name[17];