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.

diff --git a/src/ostree/ostree-trivial-httpd.c b/src/ostree/ostree-trivial-httpd.c
index facc15270f1516104d53b1db60b9e9e4c96c3130..4a0c6b0017ad2ddcbadda0c12499110008e50155 100644 (file)
--- 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 <err.h>

diff --git a/src/ostree/ot-admin-builtin-boot-complete.c b/src/ostree/ot-admin-builtin-boot-complete.c
index 4599606c8538ef24ef559f7028bccb8843594d3c..df99f8905452eb10b8d9aa129d8e71269d3e867a 100644 (file)
--- 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 b2d342318c2aec9e731012c312679f8b4ce51c68..ff33830f2a43f4fed7f763f26b5613c895f70c6d 100644 (file)
--- 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 <glib/gi18n.h>
 

diff --git a/src/ostree/ot-admin-builtin-deploy.c b/src/ostree/ot-admin-builtin-deploy.c
index 69a543362f933affd4d8bf7620a2f9ed0e403f42..f14cce5d54bd046ed028bb6ad0e383ea05df7b2c 100644 (file)
--- 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 <glib/gi18n.h>

diff --git a/src/ostree/ot-admin-builtin-diff.c b/src/ostree/ot-admin-builtin-diff.c
index 8a123a2218a060e503b86e8dee867ee8e5109781..7d96c82ec32458324288049a4a6d05e68b9b6f7f 100644 (file)
--- 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 <glib/gi18n.h>
 

diff --git a/src/ostree/ot-admin-builtin-finalize-staged.c b/src/ostree/ot-admin-builtin-finalize-staged.c
index a60f4687211afaff91b5a620d328ae96547c3113..2ae1674da86c48035b9523f5e04680a01033b87b 100644 (file)
--- 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 bf00f19eecb979489988a71b8209f9993227c098..9cda9afcfaaf391724a888af7cf7cadb322a8a56 100644 (file)
--- 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 <glib/gi18n.h>

diff --git a/src/ostree/ot-admin-builtin-instutil.c b/src/ostree/ot-admin-builtin-instutil.c
index d697cb0062e599cf55d7c8980bdb4838f68d36b3..4d0711d238cef1e11d22e278c404106af17fff9a 100644 (file)
--- 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 <glib/gi18n.h>
 

diff --git a/src/ostree/ot-admin-builtin-kargs.c b/src/ostree/ot-admin-builtin-kargs.c
index c4d440bd59f017fd9848aa84355d7417db367598..1433000e0cac7886f3a9c3a469c00a20cca98eaf 100644 (file)
--- 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 <glib/gi18n.h>

diff --git a/src/ostree/ot-admin-builtin-lock-finalization.c b/src/ostree/ot-admin-builtin-lock-finalization.c
index 1d76fc5d8decb1248abcff3ae012ae552367e8cf..e093d9528821e3453177607cb2ce63d15292da1c 100644 (file)
--- 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 <glib/gi18n.h>

diff --git a/src/ostree/ot-admin-builtin-os-init.c b/src/ostree/ot-admin-builtin-os-init.c
index 561d6cd442ea4434df99f8709ddd2a72558a3442..8f16246b3d659888648b9a22733aa709e29f64ef 100644 (file)
--- 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 <glib/gi18n.h>

diff --git a/src/ostree/ot-admin-builtin-pin.c b/src/ostree/ot-admin-builtin-pin.c
index 362df44ca908e7f6e8a956af377230adb75b621b..de219d7e437e1aebd9821125a723d0d51ff3db8d 100644 (file)
--- 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 3b96812d0434e16b74d29a026cf5ade2e2489df8..67484796df9eda3838bae23d17c512ffe595f9ce 100644 (file)
--- 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 <glib/gi18n.h>

diff --git a/src/ostree/ot-admin-builtin-set-default.c b/src/ostree/ot-admin-builtin-set-default.c
index 89e6754e339b1fae6797175db1fa8efea4213f2b..dd47ceb6c630e05e4c3a0507688f3b7f33a2caf0 100644 (file)
--- 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 45b5dbd10d9b67ce3f5bd472ab2f95b5aa0802ef..1bb0d098f48a5ca651a257963331d83702ec9991 100644 (file)
--- 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 <glib/gi18n.h>

diff --git a/src/ostree/ot-admin-builtin-status.c b/src/ostree/ot-admin-builtin-status.c
index 40c9881d4ea6d27b88119b88fd126cc518b3e479..d85c53be9ada61143a1abf1746a49146ce6a5005 100644 (file)
--- 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 <glib/gi18n.h>
 

diff --git a/src/ostree/ot-admin-builtin-switch.c b/src/ostree/ot-admin-builtin-switch.c
index cb41cac55372e770661a6a6c68d1b4c3633feb83..592673639fc69708c9b6ef8d971ded5d40730404 100644 (file)
--- 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 <glib/gi18n.h>

