GNOME.org
 

[gnome-software] trivial: Remove a whole heap of unused includes

commit c63cc1c2b830429f429720ecc3865a74943465c5
Author: Richard Hughes <richard hughsie com>
Date:   Tue Mar 7 11:01:33 2017 +0000

    trivial: Remove a whole heap of unused includes

 lib/Makefile.am                |    1 +
 lib/gnome-software-private.h   |   40 ++++++++++++++++++++++++++++++++++++++++
 lib/gs-cmd.c                   |    5 ++---
 lib/gs-self-test.c             |   11 ++---------
 src/gs-app-addon-row.c         |    2 --
 src/gs-app-addon-row.h         |    2 +-
 src/gs-app-folder-dialog.c     |    1 -
 src/gs-app-folder-dialog.h     |    2 +-
 src/gs-app-row.c               |    1 -
 src/gs-app-row.h               |    2 +-
 src/gs-app-tile.c              |    3 ---
 src/gs-app-tile.h              |    2 +-
 src/gs-application.c           |    2 --
 src/gs-application.h           |    2 +-
 src/gs-auth-dialog.c           |    2 --
 src/gs-auth-dialog.h           |    3 +--
 src/gs-category-page.c         |    1 -
 src/gs-category-page.h         |    6 ------
 src/gs-category-tile.c         |    3 ---
 src/gs-category-tile.h         |    2 +-
 src/gs-common.c                |    4 ----
 src/gs-common.h                |    3 +--
 src/gs-dbus-helper.c           |    3 ++-
 src/gs-details-page.c          |    2 --
 src/gs-details-page.h          |    6 ------
 src/gs-extras-page.c           |    1 -
 src/gs-extras-page.h           |    5 -----
 src/gs-feature-tile.h          |    3 ---
 src/gs-fixed-size-bin.c        |    3 ---
 src/gs-folders.c               |    1 -
 src/gs-hiding-box.c            |    2 --
 src/gs-history-dialog.c        |    1 -
 src/gs-history-dialog.h        |    2 +-
 src/gs-info-bar.c              |    3 ---
 src/gs-installed-page.c        |    2 --
 src/gs-installed-page.h        |    4 ----
 src/gs-language.c              |    1 -
 src/gs-loading-page.c          |    1 -
 src/gs-loading-page.h          |    4 ----
 src/gs-main.c                  |    1 -
 src/gs-moderate-page.c         |    3 ---
 src/gs-moderate-page.h         |    4 ----
 src/gs-overview-page.c         |    2 --
 src/gs-overview-page.h         |    6 ------
 src/gs-page.c                  |    3 ---
 src/gs-page.h                  |    4 ----
 src/gs-popular-tile.h          |    3 ---
 src/gs-removal-dialog.h        |    2 +-
 src/gs-review-histogram.c      |    3 ---
 src/gs-review-row.c            |    1 -
 src/gs-review-row.h            |    2 +-
 src/gs-screenshot-image.c      |    2 --
 src/gs-screenshot-image.h      |    3 ++-
 src/gs-search-page.c           |    2 --
 src/gs-search-page.h           |    5 -----
 src/gs-shell-search-provider.c |    4 ----
 src/gs-shell-search-provider.h |    2 +-
 src/gs-shell.h                 |    5 +----
 src/gs-sources-dialog.c        |    3 +--
 src/gs-sources-dialog.h        |    3 +--
 src/gs-star-widget.c           |    2 --
 src/gs-star-widget.h           |    2 +-
 src/gs-summary-tile.c          |    1 -
 src/gs-summary-tile.h          |    3 ---
 src/gs-update-dialog.c         |    1 -
 src/gs-update-dialog.h         |    3 +--
 src/gs-update-list.c           |    3 ---
 src/gs-update-list.h           |    3 +--
 src/gs-update-monitor.c        |    3 ---
 src/gs-updates-page.c          |    4 ----
 src/gs-updates-page.h          |    5 -----
 src/gs-upgrade-banner.c        |    1 -
 src/gs-upgrade-banner.h        |    2 +-
 src/gs-vendor.c                |    2 --
 74 files changed, 68 insertions(+), 174 deletions(-)
---
diff --git a/lib/Makefile.am b/lib/Makefile.am
index a9a6065..d3df299 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -28,6 +28,7 @@ gnomesoftware_include_HEADERS =                               \
 noinst_LIBRARIES = libgnomesoftware.a
 libgnomesoftware_a_SOURCES =                           \
        gnome-software.h                                \
+       gnome-software-private.h                        \
        gs-app.c                                        \
        gs-app.h                                        \
        gs-app-list.c                                   \
