diff --git a/Tools/generate_listener.py b/Tools/generate_listener.py
index df46df3ade..124d9908eb 100755
--- a/Tools/generate_listener.py
+++ b/Tools/generate_listener.py
@@ -112,7 +112,7 @@ print("""
 #endif
 
 #ifndef PRI64
-#define PRI64 "ll"
+#define PRI64 "lld"
 #endif
 
 """)
diff --git a/src/modules/mavlink/mavlink_parameters.cpp b/src/modules/mavlink/mavlink_parameters.cpp
index bdaa483dfc..747b21f6a9 100644
--- a/src/modules/mavlink/mavlink_parameters.cpp
+++ b/src/modules/mavlink/mavlink_parameters.cpp
@@ -47,6 +47,9 @@
 #include "mavlink_parameters.h"
 #include "mavlink_main.h"
 
+ORB_DEFINE(uavcan_parameter_request, struct uavcan_parameter_request_s);
+ORB_DEFINE(uavcan_parameter_value, struct uavcan_parameter_value_s);
+
 MavlinkParametersManager::MavlinkParametersManager(Mavlink *mavlink) : MavlinkStream(mavlink),
 	_send_all_index(-1),
 	_rc_param_map_pub(nullptr),
diff --git a/src/modules/uavcan/uavcan_servers.cpp b/src/modules/uavcan/uavcan_servers.cpp
index 8c3758e9af..713a4e00f7 100644
--- a/src/modules/uavcan/uavcan_servers.cpp
+++ b/src/modules/uavcan/uavcan_servers.cpp
@@ -64,9 +64,6 @@
 
 #include <v1.0/common/mavlink.h>
 
-ORB_DEFINE(uavcan_parameter_request, struct uavcan_parameter_request_s);
-ORB_DEFINE(uavcan_parameter_value, struct uavcan_parameter_value_s);
-
 //todo:The Inclusion of file_server_backend is killing
 // #include <sys/types.h> and leaving OK undefined
 # define OK 0