[gnome-software] Include a standard header in plugins

From: Richard Hughes <rhughes src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-software] Include a standard header in plugins
Date: Tue, 10 May 2016 07:53:01 +0000 (UTC)
commit d8736283cd4b4f360f5c77155b2017023c169761
Author: Richard Hughes <richard hughsie com>
Date:   Tue May 10 08:21:05 2016 +0100

    Include a standard header in plugins

 src/Makefile.am                                |    1 +
 src/gnome-software.h                           |   33 ++++++++++++++++++++++++
 src/plugins/gs-appstream.c                     |    3 +-
 src/plugins/gs-appstream.h                     |    4 +--
 src/plugins/gs-plugin-appstream.c              |    6 +---
 src/plugins/gs-plugin-dpkg.c                   |    4 +--
 src/plugins/gs-plugin-dummy.c                  |    2 +-
 src/plugins/gs-plugin-epiphany.c               |    6 +---
 src/plugins/gs-plugin-fedora-distro-upgrades.c |    5 +---
 src/plugins/gs-plugin-fedora-tagger-usage.c    |    4 +--
 src/plugins/gs-plugin-fwupd.c                  |    5 +---
 src/plugins/gs-plugin-hardcoded-blacklist.c    |    3 +-
 src/plugins/gs-plugin-icons.c                  |    5 +---
 src/plugins/gs-plugin-key-colors.c             |    2 +-
 src/plugins/gs-plugin-limba.c                  |    3 +-
 src/plugins/gs-plugin-menu-spec-categories.c   |    2 +-
 src/plugins/gs-plugin-menu-spec-refine.c       |    2 +-
 src/plugins/gs-plugin-odrs.c                   |    8 +-----
 src/plugins/gs-plugin-ostree.c                 |    4 +--
 src/plugins/gs-plugin-packagekit-history.c     |    2 +-
 src/plugins/gs-plugin-packagekit-local.c       |    4 +--
 src/plugins/gs-plugin-packagekit-offline.c     |    2 +-
 src/plugins/gs-plugin-packagekit-origin.c      |    4 +--
 src/plugins/gs-plugin-packagekit-proxy.c       |    4 +--
 src/plugins/gs-plugin-packagekit-refine.c      |    5 +---
 src/plugins/gs-plugin-packagekit-refresh.c     |    5 +---
 src/plugins/gs-plugin-packagekit-upgrade.c     |    2 +-
 src/plugins/gs-plugin-packagekit.c             |    3 +-
 src/plugins/gs-plugin-provenance-license.c     |    3 +-
 src/plugins/gs-plugin-provenance.c             |    3 +-
 src/plugins/gs-plugin-rpm.c                    |    2 +-
 src/plugins/gs-plugin-shell-extensions.c       |    4 +--
 src/plugins/gs-plugin-steam.c                  |    4 +--
 src/plugins/gs-plugin-systemd-updates.c        |    3 +-
 src/plugins/gs-plugin-ubuntu-reviews.c         |    7 +----
 src/plugins/gs-plugin-xdg-app.c                |    4 +--
 src/plugins/packagekit-common.c                |    2 +-
 src/plugins/packagekit-common.h                |    2 +-
 38 files changed, 71 insertions(+), 96 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 52d460c..d7766d6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -113,6 +113,7 @@ bin_PROGRAMS =                                              \
        gnome-software
 
 gnome_software_SOURCES =                               \
+       gnome-software.h                                \
        gs-utils.c                                      \
        gs-utils.h                                      \
        gs-app.c                                        \
diff --git a/src/gnome-software.h b/src/gnome-software.h
new file mode 100644
index 0000000..7e4c041
--- /dev/null
+++ b/src/gnome-software.h
@@ -0,0 +1,33 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2016 Richard Hughes <richard hughsie com>
+ *
+ * Licensed under the GNU General Public License Version 2
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef __GNOME_SOFTWARE_H__
+#define __GNOME_SOFTWARE_H__
+
+#include <gs-app.h>
+#include <gs-app-list.h>
+#include <gs-category.h>
+#include <gs-os-release.h>
+#include <gs-plugin.h>
+#include <gs-utils.h>
+
+#endif /* __GNOME_SOFTWARE_H__ */
+
diff --git a/src/plugins/gs-appstream.c b/src/plugins/gs-appstream.c
index c1f8c54..bfdb20c 100644
--- a/src/plugins/gs-appstream.c
+++ b/src/plugins/gs-appstream.c
@@ -21,8 +21,7 @@
 
 #include "config.h"
 