diff --git a/src/ostree/ot-admin-builtin-undeploy.c b/src/ostree/ot-admin-builtin-undeploy.c
index 3c901a44d7fce32f239f20b0fe9ebd454227eaec..4ed049082102a9dd090bc54b9e405d813e9c0544 100644 (file)
--- 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 d0c41453b4c8468cc610dc1ef7c8f52ce531a5af..4140e4caccfaa857b08d103048648e95e3fd26c8 100644 (file)
--- 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 <err.h>

diff --git a/src/ostree/ot-admin-builtin-upgrade.c b/src/ostree/ot-admin-builtin-upgrade.c
index 11710429fb2febd70f045df77c7456ac1b969b34..96b1575995cef3d9d3b4e0a7c21c65d88898c368 100644 (file)
--- 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 <glib/gi18n.h>

diff --git a/src/ostree/ot-admin-functions.h b/src/ostree/ot-admin-functions.h
index 50aef161c6ee5d3c59bd0c2d0b015fb0c6a76dc7..6a2332b75e4a0b63b4f0222e03785e4685b6bc61 100644 (file)
--- a/src/ostree/ot-admin-functions.h
+++ b/src/ostree/ot-admin-functions.h
@@ -21,8 +21,7 @@
 
 #pragma once
 
-#include <gio/gio.h>
-#include <ostree.h>
+#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 e73ffa148ad5ca676cd80c90ca173192810fc763..e5acbd7c12934ee644c342defe8b3e9889bcc4ca 100644 (file)
--- 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 bc226fb73f5c58fe1f5ea8402dfd77938c7dcdce..673b40ddd231ef81d92beac044005ce7850375ce 100644 (file)
--- 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 <string.h>
 
 #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 90a69b42df5c15c34ae87b833af3e2b324f4dbcc..21b3d7632e055f7e45d9e73bb0fec23802fbe2b6 100644 (file)
--- 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 <string.h>
 
 #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 cd434a7bcf7542330362e8c52ae6b1a64267ecd5..00025e659ef4d82218f4f574a85d150dff35f428 100644 (file)
--- 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 92169780d30880d6559d5079d3233cbb73a076e7..35a1e115c185f8c4c93817ee2b31bf8ad0215726 100644 (file)
--- 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 <glib/gi18n.h>
 

diff --git a/src/ostree/ot-builtin-cat.c b/src/ostree/ot-builtin-cat.c
index 58201b7cf04866722496ed06d8c9962f596ea578..0e44e58b646ea0c6d3ed994dec4c0d8d9ac40128 100644 (file)
--- 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 <gio/gunixoutputstream.h>

diff --git a/src/ostree/ot-builtin-checkout.c b/src/ostree/ot-builtin-checkout.c
index 368c1f6a4be1dbea01b3aa573ed63bb21b45b8a3..21213da5287548834bc01f2840b923bc6457eaf3 100644 (file)
--- 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 b3b15c26de306c38dee20efa793446b5e3ae75b6..6aa4ba93bdebc6d5f429f3666db8b652162da2b5 100644 (file)
--- 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 <string.h>
 

diff --git a/src/ostree/ot-builtin-commit.c b/src/ostree/ot-builtin-commit.c
index 0309e73f2a801e237d721adeafd30721fbb821ae..7c6d63e4df9cc82e63180007243151a5bcf30367 100644 (file)
--- 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 ad90b4b25108a77b2aff2b71526ab557fb98aec1..039656c5898d8a3e8dfafb357a5772d5a3d244c1 100644 (file)
--- 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 0c48295c36376b3df7aa5580c6d2733d091ea79d..c0a51723766632fdfa8f2c0e2c8aaf06aa009a81 100644 (file)
--- 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 2060dc7452c14237e9487ba52e8abab88143d2f3..13fcd73f0e301440a7dc74224f3171256cf9935a 100644 (file)
--- 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 4dda9c2b84a2fc78c5f4f9460930cf406acde43e..5bc17305197846bd0e78d3fbe83dba6901bb418c 100644 (file)
--- 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 b13ab4e47ecb1556e6d3a99ef2a4734f33384a8b..7475aaa618517fb362db62459f02f0d445a1931d 100644 (file)
--- 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 cd3c776818999edb3a6752c8912bd1e654919eed..bfb73444dece75d402eab75f9f1502479744a4d9 100644 (file)
--- 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 a0ddf2afcb3a2a2b9fc79d0a141bee20647d088c..9f7ac3b26607b38e8d2d6c09e8d21175645880e0 100644 (file)
--- 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 114f9baab0e6e115f09807e2c4962446a20538e0..fb3ca382d83300393351b37c59ad516fee5d39b8 100644 (file)
--- 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 222e67a35548b88e8c7e43f81487bcecfbfe91c3..cf0896e5ff02eed5401884d976e75715466a1cae 100644 (file)
--- 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 780bc0167dcf3bbca05a208a837af95bbb5e08ad..6b76bab4e0c8f47b445edd797b955bc6d65ee9f3 100644 (file)
--- 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 1416ed840ea2e69c07feee2e0334a32d1273a72a..e54eff29a3284ac8d8bc4c30de52a3a65dde69cd 100644 (file)
--- 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 d489c44bef366612fde38adb5921e81bfb8f1946..92d53afb2ae6223e0a71f1121c7d0ed4ba2d55d8 100644 (file)
--- 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 c06f4e65de0408ca87f8d267c4b4116f7db56e78..477a505a4fce7ebeaeab737d3c948a918068d9e3 100644 (file)
--- 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 ec345b5c62b1bcf485d53b473e23fb9116d59098..ff89eba47fdd3adf01037f4df97bb08f86350fac 100644 (file)
--- 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 f50e09b203931878bf3f76386e08f0bf657cf7f8..8c30e4f1ed7eac4dc0c3573102b348ac6371a358 100644 (file)
--- 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 86c5d9cdac260496ef53025bb6d30538b63017d2..126fc893026f953d72e9ad28aa91f6e4acf61b33 100644 (file)
--- 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 e94012dd79fa364c31f09a22c0353d3ae5ca6523..0d20089c90df2897832b21b119e34533f7002967 100644 (file)
--- 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 <stdbool.h>
 