diff --git a/lib/gnome-software-private.h b/lib/gnome-software-private.h
new file mode 100644
index 0000000..914c489
--- /dev/null
+++ b/lib/gnome-software-private.h
@@ -0,0 +1,40 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2017 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_PRIVATE_H__
+#define __GNOME_SOFTWARE_PRIVATE_H__
+
+#ifndef I_KNOW_THE_GNOME_SOFTWARE_API_IS_SUBJECT_TO_CHANGE
+#define I_KNOW_THE_GNOME_SOFTWARE_API_IS_SUBJECT_TO_CHANGE
+#endif
+
+#include <gnome-software.h>
+
+#include <gs-app-list-private.h>
+#include <gs-app-private.h>
+#include <gs-category-private.h>
+#include <gs-os-release.h>
+#include <gs-plugin-loader.h>
+#include <gs-plugin-loader-sync.h>
+#include <gs-plugin-private.h>
+
+#endif /* __GNOME_SOFTWARE_PRIVATE_H__ */
+
diff --git a/lib/gs-cmd.c b/lib/gs-cmd.c
index 0bb68ab..225422c 100644
--- a/lib/gs-cmd.c
+++ b/lib/gs-cmd.c
@@ -21,14 +21,13 @@
 
 #include "config.h"
 
-#include <appstream-glib.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <locale.h>
 
+#include "gnome-software-private.h"
+
 #include "gs-debug.h"
-#include "gs-plugin-loader.h"
-#include "gs-plugin-loader-sync.h"
 
 static void
 gs_cmd_show_results_apps (GsAppList *list)
diff --git a/lib/gs-self-test.c b/lib/gs-self-test.c
index 5cb8624..99340d7 100644
--- a/lib/gs-self-test.c
+++ b/lib/gs-self-test.c
@@ -21,18 +21,11 @@
 
 #include "config.h"
 
-#include <glib-object.h>
 #include <glib/gstdio.h>
 #include <stdlib.h>
-#include <fnmatch.h>
-
-#include "gs-app-private.h"
-#include "gs-app-list-private.h"
-#include "gs-os-release.h"
-#include "gs-plugin-private.h"
-#include "gs-plugin-loader.h"
-#include "gs-plugin-loader-sync.h"
-#include "gs-utils.h"
+
+#include "gnome-software-private.h"
+
 #include "gs-test.h"
 
 static gboolean
diff --git a/src/gs-app-addon-row.c b/src/gs-app-addon-row.c
index f8af884..70d2bea 100644
--- a/src/gs-app-addon-row.c
+++ b/src/gs-app-addon-row.c
@@ -23,10 +23,8 @@
 #include "config.h"
 
 #include <glib/gi18n.h>
-#include <gtk/gtk.h>
 
 #include "gs-app-addon-row.h"
