gplugin/gplugin

Run clang-format-11 once to regroup includes
bugfix/clang-format-tweaks
2020-02-26, Richard Laager
c509c17e68e3
Parents 72df99d32fa7
Children 54917b58582a
Run clang-format-11 once to regroup includes

This involved changing the .clang-format rules as indicated.
43 files changed, 84 insertions(+), 103 deletions(-)
  • +2 -2
    gplugin-gtk-viewer/gplugin-gtk-viewer-window.c
  • +1 -2
    gplugin-gtk/gplugin-gtk-plugin-info.c
  • +0 -1
    gplugin-gtk/gplugin-gtk-store.c
  • +1 -2
    gplugin-gtk/gplugin-gtk-view.c
  • +1 -2
    gplugin/gplugin-loader.c
  • +2 -5
    gplugin/gplugin-manager.c
  • +4 -6
    gplugin/gplugin-native-loader.c
  • +4 -7
    gplugin/gplugin-native-plugin.c
  • +1 -2
    gplugin/gplugin-options.c
  • +1 -2
    gplugin/gplugin-plugin-info.c
  • +1 -2
    gplugin/gplugin-plugin.c
  • +3 -3
    gplugin/gplugin-query.c
  • +3 -3
    gplugin/gplugin-version.c
  • +2 -2
    gplugin/tests/dynamic-type/dynamic-type-provider.c
  • +2 -2
    gplugin/tests/dynamic-type/dynamic-type-user.c
  • +2 -2
    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
  • +2 -2
    gplugin/tests/test-load-on-query.c
  • +2 -3
    gplugin/tests/test-native-loader.c
  • +2 -2
    gplugin/tests/test-option-group.c
  • +2 -2
    gplugin/tests/test-plugin-info.c
  • +2 -2
    gplugin/tests/test-plugin-manager-paths.c
  • +2 -2
    gplugin/tests/test-signals.c
  • +2 -2
    gplugin/tests/test-unresolved-symbol.c
  • +2 -2
    gplugin/tests/test-versioned-dependencies.c
  • +3 -3
    lua/gplugin-lua-core.c
  • +1 -1
    lua/tests/test-lua-loader.c
  • +3 -3
    perl/gplugin-perl-core.c
  • +1 -0
    perl/gplugin-perl-loader.c
  • +1 -1
    perl/tests/test-perl-loader.c
  • +4 -4
    python/gplugin-python3-core.c
  • +3 -4
    python/gplugin-python3-loader.c
  • +2 -2
    python/gplugin-python3-plugin.c
  • +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
  • +4 -4
    tcc/gplugin-tcc-core.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/gplugin-gtk-viewer/gplugin-gtk-viewer-window.c Wed Feb 26 14:02:30 2020 -0600
    +++ b/gplugin-gtk-viewer/gplugin-gtk-viewer-window.c Wed Feb 26 14:04:21 2020 -0600
    @@ -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/gplugin-gtk-plugin-info.c Wed Feb 26 14:02:30 2020 -0600
    +++ b/gplugin-gtk/gplugin-gtk-plugin-info.c Wed Feb 26 14:04:21 2020 -0600
    @@ -15,10 +15,9 @@
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    +#include <gplugin/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-store.c Wed Feb 26 14:02:30 2020 -0600
    +++ b/gplugin-gtk/gplugin-gtk-store.c Wed Feb 26 14:04:21 2020 -0600
    @@ -16,7 +16,6 @@
    */
    #include <gplugin/gplugin.h>
    -
    #include <gplugin-gtk/gplugin-gtk-store.h>
    /**
    --- a/gplugin-gtk/gplugin-gtk-view.c Wed Feb 26 14:02:30 2020 -0600
    +++ b/gplugin-gtk/gplugin-gtk-view.c Wed Feb 26 14:04:21 2020 -0600
    @@ -15,11 +15,10 @@
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    +#include <gplugin/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/gplugin-loader.c Wed Feb 26 14:02:30 2020 -0600
    +++ b/gplugin/gplugin-loader.c Wed Feb 26 14:04:21 2020 -0600
    @@ -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-manager.c Wed Feb 26 14:02:30 2020 -0600
    +++ b/gplugin/gplugin-manager.c Wed Feb 26 14:04:21 2020 -0600
    @@ -22,14 +22,11 @@
    #include <glib/gi18n-lib.h>
    #include <gplugin/gplugin-core.h>
    +#include <gplugin/gplugin-file-tree.h>
    #include <gplugin/gplugin-manager.h>
    -
    +#include <gplugin/gplugin-native.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-native-loader.c Wed Feb 26 14:02:30 2020 -0600
    +++ b/gplugin/gplugin-native-loader.c Wed Feb 26 14:04:21 2020 -0600
    @@ -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-plugin.c Wed Feb 26 14:02:30 2020 -0600
    +++ b/gplugin/gplugin-native-plugin.c Wed Feb 26 14:04:21 2020 -0600
    @@ -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 14:02:30 2020 -0600
    +++ b/gplugin/gplugin-options.c Wed Feb 26 14:04:21 2020 -0600
    @@ -19,10 +19,9 @@
    #include <glib-object.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 14:02:30 2020 -0600
    +++ b/gplugin/gplugin-plugin-info.c Wed Feb 26 14:04:21 2020 -0600
    @@ -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.c Wed Feb 26 14:02:30 2020 -0600
    +++ b/gplugin/gplugin-plugin.c Wed Feb 26 14:04:21 2020 -0600
    @@ -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-query.c Wed Feb 26 14:02:30 2020 -0600
    +++ b/gplugin/gplugin-query.c Wed Feb 26 14:04:21 2020 -0600
    @@ -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 14:02:30 2020 -0600
    +++ b/gplugin/gplugin-version.c Wed Feb 26 14:04:21 2020 -0600
    @@ -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/dynamic-type/dynamic-type-provider.c Wed Feb 26 14:02:30 2020 -0600
    +++ b/gplugin/tests/dynamic-type/dynamic-type-provider.c Wed Feb 26 14:04:21 2020 -0600
    @@ -16,11 +16,11 @@
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    +#include "dynamic-test.h"
    +
    #include <gplugin.h>
    #include <gplugin-native.h>
    -#include "dynamic-test.h"
    -
    G_DEFINE_DYNAMIC_TYPE(DynamicTest, dynamic_test, G_TYPE_OBJECT);
    static void
    --- a/gplugin/tests/dynamic-type/dynamic-type-user.c Wed Feb 26 14:02:30 2020 -0600
    +++ b/gplugin/tests/dynamic-type/dynamic-type-user.c Wed Feb 26 14:04:21 2020 -0600
    @@ -16,11 +16,11 @@
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    +#include "dynamic-test.h"
    +
    #include <gplugin.h>
    #include <gplugin-native.h>
    -#include "dynamic-test.h"
    -
    static DynamicTest *test_object = NULL;
    G_MODULE_EXPORT GPluginPluginInfo *
    --- a/gplugin/tests/test-bind-local.c Wed Feb 26 14:02:30 2020 -0600
    +++ b/gplugin/tests/test-bind-local.c Wed Feb 26 14:04:21 2020 -0600
    @@ -17,11 +17,11 @@
    #include <stdlib.h>
    +#include <glib.h>
    +
    #include <gplugin.h>
    #include <gplugin-native.h>
    -#include <glib.h>
    -
    /******************************************************************************
    * Tests
    *****************************************************************************/
    --- a/gplugin/tests/test-core.c Wed Feb 26 14:02:30 2020 -0600
    +++ b/gplugin/tests/test-core.c Wed Feb 26 14:04:21 2020 -0600
    @@ -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 14:02:30 2020 -0600
    +++ b/gplugin/tests/test-dynamic-type.c Wed Feb 26 14:04:21 2020 -0600
    @@ -17,11 +17,10 @@
    #include <stdlib.h>
    +#include <glib.h>
    +
    #include <gplugin.h>
    #include <gplugin-native.h>
    -
    -#include <glib.h>
    -
    #include <gplugin/gplugin-loader-tests.h>
    /******************************************************************************
    --- a/gplugin/tests/test-id-collision.c Wed Feb 26 14:02:30 2020 -0600
    +++ b/gplugin/tests/test-id-collision.c Wed Feb 26 14:04:21 2020 -0600
    @@ -17,11 +17,10 @@
    #include <stdlib.h>
    +#include <glib.h>
    +
    #include <gplugin.h>
    #include <gplugin-native.h>
    -
    -#include <glib.h>
    -
    #include <gplugin/gplugin-loader-tests.h>
    /******************************************************************************
    --- a/gplugin/tests/test-load-on-query.c Wed Feb 26 14:02:30 2020 -0600
    +++ b/gplugin/tests/test-load-on-query.c Wed Feb 26 14:04:21 2020 -0600
    @@ -17,11 +17,11 @@
    #include <stdlib.h>
    +#include <glib.h>
    +
    #include <gplugin.h>
    #include <gplugin-native.h>
    -#include <glib.h>
    -
    /******************************************************************************
    * Tests
    *****************************************************************************/
    --- a/gplugin/tests/test-native-loader.c Wed Feb 26 14:02:30 2020 -0600
    +++ b/gplugin/tests/test-native-loader.c Wed Feb 26 14:04:21 2020 -0600
    @@ -17,11 +17,10 @@
    #include <stdlib.h>
    +#include <glib.h>
    +
    #include <gplugin.h>
    #include <gplugin-native.h>
    -
    -#include <glib.h>
    -
    #include <gplugin/gplugin-loader-tests.h>
    /******************************************************************************
    --- a/gplugin/tests/test-option-group.c Wed Feb 26 14:02:30 2020 -0600
    +++ b/gplugin/tests/test-option-group.c Wed Feb 26 14:04:21 2020 -0600
    @@ -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 14:02:30 2020 -0600
    +++ b/gplugin/tests/test-plugin-info.c Wed Feb 26 14:04:21 2020 -0600
    @@ -15,11 +15,11 @@
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    +#include <glib.h>
    +
    #include <gplugin.h>
    #include <gplugin-native.h>
    -#include <glib.h>
    -
    #define test_string(var, value) \
    G_STMT_START \
    { \
    --- a/gplugin/tests/test-plugin-manager-paths.c Wed Feb 26 14:02:30 2020 -0600
    +++ b/gplugin/tests/test-plugin-manager-paths.c Wed Feb 26 14:04:21 2020 -0600
    @@ -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 14:02:30 2020 -0600
    +++ b/gplugin/tests/test-signals.c Wed Feb 26 14:04:21 2020 -0600
    @@ -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 14:02:30 2020 -0600
    +++ b/gplugin/tests/test-unresolved-symbol.c Wed Feb 26 14:04:21 2020 -0600
    @@ -17,11 +17,11 @@
    #include <stdlib.h>
    +#include <glib.h>
    +
    #include <gplugin.h>
    #include <gplugin-native.h>
    -#include <glib.h>
    -
    /******************************************************************************
    * Tests
    *****************************************************************************/
    --- a/gplugin/tests/test-versioned-dependencies.c Wed Feb 26 14:02:30 2020 -0600
    +++ b/gplugin/tests/test-versioned-dependencies.c Wed Feb 26 14:04:21 2020 -0600
    @@ -17,11 +17,11 @@
    #include <stdlib.h>
    +#include <glib.h>
    +
    #include <gplugin.h>
    #include <gplugin-native.h>
    -#include <glib.h>
    -
    /******************************************************************************
    * Helpers
    *****************************************************************************/
    --- a/lua/gplugin-lua-core.c Wed Feb 26 14:02:30 2020 -0600
    +++ b/lua/gplugin-lua-core.c Wed Feb 26 14:04:21 2020 -0600
    @@ -15,14 +15,14 @@
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    -#include <gplugin.h>
    -#include <gplugin-native.h>
    -
    #include "gplugin-lua-loader.h"
    #include "gplugin-lua-plugin.h"
    #include <glib/gi18n-lib.h>
    +#include <gplugin.h>
    +#include <gplugin-native.h>
    +
    G_MODULE_EXPORT GPluginPluginInfo *
    gplugin_query(G_GNUC_UNUSED GError **error)
    {
    --- a/lua/tests/test-lua-loader.c Wed Feb 26 14:02:30 2020 -0600
    +++ b/lua/tests/test-lua-loader.c Wed Feb 26 14:04:21 2020 -0600
    @@ -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 14:02:30 2020 -0600
    +++ b/perl/gplugin-perl-core.c Wed Feb 26 14:04:21 2020 -0600
    @@ -15,12 +15,12 @@
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    +#include "gplugin-perl-loader.h"
    +#include "gplugin-perl-plugin.h"
    +
    #include <gplugin.h>
    #include <gplugin-native.h>
    -#include "gplugin-perl-loader.h"
    -#include "gplugin-perl-plugin.h"
    -
    #undef _
    #include <glib/gi18n-lib.h>
    --- a/perl/gplugin-perl-loader.c Wed Feb 26 14:02:30 2020 -0600
    +++ b/perl/gplugin-perl-loader.c Wed Feb 26 14:04:21 2020 -0600
    @@ -16,6 +16,7 @@
    */
    #include "gplugin-perl-loader.h"
    +
    #include "gplugin-perl-plugin.h"
    #include <glib/gi18n-lib.h>
    --- a/perl/tests/test-perl-loader.c Wed Feb 26 14:02:30 2020 -0600
    +++ b/perl/tests/test-perl-loader.c Wed Feb 26 14:04:21 2020 -0600
    @@ -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 14:02:30 2020 -0600
    +++ b/python/gplugin-python3-core.c Wed Feb 26 14:04:21 2020 -0600
    @@ -15,13 +15,13 @@
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    -#include <gplugin.h>
    -#include <gplugin-native.h>
    +#include "gplugin-python3-loader.h"
    +#include "gplugin-python3-plugin.h"
    #include <glib/gi18n-lib.h>
    -#include "gplugin-python3-loader.h"
    -#include "gplugin-python3-plugin.h"
    +#include <gplugin.h>
    +#include <gplugin-native.h>
    G_MODULE_EXPORT GPluginPluginInfo *
    gplugin_query(G_GNUC_UNUSED GError **error)
    --- a/python/gplugin-python3-loader.c Wed Feb 26 14:02:30 2020 -0600
    +++ b/python/gplugin-python3-loader.c Wed Feb 26 14:04:21 2020 -0600
    @@ -15,17 +15,16 @@
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    -#include <Python.h>
    -
    -#include <stdlib.h>
    -
    #include "gplugin-python3-loader.h"
    #include "gplugin-python3-plugin.h"
    #include "gplugin-python3-utils.h"
    +#include <stdlib.h>
    +
    #include <glib/gi18n-lib.h>
    +#include <Python.h>
    #include <pygobject.h>
    struct _GPluginPython3Loader {
    --- a/python/gplugin-python3-plugin.c Wed Feb 26 14:02:30 2020 -0600
    +++ b/python/gplugin-python3-plugin.c Wed Feb 26 14:04:21 2020 -0600
    @@ -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-test-pygobject.c Wed Feb 26 14:02:30 2020 -0600
    +++ b/python/gplugin-python3-test-pygobject.c Wed Feb 26 14:04:21 2020 -0600
    @@ -20,7 +20,6 @@
    #include <glib.h>
    #include <Python.h>
    -
    #include <pygobject.h>
    gint
    --- a/python/gplugin-python3-utils.c Wed Feb 26 14:02:30 2020 -0600
    +++ b/python/gplugin-python3-utils.c Wed Feb 26 14:04:21 2020 -0600
    @@ -15,13 +15,13 @@
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    -#include <Python.h>
    +#include "gplugin-python3-utils.h"
    +
    +#include <string.h>
    #include <gplugin/gplugin.h>
    -#include "gplugin-python3-utils.h"
    -
    -#include <string.h>
    +#include <Python.h>
    gchar *
    gplugin_python3_filename_to_module(const gchar *filename)
    --- a/python/tests/test-python3-loader.c Wed Feb 26 14:02:30 2020 -0600
    +++ b/python/tests/test-python3-loader.c Wed Feb 26 14:04:21 2020 -0600
    @@ -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 14:02:30 2020 -0600
    +++ b/python/tests/test-python3-utils.c Wed Feb 26 14:04:21 2020 -0600
    @@ -15,12 +15,12 @@
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    -#include <Python.h>
    -
    #include "gplugin-python3-utils.h"
    #include <glib.h>
    +#include <Python.h>
    +
    /******************************************************************************
    * filename to module tests
    *****************************************************************************/
    --- a/tcc/gplugin-tcc-core.c Wed Feb 26 14:02:30 2020 -0600
    +++ b/tcc/gplugin-tcc-core.c Wed Feb 26 14:04:21 2020 -0600
    @@ -15,13 +15,13 @@
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    -#include <gplugin.h>
    -#include <gplugin-native.h>
    +#include "gplugin-tcc-loader.h"
    +#include "gplugin-tcc-plugin.h"
    #include <glib/gi18n-lib.h>
    -#include "gplugin-tcc-loader.h"
    -#include "gplugin-tcc-plugin.h"
    +#include <gplugin.h>
    +#include <gplugin-native.h>
    G_MODULE_EXPORT GPluginPluginInfo *
    gplugin_query(G_GNUC_UNUSED GError **error)
    --- a/tcc/tests/test-tcc-loader.c Wed Feb 26 14:02:30 2020 -0600
    +++ b/tcc/tests/test-tcc-loader.c Wed Feb 26 14:04:21 2020 -0600
    @@ -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 14:02:30 2020 -0600
    +++ b/vala/tests/test-genie-loading.c Wed Feb 26 14:04:21 2020 -0600
    @@ -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 14:02:30 2020 -0600
    +++ b/vala/tests/test-vala-loading.c Wed Feb 26 14:04:21 2020 -0600
    @@ -16,8 +16,8 @@
    */
    #include <glib.h>
    +
    #include <gplugin.h>
    -
    #include <gplugin/gplugin-loader-tests.h>
    /******************************************************************************