diff --git a/tool/util.c b/tool/util.c
index af78260..7e7421a 100644
--- a/tool/util.c
+++ b/tool/util.c
@@ -40,7 +40,6 @@
 
 #include <ykpiv.h>
 
-#include "cmdline.h"
 #include "util.h"
 
 FILE *open_file(const char *file_name, int mode) {
diff --git a/tool/util.h b/tool/util.h
index 33c89d4..fe314fc 100644
--- a/tool/util.h
+++ b/tool/util.h
@@ -30,6 +30,8 @@
 #ifndef YUBICO_PIV_TOOL_INTERNAL_H
 #define YUBICO_PIV_TOOL_INTERNAL_H
 
+#include "cmdline.h"
+
 #define INPUT 1
 #define OUTPUT 2
 
diff --git a/tool/yubico-piv-tool.c b/tool/yubico-piv-tool.c
index 2c628c2..3044a50 100644
--- a/tool/yubico-piv-tool.c
+++ b/tool/yubico-piv-tool.c
@@ -43,7 +43,6 @@
 #include <openssl/pkcs12.h>
 #include <openssl/rand.h>
 
-#include "cmdline.h"
 #include "util.h"
 
 /* FASC-N containing S9999F9999F999999F0F1F0000000000300001E encoded in