diff --git a/src/shared/vpick.h b/src/shared/vpick.h
index 0e0d41e5db..fec7ca4cf2 100644
--- a/src/shared/vpick.h
+++ b/src/shared/vpick.h
@@ -38,7 +38,7 @@ typedef struct PickResult {
                 .tries_done = UINT_MAX,                 \
         }
 
-#define TAKE_PICK_RESULT(ptr) TAKE_GENERIC(ptr, PickResult, PICK_RESULT_NULL)
+#define TAKE_PICK_RESULT(pick) TAKE_GENERIC(pick, PickResult, PICK_RESULT_NULL)
 
 void pick_result_done(PickResult *p);
 
diff --git a/src/vpick/vpick-tool.c b/src/vpick/vpick-tool.c
index 0ae8fe322d..f3afc33a58 100644
--- a/src/vpick/vpick-tool.c
+++ b/src/vpick/vpick-tool.c
@@ -7,8 +7,8 @@
 #include "format-table.h"
 #include "fs-util.h"
 #include "main-func.h"
-#include "path-util.h"
 #include "parse-util.h"
+#include "path-util.h"
 #include "pretty-print.h"
 #include "stat-util.h"
 #include "string-util.h"