From 0c85e1ff88ed4962a128fee8d3eedf008aaf1f88 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Mon, 27 Nov 2023 20:08:43 -0500 Subject: [PATCH] main: Drop some redundant includes of `ot-main.h` When backporting a patch recently we hit a non-obvious dependency on another fix for `ot-main.h` includes. Clean this up a bit by dropping the redundant includes. --- src/ostree/ostree-trivial-httpd.c | 1 - src/ostree/ot-admin-builtin-boot-complete.c | 1 - src/ostree/ot-admin-builtin-cleanup.c | 1 - src/ostree/ot-admin-builtin-deploy.c | 1 - src/ostree/ot-admin-builtin-diff.c | 1 - src/ostree/ot-admin-builtin-finalize-staged.c | 1 - src/ostree/ot-admin-builtin-init-fs.c | 1 - src/ostree/ot-admin-builtin-instutil.c | 1 - src/ostree/ot-admin-builtin-kargs.c | 1 - src/ostree/ot-admin-builtin-lock-finalization.c | 1 - src/ostree/ot-admin-builtin-os-init.c | 1 - src/ostree/ot-admin-builtin-pin.c | 1 - src/ostree/ot-admin-builtin-post-copy.c | 1 - src/ostree/ot-admin-builtin-set-default.c | 1 - src/ostree/ot-admin-builtin-set-origin.c | 1 - src/ostree/ot-admin-builtin-status.c | 1 - src/ostree/ot-admin-builtin-switch.c | 1 - src/ostree/ot-admin-builtin-undeploy.c | 1 - src/ostree/ot-admin-builtin-unlock.c | 1 - src/ostree/ot-admin-builtin-upgrade.c | 1 - src/ostree/ot-admin-functions.h | 3 +-- src/ostree/ot-admin-instutil-builtin-grub2-generate.c | 1 - src/ostree/ot-admin-instutil-builtin-selinux-ensure-labeled.c | 1 - src/ostree/ot-admin-instutil-builtin-set-kargs.c | 1 - src/ostree/ot-admin-kargs-builtin-edit-in-place.c | 3 --- src/ostree/ot-builtin-admin.c | 1 - src/ostree/ot-builtin-cat.c | 1 - src/ostree/ot-builtin-checkout.c | 1 - src/ostree/ot-builtin-checksum.c | 1 - src/ostree/ot-builtin-commit.c | 1 - src/ostree/ot-builtin-config.c | 1 - src/ostree/ot-builtin-create-usb.c | 1 - src/ostree/ot-builtin-diff.c | 1 - src/ostree/ot-builtin-export.c | 1 - src/ostree/ot-builtin-find-remotes.c | 1 - src/ostree/ot-builtin-fsck.c | 1 - src/ostree/ot-builtin-gpg-sign.c | 1 - src/ostree/ot-builtin-init.c | 1 - src/ostree/ot-builtin-log.c | 1 - src/ostree/ot-builtin-ls.c | 1 - src/ostree/ot-builtin-prune.c | 1 - src/ostree/ot-builtin-pull-local.c | 1 - src/ostree/ot-builtin-pull.c | 1 - src/ostree/ot-builtin-refs.c | 1 - src/ostree/ot-builtin-remote.c | 1 - src/ostree/ot-builtin-reset.c | 1 - src/ostree/ot-builtin-rev-parse.c | 1 - src/ostree/ot-builtin-show.c | 1 - src/ostree/ot-builtin-sign.c | 1 - src/ostree/ot-builtin-static-delta.c | 1 - src/ostree/ot-builtin-summary.c | 1 - src/ostree/ot-builtins.h | 1 - src/ostree/ot-main.c | 1 - src/ostree/ot-remote-builtin-add-cookie.c | 1 - src/ostree/ot-remote-builtin-add.c | 1 - src/ostree/ot-remote-builtin-delete-cookie.c | 1 - src/ostree/ot-remote-builtin-delete.c | 1 - src/ostree/ot-remote-builtin-gpg-import.c | 1 - src/ostree/ot-remote-builtin-gpg-list-keys.c | 1 - src/ostree/ot-remote-builtin-list-cookies.c | 1 - src/ostree/ot-remote-builtin-list.c | 1 - src/ostree/ot-remote-builtin-refs.c | 1 - src/ostree/ot-remote-builtin-show-url.c | 1 - src/ostree/ot-remote-builtin-summary.c | 1 - src/ostree/ot-remote-builtins.h | 2 +- src/ostree/ot-remote-cookie-util.c | 1 - 66 files changed, 2 insertions(+), 69 deletions(-) diff --git a/src/ostree/ostree-trivial-httpd.c b/src/ostree/ostree-trivial-httpd.c index facc15270f..4a0c6b0017 100644 --- a/src/ostree/ostree-trivial-httpd.c +++ b/src/ostree/ostree-trivial-httpd.c @@ -25,7 +25,6 @@ #include "ostree.h" #include "ot-builtins.h" -#include "ot-main.h" #include "otutil.h" #include diff --git a/src/ostree/ot-admin-builtin-boot-complete.c b/src/ostree/ot-admin-builtin-boot-complete.c index 4599606c85..df99f89054 100644 --- a/src/ostree/ot-admin-builtin-boot-complete.c +++ b/src/ostree/ot-admin-builtin-boot-complete.c @@ -24,7 +24,6 @@ #include "ostree.h" #include "ot-admin-builtins.h" #include "ot-admin-functions.h" -#include "ot-main.h" #include "otutil.h" #include "ostree-cmd-private.h" diff --git a/src/ostree/ot-admin-builtin-cleanup.c b/src/ostree/ot-admin-builtin-cleanup.c index b2d342318c..ff33830f2a 100644 --- a/src/ostree/ot-admin-builtin-cleanup.c +++ b/src/ostree/ot-admin-builtin-cleanup.c @@ -24,7 +24,6 @@ #include "ostree.h" #include "ot-admin-builtins.h" #include "ot-admin-functions.h" -#include "ot-main.h" #include diff --git a/src/ostree/ot-admin-builtin-deploy.c b/src/ostree/ot-admin-builtin-deploy.c index 69a543362f..f14cce5d54 100644 --- a/src/ostree/ot-admin-builtin-deploy.c +++ b/src/ostree/ot-admin-builtin-deploy.c @@ -26,7 +26,6 @@ #include "ostree.h" #include "ot-admin-builtins.h" #include "ot-admin-functions.h" -#include "ot-main.h" #include "otutil.h" #include diff --git a/src/ostree/ot-admin-builtin-diff.c b/src/ostree/ot-admin-builtin-diff.c index 8a123a2218..7d96c82ec3 100644 --- a/src/ostree/ot-admin-builtin-diff.c +++ b/src/ostree/ot-admin-builtin-diff.c @@ -24,7 +24,6 @@ #include "ostree.h" #include "ot-admin-builtins.h" #include "ot-admin-functions.h" -#include "ot-main.h" #include diff --git a/src/ostree/ot-admin-builtin-finalize-staged.c b/src/ostree/ot-admin-builtin-finalize-staged.c index a60f468721..2ae1674da8 100644 --- a/src/ostree/ot-admin-builtin-finalize-staged.c +++ b/src/ostree/ot-admin-builtin-finalize-staged.c @@ -28,7 +28,6 @@ #include "ostree.h" #include "ot-admin-builtins.h" #include "ot-admin-functions.h" -#include "ot-main.h" #include "otutil.h" #include "ostree-cmd-private.h" diff --git a/src/ostree/ot-admin-builtin-init-fs.c b/src/ostree/ot-admin-builtin-init-fs.c index bf00f19eec..9cda9afcfa 100644 --- a/src/ostree/ot-admin-builtin-init-fs.c +++ b/src/ostree/ot-admin-builtin-init-fs.c @@ -23,7 +23,6 @@ #include "ot-admin-builtins.h" #include "ot-admin-functions.h" -#include "ot-main.h" #include "otutil.h" #include diff --git a/src/ostree/ot-admin-builtin-instutil.c b/src/ostree/ot-admin-builtin-instutil.c index d697cb0062..4d0711d238 100644 --- a/src/ostree/ot-admin-builtin-instutil.c +++ b/src/ostree/ot-admin-builtin-instutil.c @@ -24,7 +24,6 @@ #include "ot-admin-functions.h" #include "ot-admin-instutil-builtins.h" #include "ot-builtins.h" -#include "ot-main.h" #include diff --git a/src/ostree/ot-admin-builtin-kargs.c b/src/ostree/ot-admin-builtin-kargs.c index c4d440bd59..1433000e0c 100644 --- a/src/ostree/ot-admin-builtin-kargs.c +++ b/src/ostree/ot-admin-builtin-kargs.c @@ -23,7 +23,6 @@ #include "ot-admin-builtins.h" #include "ot-admin-functions.h" #include "ot-admin-kargs-builtins.h" -#include "ot-main.h" #include "otutil.h" #include diff --git a/src/ostree/ot-admin-builtin-lock-finalization.c b/src/ostree/ot-admin-builtin-lock-finalization.c index 1d76fc5d8d..e093d95288 100644 --- a/src/ostree/ot-admin-builtin-lock-finalization.c +++ b/src/ostree/ot-admin-builtin-lock-finalization.c @@ -24,7 +24,6 @@ #include "ostree.h" #include "ot-admin-builtins.h" #include "ot-admin-functions.h" -#include "ot-main.h" #include "otutil.h" #include diff --git a/src/ostree/ot-admin-builtin-os-init.c b/src/ostree/ot-admin-builtin-os-init.c index 561d6cd442..8f16246b3d 100644 --- a/src/ostree/ot-admin-builtin-os-init.c +++ b/src/ostree/ot-admin-builtin-os-init.c @@ -23,7 +23,6 @@ #include "ot-admin-builtins.h" #include "ot-admin-functions.h" -#include "ot-main.h" #include "otutil.h" #include diff --git a/src/ostree/ot-admin-builtin-pin.c b/src/ostree/ot-admin-builtin-pin.c index 362df44ca9..de219d7e43 100644 --- a/src/ostree/ot-admin-builtin-pin.c +++ b/src/ostree/ot-admin-builtin-pin.c @@ -24,7 +24,6 @@ #include "ostree.h" #include "ot-admin-builtins.h" #include "ot-admin-functions.h" -#include "ot-main.h" #include "otutil.h" static gboolean opt_unpin; diff --git a/src/ostree/ot-admin-builtin-post-copy.c b/src/ostree/ot-admin-builtin-post-copy.c index 3b96812d04..67484796df 100644 --- a/src/ostree/ot-admin-builtin-post-copy.c +++ b/src/ostree/ot-admin-builtin-post-copy.c @@ -24,7 +24,6 @@ #include "ostree.h" #include "ot-admin-builtins.h" #include "ot-admin-functions.h" -#include "ot-main.h" #include "otutil.h" #include diff --git a/src/ostree/ot-admin-builtin-set-default.c b/src/ostree/ot-admin-builtin-set-default.c index 89e6754e33..dd47ceb6c6 100644 --- a/src/ostree/ot-admin-builtin-set-default.c +++ b/src/ostree/ot-admin-builtin-set-default.c @@ -22,7 +22,6 @@ #include "ostree.h" #include "ot-admin-builtins.h" #include "ot-admin-functions.h" -#include "ot-main.h" #include "otutil.h" static GOptionEntry options[] = { { NULL } }; diff --git a/src/ostree/ot-admin-builtin-set-origin.c b/src/ostree/ot-admin-builtin-set-origin.c index 45b5dbd10d..1bb0d098f4 100644 --- a/src/ostree/ot-admin-builtin-set-origin.c +++ b/src/ostree/ot-admin-builtin-set-origin.c @@ -22,7 +22,6 @@ #include "ostree.h" #include "ot-admin-builtins.h" #include "ot-admin-functions.h" -#include "ot-main.h" #include "otutil.h" #include diff --git a/src/ostree/ot-admin-builtin-status.c b/src/ostree/ot-admin-builtin-status.c index 40c9881d4e..d85c53be9a 100644 --- a/src/ostree/ot-admin-builtin-status.c +++ b/src/ostree/ot-admin-builtin-status.c @@ -25,7 +25,6 @@ #include "ostree.h" #include "ot-admin-builtins.h" #include "ot-admin-functions.h" -#include "ot-main.h" #include diff --git a/src/ostree/ot-admin-builtin-switch.c b/src/ostree/ot-admin-builtin-switch.c index cb41cac553..592673639f 100644 --- a/src/ostree/ot-admin-builtin-switch.c +++ b/src/ostree/ot-admin-builtin-switch.c @@ -22,7 +22,6 @@ #include "ostree.h" #include "ot-admin-builtins.h" #include "ot-admin-functions.h" -#include "ot-main.h" #include "otutil.h" #include diff --git a/src/ostree/ot-admin-builtin-undeploy.c b/src/ostree/ot-admin-builtin-undeploy.c index 3c901a44d7..4ed0490821 100644 --- a/src/ostree/ot-admin-builtin-undeploy.c +++ b/src/ostree/ot-admin-builtin-undeploy.c @@ -24,7 +24,6 @@ #include "ostree.h" #include "ot-admin-builtins.h" #include "ot-admin-functions.h" -#include "ot-main.h" #include "otutil.h" static GOptionEntry options[] = { { NULL } }; diff --git a/src/ostree/ot-admin-builtin-unlock.c b/src/ostree/ot-admin-builtin-unlock.c index d0c41453b4..4140e4cacc 100644 --- a/src/ostree/ot-admin-builtin-unlock.c +++ b/src/ostree/ot-admin-builtin-unlock.c @@ -22,7 +22,6 @@ #include "ostree.h" #include "ot-admin-builtins.h" #include "ot-admin-functions.h" -#include "ot-main.h" #include "otutil.h" #include diff --git a/src/ostree/ot-admin-builtin-upgrade.c b/src/ostree/ot-admin-builtin-upgrade.c index 11710429fb..96b1575995 100644 --- a/src/ostree/ot-admin-builtin-upgrade.c +++ b/src/ostree/ot-admin-builtin-upgrade.c @@ -24,7 +24,6 @@ #include "ostree.h" #include "ot-admin-builtins.h" #include "ot-admin-functions.h" -#include "ot-main.h" #include "otutil.h" #include diff --git a/src/ostree/ot-admin-functions.h b/src/ostree/ot-admin-functions.h index 50aef161c6..6a2332b75e 100644 --- a/src/ostree/ot-admin-functions.h +++ b/src/ostree/ot-admin-functions.h @@ -21,8 +21,7 @@ #pragma once -#include -#include +#include "ot-main.h" G_BEGIN_DECLS diff --git a/src/ostree/ot-admin-instutil-builtin-grub2-generate.c b/src/ostree/ot-admin-instutil-builtin-grub2-generate.c index e73ffa148a..e5acbd7c12 100644 --- a/src/ostree/ot-admin-instutil-builtin-grub2-generate.c +++ b/src/ostree/ot-admin-instutil-builtin-grub2-generate.c @@ -22,7 +22,6 @@ #include "ostree-cmd-private.h" #include "ot-admin-instutil-builtins.h" -#include "ot-main.h" #include "otutil.h" diff --git a/src/ostree/ot-admin-instutil-builtin-selinux-ensure-labeled.c b/src/ostree/ot-admin-instutil-builtin-selinux-ensure-labeled.c index bc226fb73f..673b40ddd2 100644 --- a/src/ostree/ot-admin-instutil-builtin-selinux-ensure-labeled.c +++ b/src/ostree/ot-admin-instutil-builtin-selinux-ensure-labeled.c @@ -21,7 +21,6 @@ #include #include "ot-admin-instutil-builtins.h" -#include "ot-main.h" #include "otutil.h" diff --git a/src/ostree/ot-admin-instutil-builtin-set-kargs.c b/src/ostree/ot-admin-instutil-builtin-set-kargs.c index 90a69b42df..21b3d7632e 100644 --- a/src/ostree/ot-admin-instutil-builtin-set-kargs.c +++ b/src/ostree/ot-admin-instutil-builtin-set-kargs.c @@ -21,7 +21,6 @@ #include #include "ot-admin-instutil-builtins.h" -#include "ot-main.h" #include "ostree.h" #include "otutil.h" diff --git a/src/ostree/ot-admin-kargs-builtin-edit-in-place.c b/src/ostree/ot-admin-kargs-builtin-edit-in-place.c index cd434a7bcf..00025e659e 100644 --- a/src/ostree/ot-admin-kargs-builtin-edit-in-place.c +++ b/src/ostree/ot-admin-kargs-builtin-edit-in-place.c @@ -19,9 +19,6 @@ #include "config.h" #include "ot-admin-kargs-builtins.h" -#include "ot-main.h" - -#include "ostree.h" #include "otutil.h" static char **opt_kargs_edit_in_place_append; diff --git a/src/ostree/ot-builtin-admin.c b/src/ostree/ot-builtin-admin.c index 92169780d3..35a1e115c1 100644 --- a/src/ostree/ot-builtin-admin.c +++ b/src/ostree/ot-builtin-admin.c @@ -26,7 +26,6 @@ #include "ot-admin-builtins.h" #include "ot-admin-functions.h" #include "ot-builtins.h" -#include "ot-main.h" #include diff --git a/src/ostree/ot-builtin-cat.c b/src/ostree/ot-builtin-cat.c index 58201b7cf0..0e44e58b64 100644 --- a/src/ostree/ot-builtin-cat.c +++ b/src/ostree/ot-builtin-cat.c @@ -23,7 +23,6 @@ #include "ostree.h" #include "ot-builtins.h" -#include "ot-main.h" #include "otutil.h" #include diff --git a/src/ostree/ot-builtin-checkout.c b/src/ostree/ot-builtin-checkout.c index 368c1f6a4b..21213da528 100644 --- a/src/ostree/ot-builtin-checkout.c +++ b/src/ostree/ot-builtin-checkout.c @@ -26,7 +26,6 @@ #include "ostree.h" #include "ot-builtins.h" -#include "ot-main.h" #include "otutil.h" static gboolean opt_user_mode; diff --git a/src/ostree/ot-builtin-checksum.c b/src/ostree/ot-builtin-checksum.c index b3b15c26de..6aa4ba93bd 100644 --- a/src/ostree/ot-builtin-checksum.c +++ b/src/ostree/ot-builtin-checksum.c @@ -23,7 +23,6 @@ #include "ostree.h" #include "ot-builtins.h" -#include "ot-main.h" #include diff --git a/src/ostree/ot-builtin-commit.c b/src/ostree/ot-builtin-commit.c index 0309e73f2a..7c6d63e4df 100644 --- a/src/ostree/ot-builtin-commit.c +++ b/src/ostree/ot-builtin-commit.c @@ -27,7 +27,6 @@ #include "ostree.h" #include "ot-builtins.h" #include "ot-editor.h" -#include "ot-main.h" #include "otutil.h" #include "parse-datetime.h" diff --git a/src/ostree/ot-builtin-config.c b/src/ostree/ot-builtin-config.c index ad90b4b251..039656c589 100644 --- a/src/ostree/ot-builtin-config.c +++ b/src/ostree/ot-builtin-config.c @@ -23,7 +23,6 @@ #include "ostree.h" #include "ot-builtins.h" -#include "ot-main.h" #include "otutil.h" static char *opt_group; diff --git a/src/ostree/ot-builtin-create-usb.c b/src/ostree/ot-builtin-create-usb.c index 0c48295c36..c0a5172376 100644 --- a/src/ostree/ot-builtin-create-usb.c +++ b/src/ostree/ot-builtin-create-usb.c @@ -24,7 +24,6 @@ #include "ostree.h" #include "ot-builtins.h" -#include "ot-main.h" #include "otutil.h" #include "ostree-remote-private.h" diff --git a/src/ostree/ot-builtin-diff.c b/src/ostree/ot-builtin-diff.c index 2060dc7452..13fcd73f0e 100644 --- a/src/ostree/ot-builtin-diff.c +++ b/src/ostree/ot-builtin-diff.c @@ -23,7 +23,6 @@ #include "ostree.h" #include "ot-builtins.h" -#include "ot-main.h" #include "otutil.h" static gboolean opt_stats; diff --git a/src/ostree/ot-builtin-export.c b/src/ostree/ot-builtin-export.c index 4dda9c2b84..5bc1730519 100644 --- a/src/ostree/ot-builtin-export.c +++ b/src/ostree/ot-builtin-export.c @@ -23,7 +23,6 @@ #include "ostree-repo-file.h" #include "ostree.h" #include "ot-builtins.h" -#include "ot-main.h" #include "otutil.h" #ifdef HAVE_LIBARCHIVE diff --git a/src/ostree/ot-builtin-find-remotes.c b/src/ostree/ot-builtin-find-remotes.c index b13ab4e47e..7475aaa618 100644 --- a/src/ostree/ot-builtin-find-remotes.c +++ b/src/ostree/ot-builtin-find-remotes.c @@ -24,7 +24,6 @@ #include "ostree.h" #include "ot-builtins.h" -#include "ot-main.h" #include "otutil.h" #include "ostree-remote-private.h" diff --git a/src/ostree/ot-builtin-fsck.c b/src/ostree/ot-builtin-fsck.c index cd3c776818..bfb73444de 100644 --- a/src/ostree/ot-builtin-fsck.c +++ b/src/ostree/ot-builtin-fsck.c @@ -25,7 +25,6 @@ #include "ostree-cmd-private.h" #include "ostree.h" #include "ot-builtins.h" -#include "ot-main.h" #include "otutil.h" static gboolean opt_quiet; diff --git a/src/ostree/ot-builtin-gpg-sign.c b/src/ostree/ot-builtin-gpg-sign.c index a0ddf2afcb..9f7ac3b266 100644 --- a/src/ostree/ot-builtin-gpg-sign.c +++ b/src/ostree/ot-builtin-gpg-sign.c @@ -24,7 +24,6 @@ #include "ostree-core-private.h" #include "ostree.h" #include "ot-builtins.h" -#include "ot-main.h" #include "otutil.h" static gboolean opt_delete; diff --git a/src/ostree/ot-builtin-init.c b/src/ostree/ot-builtin-init.c index 114f9baab0..fb3ca382d8 100644 --- a/src/ostree/ot-builtin-init.c +++ b/src/ostree/ot-builtin-init.c @@ -23,7 +23,6 @@ #include "ostree.h" #include "ot-builtins.h" -#include "ot-main.h" static char *opt_mode = "bare"; static char *opt_collection_id = NULL; diff --git a/src/ostree/ot-builtin-log.c b/src/ostree/ot-builtin-log.c index 222e67a355..cf0896e5ff 100644 --- a/src/ostree/ot-builtin-log.c +++ b/src/ostree/ot-builtin-log.c @@ -24,7 +24,6 @@ #include "ostree.h" #include "ot-builtins.h" #include "ot-dump.h" -#include "ot-main.h" #include "otutil.h" static gboolean opt_raw; diff --git a/src/ostree/ot-builtin-ls.c b/src/ostree/ot-builtin-ls.c index 780bc0167d..6b76bab4e0 100644 --- a/src/ostree/ot-builtin-ls.c +++ b/src/ostree/ot-builtin-ls.c @@ -24,7 +24,6 @@ #include "ostree-repo-file.h" #include "ostree.h" #include "ot-builtins.h" -#include "ot-main.h" #include "otutil.h" static gboolean opt_dironly; diff --git a/src/ostree/ot-builtin-prune.c b/src/ostree/ot-builtin-prune.c index 1416ed840e..e54eff29a3 100644 --- a/src/ostree/ot-builtin-prune.c +++ b/src/ostree/ot-builtin-prune.c @@ -24,7 +24,6 @@ #include "ostree.h" #include "ot-builtins.h" -#include "ot-main.h" #include "otutil.h" #include "parse-datetime.h" diff --git a/src/ostree/ot-builtin-pull-local.c b/src/ostree/ot-builtin-pull-local.c index d489c44bef..92d53afb2a 100644 --- a/src/ostree/ot-builtin-pull-local.c +++ b/src/ostree/ot-builtin-pull-local.c @@ -26,7 +26,6 @@ #include "ostree.h" #include "ot-builtins.h" -#include "ot-main.h" #include "otutil.h" static char *opt_remote; diff --git a/src/ostree/ot-builtin-pull.c b/src/ostree/ot-builtin-pull.c index c06f4e65de..477a505a4f 100644 --- a/src/ostree/ot-builtin-pull.c +++ b/src/ostree/ot-builtin-pull.c @@ -23,7 +23,6 @@ #include "ostree.h" #include "ot-builtins.h" -#include "ot-main.h" #include "otutil.h" static gboolean opt_disable_fsync; diff --git a/src/ostree/ot-builtin-refs.c b/src/ostree/ot-builtin-refs.c index ec345b5c62..ff89eba47f 100644 --- a/src/ostree/ot-builtin-refs.c +++ b/src/ostree/ot-builtin-refs.c @@ -23,7 +23,6 @@ #include "ostree.h" #include "ot-builtins.h" -#include "ot-main.h" static gboolean opt_delete; static gboolean opt_list; diff --git a/src/ostree/ot-builtin-remote.c b/src/ostree/ot-builtin-remote.c index f50e09b203..8c30e4f1ed 100644 --- a/src/ostree/ot-builtin-remote.c +++ b/src/ostree/ot-builtin-remote.c @@ -22,7 +22,6 @@ #include "config.h" #include "ot-builtins.h" -#include "ot-main.h" #include "ot-remote-builtins.h" static OstreeCommand remote_subcommands[] = { diff --git a/src/ostree/ot-builtin-reset.c b/src/ostree/ot-builtin-reset.c index 86c5d9cdac..126fc89302 100644 --- a/src/ostree/ot-builtin-reset.c +++ b/src/ostree/ot-builtin-reset.c @@ -23,7 +23,6 @@ #include "ostree.h" #include "ot-builtins.h" -#include "ot-main.h" #include "otutil.h" /* ATTENTION: diff --git a/src/ostree/ot-builtin-rev-parse.c b/src/ostree/ot-builtin-rev-parse.c index e94012dd79..0d20089c90 100644 --- a/src/ostree/ot-builtin-rev-parse.c +++ b/src/ostree/ot-builtin-rev-parse.c @@ -23,7 +23,6 @@ #include "ostree.h" #include "ot-builtins.h" -#include "ot-main.h" #include "otutil.h" #include diff --git a/src/ostree/ot-builtin-show.c b/src/ostree/ot-builtin-show.c index c1fc0fed08..0c1a8dbc02 100644 --- a/src/ostree/ot-builtin-show.c +++ b/src/ostree/ot-builtin-show.c @@ -24,7 +24,6 @@ #include "ostree.h" #include "ot-builtins.h" #include "ot-dump.h" -#include "ot-main.h" #include "otutil.h" static gboolean opt_print_related; diff --git a/src/ostree/ot-builtin-sign.c b/src/ostree/ot-builtin-sign.c index f51fc51e60..059df5b41d 100644 --- a/src/ostree/ot-builtin-sign.c +++ b/src/ostree/ot-builtin-sign.c @@ -28,7 +28,6 @@ #include "ostree-sign.h" #include "ostree.h" #include "ot-builtins.h" -#include "ot-main.h" #include "otutil.h" static gboolean opt_delete; diff --git a/src/ostree/ot-builtin-static-delta.c b/src/ostree/ot-builtin-static-delta.c index ba9a2f2c4a..ba91175e45 100644 --- a/src/ostree/ot-builtin-static-delta.c +++ b/src/ostree/ot-builtin-static-delta.c @@ -22,7 +22,6 @@ #include "ostree-cmd-private.h" #include "ostree.h" #include "ot-builtins.h" -#include "ot-main.h" #include "otutil.h" static char *opt_from_rev; diff --git a/src/ostree/ot-builtin-summary.c b/src/ostree/ot-builtin-summary.c index df980df8a8..d131f80ba9 100644 --- a/src/ostree/ot-builtin-summary.c +++ b/src/ostree/ot-builtin-summary.c @@ -24,7 +24,6 @@ #include "ostree.h" #include "ot-builtins.h" #include "ot-dump.h" -#include "ot-main.h" #include "otutil.h" static gboolean opt_update, opt_view, opt_raw; diff --git a/src/ostree/ot-builtins.h b/src/ostree/ot-builtins.h index e14f67ff29..a7e4e8ea3b 100644 --- a/src/ostree/ot-builtins.h +++ b/src/ostree/ot-builtins.h @@ -23,7 +23,6 @@ #include "config.h" -#include "ostree.h" #include "ot-main.h" G_BEGIN_DECLS diff --git a/src/ostree/ot-main.c b/src/ostree/ot-main.c index 59a3fcba4f..d63cbd45ec 100644 --- a/src/ostree/ot-main.c +++ b/src/ostree/ot-main.c @@ -31,7 +31,6 @@ #include "ostree.h" #include "ot-admin-functions.h" -#include "ot-main.h" #include "otutil.h" static char *opt_repo; diff --git a/src/ostree/ot-remote-builtin-add-cookie.c b/src/ostree/ot-remote-builtin-add-cookie.c index 900520dc9e..a868f0fdb8 100644 --- a/src/ostree/ot-remote-builtin-add-cookie.c +++ b/src/ostree/ot-remote-builtin-add-cookie.c @@ -23,7 +23,6 @@ #include "otutil.h" #include "ostree-repo-private.h" -#include "ot-main.h" #include "ot-remote-builtins.h" #include "ot-remote-cookie-util.h" diff --git a/src/ostree/ot-remote-builtin-add.c b/src/ostree/ot-remote-builtin-add.c index 7fd157b729..f79d8b70e4 100644 --- a/src/ostree/ot-remote-builtin-add.c +++ b/src/ostree/ot-remote-builtin-add.c @@ -21,7 +21,6 @@ #include "otutil.h" -#include "ot-main.h" #include "ot-remote-builtins.h" static char **opt_set; diff --git a/src/ostree/ot-remote-builtin-delete-cookie.c b/src/ostree/ot-remote-builtin-delete-cookie.c index f79854ea5c..8af108993d 100644 --- a/src/ostree/ot-remote-builtin-delete-cookie.c +++ b/src/ostree/ot-remote-builtin-delete-cookie.c @@ -24,7 +24,6 @@ #include #include "ostree-repo-private.h" -#include "ot-main.h" #include "ot-remote-builtins.h" #include "ot-remote-cookie-util.h" diff --git a/src/ostree/ot-remote-builtin-delete.c b/src/ostree/ot-remote-builtin-delete.c index e5e310f33a..e93929fc3b 100644 --- a/src/ostree/ot-remote-builtin-delete.c +++ b/src/ostree/ot-remote-builtin-delete.c @@ -21,7 +21,6 @@ #include "otutil.h" -#include "ot-main.h" #include "ot-remote-builtins.h" static gboolean opt_if_exists = FALSE; diff --git a/src/ostree/ot-remote-builtin-gpg-import.c b/src/ostree/ot-remote-builtin-gpg-import.c index 0d9744e5b5..d24eecbfbe 100644 --- a/src/ostree/ot-remote-builtin-gpg-import.c +++ b/src/ostree/ot-remote-builtin-gpg-import.c @@ -24,7 +24,6 @@ #include "otutil.h" -#include "ot-main.h" #include "ot-remote-builtins.h" /* XXX This belongs in libotutil. */ diff --git a/src/ostree/ot-remote-builtin-gpg-list-keys.c b/src/ostree/ot-remote-builtin-gpg-list-keys.c index 8bd4c6b1ef..fa825531af 100644 --- a/src/ostree/ot-remote-builtin-gpg-list-keys.c +++ b/src/ostree/ot-remote-builtin-gpg-list-keys.c @@ -22,7 +22,6 @@ #include "otutil.h" #include "ot-dump.h" -#include "ot-main.h" #include "ot-remote-builtins.h" /* ATTENTION: diff --git a/src/ostree/ot-remote-builtin-list-cookies.c b/src/ostree/ot-remote-builtin-list-cookies.c index 2e576d5092..5d10df151f 100644 --- a/src/ostree/ot-remote-builtin-list-cookies.c +++ b/src/ostree/ot-remote-builtin-list-cookies.c @@ -23,7 +23,6 @@ #include "otutil.h" #include "ostree-repo-private.h" -#include "ot-main.h" #include "ot-remote-builtins.h" #include "ot-remote-cookie-util.h" diff --git a/src/ostree/ot-remote-builtin-list.c b/src/ostree/ot-remote-builtin-list.c index 31c60ec042..47ce1655d8 100644 --- a/src/ostree/ot-remote-builtin-list.c +++ b/src/ostree/ot-remote-builtin-list.c @@ -19,7 +19,6 @@ #include "config.h" -#include "ot-main.h" #include "ot-remote-builtins.h" static gboolean opt_show_urls; diff --git a/src/ostree/ot-remote-builtin-refs.c b/src/ostree/ot-remote-builtin-refs.c index 103c91345c..efd6ea9a8a 100644 --- a/src/ostree/ot-remote-builtin-refs.c +++ b/src/ostree/ot-remote-builtin-refs.c @@ -21,7 +21,6 @@ #include "otutil.h" -#include "ot-main.h" #include "ot-remote-builtins.h" static gboolean opt_revision; diff --git a/src/ostree/ot-remote-builtin-show-url.c b/src/ostree/ot-remote-builtin-show-url.c index 0ce7ee35d7..63827a05a9 100644 --- a/src/ostree/ot-remote-builtin-show-url.c +++ b/src/ostree/ot-remote-builtin-show-url.c @@ -21,7 +21,6 @@ #include "otutil.h" -#include "ot-main.h" #include "ot-remote-builtins.h" /* ATTENTION: diff --git a/src/ostree/ot-remote-builtin-summary.c b/src/ostree/ot-remote-builtin-summary.c index ec508cbb3a..3b507e9096 100644 --- a/src/ostree/ot-remote-builtin-summary.c +++ b/src/ostree/ot-remote-builtin-summary.c @@ -22,7 +22,6 @@ #include "otutil.h" #include "ot-dump.h" -#include "ot-main.h" #include "ot-remote-builtins.h" static gboolean opt_list_metadata_keys; diff --git a/src/ostree/ot-remote-builtins.h b/src/ostree/ot-remote-builtins.h index 0386478f9e..88a3e31e75 100644 --- a/src/ostree/ot-remote-builtins.h +++ b/src/ostree/ot-remote-builtins.h @@ -19,7 +19,7 @@ #pragma once -#include +#include "ot-main.h" G_BEGIN_DECLS diff --git a/src/ostree/ot-remote-cookie-util.c b/src/ostree/ot-remote-cookie-util.c index 5b15dd3d30..5c926eae77 100644 --- a/src/ostree/ot-remote-cookie-util.c +++ b/src/ostree/ot-remote-cookie-util.c @@ -23,7 +23,6 @@ #include "ot-remote-cookie-util.h" #include "ostree-repo-private.h" -#include "ot-main.h" #include "ot-remote-builtins.h" #include "otutil.h"