-#include <gs-plugin.h>
-#include <gs-utils.h>
+#include <gnome-software.h>
 
 #include "gs-appstream.h"
 
diff --git a/src/plugins/gs-appstream.h b/src/plugins/gs-appstream.h
index 386f077..b6ef2a8 100644
--- a/src/plugins/gs-appstream.h
+++ b/src/plugins/gs-appstream.h
@@ -22,9 +22,7 @@
 #ifndef __APPSTREAM_COMMON_H
 #define __APPSTREAM_COMMON_H
 
-#include <glib.h>
-#include <gs-plugin.h>
-#include <appstream-glib.h>
+#include <gnome-software.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/plugins/gs-plugin-appstream.c b/src/plugins/gs-plugin-appstream.c
index 35d5987..ffd570a 100644
--- a/src/plugins/gs-plugin-appstream.c
+++ b/src/plugins/gs-plugin-appstream.c
@@ -20,12 +20,8 @@
  */
 
 #include <config.h>
-#include <glib/gi18n.h>
-#include <appstream-glib.h>
 
-#include <gs-utils.h>
-#include <gs-plugin.h>
-#include <gs-plugin-loader.h>
+#include <gnome-software.h>
 
 #include "gs-appstream.h"
 
diff --git a/src/plugins/gs-plugin-dpkg.c b/src/plugins/gs-plugin-dpkg.c
index 77f43b6..c709c3b 100644
--- a/src/plugins/gs-plugin-dpkg.c
+++ b/src/plugins/gs-plugin-dpkg.c
@@ -22,9 +22,7 @@
 #include <config.h>
 
 #include <stdlib.h>
-
-#include <gs-plugin.h>
-#include <gs-utils.h>
+#include <gnome-software.h>
 
 #define DPKG_DEB_BINARY                "/usr/bin/dpkg-deb"
 
diff --git a/src/plugins/gs-plugin-dummy.c b/src/plugins/gs-plugin-dummy.c
index a07ba7b..2d3ff08 100644
--- a/src/plugins/gs-plugin-dummy.c
+++ b/src/plugins/gs-plugin-dummy.c
@@ -21,7 +21,7 @@
 
 #include <config.h>
 
-#include <gs-plugin.h>
+#include <gnome-software.h>
 
 /*
  * SECTION:
diff --git a/src/plugins/gs-plugin-epiphany.c b/src/plugins/gs-plugin-epiphany.c
index a4c77d0..e415d5b 100644
--- a/src/plugins/gs-plugin-epiphany.c
+++ b/src/plugins/gs-plugin-epiphany.c
@@ -24,11 +24,7 @@
 #define _GNU_SOURCE
 #include <string.h>
 
-#include <glib/gi18n.h>
-#include <libsoup/soup.h>
-
-#include <gs-plugin.h>
-#include <gs-utils.h>
+#include <gnome-software.h>
 
 /*
  * SECTION:
diff --git a/src/plugins/gs-plugin-fedora-distro-upgrades.c b/src/plugins/gs-plugin-fedora-distro-upgrades.c
index 082f824..9b821cd 100644
--- a/src/plugins/gs-plugin-fedora-distro-upgrades.c
+++ b/src/plugins/gs-plugin-fedora-distro-upgrades.c
@@ -22,10 +22,7 @@
 #include <config.h>
 
 #include <json-glib/json-glib.h>
-
-#include <gs-plugin.h>
-#include <gs-os-release.h>
-#include <gs-utils.h>
+#include <gnome-software.h>
 
 #define FEDORA_PKGDB_COLLECTIONS_API_URI "https://admin.fedoraproject.org/pkgdb/api/collections/";
 
diff --git a/src/plugins/gs-plugin-fedora-tagger-usage.c b/src/plugins/gs-plugin-fedora-tagger-usage.c
index 7a96f9f..0be547e 100644
--- a/src/plugins/gs-plugin-fedora-tagger-usage.c
+++ b/src/plugins/gs-plugin-fedora-tagger-usage.c
@@ -24,9 +24,7 @@
 #include <string.h>
 #include <sqlite3.h>
 #include <stdlib.h>
-
-#include <gs-plugin.h>
-#include <gs-utils.h>
+#include <gnome-software.h>
 
 /*
  * SECTION:
diff --git a/src/plugins/gs-plugin-fwupd.c b/src/plugins/gs-plugin-fwupd.c
index 43aa785..0a3ea1e 100644
--- a/src/plugins/gs-plugin-fwupd.c
+++ b/src/plugins/gs-plugin-fwupd.c
@@ -22,15 +22,12 @@
 #include <config.h>
 
 #include <fwupd.h>
-#include <appstream-glib.h>
 #include <fcntl.h>
 #include <gio/gio.h>
 #include <gio/gunixfdlist.h>
 #include <glib/gstdio.h>
 
-#include <gs-plugin.h>
-
-#include "gs-utils.h"
+#include <gnome-software.h>
 
 /*
  * SECTION:
diff --git a/src/plugins/gs-plugin-hardcoded-blacklist.c b/src/plugins/gs-plugin-hardcoded-blacklist.c
index 85103b0..554caec 100644
--- a/src/plugins/gs-plugin-hardcoded-blacklist.c
+++ b/src/plugins/gs-plugin-hardcoded-blacklist.c
@@ -20,8 +20,9 @@
  */
 
 #include <config.h>
