diff --git a/src/external/nanopb/monado_metrics.pb.c b/src/external/nanopb/monado_metrics.pb.c
index e0dd5b8d4..017f61088 100644
--- a/src/external/nanopb/monado_metrics.pb.c
+++ b/src/external/nanopb/monado_metrics.pb.c
@@ -1,5 +1,5 @@
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.4.7-dev */
+/* Generated by nanopb-0.4.7 */
 
 #include "monado_metrics.pb.h"
 #if PB_PROTO_HEADER_VERSION != 40
diff --git a/src/external/nanopb/monado_metrics.pb.h b/src/external/nanopb/monado_metrics.pb.h
index 9a721689a..81dcbe72f 100644
--- a/src/external/nanopb/monado_metrics.pb.h
+++ b/src/external/nanopb/monado_metrics.pb.h
@@ -1,5 +1,5 @@
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.4.7-dev */
+/* Generated by nanopb-0.4.7 */
 
 #ifndef PB_MONADO_METRICS_MONADO_METRICS_PB_H_INCLUDED
 #define PB_MONADO_METRICS_MONADO_METRICS_PB_H_INCLUDED
@@ -10,6 +10,11 @@
 #endif
 
 /* Struct definitions */
+typedef struct _monado_metrics_Version {
+    uint32_t major;
+    uint32_t minor;
+} monado_metrics_Version;
+
 typedef struct _monado_metrics_SessionFrame {
     int64_t session_id;
     int64_t frame_id;
@@ -27,6 +32,13 @@ typedef struct _monado_metrics_SessionFrame {
     bool discarded;
 } monado_metrics_SessionFrame;
 
+typedef struct _monado_metrics_Used {
+    int64_t session_id;
+    int64_t session_frame_id;
+    int64_t system_frame_id;
+    uint64_t when_ns;
+} monado_metrics_Used;
+
 typedef struct _monado_metrics_SystemFrame {
     int64_t frame_id;
     uint64_t predicted_display_time_ns;
@@ -61,18 +73,6 @@ typedef struct _monado_metrics_SystemPresentInfo {
     uint64_t earliest_present_time_ns;
 } monado_metrics_SystemPresentInfo;
 
-typedef struct _monado_metrics_Used {
-    int64_t session_id;
-    int64_t session_frame_id;
-    int64_t system_frame_id;
-    uint64_t when_ns;
-} monado_metrics_Used;
-
-typedef struct _monado_metrics_Version {
-    uint32_t major;
-    uint32_t minor;
-} monado_metrics_Version;
-
 typedef struct _monado_metrics_Record {
     pb_size_t which_record;
     union {
@@ -107,6 +107,8 @@ extern "C" {
 #define monado_metrics_Record_init_zero          {0, {monado_metrics_Version_init_zero}}
 
 /* Field tags (for use in manual encoding/decoding) */
+#define monado_metrics_Version_major_tag         1
+#define monado_metrics_Version_minor_tag         2
 #define monado_metrics_SessionFrame_session_id_tag 1
 #define monado_metrics_SessionFrame_frame_id_tag 2
 #define monado_metrics_SessionFrame_predicted_frame_time_ns_tag 3
@@ -121,6 +123,10 @@ extern "C" {
 #define monado_metrics_SessionFrame_when_delivered_ns_tag 12
 #define monado_metrics_SessionFrame_when_gpu_done_ns_tag 13
 #define monado_metrics_SessionFrame_discarded_tag 14
+#define monado_metrics_Used_session_id_tag       1
+#define monado_metrics_Used_session_frame_id_tag 2
+#define monado_metrics_Used_system_frame_id_tag  3
+#define monado_metrics_Used_when_ns_tag          4
 #define monado_metrics_SystemFrame_frame_id_tag  1
 #define monado_metrics_SystemFrame_predicted_display_time_ns_tag 2
 #define monado_metrics_SystemFrame_predicted_display_period_ns_tag 3
@@ -146,12 +152,6 @@ extern "C" {
 #define monado_metrics_SystemPresentInfo_present_margin_ns_tag 13
 #define monado_metrics_SystemPresentInfo_actual_present_time_ns_tag 14
 #define monado_metrics_SystemPresentInfo_earliest_present_time_ns_tag 15
-#define monado_metrics_Used_session_id_tag       1
-#define monado_metrics_Used_session_frame_id_tag 2
-#define monado_metrics_Used_system_frame_id_tag  3
-#define monado_metrics_Used_when_ns_tag          4
-#define monado_metrics_Version_major_tag         1
-#define monado_metrics_Version_minor_tag         2
 #define monado_metrics_Record_version_tag        1
 #define monado_metrics_Record_session_frame_tag  2
 #define monado_metrics_Record_used_tag           3