-#include "gs-utils.h"
 
 struct _GsAppAddonRow
 {
diff --git a/src/gs-app-addon-row.h b/src/gs-app-addon-row.h
index f813afe..d7ed4b8 100644
--- a/src/gs-app-addon-row.h
+++ b/src/gs-app-addon-row.h
@@ -24,7 +24,7 @@
 
 #include <gtk/gtk.h>
 
-#include "gs-app.h"
+#include "gnome-software-private.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/gs-app-folder-dialog.c b/src/gs-app-folder-dialog.c
index 563f4b4..bef8dd0 100644
--- a/src/gs-app-folder-dialog.c
+++ b/src/gs-app-folder-dialog.c
@@ -22,7 +22,6 @@
 #include "config.h"
 
 #include <glib/gi18n.h>
-#include <gtk/gtk.h>
 
 #include "gs-folders.h"
 #include "gs-app-folder-dialog.h"
diff --git a/src/gs-app-folder-dialog.h b/src/gs-app-folder-dialog.h
index 90ab76f..5c0e375 100644
--- a/src/gs-app-folder-dialog.h
+++ b/src/gs-app-folder-dialog.h
@@ -24,7 +24,7 @@
 
 #include <gtk/gtk.h>
 
-#include "gs-app.h"
+#include "gnome-software-private.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/gs-app-row.c b/src/gs-app-row.c
index 0d641cd..8fa5808 100644
--- a/src/gs-app-row.c
+++ b/src/gs-app-row.c
@@ -23,7 +23,6 @@
 #include "config.h"
 
 #include <glib/gi18n.h>
-#include <gtk/gtk.h>
 
 #include "gs-app-row.h"
 #include "gs-star-widget.h"
diff --git a/src/gs-app-row.h b/src/gs-app-row.h
index e705ce5..007cf3b 100644
--- a/src/gs-app-row.h
+++ b/src/gs-app-row.h
@@ -24,7 +24,7 @@
 
 #include <gtk/gtk.h>
 
-#include "gs-app.h"
+#include "gnome-software-private.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/gs-app-tile.c b/src/gs-app-tile.c
index 81912cd..63a5278 100644
--- a/src/gs-app-tile.c
+++ b/src/gs-app-tile.c
@@ -21,9 +21,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n.h>
-#include <gtk/gtk.h>
-
 #include "gs-app-tile.h"
 #include "gs-star-widget.h"
 #include "gs-common.h"
diff --git a/src/gs-app-tile.h b/src/gs-app-tile.h
index 8b22aff..90948b0 100644
--- a/src/gs-app-tile.h
+++ b/src/gs-app-tile.h
@@ -24,7 +24,7 @@
 
 #include <gtk/gtk.h>
 
-#include "gs-app.h"
+#include "gnome-software-private.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/gs-application.c b/src/gs-application.c
index 70df489..df1a047 100644
--- a/src/gs-application.c
+++ b/src/gs-application.c
@@ -26,7 +26,6 @@
 
 #include <stdlib.h>
 #include <glib/gi18n.h>
-#include <gtk/gtk.h>
 #include <gio/gio.h>
 #include <gio/gdesktopappinfo.h>
 #include <libsoup/soup.h>
@@ -49,7 +48,6 @@
 #include "gs-update-monitor.h"
 #include "gs-shell-search-provider.h"
 #include "gs-folders.h"
-#include "gs-utils.h"
 
 #define ENABLE_SOFTWARE_SOURCES_CONF_KEY "enable-software-sources"
 
diff --git a/src/gs-application.h b/src/gs-application.h
index 3953af9..db955c7 100644
--- a/src/gs-application.h
+++ b/src/gs-application.h
@@ -24,7 +24,7 @@
 
 #include <gtk/gtk.h>
 
-#include "gs-plugin-loader.h"
+#include "gnome-software-private.h"
 
 #define GS_APPLICATION_TYPE (gs_application_get_type ())
 
diff --git a/src/gs-auth-dialog.c b/src/gs-auth-dialog.c
index 83b43ec..28238b0 100644
--- a/src/gs-auth-dialog.c
+++ b/src/gs-auth-dialog.c
@@ -22,9 +22,7 @@
 #include "config.h"
 
 #include <glib/gi18n.h>
-#include <gtk/gtk.h>
 
-#include "gs-auth.h"
 #include "gs-auth-dialog.h"
 #include "gs-common.h"
 
diff --git a/src/gs-auth-dialog.h b/src/gs-auth-dialog.h
index 5487c2b..721a307 100644
--- a/src/gs-auth-dialog.h
+++ b/src/gs-auth-dialog.h
@@ -24,8 +24,7 @@
 
 #include <gtk/gtk.h>
 
-#include "gs-app.h"
-#include "gs-plugin-loader.h"
+#include "gnome-software-private.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/gs-category-page.c b/src/gs-category-page.c
index e487584..6f41c78 100644
--- a/src/gs-category-page.c
+++ b/src/gs-category-page.c
@@ -23,7 +23,6 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n.h>
 
 #include "gs-common.h"
 #include "gs-summary-tile.h"
diff --git a/src/gs-category-page.h b/src/gs-category-page.h
index 308e39d..a2356a3 100644
--- a/src/gs-category-page.h
+++ b/src/gs-category-page.h
@@ -22,13 +22,7 @@
 #ifndef __GS_CATEGORY_PAGE_H
 #define __GS_CATEGORY_PAGE_H
 
-#include <glib-object.h>
-#include <gtk/gtk.h>
-
-#include "gs-category.h"
 #include "gs-page.h"
-#include "gs-shell.h"
-#include "gs-plugin-loader.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/gs-category-tile.c b/src/gs-category-tile.c
index 332b485..82daf47 100644
--- a/src/gs-category-tile.c
+++ b/src/gs-category-tile.c
@@ -21,9 +21,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n.h>
-#include <gtk/gtk.h>
-
 #include "gs-category-tile.h"
 #include "gs-common.h"
 
diff --git a/src/gs-category-tile.h b/src/gs-category-tile.h
index 0167237..8cbd55f 100644
--- a/src/gs-category-tile.h
+++ b/src/gs-category-tile.h
@@ -24,7 +24,7 @@
 
 #include <gtk/gtk.h>
 
-#include "gs-category.h"
+#include "gnome-software-private.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/gs-common.c b/src/gs-common.c
index cc8b11e..79d0461 100644
--- a/src/gs-common.c
+++ b/src/gs-common.c
@@ -23,12 +23,8 @@
 
 #include <glib/gi18n.h>
 #include <gio/gdesktopappinfo.h>
-#include <errno.h>
-#include <fnmatch.h>
 
-#include "gs-app.h"
 #include "gs-common.h"
-#include "gs-plugin.h"
 
 #define SPINNER_DELAY 500
 
diff --git a/src/gs-common.h b/src/gs-common.h
index 7d5d335..9d74abc 100644
--- a/src/gs-common.h
+++ b/src/gs-common.h
@@ -25,8 +25,7 @@
 #include <gio/gdesktopappinfo.h>
 #include <gtk/gtk.h>
 
-#include "gs-app.h"
-#include "gs-plugin-loader.h"
+#include "gnome-software-private.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/gs-dbus-helper.c b/src/gs-dbus-helper.c
index 14426ea..92ef2ad 100644
--- a/src/gs-dbus-helper.c
+++ b/src/gs-dbus-helper.c
@@ -27,12 +27,13 @@
 #include <gtk/gtk.h>
 #include <packagekit-glib2/packagekit.h>
 
+#include "gnome-software-private.h"
+
 #include "gs-dbus-helper.h"
 #include "gs-packagekit-generated.h"
 #include "gs-packagekit-modify2-generated.h"
 #include "gs-resources.h"
 #include "gs-extras-page.h"
-#include "gs-utils.h"
 
 struct _GsDbusHelper {
        GObject                  parent;
diff --git a/src/gs-details-page.c b/src/gs-details-page.c
index 20989c3..b599b1e 100644
--- a/src/gs-details-page.c
+++ b/src/gs-details-page.c
@@ -30,7 +30,6 @@
 #include "gs-content-rating.h"
 
 #include "gs-details-page.h"
-#include "gs-app-private.h"
 #include "gs-app-addon-row.h"
 #include "gs-auth-dialog.h"
 #include "gs-history-dialog.h"
@@ -39,7 +38,6 @@
 #include "gs-review-histogram.h"
 #include "gs-review-dialog.h"
 #include "gs-review-row.h"
-#include "gs-utils.h"
 
 /* the number of reviews to show before clicking the 'More Reviews' button */
 #define SHOW_NR_REVIEWS_INITIAL                4
diff --git a/src/gs-details-page.h b/src/gs-details-page.h
index 0a4056e..cf53430 100644
--- a/src/gs-details-page.h
+++ b/src/gs-details-page.h
@@ -22,13 +22,7 @@
 #ifndef __GS_DETAILS_PAGE_H
 #define __GS_DETAILS_PAGE_H
 
-#include <glib-object.h>
-#include <gtk/gtk.h>
-
-#include "gs-app.h"
-#include "gs-shell.h"
 #include "gs-page.h"
-#include "gs-plugin-loader.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/gs-extras-page.c b/src/gs-extras-page.c
index bf9daaa..6f37ae4 100644
--- a/src/gs-extras-page.c
+++ b/src/gs-extras-page.c
@@ -23,7 +23,6 @@
 
 #include "gs-extras-page.h"
 
-#include "gs-app.h"
 #include "gs-app-row.h"
 #include "gs-language.h"
 #include "gs-shell.h"
diff --git a/src/gs-extras-page.h b/src/gs-extras-page.h
index b59630b..bdef6cc 100644
--- a/src/gs-extras-page.h
+++ b/src/gs-extras-page.h
@@ -22,12 +22,7 @@
 #ifndef __GS_EXTRAS_PAGE_H
 #define __GS_EXTRAS_PAGE_H
 
-#include <glib-object.h>
-#include <gtk/gtk.h>
-
 #include "gs-page.h"
-#include "gs-plugin-loader.h"
-#include "gs-shell.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/gs-feature-tile.h b/src/gs-feature-tile.h
index e8e707c..67bae35 100644
--- a/src/gs-feature-tile.h
+++ b/src/gs-feature-tile.h
@@ -22,9 +22,6 @@
 #ifndef GS_FEATURE_TILE_H
 #define GS_FEATURE_TILE_H
 
-#include <gtk/gtk.h>
-
-#include "gs-app.h"
 #include "gs-app-tile.h"
 
 G_BEGIN_DECLS
diff --git a/src/gs-fixed-size-bin.c b/src/gs-fixed-size-bin.c
index d89ac0e..6cd3919 100644
--- a/src/gs-fixed-size-bin.c
+++ b/src/gs-fixed-size-bin.c
@@ -21,9 +21,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n.h>
-#include <gtk/gtk.h>
-
 #include "gs-fixed-size-bin.h"
 
 struct _GsFixedSizeBin {
diff --git a/src/gs-folders.c b/src/gs-folders.c
index 703650d..ca5014e 100644
--- a/src/gs-folders.c
+++ b/src/gs-folders.c
@@ -22,7 +22,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n.h>
 #include <gio/gio.h>
 
 #include "gs-folders.h"
diff --git a/src/gs-hiding-box.c b/src/gs-hiding-box.c
index 1e8d47d..7e329b9 100644
--- a/src/gs-hiding-box.c
+++ b/src/gs-hiding-box.c
@@ -22,7 +22,6 @@
 #include "config.h"
 
 #include <glib/gi18n.h>
-#include <gtk/gtk.h>
 
 #include "gs-hiding-box.h"
 
@@ -60,7 +59,6 @@ gs_hiding_box_buildable_init (GtkBuildableIface *iface)
 G_DEFINE_TYPE_WITH_CODE (GsHidingBox, gs_hiding_box, GTK_TYPE_CONTAINER,
                         G_IMPLEMENT_INTERFACE (GTK_TYPE_BUILDABLE, gs_hiding_box_buildable_init))
 
-
 static void
 gs_hiding_box_set_property (GObject      *object,
                            guint         prop_id,
diff --git a/src/gs-history-dialog.c b/src/gs-history-dialog.c
index 9b4a66f..a57951a 100644
--- a/src/gs-history-dialog.c
+++ b/src/gs-history-dialog.c
@@ -23,7 +23,6 @@
 #include "config.h"
 
 #include <glib/gi18n.h>
-#include <gtk/gtk.h>
 
 #include "gs-history-dialog.h"
 #include "gs-common.h"
diff --git a/src/gs-history-dialog.h b/src/gs-history-dialog.h
index 8cd3cea..0ff557e 100644
--- a/src/gs-history-dialog.h
+++ b/src/gs-history-dialog.h
@@ -24,7 +24,7 @@
 
 #include <gtk/gtk.h>
 
-#include "gs-app.h"
+#include "gnome-software-private.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/gs-info-bar.c b/src/gs-info-bar.c
index d9f94c0..6732a18 100644
--- a/src/gs-info-bar.c
+++ b/src/gs-info-bar.c
@@ -21,9 +21,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n.h>
-#include <gtk/gtk.h>
-
 #include "gs-info-bar.h"
 
 struct _GsInfoBar
diff --git a/src/gs-installed-page.c b/src/gs-installed-page.c
index 5ae6ed0..1747f66 100644
--- a/src/gs-installed-page.c
+++ b/src/gs-installed-page.c
@@ -24,11 +24,9 @@
 
 #include <string.h>
 #include <glib/gi18n.h>
-#include <appstream-glib.h>
 
 #include "gs-shell.h"
 #include "gs-installed-page.h"
-#include "gs-app.h"
 #include "gs-common.h"
 #include "gs-app-row.h"
 #include "gs-app-folder-dialog.h"
diff --git a/src/gs-installed-page.h b/src/gs-installed-page.h
index 07ce999..304222b 100644
--- a/src/gs-installed-page.h
+++ b/src/gs-installed-page.h
@@ -22,11 +22,7 @@
 #ifndef __GS_INSTALLED_PAGE_H
 #define __GS_INSTALLED_PAGE_H
 
-#include <glib-object.h>
-#include <gtk/gtk.h>
-
 #include "gs-page.h"
-#include "gs-plugin-loader.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/gs-language.c b/src/gs-language.c
index a4777c5..f895c07 100644
--- a/src/gs-language.c
+++ b/src/gs-language.c
@@ -22,7 +22,6 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib.h>
 
 #include "gs-language.h"
 
diff --git a/src/gs-loading-page.c b/src/gs-loading-page.c
index 419481c..c5e7edf 100644
--- a/src/gs-loading-page.c
+++ b/src/gs-loading-page.c
@@ -23,7 +23,6 @@
 
 #include <glib/gi18n.h>
 
-#include "gs-app.h"
 #include "gs-shell.h"
 #include "gs-loading-page.h"
 
diff --git a/src/gs-loading-page.h b/src/gs-loading-page.h
index 5751361..6b0aa75 100644
--- a/src/gs-loading-page.h
+++ b/src/gs-loading-page.h
@@ -22,11 +22,7 @@
 #ifndef __GS_LOADING_PAGE_H
 #define __GS_LOADING_PAGE_H
 
-#include <glib-object.h>
-#include <gtk/gtk.h>
-
 #include "gs-page.h"
-#include "gs-plugin-loader.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/gs-main.c b/src/gs-main.c
index a740410..f27a9a4 100644
--- a/src/gs-main.c
+++ b/src/gs-main.c
@@ -22,7 +22,6 @@
 
 #include "config.h"
 
-#include <appstream-glib.h>
 #include <glib/gi18n.h>
 #include <gio/gio.h>
 #include <gio/gdesktopappinfo.h>
diff --git a/src/gs-moderate-page.c b/src/gs-moderate-page.c
index d74d303..e99dda5 100644
--- a/src/gs-moderate-page.c
+++ b/src/gs-moderate-page.c
@@ -23,9 +23,7 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n.h>
 
-#include "gs-app.h"
 #include "gs-app-row.h"
 #include "gs-review-row.h"
 #include "gs-shell.h"
@@ -83,7 +81,6 @@ gs_moderate_page_review_clicked_cb (GsReviewRow *row,
        gtk_widget_set_visible (GTK_WIDGET (row), FALSE);
 }
 
-
 static void
 gs_moderate_page_selection_changed_cb (GtkListBox *listbox,
                                        GsAppRow *app_row,
diff --git a/src/gs-moderate-page.h b/src/gs-moderate-page.h
index d6527ae..ae4c155 100644
--- a/src/gs-moderate-page.h
+++ b/src/gs-moderate-page.h
@@ -22,11 +22,7 @@
 #ifndef __GS_MODERATE_PAGE_H
 #define __GS_MODERATE_PAGE_H
 
-#include <glib-object.h>
-#include <gtk/gtk.h>
-
 #include "gs-page.h"
-#include "gs-plugin-loader.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/gs-overview-page.c b/src/gs-overview-page.c
index f90fb32..659be0d 100644
--- a/src/gs-overview-page.c
+++ b/src/gs-overview-page.c
@@ -26,9 +26,7 @@
 
 #include "gs-shell.h"
 #include "gs-overview-page.h"
-#include "gs-app.h"
 #include "gs-app-list-private.h"
-#include "gs-category.h"
 #include "gs-popular-tile.h"
 #include "gs-feature-tile.h"
 #include "gs-category-tile.h"
diff --git a/src/gs-overview-page.h b/src/gs-overview-page.h
index a2a2313..35305b9 100644
--- a/src/gs-overview-page.h
+++ b/src/gs-overview-page.h
@@ -22,13 +22,7 @@
 #ifndef __GS_OVERVIEW_PAGE_H
 #define __GS_OVERVIEW_PAGE_H
 
-#include <glib-object.h>
-#include <gtk/gtk.h>
-
-#include "gs-app.h"
 #include "gs-page.h"
-#include "gs-shell.h"
-#include "gs-plugin-loader.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/gs-page.c b/src/gs-page.c
index 72daf6e..6614eb4 100644
--- a/src/gs-page.c
+++ b/src/gs-page.c
@@ -24,13 +24,10 @@
 #include <string.h>
 #include <glib/gi18n.h>
 
-#include "gs-app-private.h"
 #include "gs-page.h"
-#include "gs-shell.h"
 #include "gs-common.h"
 #include "gs-auth-dialog.h"
 #include "gs-screenshot-image.h"
-#include "gs-utils.h"
 
 typedef struct
 {
diff --git a/src/gs-page.h b/src/gs-page.h
index a9d9155..ebd2792 100644
--- a/src/gs-page.h
+++ b/src/gs-page.h
@@ -22,11 +22,7 @@
 #ifndef GS_PAGE_H
 #define GS_PAGE_H
 
-#include <glib-object.h>
-#include <gtk/gtk.h>
-
 #include "gs-shell.h"
-#include "gs-plugin-loader.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/gs-popular-tile.h b/src/gs-popular-tile.h
index 3c00581..3ed2566 100644
--- a/src/gs-popular-tile.h
+++ b/src/gs-popular-tile.h
@@ -22,9 +22,6 @@
 #ifndef GS_POPULAR_TILE_H
 #define GS_POPULAR_TILE_H
 
-#include <gtk/gtk.h>
-
-#include "gs-app.h"
 #include "gs-app-tile.h"
 
 G_BEGIN_DECLS
diff --git a/src/gs-removal-dialog.h b/src/gs-removal-dialog.h
index 9c1d586..0685446 100644
--- a/src/gs-removal-dialog.h
+++ b/src/gs-removal-dialog.h
@@ -24,7 +24,7 @@
 
 #include <gtk/gtk.h>
 
-#include "gs-app.h"
+#include "gnome-software-private.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/gs-review-histogram.c b/src/gs-review-histogram.c
index eda238d..2bf9dff 100644
--- a/src/gs-review-histogram.c
+++ b/src/gs-review-histogram.c
@@ -21,9 +21,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n.h>
-#include <gtk/gtk.h>
-
 #include "gs-review-histogram.h"
 #include "gs-review-bar.h"
 
diff --git a/src/gs-review-row.c b/src/gs-review-row.c
index e7cbead..a90a981 100644
--- a/src/gs-review-row.c
+++ b/src/gs-review-row.c
@@ -22,7 +22,6 @@
 #include "config.h"
 
 #include <glib/gi18n.h>
-#include <gtk/gtk.h>
 
 #include "gs-review-row.h"
 #include "gs-star-widget.h"
diff --git a/src/gs-review-row.h b/src/gs-review-row.h
index 6c1e40f..b043b64 100644
--- a/src/gs-review-row.h
+++ b/src/gs-review-row.h
@@ -24,7 +24,7 @@
 
 #include <gtk/gtk.h>
 
-#include "gs-plugin-loader.h"
+#include "gnome-software-private.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/gs-screenshot-image.c b/src/gs-screenshot-image.c
index bc7e8fb..744b495 100644
--- a/src/gs-screenshot-image.c
+++ b/src/gs-screenshot-image.c
@@ -23,7 +23,6 @@
 #include "config.h"
 
 #include <glib/gi18n.h>
-#include <gtk/gtk.h>
 
 #ifdef HAVE_GNOME_DESKTOP
 #define GNOME_DESKTOP_USE_UNSTABLE_API
@@ -33,7 +32,6 @@
 
 #include "gs-screenshot-image.h"
 #include "gs-common.h"
-#include "gs-utils.h"
 
 struct _GsScreenshotImage
 {
diff --git a/src/gs-screenshot-image.h b/src/gs-screenshot-image.h
index 113327f..0e76e98 100644
--- a/src/gs-screenshot-image.h
+++ b/src/gs-screenshot-image.h
@@ -25,7 +25,8 @@
 
 #include <gtk/gtk.h>
 #include <libsoup/soup.h>
-#include <appstream-glib.h>
+
+#include "gnome-software-private.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/gs-search-page.c b/src/gs-search-page.c
index 90aee1e..82d1a5b 100644
--- a/src/gs-search-page.c
+++ b/src/gs-search-page.c
@@ -22,11 +22,9 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n.h>
 
 #include "gs-search-page.h"
 #include "gs-shell.h"
-#include "gs-app.h"
 #include "gs-common.h"
 #include "gs-app-row.h"
 
diff --git a/src/gs-search-page.h b/src/gs-search-page.h
index 0b97879..1223081 100644
--- a/src/gs-search-page.h
+++ b/src/gs-search-page.h
@@ -22,12 +22,7 @@
 #ifndef __GS_SEARCH_PAGE_H
 #define __GS_SEARCH_PAGE_H
 
-#include <glib-object.h>
-#include <gtk/gtk.h>
-
 #include "gs-page.h"
-#include "gs-shell.h"
-#include "gs-plugin-loader.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/gs-shell-search-provider.c b/src/gs-shell-search-provider.c
index 727429d..46e1c8f 100644
--- a/src/gs-shell-search-provider.c
+++ b/src/gs-shell-search-provider.c
@@ -25,10 +25,6 @@
 
 #include <gio/gio.h>
 #include <string.h>
-#include <glib/gi18n.h>
-
-#include "gs-app-list-private.h"
-#include "gs-plugin-loader-sync.h"
 
 #include "gs-shell-search-provider-generated.h"
 #include "gs-shell-search-provider.h"
diff --git a/src/gs-shell-search-provider.h b/src/gs-shell-search-provider.h
index 415b39b..817d600 100644
--- a/src/gs-shell-search-provider.h
+++ b/src/gs-shell-search-provider.h
@@ -24,7 +24,7 @@
 #ifndef __GS_SHELL_SEARCH_PROVIDER_H
 #define __GS_SHELL_SEARCH_PROVIDER_H
 
-#include "gs-plugin-loader.h"
+#include "gnome-software-private.h"
 
 #define GS_TYPE_SHELL_SEARCH_PROVIDER gs_shell_search_provider_get_type()
 
diff --git a/src/gs-shell.h b/src/gs-shell.h
index 4a1ed8e..3820239 100644
--- a/src/gs-shell.h
+++ b/src/gs-shell.h
@@ -22,12 +22,9 @@
 #ifndef __GS_SHELL_H
 #define __GS_SHELL_H
 
-#include <glib-object.h>
 #include <gtk/gtk.h>
 
-#include "gs-plugin-loader.h"
-#include "gs-category.h"
-#include "gs-app.h"
+#include "gnome-software-private.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/gs-sources-dialog.c b/src/gs-sources-dialog.c
index 91f88f1..b594abe 100644
--- a/src/gs-sources-dialog.c
+++ b/src/gs-sources-dialog.c
@@ -23,9 +23,8 @@
 #include "config.h"
 
 #include <glib/gi18n.h>
-#include <gtk/gtk.h>
 
-#include "gs-app-list.h"
+#include "gnome-software-private.h"
 #include "gs-sources-dialog.h"
 #include "gs-os-release.h"
 #include "gs-sources-dialog-row.h"
diff --git a/src/gs-sources-dialog.h b/src/gs-sources-dialog.h
index a75e93a..d2dd59e 100644
--- a/src/gs-sources-dialog.h
+++ b/src/gs-sources-dialog.h
@@ -24,8 +24,7 @@
 
 #include <gtk/gtk.h>
 
-#include "gs-app.h"
-#include "gs-plugin-loader.h"
+#include "gnome-software-private.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/gs-star-widget.c b/src/gs-star-widget.c
index e6dbf32..fef92b4 100644
--- a/src/gs-star-widget.c
+++ b/src/gs-star-widget.c
@@ -21,8 +21,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n.h>
-#include <gtk/gtk.h>
 #include <math.h>
 
 #include "gs-common.h"
diff --git a/src/gs-star-widget.h b/src/gs-star-widget.h
index 60b19e2..df6ba0e 100644
--- a/src/gs-star-widget.h
+++ b/src/gs-star-widget.h
@@ -24,7 +24,7 @@
 
 #include <gtk/gtk.h>
 
-#include "gs-app.h"
+#include "gnome-software-private.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/gs-summary-tile.c b/src/gs-summary-tile.c
index bb7da44..7782697 100644
--- a/src/gs-summary-tile.c
+++ b/src/gs-summary-tile.c
@@ -22,7 +22,6 @@
 #include "config.h"
 
 #include <glib/gi18n.h>
-#include <gtk/gtk.h>
 
 #include "gs-summary-tile.h"
 #include "gs-star-widget.h"
diff --git a/src/gs-summary-tile.h b/src/gs-summary-tile.h
index cd5c421..9f661ce 100644
--- a/src/gs-summary-tile.h
+++ b/src/gs-summary-tile.h
@@ -22,9 +22,6 @@
 #ifndef GS_SUMMARY_TILE_H
 #define GS_SUMMARY_TILE_H
 
-#include <gtk/gtk.h>
-
-#include "gs-app.h"
 #include "gs-app-tile.h"
 
 G_BEGIN_DECLS
diff --git a/src/gs-update-dialog.c b/src/gs-update-dialog.c
index 2c2d1a3..4023874 100644
--- a/src/gs-update-dialog.c
+++ b/src/gs-update-dialog.c
@@ -22,7 +22,6 @@
 #include "config.h"
 
 #include <glib/gi18n.h>
-#include <gtk/gtk.h>
 
 #include "gs-update-dialog.h"
 #include "gs-app-row.h"
diff --git a/src/gs-update-dialog.h b/src/gs-update-dialog.h
index 813d9ac..caa6d8e 100644
--- a/src/gs-update-dialog.h
+++ b/src/gs-update-dialog.h
@@ -24,8 +24,7 @@
 
 #include <gtk/gtk.h>
 
-#include "gs-app.h"
-#include "gs-plugin-loader.h"
+#include "gnome-software-private.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/gs-update-list.c b/src/gs-update-list.c
index 3d0cc79..1a442a0 100644
--- a/src/gs-update-list.c
+++ b/src/gs-update-list.c
@@ -22,12 +22,9 @@
 #include "config.h"
 
 #include <glib/gi18n.h>
-#include <gtk/gtk.h>
-#include <appstream-glib.h>
 
 #include "gs-update-list.h"
 
-#include "gs-app.h"
 #include "gs-app-row.h"
 #include "gs-common.h"
 
diff --git a/src/gs-update-list.h b/src/gs-update-list.h
index 6e836b5..f89af51 100644
--- a/src/gs-update-list.h
+++ b/src/gs-update-list.h
@@ -24,8 +24,7 @@
 
 #include <gtk/gtk.h>
 
-#include "gs-app.h"
-#include "gs-app-list.h"
+#include "gnome-software-private.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/gs-update-monitor.c b/src/gs-update-monitor.c
index d2a46c5..ab1baaf 100644
--- a/src/gs-update-monitor.c
+++ b/src/gs-update-monitor.c
@@ -27,9 +27,7 @@
 #include <gsettings-desktop-schemas/gdesktop-enums.h>
 
 #include "gs-update-monitor.h"
-#include "gs-plugin-loader.h"
 #include "gs-common.h"
-#include "gs-utils.h"
 
 struct _GsUpdateMonitor {
        GObject          parent;
@@ -591,7 +589,6 @@ get_updates_historical_cb (GObject *object, GAsyncResult *res, gpointer data)
        g_settings_set (monitor->settings,
                        "install-timestamp", "x", gs_app_get_install_date (app));
 
-
 }
 
 static gboolean
diff --git a/src/gs-updates-page.c b/src/gs-updates-page.c
index 1d3ea06..c7137f8 100644
--- a/src/gs-updates-page.c
+++ b/src/gs-updates-page.c
@@ -27,7 +27,6 @@
 #include "gs-shell.h"
 #include "gs-updates-page.h"
 #include "gs-common.h"
-#include "gs-app-private.h"
 #include "gs-app-row.h"
 #include "gs-plugin-private.h"
 #include "gs-removal-dialog.h"
@@ -35,9 +34,7 @@
 #include "gs-update-list.h"
 #include "gs-update-monitor.h"
 #include "gs-upgrade-banner.h"
-#include "gs-utils.h"
 #include "gs-application.h"
-#include "gs-utils.h"
 
 #ifdef HAVE_GNOME_DESKTOP
 #include <gdesktop-enums.h>
@@ -435,7 +432,6 @@ gs_updates_page_decrement_refresh_count (GsUpdatesPage *self)
        gs_shell_profile_dump (self->shell);
 }
 
-
 static void
 gs_updates_page_network_available_notify_cb (GsPluginLoader *plugin_loader,
                                              GParamSpec *pspec,
diff --git a/src/gs-updates-page.h b/src/gs-updates-page.h
index 35a10a5..9198420 100644
--- a/src/gs-updates-page.h
+++ b/src/gs-updates-page.h
@@ -22,12 +22,7 @@
 #ifndef __GS_UPDATES_PAGE_H
 #define __GS_UPDATES_PAGE_H
 
-#include <glib-object.h>
-#include <gtk/gtk.h>
-
 #include "gs-page.h"
-#include "gs-shell.h"
-#include "gs-plugin-loader.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/gs-upgrade-banner.c b/src/gs-upgrade-banner.c
index 41572f2..cfebc63 100644
--- a/src/gs-upgrade-banner.c
+++ b/src/gs-upgrade-banner.c
@@ -23,7 +23,6 @@
 #include "config.h"
 
 #include <glib/gi18n.h>
-#include <gtk/gtk.h>
 #include <stdlib.h>
 
 #include "gs-upgrade-banner.h"
diff --git a/src/gs-upgrade-banner.h b/src/gs-upgrade-banner.h
index afd727d..751a164 100644
--- a/src/gs-upgrade-banner.h
+++ b/src/gs-upgrade-banner.h
@@ -24,7 +24,7 @@
 
 #include <gtk/gtk.h>
 
-#include "gs-app.h"
+#include "gnome-software-private.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/gs-vendor.c b/src/gs-vendor.c
index 98a18f9..6caf94a 100644
--- a/src/gs-vendor.c
+++ b/src/gs-vendor.c
@@ -21,8 +21,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n.h>
-
 #include "gs-vendor.h"
 
 struct _GsVendor
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]