diff --git a/src/xrt/state_trackers/oxr/oxr_api_verify.h b/src/xrt/state_trackers/oxr/oxr_api_verify.h
index fa047b5c4..b7ef788ae 100644
--- a/src/xrt/state_trackers/oxr/oxr_api_verify.h
+++ b/src/xrt/state_trackers/oxr/oxr_api_verify.h
@@ -254,6 +254,17 @@ struct oxr_subaction_paths;
 		}                                                                                                      \
 	} while (false)
 
+#define OXR_VERIFY_FORM_FACTOR(log, form_factor)                                                                       \
+	do {                                                                                                           \
+		XrFormFactor _form_factor = (form_factor);                                                             \
+		if (_form_factor != XR_FORM_FACTOR_HEAD_MOUNTED_DISPLAY &&                                             \
+		    _form_factor != XR_FORM_FACTOR_HANDHELD_DISPLAY) {                                                 \
+                                                                                                                       \
+			return oxr_error(log, XR_ERROR_FORM_FACTOR_UNSUPPORTED,                                        \
+			                 "(" #form_factor " == 0x%08x) is not a valid form factor", _form_factor);     \
+		}                                                                                                      \
+	} while (false)
+
 #define OXR_VERIFY_VIEW_CONFIG_TYPE(log, inst, view_conf)                                                              \
 	do {                                                                                                           \
 		XrResult verify_ret = oxr_verify_view_config_type(log, inst, view_conf, #view_conf);                   \
@@ -327,17 +338,6 @@ struct oxr_subaction_paths;
 		}                                                                                                      \
 	} while (false)
 
-#define OXR_VERIFY_FORM_FACTOR(log, form_factor)                                                                       \
-	do {                                                                                                           \
-		XrFormFactor _form_factor = (form_factor);                                                             \
-		if (_form_factor != XR_FORM_FACTOR_HEAD_MOUNTED_DISPLAY &&                                             \
-		    _form_factor != XR_FORM_FACTOR_HANDHELD_DISPLAY) {                                                 \
-                                                                                                                       \
-			return oxr_error(log, XR_ERROR_FORM_FACTOR_UNSUPPORTED,                                        \
-			                 "(" #form_factor " == 0x%08x) is not a valid form factor", _form_factor);     \
-		}                                                                                                      \
-	} while (false)
-
 #define OXR_VERIFY_HAND_TRACKING_DATA_SOURCE_OR_NULL(log, data_source_info)                                            \
 	do {                                                                                                           \
 		if (data_source_info != NULL) {                                                                        \