diff --git a/toolbox/Android.bp b/toolbox/Android.bp
index b5d16b8..3fd7fde 100644
--- a/toolbox/Android.bp
+++ b/toolbox/Android.bp
@@ -33,12 +33,6 @@
 }
 
 genrule {
-    name: "toolbox_tools",
-    cmd: "echo '/* file generated automatically */' >$(out) && for t in toolbox dd getevent newfs_msdos; do echo \"TOOL($$t)\" >>$(out); done",
-    out: ["tools.h"],
-}
-
-genrule {
     name: "toolbox_input_labels",
     tool_files: ["generate-input.h-labels.py"],
     cmd: "$(location) $(in) >$(out)",
@@ -55,7 +49,6 @@
         "newfs_msdos.c",
     ],
     generated_headers: [
-        "toolbox_tools",
         "toolbox_input_labels",
     ],
     whole_static_libs: ["libtoolbox_dd"],
diff --git a/toolbox/tools.h b/toolbox/tools.h
new file mode 100644
index 0000000..9134af3
--- /dev/null
+++ b/toolbox/tools.h
@@ -0,0 +1,4 @@
+TOOL(dd)
+TOOL(getevent)
+TOOL(newfs_msdos)
+TOOL(toolbox)