diff --git a/src/ostree/ot-builtin-show.c b/src/ostree/ot-builtin-show.c
index c1fc0fed086dbaa9c28d53a9a6d0b23cf7c87c7b..0c1a8dbc02b8ce32d6466df122ec440a3600b0ce 100644 (file)
--- 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 f51fc51e6073cd8a54ae0d4e13c0fd53fc2a10f5..059df5b41d0e143ee07d1a12914934e3b48bca28 100644 (file)
--- 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 ba9a2f2c4a84be0d11e6c76885d2a7678e573651..ba91175e4553c1ef778051505aed9b302216873b 100644 (file)
--- 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 df980df8a8a920674e55d857c3a2aa08db39081e..d131f80ba9ff6e3c81c40f5d75b776a0402f4b46 100644 (file)
--- 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 e14f67ff291ff0622b21d4bd6fff7cd0af99b4e6..a7e4e8ea3b085ca94e5f577fb133aeda95d7907d 100644 (file)
--- 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 59a3fcba4f32e474a5a870b5abee632edf0ace7f..d63cbd45ec516584064797e3174a742b8bc891fa 100644 (file)
--- 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 900520dc9e58c5bdb2169366def8d0d7f098dbbe..a868f0fdb856835b3e44a1fa689a617fff1e1db2 100644 (file)
--- 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 7fd157b729f9508039600509ffd2b51b48c93db2..f79d8b70e4d46847016af2321955a6196416d9a0 100644 (file)
--- 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 f79854ea5c49786c69a1e8d39cf73da0b32726ab..8af108993d8b4186fc853a72bbb5d45399f5fcb9 100644 (file)
--- a/src/ostree/ot-remote-builtin-delete-cookie.c
+++ b/src/ostree/ot-remote-builtin-delete-cookie.c
@@ -24,7 +24,6 @@
 #include <sys/stat.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-delete.c b/src/ostree/ot-remote-builtin-delete.c
index e5e310f33add0d2bb09a1aa00ff2a33679542196..e93929fc3b7108aabd8be540f61946870e662ecf 100644 (file)
--- 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 0d9744e5b584f4f4665ce0f6cac26d4b0f43d197..d24eecbfbe186616b4c26f1085d2a3edbda1b9d1 100644 (file)
--- 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 8bd4c6b1ef39df3fc3b2c3ad83dcdbd0b3564b0b..fa825531af2036f17ae770a7a52ccf14fc759af5 100644 (file)
--- 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 2e576d5092375868d1ede08e12d5f904ac7fc670..5d10df151f67575183f3052839d8f560937ad04d 100644 (file)
--- 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 31c60ec042ba4c1dee90a509564eb80f2701c151..47ce1655d8238c1f94d523f671abeb7566549ccd 100644 (file)
--- 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 103c91345cd61b763267470e8f82949eae5a7e45..efd6ea9a8a113a2e9d0a386b2e4b79de137f2c58 100644 (file)
--- 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 0ce7ee35d7f44c4bb8104715a92b3318e6034951..63827a05a9ebd414351128fbf9829e4f70c80a46 100644 (file)
--- 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 ec508cbb3ada4c601b35e4d9b29123d4af8c0293..3b507e90969ed10251634861411824088d18992a 100644 (file)
--- 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 0386478f9e8ba0123adcd91e14bdfdb2afbf989e..88a3e31e75269b0570fcda923690995089f616bb 100644 (file)
--- a/src/ostree/ot-remote-builtins.h
+++ b/src/ostree/ot-remote-builtins.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <ostree.h>
+#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 5b15dd3d30b672a88dc3037bea7b4bc41ab83295..5c926eae77b047ac7b06237988c6a997d4b5f5e8 100644 (file)
--- 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"