diff --git a/src/util/arg-parser.h b/include/avian/util/arg-parser.h
similarity index 100%
rename from src/util/arg-parser.h
rename to include/avian/util/arg-parser.h
diff --git a/src/tools/audit-codegen/main.cpp b/src/tools/audit-codegen/main.cpp
index 9fc8d10119..77f0b36e8a 100644
--- a/src/tools/audit-codegen/main.cpp
+++ b/src/tools/audit-codegen/main.cpp
@@ -10,7 +10,7 @@
 
 #include "system.h"
 
-#include "util/arg-parser.h"
+#include <avian/util/arg-parser.h>
 
 #include "codegen/lir.h"
 #include "codegen/assembler.h"
diff --git a/src/tools/bootimage-generator/main.cpp b/src/tools/bootimage-generator/main.cpp
index 7688613913..6f27cb5d70 100644
--- a/src/tools/bootimage-generator/main.cpp
+++ b/src/tools/bootimage-generator/main.cpp
@@ -21,7 +21,7 @@
 #include <avian/util/runtime-array.h>
 #include "lzma.h"
 
-#include "util/arg-parser.h"
+#include <avian/util/arg-parser.h>
 #include "util/abort.h"
 
 // since we aren't linking against libstdc++, we must implement this
diff --git a/src/util/arg-parser.cpp b/src/util/arg-parser.cpp
index ac652563be..cefc221532 100644
--- a/src/util/arg-parser.cpp
+++ b/src/util/arg-parser.cpp
@@ -11,7 +11,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "util/arg-parser.h"
+#include <avian/util/arg-parser.h>
 
 namespace avian {
 namespace util {
diff --git a/unittest/util/arg-parser-test.cpp b/unittest/util/arg-parser-test.cpp
index bd93a04c99..799acba040 100644
--- a/unittest/util/arg-parser-test.cpp
+++ b/unittest/util/arg-parser-test.cpp
@@ -13,7 +13,7 @@
 
 #include "common.h"
 
-#include "util/arg-parser.h"
+#include <avian/util/arg-parser.h>
 
 #include "test-harness.h"