+
 #include <fnmatch.h>
-#include <gs-plugin.h>
+#include <gnome-software.h>
 
 /*
  * SECTION:
diff --git a/src/plugins/gs-plugin-icons.c b/src/plugins/gs-plugin-icons.c
index e7fd022..0c34179 100644
--- a/src/plugins/gs-plugin-icons.c
+++ b/src/plugins/gs-plugin-icons.c
@@ -24,10 +24,7 @@
 #define _GNU_SOURCE
 #include <string.h>
 
-#include <glib/gi18n.h>
-
-#include <gs-plugin.h>
-#include <gs-utils.h>
+#include <gnome-software.h>
 
 /*
  * SECTION:
diff --git a/src/plugins/gs-plugin-key-colors.c b/src/plugins/gs-plugin-key-colors.c
index 30f918c..3089712 100644
--- a/src/plugins/gs-plugin-key-colors.c
+++ b/src/plugins/gs-plugin-key-colors.c
@@ -21,7 +21,7 @@
 
 #include <config.h>
 
-#include <gs-plugin.h>
+#include <gnome-software.h>
 
 /**
  * gs_plugin_order_after:
diff --git a/src/plugins/gs-plugin-limba.c b/src/plugins/gs-plugin-limba.c
index 816fa3e..71813e4 100644
--- a/src/plugins/gs-plugin-limba.c
+++ b/src/plugins/gs-plugin-limba.c
@@ -23,8 +23,7 @@
 #include <config.h>
 
 #include <limba.h>
-#include <appstream-glib.h>
-#include <gs-plugin.h>
+#include <gnome-software.h>
 
 /*
  * SECTION:
diff --git a/src/plugins/gs-plugin-menu-spec-categories.c b/src/plugins/gs-plugin-menu-spec-categories.c
index f3b38bb..f7f3b4c 100644
--- a/src/plugins/gs-plugin-menu-spec-categories.c
+++ b/src/plugins/gs-plugin-menu-spec-categories.c
@@ -21,7 +21,7 @@
 
 #include <config.h>
 
-#include <gs-plugin.h>
+#include <gnome-software.h>
 #include <glib/gi18n.h>
 
 #include "menu-spec-common.h"
diff --git a/src/plugins/gs-plugin-menu-spec-refine.c b/src/plugins/gs-plugin-menu-spec-refine.c
index affa9f7..cf10c7d 100644
--- a/src/plugins/gs-plugin-menu-spec-refine.c
+++ b/src/plugins/gs-plugin-menu-spec-refine.c
@@ -21,7 +21,7 @@
 
 #include <config.h>
 
-#include <gs-plugin.h>
+#include <gnome-software.h>
 #include <glib/gi18n.h>
 
 #include "menu-spec-common.h"
diff --git a/src/plugins/gs-plugin-odrs.c b/src/plugins/gs-plugin-odrs.c
index 1a8a661..40f5ac8 100644
--- a/src/plugins/gs-plugin-odrs.c
+++ b/src/plugins/gs-plugin-odrs.c
@@ -21,16 +21,10 @@
 
 #include <config.h>
 
-#include <gs-plugin.h>
+#include <gnome-software.h>
 #include <json-glib/json-glib.h>
 #include <string.h>
 
-#include "gs-app.h"
-#include "gs-os-release.h"
-#include "gs-plugin.h"
-#include "gs-review.h"
-#include "gs-utils.h"
-
 /*
  * SECTION:
  * Provides review data from the Open Desktop Ratings Serice.
diff --git a/src/plugins/gs-plugin-ostree.c b/src/plugins/gs-plugin-ostree.c
index 8bd4523..8df8473 100644
--- a/src/plugins/gs-plugin-ostree.c
+++ b/src/plugins/gs-plugin-ostree.c
@@ -25,9 +25,7 @@
 #include <gio/gio.h>
 #include <glib/gstdio.h>
 
-#include <gs-plugin.h>
-
-#include "gs-utils.h"
+#include <gnome-software.h>
 
 struct GsPluginData {
        OstreeRepo              *ostree_repo;
diff --git a/src/plugins/gs-plugin-packagekit-history.c b/src/plugins/gs-plugin-packagekit-history.c
index 8686879..52840bc 100644
--- a/src/plugins/gs-plugin-packagekit-history.c
+++ b/src/plugins/gs-plugin-packagekit-history.c
@@ -24,7 +24,7 @@
 #define I_KNOW_THE_PACKAGEKIT_GLIB2_API_IS_SUBJECT_TO_CHANGE
 #include <packagekit-glib2/packagekit.h>
 
-#include <gs-plugin.h>
+#include <gnome-software.h>
 
 #define GS_PLUGIN_PACKAGEKIT_HISTORY_TIMEOUT   5000 /* ms */
 
