diff --git a/src/ostree/ot-builtin-cat.c b/src/ostree/ot-builtin-cat.c index 3169e49a..4650ee46 100644 --- a/src/ostree/ot-builtin-cat.c +++ b/src/ostree/ot-builtin-cat.c @@ -24,10 +24,8 @@ #include "ot-builtins.h" #include "ostree.h" -#include "ostree-repo-file.h" #include -#include static GOptionEntry options[] = { }; diff --git a/src/ostree/ot-builtin-checkout.c b/src/ostree/ot-builtin-checkout.c index 25433af1..e2ada071 100644 --- a/src/ostree/ot-builtin-checkout.c +++ b/src/ostree/ot-builtin-checkout.c @@ -27,8 +27,6 @@ #include -#include - static gboolean opt_user_mode; static gboolean opt_allow_noent; static char *opt_subpath; diff --git a/src/ostree/ot-builtin-checksum.c b/src/ostree/ot-builtin-checksum.c index 150a24f1..89dc4abe 100644 --- a/src/ostree/ot-builtin-checksum.c +++ b/src/ostree/ot-builtin-checksum.c @@ -25,8 +25,6 @@ #include "ot-builtins.h" #include "ostree.h" -#include - static GOptionEntry options[] = { { NULL } }; diff --git a/src/ostree/ot-builtin-commit.c b/src/ostree/ot-builtin-commit.c index b79a3a35..805dfcd7 100644 --- a/src/ostree/ot-builtin-commit.c +++ b/src/ostree/ot-builtin-commit.c @@ -25,10 +25,6 @@ #include "ot-builtins.h" #include "ostree.h" -#include - -#include - static char *metadata_text_path; static char *metadata_bin_path; static char *subject; diff --git a/src/ostree/ot-builtin-config.c b/src/ostree/ot-builtin-config.c index 2165b0c7..28c26dd1 100644 --- a/src/ostree/ot-builtin-config.c +++ b/src/ostree/ot-builtin-config.c @@ -25,8 +25,6 @@ #include "ot-builtins.h" #include "ostree.h" -#include - static GOptionEntry options[] = { { NULL } }; diff --git a/src/ostree/ot-builtin-diff.c b/src/ostree/ot-builtin-diff.c index 9c091d72..484f0369 100644 --- a/src/ostree/ot-builtin-diff.c +++ b/src/ostree/ot-builtin-diff.c @@ -25,8 +25,6 @@ #include "ot-builtins.h" #include "ostree.h" -#include - static GOptionEntry options[] = { { NULL } }; diff --git a/src/ostree/ot-builtin-fsck.c b/src/ostree/ot-builtin-fsck.c index 65dd70b3..fe2b6dfb 100644 --- a/src/ostree/ot-builtin-fsck.c +++ b/src/ostree/ot-builtin-fsck.c @@ -25,9 +25,6 @@ #include "ot-builtins.h" #include "ostree.h" -#include -#include - static gboolean quiet; static gboolean delete; diff --git a/src/ostree/ot-builtin-init.c b/src/ostree/ot-builtin-init.c index 08cf222d..add3aab2 100644 --- a/src/ostree/ot-builtin-init.c +++ b/src/ostree/ot-builtin-init.c @@ -25,8 +25,6 @@ #include "ot-builtins.h" #include "ostree.h" -#include - static gboolean opt_archive; static char *opt_mode = NULL; diff --git a/src/ostree/ot-builtin-log.c b/src/ostree/ot-builtin-log.c index ebc30e11..638cec80 100644 --- a/src/ostree/ot-builtin-log.c +++ b/src/ostree/ot-builtin-log.c @@ -25,8 +25,6 @@ #include "ot-builtins.h" #include "ostree.h" -#include - static GOptionEntry options[] = { { NULL } }; diff --git a/src/ostree/ot-builtin-ls.c b/src/ostree/ot-builtin-ls.c index 4e08181d..333d9566 100644 --- a/src/ostree/ot-builtin-ls.c +++ b/src/ostree/ot-builtin-ls.c @@ -26,8 +26,6 @@ #include "ostree.h" #include "ostree-repo-file.h" -#include - static gboolean recursive; static gboolean checksum; static gboolean xattrs; diff --git a/src/ostree/ot-builtin-prune.c b/src/ostree/ot-builtin-prune.c index 3c0a68c7..be22f4c1 100644 --- a/src/ostree/ot-builtin-prune.c +++ b/src/ostree/ot-builtin-prune.c @@ -25,9 +25,6 @@ #include "ot-builtins.h" #include "ostree.h" -#include -#include - static gboolean opt_no_prune; static gint opt_depth = -1; static gboolean opt_refs_only; diff --git a/src/ostree/ot-builtin-pull-local.c b/src/ostree/ot-builtin-pull-local.c index 9a8cdfa3..da5374ed 100644 --- a/src/ostree/ot-builtin-pull-local.c +++ b/src/ostree/ot-builtin-pull-local.c @@ -22,12 +22,12 @@ #include "config.h" -#include "ot-builtins.h" -#include "ostree.h" - #include #include +#include "ot-builtins.h" +#include "ostree.h" + static char *opt_remote; static GOptionEntry options[] = { diff --git a/src/ostree/ot-builtin-pull.c b/src/ostree/ot-builtin-pull.c index a3aa73ba..5753cd87 100644 --- a/src/ostree/ot-builtin-pull.c +++ b/src/ostree/ot-builtin-pull.c @@ -24,10 +24,6 @@ #include "ot-builtins.h" #include "ostree.h" -#include "ostree-repo-file.h" - -#include -#include gboolean opt_related; diff --git a/src/ostree/ot-builtin-refs.c b/src/ostree/ot-builtin-refs.c index 3164604d..0c8c751f 100644 --- a/src/ostree/ot-builtin-refs.c +++ b/src/ostree/ot-builtin-refs.c @@ -24,7 +24,6 @@ #include "ot-builtins.h" #include "ostree.h" -#include "ostree-repo-file.h" static gboolean opt_delete; diff --git a/src/ostree/ot-builtin-remote.c b/src/ostree/ot-builtin-remote.c index 60398627..16ecbea1 100644 --- a/src/ostree/ot-builtin-remote.c +++ b/src/ostree/ot-builtin-remote.c @@ -25,8 +25,6 @@ #include "ot-builtins.h" #include "ostree.h" -#include - static GOptionEntry options[] = { { NULL } }; diff --git a/src/ostree/ot-builtin-rev-parse.c b/src/ostree/ot-builtin-rev-parse.c index e864c7cf..c29172cd 100644 --- a/src/ostree/ot-builtin-rev-parse.c +++ b/src/ostree/ot-builtin-rev-parse.c @@ -25,8 +25,6 @@ #include "ot-builtins.h" #include "ostree.h" -#include - static GOptionEntry options[] = { { NULL } }; diff --git a/src/ostree/ot-builtin-show.c b/src/ostree/ot-builtin-show.c index b323cc3e..543672ff 100644 --- a/src/ostree/ot-builtin-show.c +++ b/src/ostree/ot-builtin-show.c @@ -25,8 +25,6 @@ #include "ot-builtins.h" #include "ostree.h" -#include - static gboolean print_related; static char* print_variant_type; static char* print_metadata_key; diff --git a/src/ostree/ot-builtin-trivial-httpd.c b/src/ostree/ot-builtin-trivial-httpd.c index 83484fc9..ac11c72e 100644 --- a/src/ostree/ot-builtin-trivial-httpd.c +++ b/src/ostree/ot-builtin-trivial-httpd.c @@ -23,13 +23,7 @@ #include #include "ot-builtins.h" -#include "ot-admin-builtins.h" -#include "ot-admin-functions.h" -#include "ot-main.h" #include "ostree.h" -#include "ostree-repo-file.h" - -#include static char *opt_port_file = NULL; static gboolean opt_daemonize; diff --git a/src/ostree/ot-builtin-write-refs.c b/src/ostree/ot-builtin-write-refs.c index 6422b3c6..01185d8d 100644 --- a/src/ostree/ot-builtin-write-refs.c +++ b/src/ostree/ot-builtin-write-refs.c @@ -28,8 +28,6 @@ #include #include -#include - static GOptionEntry options[] = { { NULL } };