Move common panel code from shell/ to panel/common

This creates a new static library called libwidget which the shell links
against.

51 files changed, 88 insertions, 73 deletions

diff --git a/panels/color/cc-color-panel.c b/panels/color/cc-color-panel.c
index e7957deba..e9a65cf58 100644
--- a/panels/color/cc-color-panel.c
+++ b/panels/color/cc-color-panel.c
@@ -26,7 +26,7 @@
 #include <gdk/gdkx.h>
 #include <libsoup/soup.h>
 
-#include "shell/list-box-helper.h"
+#include "list-box-helper.h"
 #include "cc-color-calibrate.h"
 #include "cc-color-cell-renderer-text.h"
 #include "cc-color-panel.h"
diff --git a/panels/color/meson.build b/panels/color/meson.build
index 36bd4be7d..54766a807 100644
--- a/panels/color/meson.build
+++ b/panels/color/meson.build
@@ -55,7 +55,7 @@ cflags += [
 panels_libs += static_library(
   cappletname,
   sources: sources,
-  include_directories: top_inc,
+  include_directories: [ top_inc, common_inc ],
   dependencies: deps,
   c_args: cflags
 )
diff --git a/shell/cc-hostname-entry.c b/panels/common/cc-hostname-entry.c
index 0b0d6d10c..0b0d6d10c 100644
--- a/shell/cc-hostname-entry.c
+++ b/panels/common/cc-hostname-entry.c
diff --git a/shell/cc-hostname-entry.h b/panels/common/cc-hostname-entry.h
index a48177961..a48177961 100644
--- a/shell/cc-hostname-entry.h
+++ b/panels/common/cc-hostname-entry.h
diff --git a/panels/common/cc-language-chooser.c b/panels/common/cc-language-chooser.c
index 961df5a0a..f0d2ecedc 100644
--- a/panels/common/cc-language-chooser.c
+++ b/panels/common/cc-language-chooser.c
@@ -29,7 +29,7 @@
 #include <gio/gio.h>
 #include <gtk/gtk.h>
 
-#include "shell/list-box-helper.h"
+#include "list-box-helper.h"
 #include "cc-common-language.h"
 #include "cc-util.h"
 
diff --git a/shell/hostname-helper.c b/panels/common/hostname-helper.c
index df596975e..df596975e 100644
--- a/shell/hostname-helper.c
+++ b/panels/common/hostname-helper.c
diff --git a/shell/hostname-helper.h b/panels/common/hostname-helper.h
index 9f96c12f9..9f96c12f9 100644
--- a/shell/hostname-helper.h
+++ b/panels/common/hostname-helper.h
diff --git a/shell/hostnames-test.txt b/panels/common/hostnames-test.txt
index 5a31ce28b..5a31ce28b 100644
--- a/shell/hostnames-test.txt
+++ b/panels/common/hostnames-test.txt
diff --git a/shell/list-box-helper.c b/panels/common/list-box-helper.c
index 415cdde94..415cdde94 100644
--- a/shell/list-box-helper.c
+++ b/panels/common/list-box-helper.c
diff --git a/shell/list-box-helper.h b/panels/common/list-box-helper.h
index c2a0acc97..c2a0acc97 100644
--- a/shell/list-box-helper.h
+++ b/panels/common/list-box-helper.h
diff --git a/panels/common/meson.build b/panels/common/meson.build
index 561f42cf7..42594360f 100644
--- a/panels/common/meson.build
+++ b/panels/common/meson.build
@@ -24,6 +24,23 @@ common_sources += gnome.mkenums(
   vtail: '      { 0, NULL, NULL }\n    };\n    etype = g_@type@_register_static ("@EnumName@", values);\n  }\n  return etype;\n}\n'
 )
 
+sources = files(
+  'cc-hostname-entry.c',
+  'hostname-helper.c',
+  'list-box-helper.c',
+)
+
+libwidgets = static_library(
+  'widgets',
+  sources: sources,
+  include_directories: top_inc,
+  dependencies: common_deps + [ polkit_gobject_dep ]
+)
+libwidgets_dep = declare_dependency(
+  include_directories: common_inc,
+  link_with: libwidgets
+)
+
 sources = common_sources + files(
   'cc-common-language.c',
   'cc-language-chooser.c',
@@ -121,3 +138,26 @@ run_target(
   script_name,
   command: script
 )
+
+
+test_unit = 'test-hostname'
+
+sources = files(
+  'hostname-helper.c',
+  test_unit + '.c'
+)
+
+cflags = [
+  '-DTEST_SRCDIR="@0@"'.format(meson.current_source_dir()),
+  '-DTEST_TOPSRCDIR="@0@"'.format(meson.source_root())
+]
+
+exe = executable(
+  test_unit,
+  sources,
+  include_directories: top_inc,
+  dependencies: [ common_deps, libwidgets_dep ],
+  c_args: cflags
+)
+
+test(test_unit, exe)
diff --git a/shell/ssids-test.txt b/panels/common/ssids-test.txt
index 0545437cf..0545437cf 100644
--- a/shell/ssids-test.txt
+++ b/panels/common/ssids-test.txt
diff --git a/shell/test-hostname.c b/panels/common/test-hostname.c
index 3df293051..4e14f715a 100644
--- a/shell/test-hostname.c
+++ b/panels/common/test-hostname.c
@@ -129,8 +129,8 @@ int main (int argc, char **argv)
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 	g_test_init (&argc, &argv, NULL);
 
-	g_test_add_func ("/shell/hostname", test_hostname);
-	g_test_add_func ("/shell/ssid", test_ssid);
+	g_test_add_func ("/common/hostname", test_hostname);
+	g_test_add_func ("/common/ssid", test_ssid);
 
 	return g_test_run ();
 }
diff --git a/panels/datetime/cc-datetime-panel.c b/panels/datetime/cc-datetime-panel.c
index 2ea385188..15f3dd8c3 100644
--- a/panels/datetime/cc-datetime-panel.c
+++ b/panels/datetime/cc-datetime-panel.c
@@ -25,7 +25,7 @@
 
 #include <langinfo.h>
 #include <sys/time.h>
-#include "shell/list-box-helper.h"
+#include "list-box-helper.h"
 #include "cc-timezone-map.h"
 #include "timedated.h"
 #include "date-endian.h"
diff --git a/panels/datetime/meson.build b/panels/datetime/meson.build
index ba82618f2..8a96844be 100644
--- a/panels/datetime/meson.build
+++ b/panels/datetime/meson.build
@@ -186,7 +186,7 @@ cflags += [
 panels_libs += static_library(
   cappletname,
   sources: sources + resources,
-  include_directories: top_inc,
+  include_directories: [ top_inc, common_inc ],
   dependencies: deps,
   c_args: cflags
 )
diff --git a/panels/display/cc-display-panel.c b/panels/display/cc-display-panel.c
index 550376776..9488ca80b 100644
--- a/panels/display/cc-display-panel.c
+++ b/panels/display/cc-display-panel.c
@@ -30,7 +30,7 @@
 #include <math.h>
 
 #include "shell/cc-object-storage.h"
-#include "shell/list-box-helper.h"
+#include "list-box-helper.h"
 #include <libupower-glib/upower.h>
 
 #include "cc-display-config-manager-dbus.h"
diff --git a/panels/display/meson.build b/panels/display/meson.build
index ee33b4355..d341758f8 100644
--- a/panels/display/meson.build
+++ b/panels/display/meson.build
@@ -58,7 +58,7 @@ cflags += [
 panels_libs += static_library(
   cappletname,
   sources: sources,
-  include_directories: top_inc,
+  include_directories: [ top_inc, common_inc ],
   dependencies: deps,
   c_args: cflags
 )
diff --git a/panels/info/cc-info-overview-panel.c b/panels/info/cc-info-overview-panel.c
index 4301090f9..19f785a36 100644
--- a/panels/info/cc-info-overview-panel.c
+++ b/panels/info/cc-info-overview-panel.c
@@ -21,8 +21,8 @@
 
 #include <config.h>
 
-#include "shell/cc-hostname-entry.h"
 #include "shell/cc-object-storage.h"
+#include "cc-hostname-entry.h"
 
 #include "cc-info-resources.h"
 #include "info-cleanup.h"
diff --git a/panels/info/meson.build b/panels/info/meson.build
index 13015b96c..6b41706bc 100644
--- a/panels/info/meson.build
+++ b/panels/info/meson.build
@@ -67,7 +67,7 @@ deps = common_deps + [
 panels_libs += static_library(
   cappletname,
   sources: sources,
-  include_directories: top_inc,
+  include_directories: [ top_inc, common_inc ],
   dependencies: deps,
   c_args: cflags
 )
diff --git a/panels/mouse/gnome-mouse-properties.c b/panels/mouse/gnome-mouse-properties.c
index 4d0920b2d..2a22b4815 100644
--- a/panels/mouse/gnome-mouse-properties.c
+++ b/panels/mouse/gnome-mouse-properties.c
@@ -35,7 +35,7 @@
 #include "gnome-mouse-properties.h"
 #include "gsd-input-helper.h"
 #include "gsd-device-manager.h"
-#include "shell/list-box-helper.h"
+#include "list-box-helper.h"
 #include "cc-mouse-caps-helper.h"
 
 #include <sys/types.h>
diff --git a/panels/network/cc-wifi-panel.c b/panels/network/cc-wifi-panel.c
index 64321752c..d785bad0d 100644
--- a/panels/network/cc-wifi-panel.c
+++ b/panels/network/cc-wifi-panel.c
@@ -24,7 +24,7 @@
 #include "network-dialogs.h"
 
 #include "shell/cc-object-storage.h"
-#include "shell/list-box-helper.h"
+#include "list-box-helper.h"
 
 #include <glib/gi18n.h>
 #include <NetworkManager.h>
diff --git a/panels/network/connection-editor/ce-page-ip4.c b/panels/network/connection-editor/ce-page-ip4.c
index 400dc433d..100a3b4e3 100644
--- a/panels/network/connection-editor/ce-page-ip4.c
+++ b/panels/network/connection-editor/ce-page-ip4.c
@@ -28,7 +28,7 @@
 #include <glib/gi18n.h>
 #include <NetworkManager.h>
 
-#include "shell/list-box-helper.h"
+#include "list-box-helper.h"
 #include "ce-page-ip4.h"
 #include "ui-helpers.h"
 
diff --git a/panels/network/connection-editor/ce-page-ip6.c b/panels/network/connection-editor/ce-page-ip6.c
index 995197504..35653f3a1 100644
--- a/panels/network/connection-editor/ce-page-ip6.c
+++ b/panels/network/connection-editor/ce-page-ip6.c
@@ -28,7 +28,7 @@
 #include <glib/gi18n.h>
 #include <NetworkManager.h>
 
-#include "shell/list-box-helper.h"
+#include "list-box-helper.h"
 #include "ce-page-ip6.h"
 #include "ui-helpers.h"
 
diff --git a/panels/network/connection-editor/meson.build b/panels/network/connection-editor/meson.build
index 616bafdb1..9ba9b3784 100644
--- a/panels/network/connection-editor/meson.build
+++ b/panels/network/connection-editor/meson.build
@@ -40,7 +40,7 @@ sources += gnome.compile_resources(
 libconnection_editor = static_library(
   name,
   sources: sources,
-  include_directories: [top_inc, wireless_security_inc],
+  include_directories: [top_inc, common_inc, wireless_security_inc],
   dependencies: deps,
   c_args: cflags,
   link_with: libwireless_security
diff --git a/panels/network/connection-editor/net-connection-editor.c b/panels/network/connection-editor/net-connection-editor.c
index 1b268044a..556b57fb8 100644
--- a/panels/network/connection-editor/net-connection-editor.c
+++ b/panels/network/connection-editor/net-connection-editor.c
@@ -26,7 +26,7 @@
 
 #include <NetworkManager.h>
 
-#include "shell/list-box-helper.h"
+#include "list-box-helper.h"
 #include "net-connection-editor.h"
 #include "net-connection-editor-resources.h"
 #include "ce-page-details.h"
diff --git a/panels/network/meson.build b/panels/network/meson.build
index 8036d79f8..0325c5afd 100644
--- a/panels/network/meson.build
+++ b/panels/network/meson.build
@@ -72,7 +72,7 @@ cflags += '-DGNOMELOCALEDIR="@0@"'.format(control_center_localedir)
 panels_libs += static_library(
   cappletname,
   sources: sources,
-  include_directories: top_inc,
+  include_directories: [top_inc, common_inc],
   dependencies: deps,
   c_args: cflags,
   link_with: libconnection_editor
diff --git a/panels/network/net-device-ethernet.c b/panels/network/net-device-ethernet.c
index 603ad6c86..0412facaf 100644
--- a/panels/network/net-device-ethernet.c
+++ b/panels/network/net-device-ethernet.c
@@ -28,7 +28,7 @@
 
 #include "panel-common.h"
 
-#include "shell/list-box-helper.h"
+#include "list-box-helper.h"
 #include "connection-editor/net-connection-editor.h"
 #include "connection-editor/ce-page.h"
 
diff --git a/panels/network/net-device-wifi.c b/panels/network/net-device-wifi.c
index 313e9ab8c..5b9a77a1f 100644
--- a/panels/network/net-device-wifi.c
+++ b/panels/network/net-device-wifi.c
@@ -29,8 +29,8 @@
 #include <NetworkManager.h>
 #include <polkit/polkit.h>
 
-#include "shell/list-box-helper.h"
-#include "shell/hostname-helper.h"
+#include "list-box-helper.h"
+#include "hostname-helper.h"
 #include "network-dialogs.h"
 #include "panel-common.h"
 
diff --git a/panels/notifications/cc-edit-dialog.c b/panels/notifications/cc-edit-dialog.c
index 778c18c86..bdac5a4f9 100644
--- a/panels/notifications/cc-edit-dialog.c
+++ b/panels/notifications/cc-edit-dialog.c
@@ -26,7 +26,7 @@
 #include <gio/gio.h>
 #include <gio/gdesktopappinfo.h>
 
-#include "shell/list-box-helper.h"
+#include "list-box-helper.h"
 #include "cc-notifications-panel.h"
 #include "cc-edit-dialog.h"
 
diff --git a/panels/notifications/cc-notifications-panel.c b/panels/notifications/cc-notifications-panel.c
index 0b1b834ca..9baa5a80e 100644
--- a/panels/notifications/cc-notifications-panel.c
+++ b/panels/notifications/cc-notifications-panel.c
@@ -26,7 +26,7 @@
 #include <gio/gdesktopappinfo.h>
 
 #include "shell/cc-object-storage.h"
-#include "shell/list-box-helper.h"
+#include "list-box-helper.h"
 #include "cc-notifications-panel.h"
 #include "cc-notifications-resources.h"
 #include "cc-edit-dialog.h"
diff --git a/panels/notifications/meson.build b/panels/notifications/meson.build
index 97a623fcb..55adee3b5 100644
--- a/panels/notifications/meson.build
+++ b/panels/notifications/meson.build
@@ -40,7 +40,7 @@ cflags += '-DGNOMELOCALEDIR="@0@"'.format(control_center_localedir)
 panels_libs += static_library(
   cappletname,
   sources: sources,
-  include_directories: top_inc,
+  include_directories: [ top_inc, common_inc ],
   dependencies: common_deps,
   c_args: cflags
 )
diff --git a/panels/online-accounts/cc-online-accounts-panel.c b/panels/online-accounts/cc-online-accounts-panel.c
index 3177a4d27..a89d249c0 100644
--- a/panels/online-accounts/cc-online-accounts-panel.c
+++ b/panels/online-accounts/cc-online-accounts-panel.c
@@ -32,7 +32,7 @@
 #include "cc-online-accounts-panel.h"
 #include "cc-online-accounts-resources.h"
 
-#include "shell/list-box-helper.h"
+#include "list-box-helper.h"
 
 struct _CcGoaPanel
 {
diff --git a/panels/online-accounts/meson.build b/panels/online-accounts/meson.build
index eea6f89ec..1f899e881 100644
--- a/panels/online-accounts/meson.build
+++ b/panels/online-accounts/meson.build
@@ -39,7 +39,7 @@ cflags += '-DGNOMELOCALEDIR="@0@"'.format(control_center_localedir)
 panels_libs += static_library(
   cappletname,
   sources: sources,
-  include_directories: top_inc,
+  include_directories: [ top_inc, common_inc ],
   dependencies: deps,
   c_args: cflags
 )
diff --git a/panels/power/cc-power-panel.c b/panels/power/cc-power-panel.c
index b78c17a49..85013105c 100644
--- a/panels/power/cc-power-panel.c
+++ b/panels/power/cc-power-panel.c
@@ -30,7 +30,7 @@
 #endif
 
 #include "shell/cc-object-storage.h"
-#include "shell/list-box-helper.h"
+#include "list-box-helper.h"
 #include "cc-power-panel.h"
 #include "cc-power-resources.h"
 
diff --git a/panels/power/meson.build b/panels/power/meson.build
index 9a27e93bd..d4091eaa1 100644
--- a/panels/power/meson.build
+++ b/panels/power/meson.build
@@ -47,7 +47,7 @@ endif
 panels_libs += static_library(
   cappletname,
   sources: sources,
-  include_directories: top_inc,
+  include_directories: [ top_inc, common_inc ],
   dependencies: deps,
   c_args: cflags
 )
diff --git a/panels/printers/pp-jobs-dialog.c b/panels/printers/pp-jobs-dialog.c
index dfab7eb42..f1331d6d6 100644
--- a/panels/printers/pp-jobs-dialog.c
+++ b/panels/printers/pp-jobs-dialog.c
@@ -31,7 +31,7 @@
 
 #include <cups/cups.h>
 
-#include "shell/list-box-helper.h"
+#include "list-box-helper.h"
 #include "pp-jobs-dialog.h"
 #include "pp-utils.h"
 #include "pp-job.h"
diff --git a/panels/privacy/cc-privacy-panel.c b/panels/privacy/cc-privacy-panel.c
index daa050a41..8735e33d0 100644
--- a/panels/privacy/cc-privacy-panel.c
+++ b/panels/privacy/cc-privacy-panel.c
@@ -19,7 +19,7 @@
  */
 
 #include "shell/cc-object-storage.h"
-#include "shell/list-box-helper.h"
+#include "list-box-helper.h"
 #include "cc-privacy-panel.h"
 #include "cc-privacy-resources.h"
 #include "cc-util.h"
diff --git a/panels/region/cc-format-chooser.c b/panels/region/cc-format-chooser.c
index 4998de99d..2fed3f10e 100644
--- a/panels/region/cc-format-chooser.c
+++ b/panels/region/cc-format-chooser.c
@@ -27,7 +27,7 @@
 #include <string.h>
 #include <glib/gi18n.h>
 
-#include "shell/list-box-helper.h"
+#include "list-box-helper.h"
 #include "cc-common-language.h"
 #include "cc-util.h"
 
diff --git a/panels/region/cc-input-chooser.c b/panels/region/cc-input-chooser.c
index a5156ccbf..9f882cdb3 100644
--- a/panels/region/cc-input-chooser.c
+++ b/panels/region/cc-input-chooser.c
@@ -22,7 +22,7 @@
 #define GNOME_DESKTOP_USE_UNSTABLE_API
 #include <libgnome-desktop/gnome-languages.h>
 
-#include "shell/list-box-helper.h"
+#include "list-box-helper.h"
 #include "cc-common-language.h"
 #include "cc-util.h"
 #include "cc-input-chooser.h"
diff --git a/panels/region/cc-region-panel.c b/panels/region/cc-region-panel.c
index 232c3faad..5fdb35a25 100644
--- a/panels/region/cc-region-panel.c
+++ b/panels/region/cc-region-panel.c
@@ -27,7 +27,7 @@
 #include <polkit/polkit.h>
 
 #include "shell/cc-object-storage.h"
-#include "shell/list-box-helper.h"
+#include "list-box-helper.h"
 #include "cc-region-panel.h"
 #include "cc-region-resources.h"
 #include "cc-language-chooser.h"
diff --git a/panels/search/cc-search-locations-dialog.c b/panels/search/cc-search-locations-dialog.c
index 3d2ec8a47..132754722 100644
--- a/panels/search/cc-search-locations-dialog.c
+++ b/panels/search/cc-search-locations-dialog.c
@@ -19,7 +19,7 @@
  */
 
 #include "cc-search-locations-dialog.h"
-#include "shell/list-box-helper.h"
+#include "list-box-helper.h"
 
 #include <glib/gi18n.h>
 
diff --git a/panels/search/cc-search-panel.c b/panels/search/cc-search-panel.c
index 67e722556..7c5051ae2 100644
--- a/panels/search/cc-search-panel.c
+++ b/panels/search/cc-search-panel.c
@@ -21,7 +21,7 @@
 #include "cc-search-panel.h"
 #include "cc-search-locations-dialog.h"
 #include "cc-search-resources.h"
-#include "shell/list-box-helper.h"
+#include "list-box-helper.h"
 
 #include <gio/gdesktopappinfo.h>
 #include <glib/gi18n.h>
diff --git a/panels/search/meson.build b/panels/search/meson.build
index 0081674c4..f8663fb65 100644
--- a/panels/search/meson.build
+++ b/panels/search/meson.build
@@ -43,7 +43,7 @@ cflags += [
 panels_libs += static_library(
   cappletname,
   sources: sources,
-  include_directories: top_inc,
+  include_directories: [ top_inc, common_inc ],
   dependencies: common_deps,
   c_args: cflags
 )
diff --git a/panels/sharing/cc-sharing-networks.c b/panels/sharing/cc-sharing-networks.c
index d703af5bc..d97f811ea 100644
--- a/panels/sharing/cc-sharing-networks.c
+++ b/panels/sharing/cc-sharing-networks.c
@@ -26,7 +26,7 @@
 #include "cc-sharing-networks.h"
 #include "org.gnome.SettingsDaemon.Sharing.h"
 #include "gsd-sharing-enums.h"
-#include "shell/list-box-helper.h"
+#include "list-box-helper.h"
 
 struct _CcSharingNetworksPrivate {
   GtkWidget *listbox;
diff --git a/panels/sharing/cc-sharing-panel.c b/panels/sharing/cc-sharing-panel.c
index 8b35c9a31..1352f7e8f 100644
--- a/panels/sharing/cc-sharing-panel.c
+++ b/panels/sharing/cc-sharing-panel.c
@@ -20,9 +20,9 @@
  */
 
 #include "cc-sharing-panel.h"
-#include "shell/cc-hostname-entry.h"
+#include "cc-hostname-entry.h"
 
-#include "shell/list-box-helper.h"
+#include "list-box-helper.h"
 #include "cc-sharing-resources.h"
 #include "vino-preferences.h"
 #include "cc-remote-login.h"
diff --git a/panels/sharing/meson.build b/panels/sharing/meson.build
index 5caac36c0..236458171 100644
--- a/panels/sharing/meson.build
+++ b/panels/sharing/meson.build
@@ -78,7 +78,7 @@ cflags += [
 panels_libs += static_library(
   cappletname,
   sources: sources,
-  include_directories: top_inc,
+  include_directories: [ top_inc, common_inc ],
   dependencies: common_deps,
   c_args: cflags
 )
diff --git a/panels/thunderbolt/cc-bolt-panel.c b/panels/thunderbolt/cc-bolt-panel.c
index a162a1f19..a4face5b3 100644
--- a/panels/thunderbolt/cc-bolt-panel.c
+++ b/panels/thunderbolt/cc-bolt-panel.c
@@ -20,7 +20,7 @@
 #include <config.h>
 
 #include <shell/cc-panel.h>
-#include <shell/list-box-helper.h>
+#include <list-box-helper.h>
 
 #include <glib/gi18n.h>
 #include <polkit/polkit.h>
diff --git a/panels/thunderbolt/meson.build b/panels/thunderbolt/meson.build
index e85566157..17e125b5f 100644
--- a/panels/thunderbolt/meson.build
+++ b/panels/thunderbolt/meson.build
@@ -68,7 +68,7 @@ cflags += [
 panels_libs += static_library(
   cappletname,
   sources: sources,
-  include_directories: top_inc,
+  include_directories: [top_inc, common_inc],
   dependencies: deps,
   c_args: cflags
 )
diff --git a/panels/universal-access/cc-ua-panel.c b/panels/universal-access/cc-ua-panel.c
index 23e7d8a56..7a56ee1f3 100644
--- a/panels/universal-access/cc-ua-panel.c
+++ b/panels/universal-access/cc-ua-panel.c
@@ -27,7 +27,7 @@
 #include <glib/gi18n-lib.h>
 #include <gdesktop-enums.h>
 
-#include "shell/list-box-helper.h"
+#include "list-box-helper.h"
 #include "cc-ua-panel.h"
 #include "cc-ua-resources.h"
 
diff --git a/panels/universal-access/meson.build b/panels/universal-access/meson.build
index d7983f200..119143654 100644
--- a/panels/universal-access/meson.build
+++ b/panels/universal-access/meson.build
@@ -47,7 +47,7 @@ cflags += '-DGNOMELOCALEDIR="@0@"'.format(control_center_localedir)
 panels_libs += static_library(
   cappletname,
   sources: sources,
-  include_directories: top_inc,
+  include_directories: [ top_inc, common_inc ],
   dependencies: deps,
   c_args: cflags
 )
diff --git a/shell/meson.build b/shell/meson.build
index d092ccb7c..942595127 100644
--- a/shell/meson.build
+++ b/shell/meson.build
@@ -42,9 +42,8 @@ libshell = static_library(
   c_args: cflags
 )
 
-common_sources = files(
+sources = files(
   'cc-application.c',
-  'cc-hostname-entry.c',
   'cc-log.c',
   'cc-object-storage.c',
   'cc-panel-loader.c',
@@ -52,8 +51,6 @@ common_sources = files(
   'cc-shell-category-view.c',
   'cc-shell-item-view.c',
   'cc-shell.c',
-  'hostname-helper.c',
-  'list-box-helper.c',
   'main.c'
 )
 
@@ -63,14 +60,14 @@ resource_data = files(
   'window.ui'
 )
 
-common_sources += gnome.compile_resources(
+sources += gnome.compile_resources(
   'resources',
   meson.project_name() + '.gresource.xml',
   dependencies: resource_data,
   export: true
 )
 
-sources = common_sources + files(
+sources += files(
   'cc-panel-list.c',
   'cc-window.c'
 )
@@ -78,7 +75,7 @@ sources = common_sources + files(
 shell_deps = common_deps + [
   libdevice_dep,
   liblanguage_dep,
-  polkit_gobject_dep,
+  libwidgets_dep,
   x11_dep
 ]
 
@@ -122,27 +119,5 @@ libpanel_loader = static_library(
   c_args: cflags + ['-DCC_PANEL_LOADER_NO_GTYPES']
 )
 
-test_unit = 'test-hostname'
-
-sources = files(
-  'hostname-helper.c',
-  test_unit + '.c'
-)
-
-cflags += [
-  '-DTEST_SRCDIR="@0@"'.format(meson.current_source_dir()),
-  '-DTEST_TOPSRCDIR="@0@"'.format(meson.source_root())
-]
-
-exe = executable(
-  test_unit,
-  sources,
-  include_directories: top_inc,
-  dependencies: common_deps,
-  c_args: cflags
-)
-
-test(test_unit, exe)
-
 install_data ('org.gnome.ControlCenter.gschema.xml',
               install_dir: control_center_schemadir)