diff --git a/src/plugins/gs-plugin-packagekit-local.c b/src/plugins/gs-plugin-packagekit-local.c
index d4638ac..8dc984f 100644
--- a/src/plugins/gs-plugin-packagekit-local.c
+++ b/src/plugins/gs-plugin-packagekit-local.c
@@ -25,9 +25,7 @@
 
 #define I_KNOW_THE_PACKAGEKIT_GLIB2_API_IS_SUBJECT_TO_CHANGE
 #include <packagekit-glib2/packagekit.h>
-
-#include <gs-plugin.h>
-#include <gs-utils.h>
+#include <gnome-software.h>
 
 #include "packagekit-common.h"
 
diff --git a/src/plugins/gs-plugin-packagekit-offline.c b/src/plugins/gs-plugin-packagekit-offline.c
index d756c2c..85c7653 100644
--- a/src/plugins/gs-plugin-packagekit-offline.c
+++ b/src/plugins/gs-plugin-packagekit-offline.c
@@ -24,7 +24,7 @@
 #define I_KNOW_THE_PACKAGEKIT_GLIB2_API_IS_SUBJECT_TO_CHANGE
 #include <packagekit-glib2/packagekit.h>
 
-#include <gs-plugin.h>
+#include <gnome-software.h>
 
 /*
  * SECTION:
diff --git a/src/plugins/gs-plugin-packagekit-origin.c b/src/plugins/gs-plugin-packagekit-origin.c
index ccd8bba..38a6bc5 100644
--- a/src/plugins/gs-plugin-packagekit-origin.c
+++ b/src/plugins/gs-plugin-packagekit-origin.c
@@ -23,9 +23,7 @@
 
 #define I_KNOW_THE_PACKAGEKIT_GLIB2_API_IS_SUBJECT_TO_CHANGE
 #include <packagekit-glib2/packagekit.h>
-
-#include <gs-plugin.h>
-#include <gs-utils.h>
+#include <gnome-software.h>
 
 #include "packagekit-common.h"
 
diff --git a/src/plugins/gs-plugin-packagekit-proxy.c b/src/plugins/gs-plugin-packagekit-proxy.c
index 375f1bc..28699d5 100644
--- a/src/plugins/gs-plugin-packagekit-proxy.c
+++ b/src/plugins/gs-plugin-packagekit-proxy.c
@@ -26,9 +26,7 @@
 #include <packagekit-glib2/packagekit.h>
 #include <string.h>
 #include <gsettings-desktop-schemas/gdesktop-enums.h>
-
-#include <gs-plugin.h>
-#include <gs-utils.h>
+#include <gnome-software.h>
 
 /*
  * SECTION:
diff --git a/src/plugins/gs-plugin-packagekit-refine.c b/src/plugins/gs-plugin-packagekit-refine.c
index 9f60a54..e19aba0 100644
--- a/src/plugins/gs-plugin-packagekit-refine.c
+++ b/src/plugins/gs-plugin-packagekit-refine.c
@@ -23,10 +23,7 @@
 
 #define I_KNOW_THE_PACKAGEKIT_GLIB2_API_IS_SUBJECT_TO_CHANGE
 #include <packagekit-glib2/packagekit.h>
-
-#include <gs-plugin.h>
-#include <gs-utils.h>
-#include <glib/gi18n.h>
+#include <gnome-software.h>
 
 #include "gs-markdown.h"
 #include "packagekit-common.h"
diff --git a/src/plugins/gs-plugin-packagekit-refresh.c b/src/plugins/gs-plugin-packagekit-refresh.c
index 5152cc9..266bb2c 100644
--- a/src/plugins/gs-plugin-packagekit-refresh.c
+++ b/src/plugins/gs-plugin-packagekit-refresh.c
@@ -23,10 +23,7 @@
 
 #define I_KNOW_THE_PACKAGEKIT_GLIB2_API_IS_SUBJECT_TO_CHANGE
 #include <packagekit-glib2/packagekit.h>
-#include <glib/gi18n.h>
-
-#include <gs-plugin.h>
-#include <gs-utils.h>
+#include <gnome-software.h>
 
 #include "packagekit-common.h"
 
diff --git a/src/plugins/gs-plugin-packagekit-upgrade.c b/src/plugins/gs-plugin-packagekit-upgrade.c
index 6d231c5..0759e01 100644
--- a/src/plugins/gs-plugin-packagekit-upgrade.c
+++ b/src/plugins/gs-plugin-packagekit-upgrade.c
@@ -24,7 +24,7 @@
 #define I_KNOW_THE_PACKAGEKIT_GLIB2_API_IS_SUBJECT_TO_CHANGE
 #include <packagekit-glib2/packagekit.h>
 
-#include <gs-plugin.h>
+#include <gnome-software.h>
 
 #include "packagekit-common.h"
 
diff --git a/src/plugins/gs-plugin-packagekit.c b/src/plugins/gs-plugin-packagekit.c
index e549c32..4c8a767 100644
--- a/src/plugins/gs-plugin-packagekit.c
+++ b/src/plugins/gs-plugin-packagekit.c
@@ -23,9 +23,8 @@
 
 #define I_KNOW_THE_PACKAGEKIT_GLIB2_API_IS_SUBJECT_TO_CHANGE
 #include <packagekit-glib2/packagekit.h>
-#include <glib/gi18n.h>
 
-#include <gs-plugin.h>
+#include <gnome-software.h>
 
 #include "packagekit-common.h"
 
diff --git a/src/plugins/gs-plugin-provenance-license.c b/src/plugins/gs-plugin-provenance-license.c
index ec59c6f..0094c86 100644
--- a/src/plugins/gs-plugin-provenance-license.c
+++ b/src/plugins/gs-plugin-provenance-license.c
@@ -22,8 +22,7 @@
 
 #include <config.h>
 
-#include <gs-plugin.h>
-#include <gs-utils.h>
+#include <gnome-software.h>
 
 /*
  * SECTION:
diff --git a/src/plugins/gs-plugin-provenance.c b/src/plugins/gs-plugin-provenance.c
index 8b1ef72..0070ee4 100644
--- a/src/plugins/gs-plugin-provenance.c
+++ b/src/plugins/gs-plugin-provenance.c
@@ -21,8 +21,7 @@
 
 #include <config.h>
 
-#include <gs-plugin.h>
-#include <gs-utils.h>
+#include <gnome-software.h>
 
 /*
  * SECTION:
diff --git a/src/plugins/gs-plugin-rpm.c b/src/plugins/gs-plugin-rpm.c
index b29715e..872699f 100644
--- a/src/plugins/gs-plugin-rpm.c
+++ b/src/plugins/gs-plugin-rpm.c
@@ -26,7 +26,7 @@
 #include <rpm/rpmlib.h>
 #include <rpm/rpmts.h>
 
-#include <gs-plugin.h>
+#include <gnome-software.h>
 
 /**
  * gs_plugin_order_after:
diff --git a/src/plugins/gs-plugin-shell-extensions.c b/src/plugins/gs-plugin-shell-extensions.c
index 208af11..7638533 100644
--- a/src/plugins/gs-plugin-shell-extensions.c
+++ b/src/plugins/gs-plugin-shell-extensions.c
@@ -24,9 +24,7 @@
 #include <errno.h>
 #include <json-glib/json-glib.h>
 
-#include <gs-plugin.h>
-#include <gs-os-release.h>
-#include <gs-utils.h>
+#include <gnome-software.h>
 
 #define SHELL_EXTENSIONS_API_URI               "https://extensions.gnome.org/";
 
diff --git a/src/plugins/gs-plugin-steam.c b/src/plugins/gs-plugin-steam.c
index 58465d5..05d96bb 100644
--- a/src/plugins/gs-plugin-steam.c
+++ b/src/plugins/gs-plugin-steam.c
@@ -21,11 +21,9 @@
 
 #include <config.h>
 
-#include <gs-plugin.h>
+#include <gnome-software.h>
 #include <string.h>
 
-#include "gs-utils.h"
-
 #define GS_PLUGIN_STEAM_SCREENSHOT_URI "http://cdn.akamai.steamstatic.com/steam/apps";
 
 /**
diff --git a/src/plugins/gs-plugin-systemd-updates.c b/src/plugins/gs-plugin-systemd-updates.c
index 1e819a5..bf1c1a0 100644
--- a/src/plugins/gs-plugin-systemd-updates.c
+++ b/src/plugins/gs-plugin-systemd-updates.c
@@ -20,12 +20,11 @@
  */
 
 #include <config.h>
