diff --git a/builtin.h b/builtin_commands.h
similarity index 99%
rename from builtin.h
rename to builtin_commands.h
index 16ecd5586f..240d11991c 100644
--- a/builtin.h
+++ b/builtin_commands.h
@@ -116,6 +116,7 @@ int cmd_am(int argc, const char **argv, const char *prefix);
 int cmd_annotate(int argc, const char **argv, const char *prefix);
 int cmd_apply(int argc, const char **argv, const char *prefix);
 int cmd_archive(int argc, const char **argv, const char *prefix);
+int cmd_bar(int argc, const char **argv, const char *prefix);
 int cmd_bisect__helper(int argc, const char **argv, const char *prefix);
 int cmd_blame(int argc, const char **argv, const char *prefix);
 int cmd_branch(int argc, const char **argv, const char *prefix);
diff --git a/git.c b/git.c
index 18bed9a996..56459fc2b8 100644
--- a/git.c
+++ b/git.c
@@ -481,7 +481,7 @@ static int run_builtin(struct cmd_struct *p, int argc, const char **argv)
 	return 0;
 }
 
-static struct cmd_struct commands[] = {
+static struct cmd_struct cli_commands[] = {
 	{ "add", cmd_add, RUN_SETUP | NEED_WORK_TREE },
 	{ "am", cmd_am, RUN_SETUP | NEED_WORK_TREE },
 	{ "annotate", cmd_annotate, RUN_SETUP | NO_PARSEOPT },