gplugin/gplugin

Merged in bugfix/clang-format-tweaks (pull request #67)
develop
2020-02-26, Gary Kramlich
ca39d0ed5263
Parents 2f437170b1d7bc1dffc263b1
Children 84f8d9655a7d0c43b486bb14
Merged in bugfix/clang-format-tweaks (pull request #67)

Bugfix/clang format tweaks

Approved-by: Gary Kramlich
98 files changed, 207 insertions(+), 191 deletions(-)
  • +46 -7
    .clang-format
  • +2 -2
    gplugin-gtk-viewer/gplugin-gtk-viewer-window.c
  • +1 -1
    gplugin-gtk-viewer/gplugin-gtk-viewer-window.h
  • +2 -2
    gplugin-gtk-viewer/gplugin-gtk-viewer.c
  • +1 -2
    gplugin-gtk/gplugin-gtk-plugin-info.c
  • +1 -1
    gplugin-gtk/gplugin-gtk-plugin-info.h
  • +1 -2
    gplugin-gtk/gplugin-gtk-store.c
  • +1 -1
    gplugin-gtk/gplugin-gtk-store.h
  • +1 -2
    gplugin-gtk/gplugin-gtk-view.c
  • +1 -1
    gplugin-gtk/gplugin-gtk-view.h
  • +1 -1
    gplugin/gplugin-core.c
  • +1 -1
    gplugin/gplugin-core.h
  • +1 -1
    gplugin/gplugin-loader-tests.h
  • +1 -2
    gplugin/gplugin-loader.c
  • +1 -1
    gplugin/gplugin-loader.h
  • +2 -5
    gplugin/gplugin-manager.c
  • +1 -1
    gplugin/gplugin-manager.h
  • +4 -6
    gplugin/gplugin-native-loader.c
  • +1 -1
    gplugin/gplugin-native-loader.h
  • +4 -7
    gplugin/gplugin-native-plugin.c
  • +2 -3
    gplugin/gplugin-options.c
  • +1 -2
    gplugin/gplugin-plugin-info.c
  • +1 -1
    gplugin/gplugin-plugin-info.h
  • +1 -2
    gplugin/gplugin-plugin.c
  • +12 -12
    gplugin/gplugin-plugin.h
  • +1 -1
    gplugin/gplugin-private.h
  • +3 -3
    gplugin/gplugin-query.c
  • +3 -3
    gplugin/gplugin-version.c
  • +1 -1
    gplugin/tests/bad-plugins/query-error.c
  • +1 -1
    gplugin/tests/bind-local/bind-local.c
  • +1 -1
    gplugin/tests/dynamic-type/dynamic-test.h
  • +1 -1
    gplugin/tests/dynamic-type/dynamic-type-provider.c
  • +1 -1
    gplugin/tests/dynamic-type/dynamic-type-user.c
  • +1 -1
    gplugin/tests/id-collision/id-collision1.c
  • +1 -1
    gplugin/tests/id-collision/id-collision2.c
  • +1 -1
    gplugin/tests/load-on-query-fail/load-on-query-fail.c
  • +1 -1
    gplugin/tests/load-on-query-pass/load-on-query-pass.c
  • +1 -1
    gplugin/tests/plugins/basic-plugin.c
  • +1 -1
    gplugin/tests/plugins/broken-dependent-plugin.c
  • +1 -1
    gplugin/tests/plugins/dependent-plugin.c
  • +1 -1
    gplugin/tests/plugins/load-exception.c
  • +1 -1
    gplugin/tests/plugins/load-failed.c
  • +1 -1
    gplugin/tests/plugins/unload-failed.c
  • +3 -3
    gplugin/tests/test-bind-local.c
  • +2 -2
    gplugin/tests/test-core.c
  • +2 -3
    gplugin/tests/test-dynamic-type.c
  • +2 -3
    gplugin/tests/test-id-collision.c
  • +3 -3
    gplugin/tests/test-load-on-query.c
  • +2 -3
    gplugin/tests/test-native-loader.c
  • +2 -2
    gplugin/tests/test-option-group.c
  • +3 -3
    gplugin/tests/test-plugin-info.c
  • +2 -2
    gplugin/tests/test-plugin-manager-paths.c
  • +2 -2
    gplugin/tests/test-signals.c
  • +3 -3
    gplugin/tests/test-unresolved-symbol.c
  • +3 -3
    gplugin/tests/test-versioned-dependencies.c
  • +1 -1
    gplugin/tests/unresolved-symbol/unresolved-symbol.c
  • +1 -1
    gplugin/tests/versioned-dependencies/bar.c
  • +1 -1
    gplugin/tests/versioned-dependencies/baz.c
  • +1 -1
    gplugin/tests/versioned-dependencies/exact1.c
  • +1 -1
    gplugin/tests/versioned-dependencies/exact2.c
  • +1 -1
    gplugin/tests/versioned-dependencies/fez.c
  • +1 -1
    gplugin/tests/versioned-dependencies/greater-equal.c
  • +1 -1
    gplugin/tests/versioned-dependencies/greater.c
  • +1 -1
    gplugin/tests/versioned-dependencies/less-equal.c
  • +1 -1
    gplugin/tests/versioned-dependencies/less.c
  • +1 -1
    gplugin/tests/versioned-dependencies/no-version.c
  • +1 -1
    gplugin/tests/versioned-dependencies/super-dependent.c
  • +3 -3
    lua/gplugin-lua-core.c
  • +2 -2
    lua/gplugin-lua-loader.c
  • +1 -1
    lua/gplugin-lua-loader.h
  • +1 -1
    lua/gplugin-lua-plugin.h
  • +1 -1
    lua/tests/test-lua-loader.c
  • +1 -1
    perl/gplugin-perl-core.c
  • +7 -10
    perl/gplugin-perl-loader.c
  • +1 -1
    perl/gplugin-perl-loader.h
  • +1 -1
    perl/gplugin-perl-plugin.h
  • +1 -1
    perl/tests/test-perl-loader.c
  • +3 -3
    python/gplugin-python3-core.c
  • +5 -6
    python/gplugin-python3-loader.c
  • +1 -1
    python/gplugin-python3-loader.h
  • +2 -2
    python/gplugin-python3-plugin.c
  • +1 -1
    python/gplugin-python3-plugin.h
  • +0 -1
    python/gplugin-python3-test-pygobject.c
  • +4 -4
    python/gplugin-python3-utils.c
  • +1 -1
    python/tests/test-python3-loader.c
  • +2 -2
    python/tests/test-python3-utils.c
  • +3 -3
    tcc/gplugin-tcc-core.c
  • +2 -2
    tcc/gplugin-tcc-loader.c
  • +1 -1
    tcc/gplugin-tcc-loader.h
  • +1 -1
    tcc/gplugin-tcc-plugin.h
  • +1 -1
    tcc/tests/plugins/basic-plugin.c
  • +1 -1
    tcc/tests/plugins/dependent.c
  • +1 -1
    tcc/tests/plugins/load-exception.c
  • +1 -1
    tcc/tests/plugins/load-failed.c
  • +1 -1
    tcc/tests/plugins/unload-failed.c
  • +1 -1
    tcc/tests/test-tcc-loader.c
  • +1 -1
    vala/tests/test-genie-loading.c
  • +1 -1
    vala/tests/test-vala-loading.c
    • --- a/.clang-format Wed Feb 26 03:13:57 2020 -0600
    +++ b/.clang-format Wed Feb 26 21:09:37 2020 +0000
    @@ -64,14 +64,53 @@
    - foreach
    - Q_FOREACH
    - BOOST_FOREACH
    -IncludeBlocks: Preserve
    +# With clang-format-11, change:
    +IncludeBlocks: Preserve
    +#IncludeBlocks: Regroup
    IncludeCategories:
    - - Regex: '^"(llvm|llvm-c|clang|clang-c)/'
    - Priority: 2
    - - Regex: '^(<|"(gtest|gmock|isl|json)/)'
    - Priority: 3
    - - Regex: '.*'
    - Priority: 1
    + # C system headers.
    + - Regex: '^[<"](aio|arpa/inet|assert|complex|cpio|ctype|curses|dirent|dlfcn|errno|fcntl|fenv|float|fmtmsg|fnmatch|ftw|glob|grp|iconv|inttypes|iso646|langinfo|libgen|limits|locale|math|monetary|mqueue|ndbm|netdb|net/if|netinet/in|netinet/tcp|nl_types|poll|pthread|pwd|regex|sched|search|semaphore|setjmp|signal|spawn|stdalign|stdarg|stdatomic|stdbool|stddef|stdint|stdio|stdlib|stdnoreturn|string|strings|stropts|sys/ipc|syslog|sys/mman|sys/msg|sys/resource|sys/select|sys/sem|sys/shm|sys/socket|sys/stat|sys/statvfs|sys/time|sys/times|sys/types|sys/uio|sys/un|sys/utsname|sys/wait|tar|term|termios|tgmath|threads|time|trace|uchar|ulimit|uncntrl|unistd|utime|utmpx|wchar|wctype|wordexp)\.h[">]$'
    + Priority: 20
    + # glib headers
    + - Regex: '^<glib\.h>'
    + Priority: 30
    + - Regex: '^<(glib-|gmodule)'
    + # With clang-format-11, change:
    + Priority: 31
    + #Priority: 30
    + #SortPriority: 31
    + - Regex: '^<(gio/|glib/|gobject/)'
    + # With clang-format-11, change:
    + Priority: 32
    + #Priority: 30
    + #SortPriority: 32
    + # GTK headers
    + - Regex: '^<gtk/'
    + Priority: 40
    + # gplugin headers
    + - Regex: '^<gplugin\.h>'
    + Priority: 50
    + - Regex: '^<gplugin-[^/]+\.h>'
    + # With clang-format-11, change:
    + Priority: 51
    + #Priority: 50
    + #SortPriority: 51
    + - Regex: '^<gplugin/'
    + # With clang-format-11, change:
    + Priority: 52
    + #Priority: 50
    + #SortPriority: 52
    + - Regex: '^<gplugin-gtk/'
    + # With clang-format-11, change:
    + Priority: 53
    + #Priority: 50
    + #SortPriority: 53
    + # Other libraries' headers
    + - Regex: '^<'
    + Priority: 60
    + # Our (internal) headers
    + - Regex: '^"'
    + Priority: 70
    IncludeIsMainRegex: '(Test)?$'
    IndentCaseLabels: true
    IndentPPDirectives: None
    --- a/gplugin-gtk-viewer/gplugin-gtk-viewer-window.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/gplugin-gtk-viewer/gplugin-gtk-viewer-window.c Wed Feb 26 21:09:37 2020 +0000
    @@ -14,9 +14,9 @@
    * You should have received a copy of the GNU Lesser General Public
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    -#include <gtk/gtk.h>
    +#include "gplugin-gtk-viewer-window.h"
    -#include "gplugin-gtk-viewer-window.h"
    +#include <gtk/gtk.h>
    struct _GPluginGtkViewerWindow {
    GtkWindow parent;
    --- a/gplugin-gtk-viewer/gplugin-gtk-viewer-window.h Wed Feb 26 03:13:57 2020 -0600
    +++ b/gplugin-gtk-viewer/gplugin-gtk-viewer-window.h Wed Feb 26 21:09:37 2020 +0000
    @@ -18,8 +18,8 @@
    #ifndef GPLUGIN_GTK_VIEWER_WINDOW_H
    #define GPLUGIN_GTK_VIEWER_WINDOW_H
    +#include <glib.h>
    #include <glib-object.h>
    -#include <glib.h>
    #include <gtk/gtk.h>
    --- a/gplugin-gtk-viewer/gplugin-gtk-viewer.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/gplugin-gtk-viewer/gplugin-gtk-viewer.c Wed Feb 26 21:09:37 2020 +0000
    @@ -20,8 +20,8 @@
    #include <gtk/gtk.h>
    -#include <gplugin-gtk/gplugin-gtk.h>
    -#include <gplugin/gplugin.h>
    +#include <gplugin.h>
    +#include <gplugin-gtk.h>
    /******************************************************************************
    * Globals
    --- a/gplugin-gtk/gplugin-gtk-plugin-info.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/gplugin-gtk/gplugin-gtk-plugin-info.c Wed Feb 26 21:09:37 2020 +0000
    @@ -15,10 +15,9 @@
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    +#include <gplugin.h>
    #include <gplugin-gtk/gplugin-gtk-plugin-info.h>
    -#include <gplugin/gplugin.h>
    -
    /**
    * SECTION:gplugin-gtk-plugin-info
    * @title: Plugin Info Gtk Widgets
    --- a/gplugin-gtk/gplugin-gtk-plugin-info.h Wed Feb 26 03:13:57 2020 -0600
    +++ b/gplugin-gtk/gplugin-gtk-plugin-info.h Wed Feb 26 21:09:37 2020 +0000
    @@ -23,8 +23,8 @@
    #ifndef GPLUGIN_GTK_PLUGIN_INFO_H
    #define GPLUGIN_GTK_PLUGIN_INFO_H
    +#include <glib.h>
    #include <glib-object.h>
    -#include <glib.h>
    #include <gtk/gtk.h>
    --- a/gplugin-gtk/gplugin-gtk-store.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/gplugin-gtk/gplugin-gtk-store.c Wed Feb 26 21:09:37 2020 +0000
    @@ -15,8 +15,7 @@
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    -#include <gplugin/gplugin.h>
    -
    +#include <gplugin.h>
    #include <gplugin-gtk/gplugin-gtk-store.h>
    /**
    --- a/gplugin-gtk/gplugin-gtk-store.h Wed Feb 26 03:13:57 2020 -0600
    +++ b/gplugin-gtk/gplugin-gtk-store.h Wed Feb 26 21:09:37 2020 +0000
    @@ -23,8 +23,8 @@
    #ifndef GPLUGIN_GTK_STORE_H
    #define GPLUGIN_GTK_STORE_H
    +#include <glib.h>
    #include <glib-object.h>
    -#include <glib.h>
    #include <gtk/gtk.h>
    --- a/gplugin-gtk/gplugin-gtk-view.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/gplugin-gtk/gplugin-gtk-view.c Wed Feb 26 21:09:37 2020 +0000
    @@ -15,11 +15,10 @@
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    +#include <gplugin.h>
    #include <gplugin-gtk/gplugin-gtk-store.h>
    #include <gplugin-gtk/gplugin-gtk-view.h>
    -#include <gplugin/gplugin.h>
    -
    /**
    * SECTION:gplugin-gtk-view
    * @title: GtkTreeView for plugins
    --- a/gplugin-gtk/gplugin-gtk-view.h Wed Feb 26 03:13:57 2020 -0600
    +++ b/gplugin-gtk/gplugin-gtk-view.h Wed Feb 26 21:09:37 2020 +0000
    @@ -23,8 +23,8 @@
    #ifndef GPLUGIN_GTK_VIEW_H
    #define GPLUGIN_GTK_VIEW_H
    +#include <glib.h>
    #include <glib-object.h>
    -#include <glib.h>
    #include <gtk/gtk.h>
    --- a/gplugin/gplugin-core.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/gplugin/gplugin-core.c Wed Feb 26 21:09:37 2020 +0000
    @@ -15,8 +15,8 @@
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    +#include <glib.h>
    #include <glib-object.h>
    -#include <glib.h>
    #include <glib/gi18n-lib.h>
    #include <gplugin/gplugin-core.h>
    --- a/gplugin/gplugin-core.h Wed Feb 26 03:13:57 2020 -0600
    +++ b/gplugin/gplugin-core.h Wed Feb 26 21:09:37 2020 +0000
    @@ -22,8 +22,8 @@
    #ifndef GPLUGIN_CORE_H
    #define GPLUGIN_CORE_H
    +#include <glib.h>
    #include <glib-object.h>
    -#include <glib.h>
    #define GPLUGIN_DOMAIN (g_quark_from_static_string("gplugin"))
    --- a/gplugin/gplugin-loader-tests.h Wed Feb 26 03:13:57 2020 -0600
    +++ b/gplugin/gplugin-loader-tests.h Wed Feb 26 21:09:37 2020 +0000
    @@ -18,8 +18,8 @@
    #ifndef GPLUGIN_LOADER_TESTS_H
    #define GPLUGIN_LOADER_TESTS_H
    +#include <glib.h>
    #include <glib-object.h>
    -#include <glib.h>
    G_BEGIN_DECLS
    --- a/gplugin/gplugin-loader.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/gplugin/gplugin-loader.c Wed Feb 26 21:09:37 2020 +0000
    @@ -15,10 +15,9 @@
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    +#include <gplugin/gplugin-core.h>
    #include <gplugin/gplugin-loader.h>
    -#include <gplugin/gplugin-core.h>
    -
    /**
    * SECTION:gplugin-loader
    * @title: Plugin Loader
    --- a/gplugin/gplugin-loader.h Wed Feb 26 03:13:57 2020 -0600
    +++ b/gplugin/gplugin-loader.h Wed Feb 26 21:09:37 2020 +0000
    @@ -22,8 +22,8 @@
    #ifndef GPLUGIN_LOADER_H
    #define GPLUGIN_LOADER_H
    +#include <glib.h>
    #include <glib-object.h>
    -#include <glib.h>
    G_BEGIN_DECLS
    --- a/gplugin/gplugin-manager.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/gplugin/gplugin-manager.c Wed Feb 26 21:09:37 2020 +0000
    @@ -21,15 +21,12 @@
    #include <glib.h>
    #include <glib/gi18n-lib.h>
    +#include <gplugin-native.h>
    #include <gplugin/gplugin-core.h>
    +#include <gplugin/gplugin-file-tree.h>
    #include <gplugin/gplugin-manager.h>
    -
    #include <gplugin/gplugin-private.h>
    -#include <gplugin/gplugin-native.h>
    -
    -#include <gplugin/gplugin-file-tree.h>
    -
    /**
    * SECTION:gplugin-manager
    * @Title: Manager API
    --- a/gplugin/gplugin-manager.h Wed Feb 26 03:13:57 2020 -0600
    +++ b/gplugin/gplugin-manager.h Wed Feb 26 21:09:37 2020 +0000
    @@ -22,8 +22,8 @@
    #ifndef GPLUGIN_MANAGER_H
    #define GPLUGIN_MANAGER_H
    +#include <glib.h>
    #include <glib-object.h>
    -#include <glib.h>
    #include <gplugin/gplugin-plugin.h>
    --- a/gplugin/gplugin-native-loader.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/gplugin/gplugin-native-loader.c Wed Feb 26 21:09:37 2020 +0000
    @@ -15,16 +15,14 @@
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    +#include <gmodule.h>
    +#include <glib/gi18n-lib.h>
    +
    #include <gplugin/gplugin-core.h>
    -#include <gplugin/gplugin-private.h>
    -
    #include <gplugin/gplugin-native-loader.h>
    #include <gplugin/gplugin-native-plugin.h>
    #include <gplugin/gplugin-native-private.h>
    -
    -#include <glib/gi18n-lib.h>
    -
    -#include <gmodule.h>
    +#include <gplugin/gplugin-private.h>
    #define GPLUGIN_QUERY_SYMBOL "gplugin_query"
    #define GPLUGIN_LOAD_SYMBOL "gplugin_load"
    --- a/gplugin/gplugin-native-loader.h Wed Feb 26 03:13:57 2020 -0600
    +++ b/gplugin/gplugin-native-loader.h Wed Feb 26 21:09:37 2020 +0000
    @@ -22,8 +22,8 @@
    #ifndef GPLUGIN_NATIVE_LOADER_H
    #define GPLUGIN_NATIVE_LOADER_H
    +#include <glib.h>
    #include <glib-object.h>
    -#include <glib.h>
    #include <gplugin/gplugin-loader.h>
    --- a/gplugin/gplugin-native-plugin.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/gplugin/gplugin-native-plugin.c Wed Feb 26 21:09:37 2020 +0000
    @@ -15,16 +15,13 @@
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    -#include <gplugin/gplugin-native-plugin.h>
    +#include <glib/gi18n-lib.h>
    -#include <gplugin/gplugin-native-private.h>
    -
    +#include <gplugin/gplugin-core.h>
    #include <gplugin/gplugin-loader.h>
    #include <gplugin/gplugin-manager.h>
    -
    -#include <gplugin/gplugin-core.h>
    -
    -#include <glib/gi18n-lib.h>
    +#include <gplugin/gplugin-native-plugin.h>
    +#include <gplugin/gplugin-native-private.h>
    /**
    * GPLUGIN_TYPE_NATIVE_PLUGIN:
    --- a/gplugin/gplugin-options.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/gplugin/gplugin-options.c Wed Feb 26 21:09:37 2020 +0000
    @@ -15,14 +15,13 @@
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    +#include <glib.h>
    #include <glib-object.h>
    -#include <glib.h>
    #include <glib/gi18n-lib.h>
    -#include <gplugin/gplugin-options.h>
    -
    #include <gplugin/gplugin-core.h>
    #include <gplugin/gplugin-manager.h>
    +#include <gplugin/gplugin-options.h>
    /**
    * SECTION:gplugin-options
    --- a/gplugin/gplugin-plugin-info.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/gplugin/gplugin-plugin-info.c Wed Feb 26 21:09:37 2020 +0000
    @@ -16,9 +16,8 @@
    */
    #include <gplugin/gplugin-core.h>
    +#include <gplugin/gplugin-enums.h>
    #include <gplugin/gplugin-plugin-info.h>
    -
    -#include <gplugin/gplugin-enums.h>
    #include <gplugin/gplugin-private.h>
    /**
    --- a/gplugin/gplugin-plugin-info.h Wed Feb 26 03:13:57 2020 -0600
    +++ b/gplugin/gplugin-plugin-info.h Wed Feb 26 21:09:37 2020 +0000
    @@ -22,8 +22,8 @@
    #ifndef GPLUGIN_PLUGIN_INFO_H
    #define GPLUGIN_PLUGIN_INFO_H
    +#include <glib.h>
    #include <glib-object.h>
    -#include <glib.h>
    G_BEGIN_DECLS
    --- a/gplugin/gplugin-plugin.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/gplugin/gplugin-plugin.c Wed Feb 26 21:09:37 2020 +0000
    @@ -15,9 +15,8 @@
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    +#include <gplugin/gplugin-enums.h>
    #include <gplugin/gplugin-plugin.h>
    -
    -#include <gplugin/gplugin-enums.h>
    #include <gplugin/gplugin-private.h>
    /**
    --- a/gplugin/gplugin-plugin.h Wed Feb 26 03:13:57 2020 -0600
    +++ b/gplugin/gplugin-plugin.h Wed Feb 26 21:09:37 2020 +0000
    @@ -22,22 +22,22 @@
    #ifndef GPLUGIN_PLUGIN_H
    #define GPLUGIN_PLUGIN_H
    +#include <glib.h>
    #include <glib-object.h>
    -#include <glib.h>
    -typedef enum /*<
    - prefix=GPLUGIN_PLUGIN_STATE,underscore_name=GPLUGIN_PLUGIN_STATE
    - >*/
    -{ GPLUGIN_PLUGIN_STATE_UNKNOWN = -1,
    - GPLUGIN_PLUGIN_STATE_ERROR = 0,
    - GPLUGIN_PLUGIN_STATE_QUERIED,
    - GPLUGIN_PLUGIN_STATE_REQUERY,
    - GPLUGIN_PLUGIN_STATE_LOADED,
    - GPLUGIN_PLUGIN_STATE_LOAD_FAILED,
    +/* clang-format off */
    +typedef enum /*< prefix=GPLUGIN_PLUGIN_STATE,underscore_name=GPLUGIN_PLUGIN_STATE >*/ {
    + GPLUGIN_PLUGIN_STATE_UNKNOWN = -1,
    + GPLUGIN_PLUGIN_STATE_ERROR = 0,
    + GPLUGIN_PLUGIN_STATE_QUERIED,
    + GPLUGIN_PLUGIN_STATE_REQUERY,
    + GPLUGIN_PLUGIN_STATE_LOADED,
    + GPLUGIN_PLUGIN_STATE_LOAD_FAILED,
    - /*< private >*/
    - GPLUGIN_PLUGIN_STATES, /*< skip >*/
    + /*< private >*/
    + GPLUGIN_PLUGIN_STATES, /*< skip >*/
    } GPluginPluginState;
    +/* clang-format on */
    G_BEGIN_DECLS
    --- a/gplugin/gplugin-private.h Wed Feb 26 03:13:57 2020 -0600
    +++ b/gplugin/gplugin-private.h Wed Feb 26 21:09:37 2020 +0000
    @@ -22,8 +22,8 @@
    #ifndef GPLUGIN_PRIVATE_H
    #define GPLUGIN_PRIVATE_H
    +#include <glib.h>
    #include <glib-object.h>
    -#include <glib.h>
    #include <gplugin/gplugin-plugin-info.h>
    #include <gplugin/gplugin-plugin.h>
    --- a/gplugin/gplugin-query.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/gplugin/gplugin-query.c Wed Feb 26 21:09:37 2020 +0000
    @@ -15,13 +15,13 @@
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    -#include <glib.h>
    -#include <glib/gi18n.h>
    -
    #include <stdio.h>
    #include <stdlib.h>
    #include <string.h>
    +#include <glib.h>
    +#include <glib/gi18n.h>
    +
    #include <gplugin.h>
    /******************************************************************************
    --- a/gplugin/gplugin-version.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/gplugin/gplugin-version.c Wed Feb 26 21:09:37 2020 +0000
    @@ -25,13 +25,13 @@
    * unless checking for new versions during builds.
    */
    -#include <gplugin/gplugin-core.h>
    -#include <gplugin/gplugin-version.h>
    -
    #include <stdlib.h>
    #include <glib/gi18n-lib.h>
    +#include <gplugin/gplugin-core.h>
    +#include <gplugin/gplugin-version.h>
    +
    /******************************************************************************
    * Globals
    *****************************************************************************/
    --- a/gplugin/tests/bad-plugins/query-error.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/gplugin/tests/bad-plugins/query-error.c Wed Feb 26 21:09:37 2020 +0000
    @@ -15,8 +15,8 @@
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    +#include <gplugin.h>
    #include <gplugin-native.h>
    -#include <gplugin.h>
    G_MODULE_EXPORT GPluginPluginInfo *
    gplugin_query(G_GNUC_UNUSED GError **error)
    --- a/gplugin/tests/bind-local/bind-local.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/gplugin/tests/bind-local/bind-local.c Wed Feb 26 21:09:37 2020 +0000
    @@ -15,8 +15,8 @@
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    +#include <gplugin.h>
    #include <gplugin-native.h>
    -#include <gplugin.h>
    G_MODULE_EXPORT GPluginPluginInfo *
    gplugin_query(G_GNUC_UNUSED GError **error)
    --- a/gplugin/tests/dynamic-type/dynamic-test.h Wed Feb 26 03:13:57 2020 -0600
    +++ b/gplugin/tests/dynamic-type/dynamic-test.h Wed Feb 26 21:09:37 2020 +0000
    @@ -34,8 +34,8 @@
    typedef struct _DynamicTest DynamicTest;
    typedef struct _DynamicTestClass DynamicTestClass;
    +#include <glib.h>
    #include <glib-object.h>
    -#include <glib.h>
    struct _DynamicTest {
    GObject gparent;
    --- a/gplugin/tests/dynamic-type/dynamic-type-provider.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/gplugin/tests/dynamic-type/dynamic-type-provider.c Wed Feb 26 21:09:37 2020 +0000
    @@ -16,8 +16,8 @@
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    +#include <gplugin.h>
    #include <gplugin-native.h>
    -#include <gplugin.h>
    #include "dynamic-test.h"
    --- a/gplugin/tests/dynamic-type/dynamic-type-user.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/gplugin/tests/dynamic-type/dynamic-type-user.c Wed Feb 26 21:09:37 2020 +0000
    @@ -16,8 +16,8 @@
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    +#include <gplugin.h>
    #include <gplugin-native.h>
    -#include <gplugin.h>
    #include "dynamic-test.h"
    --- a/gplugin/tests/id-collision/id-collision1.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/gplugin/tests/id-collision/id-collision1.c Wed Feb 26 21:09:37 2020 +0000
    @@ -15,8 +15,8 @@
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    +#include <gplugin.h>
    #include <gplugin-native.h>
    -#include <gplugin.h>
    G_MODULE_EXPORT GPluginPluginInfo *
    gplugin_query(G_GNUC_UNUSED GError **error)
    --- a/gplugin/tests/id-collision/id-collision2.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/gplugin/tests/id-collision/id-collision2.c Wed Feb 26 21:09:37 2020 +0000
    @@ -15,8 +15,8 @@
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    +#include <gplugin.h>
    #include <gplugin-native.h>
    -#include <gplugin.h>
    G_MODULE_EXPORT GPluginPluginInfo *
    gplugin_query(G_GNUC_UNUSED GError **error)
    --- a/gplugin/tests/load-on-query-fail/load-on-query-fail.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/gplugin/tests/load-on-query-fail/load-on-query-fail.c Wed Feb 26 21:09:37 2020 +0000
    @@ -15,8 +15,8 @@
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    +#include <gplugin.h>
    #include <gplugin-native.h>
    -#include <gplugin.h>
    G_MODULE_EXPORT GPluginPluginInfo *
    gplugin_query(G_GNUC_UNUSED GError **error)
    --- a/gplugin/tests/load-on-query-pass/load-on-query-pass.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/gplugin/tests/load-on-query-pass/load-on-query-pass.c Wed Feb 26 21:09:37 2020 +0000
    @@ -15,8 +15,8 @@
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    +#include <gplugin.h>
    #include <gplugin-native.h>
    -#include <gplugin.h>
    G_MODULE_EXPORT GPluginPluginInfo *
    gplugin_query(G_GNUC_UNUSED GError **error)
    --- a/gplugin/tests/plugins/basic-plugin.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/gplugin/tests/plugins/basic-plugin.c Wed Feb 26 21:09:37 2020 +0000
    @@ -15,8 +15,8 @@
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    +#include <gplugin.h>
    #include <gplugin-native.h>
    -#include <gplugin.h>
    G_MODULE_EXPORT GPluginPluginInfo *
    gplugin_query(G_GNUC_UNUSED GError **error)
    --- a/gplugin/tests/plugins/broken-dependent-plugin.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/gplugin/tests/plugins/broken-dependent-plugin.c Wed Feb 26 21:09:37 2020 +0000
    @@ -15,8 +15,8 @@
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    +#include <gplugin.h>
    #include <gplugin-native.h>
    -#include <gplugin.h>
    G_MODULE_EXPORT GPluginPluginInfo *
    gplugin_query(G_GNUC_UNUSED GError **error)
    --- a/gplugin/tests/plugins/dependent-plugin.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/gplugin/tests/plugins/dependent-plugin.c Wed Feb 26 21:09:37 2020 +0000
    @@ -15,8 +15,8 @@
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    +#include <gplugin.h>
    #include <gplugin-native.h>
    -#include <gplugin.h>
    G_MODULE_EXPORT GPluginPluginInfo *
    gplugin_query(G_GNUC_UNUSED GError **error)
    --- a/gplugin/tests/plugins/load-exception.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/gplugin/tests/plugins/load-exception.c Wed Feb 26 21:09:37 2020 +0000
    @@ -15,8 +15,8 @@
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    +#include <gplugin.h>
    #include <gplugin-native.h>
    -#include <gplugin.h>
    G_MODULE_EXPORT GPluginPluginInfo *
    gplugin_query(G_GNUC_UNUSED GError **error)
    --- a/gplugin/tests/plugins/load-failed.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/gplugin/tests/plugins/load-failed.c Wed Feb 26 21:09:37 2020 +0000
    @@ -15,8 +15,8 @@
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    +#include <gplugin.h>
    #include <gplugin-native.h>
    -#include <gplugin.h>
    G_MODULE_EXPORT GPluginPluginInfo *
    gplugin_query(G_GNUC_UNUSED GError **error)
    --- a/gplugin/tests/plugins/unload-failed.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/gplugin/tests/plugins/unload-failed.c Wed Feb 26 21:09:37 2020 +0000
    @@ -15,8 +15,8 @@
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    +#include <gplugin.h>
    #include <gplugin-native.h>
    -#include <gplugin.h>
    G_MODULE_EXPORT GPluginPluginInfo *
    gplugin_query(G_GNUC_UNUSED GError **error)
    --- a/gplugin/tests/test-bind-local.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/gplugin/tests/test-bind-local.c Wed Feb 26 21:09:37 2020 +0000
    @@ -17,10 +17,10 @@
    #include <stdlib.h>
    -#include <gplugin-native.h>
    +#include <glib.h>
    +
    #include <gplugin.h>
    -
    -#include <glib.h>
    +#include <gplugin-native.h>
    /******************************************************************************
    * Tests
    --- a/gplugin/tests/test-core.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/gplugin/tests/test-core.c Wed Feb 26 21:09:37 2020 +0000
    @@ -15,9 +15,9 @@
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    -#include <gplugin.h>
    +#include <glib.h>
    -#include <glib.h>
    +#include <gplugin.h>
    /******************************************************************************
    * Tests
    --- a/gplugin/tests/test-dynamic-type.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/gplugin/tests/test-dynamic-type.c Wed Feb 26 21:09:37 2020 +0000
    @@ -17,11 +17,10 @@
    #include <stdlib.h>
    -#include <gplugin-native.h>
    -#include <gplugin.h>
    -
    #include <glib.h>
    +#include <gplugin.h>
    +#include <gplugin-native.h>
    #include <gplugin/gplugin-loader-tests.h>
    /******************************************************************************
    --- a/gplugin/tests/test-id-collision.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/gplugin/tests/test-id-collision.c Wed Feb 26 21:09:37 2020 +0000
    @@ -17,11 +17,10 @@
    #include <stdlib.h>
    -#include <gplugin-native.h>
    -#include <gplugin.h>
    -
    #include <glib.h>
    +#include <gplugin.h>
    +#include <gplugin-native.h>
    #include <gplugin/gplugin-loader-tests.h>
    /******************************************************************************
    --- a/gplugin/tests/test-load-on-query.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/gplugin/tests/test-load-on-query.c Wed Feb 26 21:09:37 2020 +0000
    @@ -17,10 +17,10 @@
    #include <stdlib.h>
    -#include <gplugin-native.h>
    +#include <glib.h>
    +
    #include <gplugin.h>
    -
    -#include <glib.h>
    +#include <gplugin-native.h>
    /******************************************************************************
    * Tests
    --- a/gplugin/tests/test-native-loader.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/gplugin/tests/test-native-loader.c Wed Feb 26 21:09:37 2020 +0000
    @@ -17,11 +17,10 @@
    #include <stdlib.h>
    -#include <gplugin-native.h>
    -#include <gplugin.h>
    -
    #include <glib.h>
    +#include <gplugin.h>
    +#include <gplugin-native.h>
    #include <gplugin/gplugin-loader-tests.h>
    /******************************************************************************
    --- a/gplugin/tests/test-option-group.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/gplugin/tests/test-option-group.c Wed Feb 26 21:09:37 2020 +0000
    @@ -15,9 +15,9 @@
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    -#include <gplugin.h>
    +#include <glib.h>
    -#include <glib.h>
    +#include <gplugin.h>
    /******************************************************************************
    * Tests
    --- a/gplugin/tests/test-plugin-info.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/gplugin/tests/test-plugin-info.c Wed Feb 26 21:09:37 2020 +0000
    @@ -15,10 +15,10 @@
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    -#include <gplugin-native.h>
    +#include <glib.h>
    +
    #include <gplugin.h>
    -
    -#include <glib.h>
    +#include <gplugin-native.h>
    #define test_string(var, value) \
    G_STMT_START \
    --- a/gplugin/tests/test-plugin-manager-paths.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/gplugin/tests/test-plugin-manager-paths.c Wed Feb 26 21:09:37 2020 +0000
    @@ -15,9 +15,9 @@
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    -#include <gplugin.h>
    +#include <glib.h>
    -#include <glib.h>
    +#include <gplugin.h>
    #define test_path_count(e) \
    G_STMT_START \
    --- a/gplugin/tests/test-signals.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/gplugin/tests/test-signals.c Wed Feb 26 21:09:37 2020 +0000
    @@ -15,9 +15,9 @@
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    -#include <gplugin.h>
    +#include <glib.h>
    -#include <glib.h>
    +#include <gplugin.h>
    typedef struct {
    gboolean loading;
    --- a/gplugin/tests/test-unresolved-symbol.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/gplugin/tests/test-unresolved-symbol.c Wed Feb 26 21:09:37 2020 +0000
    @@ -17,10 +17,10 @@
    #include <stdlib.h>
    -#include <gplugin-native.h>
    +#include <glib.h>
    +
    #include <gplugin.h>
    -
    -#include <glib.h>
    +#include <gplugin-native.h>
    /******************************************************************************
    * Tests
    --- a/gplugin/tests/test-versioned-dependencies.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/gplugin/tests/test-versioned-dependencies.c Wed Feb 26 21:09:37 2020 +0000
    @@ -17,10 +17,10 @@
    #include <stdlib.h>
    -#include <gplugin-native.h>
    +#include <glib.h>
    +
    #include <gplugin.h>
    -
    -#include <glib.h>
    +#include <gplugin-native.h>
    /******************************************************************************
    * Helpers
    --- a/gplugin/tests/unresolved-symbol/unresolved-symbol.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/gplugin/tests/unresolved-symbol/unresolved-symbol.c Wed Feb 26 21:09:37 2020 +0000
    @@ -15,8 +15,8 @@
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    +#include <gplugin.h>
    #include <gplugin-native.h>
    -#include <gplugin.h>
    void some_unresolved_symbol(void);
    --- a/gplugin/tests/versioned-dependencies/bar.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/gplugin/tests/versioned-dependencies/bar.c Wed Feb 26 21:09:37 2020 +0000
    @@ -15,8 +15,8 @@
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    +#include <gplugin.h>
    #include <gplugin-native.h>
    -#include <gplugin.h>
    G_MODULE_EXPORT GPluginPluginInfo *
    gplugin_query(G_GNUC_UNUSED GError **error)
    --- a/gplugin/tests/versioned-dependencies/baz.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/gplugin/tests/versioned-dependencies/baz.c Wed Feb 26 21:09:37 2020 +0000
    @@ -15,8 +15,8 @@
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    +#include <gplugin.h>
    #include <gplugin-native.h>
    -#include <gplugin.h>
    G_MODULE_EXPORT GPluginPluginInfo *
    gplugin_query(G_GNUC_UNUSED GError **error)
    --- a/gplugin/tests/versioned-dependencies/exact1.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/gplugin/tests/versioned-dependencies/exact1.c Wed Feb 26 21:09:37 2020 +0000
    @@ -15,8 +15,8 @@
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    +#include <gplugin.h>
    #include <gplugin-native.h>
    -#include <gplugin.h>
    G_MODULE_EXPORT GPluginPluginInfo *
    gplugin_query(G_GNUC_UNUSED GError **error)
    --- a/gplugin/tests/versioned-dependencies/exact2.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/gplugin/tests/versioned-dependencies/exact2.c Wed Feb 26 21:09:37 2020 +0000
    @@ -15,8 +15,8 @@
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    +#include <gplugin.h>
    #include <gplugin-native.h>
    -#include <gplugin.h>
    G_MODULE_EXPORT GPluginPluginInfo *
    gplugin_query(G_GNUC_UNUSED GError **error)
    --- a/gplugin/tests/versioned-dependencies/fez.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/gplugin/tests/versioned-dependencies/fez.c Wed Feb 26 21:09:37 2020 +0000
    @@ -15,8 +15,8 @@
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    +#include <gplugin.h>
    #include <gplugin-native.h>
    -#include <gplugin.h>
    G_MODULE_EXPORT GPluginPluginInfo *
    gplugin_query(G_GNUC_UNUSED GError **error)
    --- a/gplugin/tests/versioned-dependencies/greater-equal.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/gplugin/tests/versioned-dependencies/greater-equal.c Wed Feb 26 21:09:37 2020 +0000
    @@ -15,8 +15,8 @@
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    +#include <gplugin.h>
    #include <gplugin-native.h>
    -#include <gplugin.h>
    G_MODULE_EXPORT GPluginPluginInfo *
    gplugin_query(G_GNUC_UNUSED GError **error)
    --- a/gplugin/tests/versioned-dependencies/greater.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/gplugin/tests/versioned-dependencies/greater.c Wed Feb 26 21:09:37 2020 +0000
    @@ -15,8 +15,8 @@
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    +#include <gplugin.h>
    #include <gplugin-native.h>
    -#include <gplugin.h>
    G_MODULE_EXPORT GPluginPluginInfo *
    gplugin_query(G_GNUC_UNUSED GError **error)
    --- a/gplugin/tests/versioned-dependencies/less-equal.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/gplugin/tests/versioned-dependencies/less-equal.c Wed Feb 26 21:09:37 2020 +0000
    @@ -15,8 +15,8 @@
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    +#include <gplugin.h>
    #include <gplugin-native.h>
    -#include <gplugin.h>
    G_MODULE_EXPORT GPluginPluginInfo *
    gplugin_query(G_GNUC_UNUSED GError **error)
    --- a/gplugin/tests/versioned-dependencies/less.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/gplugin/tests/versioned-dependencies/less.c Wed Feb 26 21:09:37 2020 +0000
    @@ -15,8 +15,8 @@
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    +#include <gplugin.h>
    #include <gplugin-native.h>
    -#include <gplugin.h>
    G_MODULE_EXPORT GPluginPluginInfo *
    gplugin_query(G_GNUC_UNUSED GError **error)
    --- a/gplugin/tests/versioned-dependencies/no-version.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/gplugin/tests/versioned-dependencies/no-version.c Wed Feb 26 21:09:37 2020 +0000
    @@ -15,8 +15,8 @@
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    +#include <gplugin.h>
    #include <gplugin-native.h>
    -#include <gplugin.h>
    G_MODULE_EXPORT GPluginPluginInfo *
    gplugin_query(G_GNUC_UNUSED GError **error)
    --- a/gplugin/tests/versioned-dependencies/super-dependent.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/gplugin/tests/versioned-dependencies/super-dependent.c Wed Feb 26 21:09:37 2020 +0000
    @@ -15,8 +15,8 @@
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    +#include <gplugin.h>
    #include <gplugin-native.h>
    -#include <gplugin.h>
    G_MODULE_EXPORT GPluginPluginInfo *
    gplugin_query(G_GNUC_UNUSED GError **error)
    --- a/lua/gplugin-lua-core.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/lua/gplugin-lua-core.c Wed Feb 26 21:09:37 2020 +0000
    @@ -15,14 +15,14 @@
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    +#include <glib/gi18n-lib.h>
    +
    +#include <gplugin.h>
    #include <gplugin-native.h>
    -#include <gplugin.h>
    #include "gplugin-lua-loader.h"
    #include "gplugin-lua-plugin.h"
    -#include <glib/gi18n-lib.h>
    -
    G_MODULE_EXPORT GPluginPluginInfo *
    gplugin_query(G_GNUC_UNUSED GError **error)
    {
    --- a/lua/gplugin-lua-loader.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/lua/gplugin-lua-loader.c Wed Feb 26 21:09:37 2020 +0000
    @@ -17,14 +17,14 @@
    #include "gplugin-lua-loader.h"
    -#include "gplugin-lua-plugin.h"
    -
    #include <glib/gi18n-lib.h>
    #include <lauxlib.h>
    #include <lua.h>
    #include <lualib.h>
    +#include "gplugin-lua-plugin.h"
    +
    struct _GPluginLuaLoader {
    GPluginLoader parent;
    };
    --- a/lua/gplugin-lua-loader.h Wed Feb 26 03:13:57 2020 -0600
    +++ b/lua/gplugin-lua-loader.h Wed Feb 26 21:09:37 2020 +0000
    @@ -18,8 +18,8 @@
    #ifndef GPLUGIN_LUA_LOADER_H
    #define GPLUGIN_LUA_LOADER_H
    +#include <gplugin.h>
    #include <gplugin-native.h>
    -#include <gplugin.h>
    G_BEGIN_DECLS
    --- a/lua/gplugin-lua-plugin.h Wed Feb 26 03:13:57 2020 -0600
    +++ b/lua/gplugin-lua-plugin.h Wed Feb 26 21:09:37 2020 +0000
    @@ -18,8 +18,8 @@
    #ifndef GPLUGIN_LUA_PLUGIN_H
    #define GPLUGIN_LUA_PLUGIN_H
    +#include <gplugin.h>
    #include <gplugin-native.h>
    -#include <gplugin.h>
    #include <lua.h>
    --- a/lua/tests/test-lua-loader.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/lua/tests/test-lua-loader.c Wed Feb 26 21:09:37 2020 +0000
    @@ -16,8 +16,8 @@
    */
    #include <glib.h>
    +
    #include <gplugin.h>
    -
    #include <gplugin/gplugin-loader-tests.h>
    gint
    --- a/perl/gplugin-perl-core.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/perl/gplugin-perl-core.c Wed Feb 26 21:09:37 2020 +0000
    @@ -15,8 +15,8 @@
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    +#include <gplugin.h>
    #include <gplugin-native.h>
    -#include <gplugin.h>
    #include "gplugin-perl-loader.h"
    #include "gplugin-perl-plugin.h"
    --- a/perl/gplugin-perl-loader.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/perl/gplugin-perl-loader.c Wed Feb 26 21:09:37 2020 +0000
    @@ -16,10 +16,9 @@
    */
    #include "gplugin-perl-loader.h"
    +
    #include "gplugin-perl-plugin.h"
    -#include <glib/gi18n-lib.h>
    -
    struct _GPluginPerlLoader {
    GPluginLoader parent;
    };
    @@ -249,17 +248,15 @@
    return NULL;
    }
    + /* clang-format off */
    plugin = g_object_new(
    GPLUGIN_PERL_TYPE_PLUGIN,
    - "interpreter",
    - interpreter,
    - "filename",
    - filename,
    - "info",
    - info,
    - "loader",
    - g_object_ref(loader),
    + "interpreter", interpreter,
    + "filename", filename,
    + "info", info,
    + "loader", g_object_ref(loader),
    NULL);
    + /* clang-format on */
    return plugin;
    }
    --- a/perl/gplugin-perl-loader.h Wed Feb 26 03:13:57 2020 -0600
    +++ b/perl/gplugin-perl-loader.h Wed Feb 26 21:09:37 2020 +0000
    @@ -18,8 +18,8 @@
    #ifndef GPLUGIN_PERL_LOADER_H
    #define GPLUGIN_PERL_LOADER_H
    +#include <gplugin.h>
    #include <gplugin-native.h>
    -#include <gplugin.h>
    G_BEGIN_DECLS
    --- a/perl/gplugin-perl-plugin.h Wed Feb 26 03:13:57 2020 -0600
    +++ b/perl/gplugin-perl-plugin.h Wed Feb 26 21:09:37 2020 +0000
    @@ -18,8 +18,8 @@
    #ifndef GPLUGIN_PERL_PLUGIN_H
    #define GPLUGIN_PERL_PLUGIN_H
    +#include <gplugin.h>
    #include <gplugin-native.h>
    -#include <gplugin.h>
    #define PERL_NO_GET_CONTEXT
    #include <gperl.h>
    --- a/perl/tests/test-perl-loader.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/perl/tests/test-perl-loader.c Wed Feb 26 21:09:37 2020 +0000
    @@ -16,8 +16,8 @@
    */
    #include <glib.h>
    +
    #include <gplugin.h>
    -
    #include <gplugin/gplugin-loader-tests.h>
    gint
    --- a/python/gplugin-python3-core.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/python/gplugin-python3-core.c Wed Feb 26 21:09:37 2020 +0000
    @@ -15,10 +15,10 @@
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    -#include <gplugin-native.h>
    +#include <glib/gi18n-lib.h>
    +
    #include <gplugin.h>
    -
    -#include <glib/gi18n-lib.h>
    +#include <gplugin-native.h>
    #include "gplugin-python3-loader.h"
    #include "gplugin-python3-plugin.h"
    --- a/python/gplugin-python3-loader.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/python/gplugin-python3-loader.c Wed Feb 26 21:09:37 2020 +0000
    @@ -15,19 +15,18 @@
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    -#include <Python.h>
    +#include "gplugin-python3-loader.h"
    #include <stdlib.h>
    -#include "gplugin-python3-loader.h"
    +#include <glib/gi18n-lib.h>
    +
    +#include <Python.h>
    +#include <pygobject.h>
    #include "gplugin-python3-plugin.h"
    #include "gplugin-python3-utils.h"
    -#include <glib/gi18n-lib.h>
    -
    -#include <pygobject.h>
    -
    struct _GPluginPython3Loader {
    GPluginLoader parent;
    --- a/python/gplugin-python3-loader.h Wed Feb 26 03:13:57 2020 -0600
    +++ b/python/gplugin-python3-loader.h Wed Feb 26 21:09:37 2020 +0000
    @@ -18,8 +18,8 @@
    #ifndef GPLUGIN_PYTHON3_LOADER_H
    #define GPLUGIN_PYTHON3_LOADER_H
    +#include <gplugin.h>
    #include <gplugin-native.h>
    -#include <gplugin.h>
    G_BEGIN_DECLS
    --- a/python/gplugin-python3-plugin.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/python/gplugin-python3-plugin.c Wed Feb 26 21:09:37 2020 +0000
    @@ -15,9 +15,9 @@
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    -#include <Python.h>
    +#include "gplugin-python3-plugin.h"
    -#include "gplugin-python3-plugin.h"
    +#include <Python.h>
    /******************************************************************************
    * Typedefs
    --- a/python/gplugin-python3-plugin.h Wed Feb 26 03:13:57 2020 -0600
    +++ b/python/gplugin-python3-plugin.h Wed Feb 26 21:09:37 2020 +0000
    @@ -18,8 +18,8 @@
    #ifndef GPLUGIN_PYTHON3_PLUGIN_H
    #define GPLUGIN_PYTHON3_PLUGIN_H
    +#include <gplugin.h>
    #include <gplugin-native.h>
    -#include <gplugin.h>
    G_BEGIN_DECLS
    --- a/python/gplugin-python3-test-pygobject.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/python/gplugin-python3-test-pygobject.c Wed Feb 26 21:09:37 2020 +0000
    @@ -20,7 +20,6 @@
    #include <glib.h>
    #include <Python.h>
    -
    #include <pygobject.h>
    gint
    --- a/python/gplugin-python3-utils.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/python/gplugin-python3-utils.c Wed Feb 26 21:09:37 2020 +0000
    @@ -15,14 +15,14 @@
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    -#include <Python.h>
    -
    -#include <gplugin/gplugin.h>
    -
    #include "gplugin-python3-utils.h"
    #include <string.h>
    +#include <gplugin.h>
    +
    +#include <Python.h>
    +
    gchar *
    gplugin_python3_filename_to_module(const gchar *filename)
    {
    --- a/python/tests/test-python3-loader.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/python/tests/test-python3-loader.c Wed Feb 26 21:09:37 2020 +0000
    @@ -16,8 +16,8 @@
    */
    #include <glib.h>
    +
    #include <gplugin.h>
    -
    #include <gplugin/gplugin-loader-tests.h>
    /******************************************************************************
    --- a/python/tests/test-python3-utils.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/python/tests/test-python3-utils.c Wed Feb 26 21:09:37 2020 +0000
    @@ -15,12 +15,12 @@
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    +#include <glib.h>
    +
    #include <Python.h>
    #include "gplugin-python3-utils.h"
    -#include <glib.h>
    -
    /******************************************************************************
    * filename to module tests
    *****************************************************************************/
    --- a/tcc/gplugin-tcc-core.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/tcc/gplugin-tcc-core.c Wed Feb 26 21:09:37 2020 +0000
    @@ -15,10 +15,10 @@
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    -#include <gplugin-native.h>
    +#include <glib/gi18n-lib.h>
    +
    #include <gplugin.h>
    -
    -#include <glib/gi18n-lib.h>
    +#include <gplugin-native.h>
    #include "gplugin-tcc-loader.h"
    #include "gplugin-tcc-plugin.h"
    --- a/tcc/gplugin-tcc-loader.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/tcc/gplugin-tcc-loader.c Wed Feb 26 21:09:37 2020 +0000
    @@ -17,12 +17,12 @@
    #include "gplugin-tcc-loader.h"
    -#include "gplugin-tcc-plugin.h"
    -
    #include <glib/gi18n-lib.h>
    #include <libtcc.h>
    +#include "gplugin-tcc-plugin.h"
    +
    struct _GPluginTccLoader {
    GPluginLoader parent;
    };
    --- a/tcc/gplugin-tcc-loader.h Wed Feb 26 03:13:57 2020 -0600
    +++ b/tcc/gplugin-tcc-loader.h Wed Feb 26 21:09:37 2020 +0000
    @@ -17,8 +17,8 @@
    #ifndef GPLUGIN_TCC_LOADER_H
    #define GPLUGIN_TCC_LOADER_H
    +#include <gplugin.h>
    #include <gplugin-native.h>
    -#include <gplugin.h>
    G_BEGIN_DECLS
    --- a/tcc/gplugin-tcc-plugin.h Wed Feb 26 03:13:57 2020 -0600
    +++ b/tcc/gplugin-tcc-plugin.h Wed Feb 26 21:09:37 2020 +0000
    @@ -17,8 +17,8 @@
    #ifndef GPLUGIN_TCC_PLUGIN_H
    #define GPLUGIN_TCC_PLUGIN_H
    +#include <gplugin.h>
    #include <gplugin-native.h>
    -#include <gplugin.h>
    #include <libtcc.h>
    --- a/tcc/tests/plugins/basic-plugin.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/tcc/tests/plugins/basic-plugin.c Wed Feb 26 21:09:37 2020 +0000
    @@ -14,8 +14,8 @@
    * You should have received a copy of the GNU Lesser General Public
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    +#include <gplugin.h>
    #include <gplugin-native.h>
    -#include <gplugin.h>
    G_MODULE_EXPORT GPluginPluginInfo *
    gplugin_query(G_GNUC_UNUSED GError **error)
    --- a/tcc/tests/plugins/dependent.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/tcc/tests/plugins/dependent.c Wed Feb 26 21:09:37 2020 +0000
    @@ -14,8 +14,8 @@
    * You should have received a copy of the GNU Lesser General Public
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    +#include <gplugin.h>
    #include <gplugin-native.h>
    -#include <gplugin.h>
    G_MODULE_EXPORT GPluginPluginInfo *
    gplugin_query(G_GNUC_UNUSED GError **error)
    --- a/tcc/tests/plugins/load-exception.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/tcc/tests/plugins/load-exception.c Wed Feb 26 21:09:37 2020 +0000
    @@ -14,8 +14,8 @@
    * You should have received a copy of the GNU Lesser General Public
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    +#include <gplugin.h>
    #include <gplugin-native.h>
    -#include <gplugin.h>
    G_MODULE_EXPORT GPluginPluginInfo *
    gplugin_query(G_GNUC_UNUSED GError **error)
    --- a/tcc/tests/plugins/load-failed.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/tcc/tests/plugins/load-failed.c Wed Feb 26 21:09:37 2020 +0000
    @@ -14,8 +14,8 @@
    * You should have received a copy of the GNU Lesser General Public
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    +#include <gplugin.h>
    #include <gplugin-native.h>
    -#include <gplugin.h>
    G_MODULE_EXPORT GPluginPluginInfo *
    gplugin_query(G_GNUC_UNUSED GError **error)
    --- a/tcc/tests/plugins/unload-failed.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/tcc/tests/plugins/unload-failed.c Wed Feb 26 21:09:37 2020 +0000
    @@ -14,8 +14,8 @@
    * You should have received a copy of the GNU Lesser General Public
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    +#include <gplugin.h>
    #include <gplugin-native.h>
    -#include <gplugin.h>
    G_MODULE_EXPORT GPluginPluginInfo *
    gplugin_query(G_GNUC_UNUSED GError **error)
    --- a/tcc/tests/test-tcc-loader.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/tcc/tests/test-tcc-loader.c Wed Feb 26 21:09:37 2020 +0000
    @@ -16,8 +16,8 @@
    */
    #include <glib.h>
    +
    #include <gplugin.h>
    -
    #include <gplugin/gplugin-loader-tests.h>
    gint
    --- a/vala/tests/test-genie-loading.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/vala/tests/test-genie-loading.c Wed Feb 26 21:09:37 2020 +0000
    @@ -16,8 +16,8 @@
    */
    #include <glib.h>
    +
    #include <gplugin.h>
    -
    #include <gplugin/gplugin-loader-tests.h>
    /******************************************************************************
    --- a/vala/tests/test-vala-loading.c Wed Feb 26 03:13:57 2020 -0600
    +++ b/vala/tests/test-vala-loading.c Wed Feb 26 21:09:37 2020 +0000
    @@ -16,8 +16,8 @@
    */
    #include <glib.h>
    +
    #include <gplugin.h>
    -
    #include <gplugin/gplugin-loader-tests.h>
    /******************************************************************************