-#include <gio/gio.h>
 
 #define I_KNOW_THE_PACKAGEKIT_GLIB2_API_IS_SUBJECT_TO_CHANGE
 #include <packagekit-glib2/packagekit.h>
 
-#include <gs-plugin.h>
+#include <gnome-software.h>
 
 /*
  * SECTION:
diff --git a/src/plugins/gs-plugin-ubuntu-reviews.c b/src/plugins/gs-plugin-ubuntu-reviews.c
index ce0d916..64052b1 100644
--- a/src/plugins/gs-plugin-ubuntu-reviews.c
+++ b/src/plugins/gs-plugin-ubuntu-reviews.c
@@ -23,14 +23,9 @@
 
 #include <string.h>
 #include <math.h>
-#include <libsoup/soup.h>
 #include <json-glib/json-glib.h>
 #include <sqlite3.h>
-
-#include <gs-plugin.h>
-#include <gs-utils.h>
-
-#include "gs-os-release.h"
+#include <gnome-software.h>
 
 struct GsPluginData {
        gchar           *db_path;
diff --git a/src/plugins/gs-plugin-xdg-app.c b/src/plugins/gs-plugin-xdg-app.c
index 155881c..d732ca1 100644
--- a/src/plugins/gs-plugin-xdg-app.c
+++ b/src/plugins/gs-plugin-xdg-app.c
@@ -33,11 +33,9 @@
 #include <config.h>
 
 #include <xdg-app.h>
-
-#include <gs-plugin.h>
+#include <gnome-software.h>
 
 #include "gs-appstream.h"
-#include "gs-utils.h"
 
 static gboolean                gs_plugin_refine_item_metadata (GsPlugin *plugin,
                                                        GsApp *app,
diff --git a/src/plugins/packagekit-common.c b/src/plugins/packagekit-common.c
index c3bd09a..91ab368 100644
--- a/src/plugins/packagekit-common.c
+++ b/src/plugins/packagekit-common.c
@@ -24,7 +24,7 @@
 #define I_KNOW_THE_PACKAGEKIT_GLIB2_API_IS_SUBJECT_TO_CHANGE
 #include <packagekit-glib2/packagekit.h>
 
-#include <gs-plugin.h>
+#include <gnome-software.h>
 
 #include "packagekit-common.h"
 
diff --git a/src/plugins/packagekit-common.h b/src/plugins/packagekit-common.h
index f8cbdd6..590e416 100644
--- a/src/plugins/packagekit-common.h
+++ b/src/plugins/packagekit-common.h
@@ -23,7 +23,7 @@
 #define __APPSTREAM_CACHE_H
 
 #include <glib.h>
-#include <gs-plugin.h>
+#include <gnome-software.h>
 
 #define I_KNOW_THE_PACKAGEKIT_GLIB2_API_IS_SUBJECT_TO_CHANGE
 #include <packagekit-glib2/packagekit.h>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]