diff --git a/clients/cli/agent.c b/clients/cli/agent.c
index 75422ceae9..fc716b57f7 100644
--- a/clients/cli/agent.c
+++ b/clients/cli/agent.c
@@ -21,7 +21,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
diff --git a/clients/cli/common.c b/clients/cli/common.c
index 5a3f796424..e7d7e13224 100644
--- a/clients/cli/common.c
+++ b/clients/cli/common.c
@@ -21,7 +21,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
diff --git a/clients/cli/connections.c b/clients/cli/connections.c
index 372f6ad1c7..9c87b5d19f 100644
--- a/clients/cli/connections.c
+++ b/clients/cli/connections.c
@@ -19,7 +19,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/clients/cli/devices.c b/clients/cli/devices.c
index 940181384d..740e3234a3 100644
--- a/clients/cli/devices.c
+++ b/clients/cli/devices.c
@@ -25,8 +25,6 @@
 #include <errno.h>
 #include <readline/readline.h>
 
-#include <glib/gi18n.h>
-
 #include "nm-default.h"
 #include "nm-secret-agent-simple.h"
 #include "polkit-agent.h"
diff --git a/clients/cli/general.c b/clients/cli/general.c
index fa493bb849..2d2197cba1 100644
--- a/clients/cli/general.c
+++ b/clients/cli/general.c
@@ -22,8 +22,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include <glib/gi18n.h>
-
 #include "nm-default.h"
 #include "polkit-agent.h"
 #include "utils.h"
diff --git a/clients/cli/nmcli.c b/clients/cli/nmcli.c
index 7ad5fa1b89..bd176c8fc8 100644
--- a/clients/cli/nmcli.c
+++ b/clients/cli/nmcli.c
@@ -33,8 +33,6 @@
 #include <readline/readline.h>
 #include <readline/history.h>
 
-#include <glib/gi18n.h>
-
 #include "nm-default.h"
 #include "polkit-agent.h"
 #include "nmcli.h"
diff --git a/clients/cli/polkit-agent.c b/clients/cli/polkit-agent.c
index 1120b7eb7c..0d305f74d0 100644
--- a/clients/cli/polkit-agent.c
+++ b/clients/cli/polkit-agent.c
@@ -27,8 +27,6 @@
 #include <unistd.h>
 #include <termios.h>
 
-#include <glib/gi18n-lib.h>
-
 #include "nm-default.h"
 #include "polkit-agent.h"
 #include "nm-polkit-listener.h"
diff --git a/clients/cli/settings.c b/clients/cli/settings.c
index e5e6cd57cc..9460acdabc 100644
--- a/clients/cli/settings.c
+++ b/clients/cli/settings.c
@@ -22,8 +22,6 @@
 #include <stdlib.h>
 #include <arpa/inet.h>
 
-#include <glib/gi18n.h>
-
 #include "nm-default.h"
 #include "utils.h"
 #include "common.h"
diff --git a/clients/cli/utils.c b/clients/cli/utils.c
index cfc8cd2835..e3f573fba4 100644
--- a/clients/cli/utils.c
+++ b/clients/cli/utils.c
@@ -29,8 +29,6 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include <glib/gi18n.h>
-
 #include "nm-default.h"
 #include "utils.h"
 
diff --git a/clients/common/nm-polkit-listener.c b/clients/common/nm-polkit-listener.c
index 5726e6506d..3f871b6323 100644
--- a/clients/common/nm-polkit-listener.c
+++ b/clients/common/nm-polkit-listener.c
@@ -36,7 +36,6 @@
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <glib/gi18n-lib.h>
 
 #include "nm-default.h"
 #include "nm-polkit-listener.h"
diff --git a/clients/common/nm-secret-agent-simple.c b/clients/common/nm-secret-agent-simple.c
index 00dc965e12..6eaba275fb 100644
--- a/clients/common/nm-secret-agent-simple.c
+++ b/clients/common/nm-secret-agent-simple.c
@@ -32,7 +32,6 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n-lib.h>
 
 #include "nm-default.h"
 #include "nm-secret-agent-simple.h"
diff --git a/clients/nm-online.c b/clients/nm-online.c
index 60e1a0a01b..b997e4a144 100644
--- a/clients/nm-online.c
+++ b/clients/nm-online.c
@@ -38,8 +38,6 @@
 #include <getopt.h>
 #include <locale.h>
 
-#include <glib/gi18n.h>
-
 #include <NetworkManager.h>
 
 #include "nm-default.h"
diff --git a/clients/tui/newt/nmt-newt-form.c b/clients/tui/newt/nmt-newt-form.c
index 19bd39989e..ce401e2550 100644
--- a/clients/tui/newt/nmt-newt-form.c
+++ b/clients/tui/newt/nmt-newt-form.c
@@ -30,8 +30,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <glib/gi18n-lib.h>
-
 #include "nmt-newt-form.h"
 #include "nmt-newt-button.h"
 #include "nmt-newt-grid.h"
diff --git a/clients/tui/newt/nmt-newt-popup.c b/clients/tui/newt/nmt-newt-popup.c
index b604eaaa39..f7813063ed 100644
--- a/clients/tui/newt/nmt-newt-popup.c
+++ b/clients/tui/newt/nmt-newt-popup.c
@@ -28,8 +28,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n-lib.h>
-
 #include "nmt-newt-popup.h"
 #include "nmt-newt-form.h"
 #include "nmt-newt-hacks.h"
diff --git a/clients/tui/newt/nmt-newt-utils.c b/clients/tui/newt/nmt-newt-utils.c
index b796219454..841144d8e6 100644
--- a/clients/tui/newt/nmt-newt-utils.c
+++ b/clients/tui/newt/nmt-newt-utils.c
@@ -28,8 +28,6 @@
 #include <unistd.h>
 #include <sys/wait.h>
 
-#include <glib/gi18n-lib.h>
-
 #include "nm-default.h"
 #include "nmt-newt-utils.h"
 
diff --git a/clients/tui/nm-editor-utils.c b/clients/tui/nm-editor-utils.c
index 8f15b734b5..befc5f396e 100644
--- a/clients/tui/nm-editor-utils.c
+++ b/clients/tui/nm-editor-utils.c
@@ -27,7 +27,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n.h>
 #include <NetworkManager.h>
 
 #include "nm-default.h"
diff --git a/clients/tui/nmt-address-list.c b/clients/tui/nmt-address-list.c
index 42873c521f..3faf3442ed 100644
--- a/clients/tui/nmt-address-list.c
+++ b/clients/tui/nmt-address-list.c
@@ -35,8 +35,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <glib/gi18n-lib.h>
-
 #include "nmt-address-list.h"
 #include "nmt-ip-entry.h"
 
diff --git a/clients/tui/nmt-connect-connection-list.c b/clients/tui/nmt-connect-connection-list.c
index 88502ba7c8..c21cc5be7f 100644
--- a/clients/tui/nmt-connect-connection-list.c
+++ b/clients/tui/nmt-connect-connection-list.c
@@ -27,7 +27,6 @@
 #include "config.h"
 
 #include <stdlib.h>
-#include <glib/gi18n-lib.h>
 
 #include <NetworkManager.h>
 
diff --git a/clients/tui/nmt-device-entry.c b/clients/tui/nmt-device-entry.c
index 2af5e584c4..2760b1491a 100644
--- a/clients/tui/nmt-device-entry.c
+++ b/clients/tui/nmt-device-entry.c
@@ -40,7 +40,6 @@
 #include <sys/socket.h>
 #include <linux/if_arp.h>
 
-#include <glib/gi18n-lib.h>
 #include <NetworkManager.h>
 
 #include "nmtui.h"
diff --git a/clients/tui/nmt-edit-connection-list.c b/clients/tui/nmt-edit-connection-list.c
index e1b982dde9..72e8c706cd 100644
--- a/clients/tui/nmt-edit-connection-list.c
+++ b/clients/tui/nmt-edit-connection-list.c
@@ -26,8 +26,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n-lib.h>
-
 #include "nmtui.h"
 #include "nmtui-edit.h"
 #include "nmt-edit-connection-list.h"
diff --git a/clients/tui/nmt-editor-page.c b/clients/tui/nmt-editor-page.c
index a46d0ed43d..f2afc8c702 100644
--- a/clients/tui/nmt-editor-page.c
+++ b/clients/tui/nmt-editor-page.c
@@ -26,8 +26,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n-lib.h>
-
 #include "nmt-editor-page.h"
 
 G_DEFINE_ABSTRACT_TYPE (NmtEditorPage, nmt_editor_page, G_TYPE_OBJECT)
diff --git a/clients/tui/nmt-editor-section.c b/clients/tui/nmt-editor-section.c
index ff463f7fe3..b9a3ae839b 100644
--- a/clients/tui/nmt-editor-section.c
+++ b/clients/tui/nmt-editor-section.c
@@ -25,8 +25,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n-lib.h>
-
 #include "nmt-editor-section.h"
 #include "nmt-newt-toggle-button.h"
 
diff --git a/clients/tui/nmt-editor.c b/clients/tui/nmt-editor.c
index 342da77d90..aaa73cbef5 100644
--- a/clients/tui/nmt-editor.c
+++ b/clients/tui/nmt-editor.c
@@ -27,7 +27,6 @@
 
 #include "nmt-editor.h"
 
-#include <glib/gi18n-lib.h>
 #include <nm-utils.h>
 
 #include "nm-default.h"
diff --git a/clients/tui/nmt-ip-entry.c b/clients/tui/nmt-ip-entry.c
index 30c7e2e48f..d31a1f46ad 100644
--- a/clients/tui/nmt-ip-entry.c
+++ b/clients/tui/nmt-ip-entry.c
@@ -33,8 +33,6 @@
 #include <netinet/in.h>
 #include <stdlib.h>
 
-#include <glib/gi18n-lib.h>
-
 #include "nmt-ip-entry.h"
 
 G_DEFINE_TYPE (NmtIPEntry, nmt_ip_entry, NMT_TYPE_NEWT_ENTRY)
diff --git a/clients/tui/nmt-mtu-entry.c b/clients/tui/nmt-mtu-entry.c
index f599557aea..9f11af0a08 100644
--- a/clients/tui/nmt-mtu-entry.c
+++ b/clients/tui/nmt-mtu-entry.c
@@ -34,8 +34,6 @@
 
 #include <stdlib.h>
 
-#include <glib/gi18n-lib.h>
-
 #include "nmt-mtu-entry.h"
 
 G_DEFINE_TYPE (NmtMtuEntry, nmt_mtu_entry, NMT_TYPE_NEWT_GRID)
diff --git a/clients/tui/nmt-page-bond.c b/clients/tui/nmt-page-bond.c
index ef7a79ae1d..ecc9aefcf3 100644
--- a/clients/tui/nmt-page-bond.c
+++ b/clients/tui/nmt-page-bond.c
@@ -27,8 +27,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n-lib.h>
-
 #include "nm-default.h"
 #include "nmt-page-bond.h"
 
diff --git a/clients/tui/nmt-page-bridge-port.c b/clients/tui/nmt-page-bridge-port.c
index c4238fff5c..fdf4403921 100644
--- a/clients/tui/nmt-page-bridge-port.c
+++ b/clients/tui/nmt-page-bridge-port.c
@@ -23,8 +23,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n-lib.h>
-
 #include "nm-default.h"
 #include "nmt-page-bridge-port.h"
 
diff --git a/clients/tui/nmt-page-bridge.c b/clients/tui/nmt-page-bridge.c
index 042a650938..e9b0e66dc6 100644
--- a/clients/tui/nmt-page-bridge.c
+++ b/clients/tui/nmt-page-bridge.c
@@ -23,8 +23,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n-lib.h>
-
 #include "nm-default.h"
 #include "nmt-page-bridge.h"
 
diff --git a/clients/tui/nmt-page-dsl.c b/clients/tui/nmt-page-dsl.c
index 9916553d0b..2346b496be 100644
--- a/clients/tui/nmt-page-dsl.c
+++ b/clients/tui/nmt-page-dsl.c
@@ -23,8 +23,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n-lib.h>
-
 #include "nm-default.h"
 #include "nmt-page-dsl.h"
 #include "nmt-page-ethernet.h"
diff --git a/clients/tui/nmt-page-ethernet.c b/clients/tui/nmt-page-ethernet.c
index 433710186f..fed81f1c65 100644
--- a/clients/tui/nmt-page-ethernet.c
+++ b/clients/tui/nmt-page-ethernet.c
@@ -23,8 +23,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n-lib.h>
-
 #include "nm-default.h"
 #include "nmt-page-ethernet.h"
 #include "nmt-mac-entry.h"
diff --git a/clients/tui/nmt-page-infiniband.c b/clients/tui/nmt-page-infiniband.c
index 69ae2818ca..e10c5a7ac3 100644
--- a/clients/tui/nmt-page-infiniband.c
+++ b/clients/tui/nmt-page-infiniband.c
@@ -23,8 +23,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n-lib.h>
-
 #include "nm-default.h"
 #include "nmt-page-infiniband.h"
 #include "nmt-mtu-entry.h"
diff --git a/clients/tui/nmt-page-ip4.c b/clients/tui/nmt-page-ip4.c
index 5ec5736bbb..352fdab8b3 100644
--- a/clients/tui/nmt-page-ip4.c
+++ b/clients/tui/nmt-page-ip4.c
@@ -25,8 +25,6 @@
 
 #include <stdlib.h>
 
-#include <glib/gi18n-lib.h>
-
 #include "nm-default.h"
 #include "nmt-page-ip4.h"
 #include "nmt-ip-entry.h"
diff --git a/clients/tui/nmt-page-ip6.c b/clients/tui/nmt-page-ip6.c
index ea84af31c5..24678e50ec 100644
--- a/clients/tui/nmt-page-ip6.c
+++ b/clients/tui/nmt-page-ip6.c
@@ -25,8 +25,6 @@
 
 #include <stdlib.h>
 
-#include <glib/gi18n-lib.h>
-
 #include "nm-default.h"
 #include "nmt-page-ip6.h"
 #include "nmt-ip-entry.h"
diff --git a/clients/tui/nmt-page-ppp.c b/clients/tui/nmt-page-ppp.c
index 7c2d940a94..662ebd9c4d 100644
--- a/clients/tui/nmt-page-ppp.c
+++ b/clients/tui/nmt-page-ppp.c
@@ -25,8 +25,6 @@
 
 #include <stdlib.h>
 
-#include <glib/gi18n-lib.h>
-
 #include "nm-default.h"
 #include "nmt-page-ppp.h"
 #include "nmt-newt-section.h"
diff --git a/clients/tui/nmt-page-team-port.c b/clients/tui/nmt-page-team-port.c
index dfcaa15ed4..797c1cf125 100644
--- a/clients/tui/nmt-page-team-port.c
+++ b/clients/tui/nmt-page-team-port.c
@@ -23,8 +23,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n-lib.h>
-
 #include "nm-default.h"
 #include "nmt-page-team-port.h"
 
diff --git a/clients/tui/nmt-page-team.c b/clients/tui/nmt-page-team.c
index d153738ef5..572941b663 100644
--- a/clients/tui/nmt-page-team.c
+++ b/clients/tui/nmt-page-team.c
@@ -23,8 +23,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n-lib.h>
-
 #include "nm-default.h"
 #include "nmt-page-team.h"
 
diff --git a/clients/tui/nmt-page-vlan.c b/clients/tui/nmt-page-vlan.c
index 637987c398..d392c55235 100644
--- a/clients/tui/nmt-page-vlan.c
+++ b/clients/tui/nmt-page-vlan.c
@@ -23,8 +23,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n-lib.h>
-
 #include "nm-default.h"
 #include "nm-editor-bindings.h"
 
diff --git a/clients/tui/nmt-page-wifi.c b/clients/tui/nmt-page-wifi.c
index 8a0c671639..c4b085ea30 100644
--- a/clients/tui/nmt-page-wifi.c
+++ b/clients/tui/nmt-page-wifi.c
@@ -29,8 +29,6 @@
 
 #include <stdlib.h>
 
-#include <glib/gi18n-lib.h>
-
 #include "nm-default.h"
 #include "nmt-page-wifi.h"
 #include "nmt-mac-entry.h"
diff --git a/clients/tui/nmt-password-dialog.c b/clients/tui/nmt-password-dialog.c
index aeece1211f..8eeaa54896 100644
--- a/clients/tui/nmt-password-dialog.c
+++ b/clients/tui/nmt-password-dialog.c
@@ -26,8 +26,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n-lib.h>
-
 #include "nmt-password-dialog.h"
 #include "nm-secret-agent-simple.h"
 #include "nmtui.h"
diff --git a/clients/tui/nmt-password-fields.c b/clients/tui/nmt-password-fields.c
index 7ef037b9de..cba649356e 100644
--- a/clients/tui/nmt-password-fields.c
+++ b/clients/tui/nmt-password-fields.c
@@ -27,8 +27,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n-lib.h>
-
 #include "nmt-password-fields.h"
 
 G_DEFINE_TYPE (NmtPasswordFields, nmt_password_fields, NMT_TYPE_NEWT_GRID)
diff --git a/clients/tui/nmt-route-editor.c b/clients/tui/nmt-route-editor.c
index 875c2c99a4..dc4d118b74 100644
--- a/clients/tui/nmt-route-editor.c
+++ b/clients/tui/nmt-route-editor.c
@@ -27,8 +27,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n-lib.h>
-
 #include "nm-default.h"
 #include "nmt-route-editor.h"
 #include "nmt-route-table.h"
diff --git a/clients/tui/nmt-route-entry.c b/clients/tui/nmt-route-entry.c
index 3a87552089..1cc99940f8 100644
--- a/clients/tui/nmt-route-entry.c
+++ b/clients/tui/nmt-route-entry.c
@@ -32,7 +32,6 @@
 #include <netinet/in.h>
 #include <stdlib.h>
 
-#include <glib/gi18n-lib.h>
 #include <NetworkManager.h>
 
 #include "nmt-route-entry.h"
diff --git a/clients/tui/nmt-route-table.c b/clients/tui/nmt-route-table.c
index 523d8ee32a..0731acb6d0 100644
--- a/clients/tui/nmt-route-table.c
+++ b/clients/tui/nmt-route-table.c
@@ -30,7 +30,6 @@
 #include <netinet/in.h>
 #include <stdlib.h>
 
-#include <glib/gi18n-lib.h>
 #include <NetworkManager.h>
 
 #include "nmt-route-table.h"
diff --git a/clients/tui/nmt-slave-list.c b/clients/tui/nmt-slave-list.c
index 9c8596f77c..5a9b7482eb 100644
--- a/clients/tui/nmt-slave-list.c
+++ b/clients/tui/nmt-slave-list.c
@@ -26,7 +26,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n-lib.h>
 #include <NetworkManager.h>
 
 #include "nmt-slave-list.h"
diff --git a/clients/tui/nmt-widget-list.c b/clients/tui/nmt-widget-list.c
index 9159ed989a..b314e146a0 100644
--- a/clients/tui/nmt-widget-list.c
+++ b/clients/tui/nmt-widget-list.c
@@ -37,8 +37,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <glib/gi18n-lib.h>
-
 #include "nmt-widget-list.h"
 #include "nmt-newt.h"
 
diff --git a/clients/tui/nmtui-connect.c b/clients/tui/nmtui-connect.c
index 438915d2a6..43a5cf9db1 100644
--- a/clients/tui/nmtui-connect.c
+++ b/clients/tui/nmtui-connect.c
@@ -28,8 +28,6 @@
 
 #include <stdlib.h>
 
-#include <glib/gi18n-lib.h>
-
 #include "nmt-newt.h"
 
 #include "nmtui.h"
diff --git a/clients/tui/nmtui-edit.c b/clients/tui/nmtui-edit.c
index 0c3206da60..258b798a52 100644
--- a/clients/tui/nmtui-edit.c
+++ b/clients/tui/nmtui-edit.c
@@ -27,7 +27,6 @@
 
 #include <stdlib.h>
 
-#include <glib/gi18n-lib.h>
 #include <NetworkManager.h>
 
 #include "nmtui.h"
diff --git a/clients/tui/nmtui-hostname.c b/clients/tui/nmtui-hostname.c
index 23de95b854..f77a918b33 100644
--- a/clients/tui/nmtui-hostname.c
+++ b/clients/tui/nmtui-hostname.c
@@ -25,8 +25,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n-lib.h>
-
 #include "nmt-newt.h"
 
 #include "nmtui.h"
diff --git a/clients/tui/nmtui.c b/clients/tui/nmtui.c
index d9e5142be7..20e7d02b04 100644
--- a/clients/tui/nmtui.c
+++ b/clients/tui/nmtui.c
@@ -30,8 +30,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <glib/gi18n-lib.h>
-
 #include <NetworkManager.h>
 
 #include "nm-default.h"
diff --git a/clients/tui/vpn-helpers.c b/clients/tui/vpn-helpers.c
index 5ab22f4ef1..9b623aab08 100644
--- a/clients/tui/vpn-helpers.c
+++ b/clients/tui/vpn-helpers.c
@@ -32,7 +32,6 @@
 
 #include <string.h>
 #include <gmodule.h>
-#include <glib/gi18n.h>
 
 #include "nm-default.h"
 #include "vpn-helpers.h"
diff --git a/libnm-core/crypto.c b/libnm-core/crypto.c
index 77bc071ce8..559ac52b61 100644
--- a/libnm-core/crypto.c
+++ b/libnm-core/crypto.c
@@ -27,7 +27,6 @@
 #include <strings.h>
 #include <unistd.h>
 #include <stdlib.h>
-#include <glib/gi18n-lib.h>
 
 #include "nm-default.h"
 #include "crypto.h"
diff --git a/libnm-core/crypto_gnutls.c b/libnm-core/crypto_gnutls.c
index 6098b86ad1..08047bd9fb 100644
--- a/libnm-core/crypto_gnutls.c
+++ b/libnm-core/crypto_gnutls.c
@@ -23,8 +23,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n-lib.h>
-
 #include <gnutls/gnutls.h>
 #include <gnutls/crypto.h>
 #include <gnutls/x509.h>
diff --git a/libnm-core/crypto_nss.c b/libnm-core/crypto_nss.c
index a1916a22c7..7f61ad7c67 100644
--- a/libnm-core/crypto_nss.c
+++ b/libnm-core/crypto_nss.c
@@ -23,8 +23,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n-lib.h>
-
 #include <prinit.h>
 #include <nss.h>
 #include <pk11pub.h>
diff --git a/libnm-core/nm-connection.c b/libnm-core/nm-connection.c
index fd4b57305b..5abb13abe7 100644
--- a/libnm-core/nm-connection.c
+++ b/libnm-core/nm-connection.c
@@ -22,7 +22,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n-lib.h>
 #include <string.h>
 #include "nm-default.h"
 #include "nm-connection.h"
diff --git a/libnm-core/nm-dbus-utils.c b/libnm-core/nm-dbus-utils.c
index 6d75176e0e..730a0eb3ec 100644
--- a/libnm-core/nm-dbus-utils.c
+++ b/libnm-core/nm-dbus-utils.c
@@ -21,7 +21,6 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n-lib.h>
 
 #include "nm-default.h"
 #include "nm-core-internal.h"
diff --git a/libnm-core/nm-keyfile-reader.c b/libnm-core/nm-keyfile-reader.c
index 22141bd657..daa9c2adbf 100644
--- a/libnm-core/nm-keyfile-reader.c
+++ b/libnm-core/nm-keyfile-reader.c
@@ -28,7 +28,6 @@
 #include <sys/types.h>
 #include <arpa/inet.h>
 #include <string.h>
-#include <glib/gi18n-lib.h>
 
 #include "nm-default.h"
 #include "nm-core-internal.h"
diff --git a/libnm-core/nm-keyfile-writer.c b/libnm-core/nm-keyfile-writer.c
index a2270882e3..ead1305534 100644
--- a/libnm-core/nm-keyfile-writer.c
+++ b/libnm-core/nm-keyfile-writer.c
@@ -28,7 +28,6 @@
 #include <errno.h>
 #include <arpa/inet.h>
 #include <string.h>
-#include <glib/gi18n-lib.h>
 
 #include "nm-default.h"
 #include "nm-setting.h"
diff --git a/libnm-core/nm-setting-8021x.c b/libnm-core/nm-setting-8021x.c
index 21fa9a4986..cd0d4e664b 100644
--- a/libnm-core/nm-setting-8021x.c
+++ b/libnm-core/nm-setting-8021x.c
@@ -23,7 +23,6 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n-lib.h>
 
 #include "nm-default.h"
 #include "nm-setting-8021x.h"
diff --git a/libnm-core/nm-setting-adsl.c b/libnm-core/nm-setting-adsl.c
index 2e71f8e790..e3c188747f 100644
--- a/libnm-core/nm-setting-adsl.c
+++ b/libnm-core/nm-setting-adsl.c
@@ -22,7 +22,6 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n-lib.h>
 
 #include "nm-setting-adsl.h"
 #include "nm-setting-ppp.h"
diff --git a/libnm-core/nm-setting-bluetooth.c b/libnm-core/nm-setting-bluetooth.c
index 41a0b4c2ff..864a91ccf1 100644
--- a/libnm-core/nm-setting-bluetooth.c
+++ b/libnm-core/nm-setting-bluetooth.c
@@ -24,7 +24,6 @@
 
 #include <string.h>
 #include <net/ethernet.h>
-#include <glib/gi18n-lib.h>
 
 #include "nm-setting-bluetooth.h"
 #include "nm-setting-cdma.h"
diff --git a/libnm-core/nm-setting-bond.c b/libnm-core/nm-setting-bond.c
index 5441a090da..1c37758422 100644
--- a/libnm-core/nm-setting-bond.c
+++ b/libnm-core/nm-setting-bond.c
@@ -26,7 +26,6 @@
 #include <errno.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <glib/gi18n-lib.h>
 
 #include "nm-setting-bond.h"
 #include "nm-utils.h"
diff --git a/libnm-core/nm-setting-bridge-port.c b/libnm-core/nm-setting-bridge-port.c
index 763af37bcf..a02b8de12a 100644
--- a/libnm-core/nm-setting-bridge-port.c
+++ b/libnm-core/nm-setting-bridge-port.c
@@ -24,7 +24,6 @@
 #include <string.h>
 #include <ctype.h>
 #include <stdlib.h>
-#include <glib/gi18n-lib.h>
 
 #include "nm-setting-bridge-port.h"
 #include "nm-utils.h"
diff --git a/libnm-core/nm-setting-bridge.c b/libnm-core/nm-setting-bridge.c
index fe10ad69ad..7915e73072 100644
--- a/libnm-core/nm-setting-bridge.c
+++ b/libnm-core/nm-setting-bridge.c
@@ -24,7 +24,6 @@
 #include <string.h>
 #include <ctype.h>
 #include <stdlib.h>
-#include <glib/gi18n-lib.h>
 
 #include "nm-setting-bridge.h"
 #include "nm-connection-private.h"
diff --git a/libnm-core/nm-setting-cdma.c b/libnm-core/nm-setting-cdma.c
index ecc387c8f5..3b4a046422 100644
--- a/libnm-core/nm-setting-cdma.c
+++ b/libnm-core/nm-setting-cdma.c
@@ -22,7 +22,6 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n-lib.h>
 
 #include "nm-setting-cdma.h"
 #include "nm-utils.h"
diff --git a/libnm-core/nm-setting-connection.c b/libnm-core/nm-setting-connection.c
index 21b9d80ed5..32469e5376 100644
--- a/libnm-core/nm-setting-connection.c
+++ b/libnm-core/nm-setting-connection.c
@@ -23,7 +23,6 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n-lib.h>
 
 #include "nm-utils.h"
 #include "nm-utils-private.h"
diff --git a/libnm-core/nm-setting-dcb.c b/libnm-core/nm-setting-dcb.c
index 915cc41f2e..89675810ff 100644
--- a/libnm-core/nm-setting-dcb.c
+++ b/libnm-core/nm-setting-dcb.c
@@ -22,7 +22,6 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n-lib.h>
 
 #include "nm-setting-dcb.h"
 #include "nm-utils.h"
diff --git a/libnm-core/nm-setting-gsm.c b/libnm-core/nm-setting-gsm.c
index 36557a256c..4d5d7d43b3 100644
--- a/libnm-core/nm-setting-gsm.c
+++ b/libnm-core/nm-setting-gsm.c
@@ -23,7 +23,6 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n-lib.h>
 
 #include "nm-setting-gsm.h"
 #include "nm-utils.h"
diff --git a/libnm-core/nm-setting-infiniband.c b/libnm-core/nm-setting-infiniband.c
index b0afe04f11..1cffdd79c7 100644
--- a/libnm-core/nm-setting-infiniband.c
+++ b/libnm-core/nm-setting-infiniband.c
@@ -22,7 +22,6 @@
 #include "config.h"
 
 #include <stdlib.h>
-#include <glib/gi18n-lib.h>
 
 #include "nm-setting-infiniband.h"
 #include "nm-utils.h"
diff --git a/libnm-core/nm-setting-ip-config.c b/libnm-core/nm-setting-ip-config.c
index 6d4441d7a6..c01f66182b 100644
--- a/libnm-core/nm-setting-ip-config.c
+++ b/libnm-core/nm-setting-ip-config.c
@@ -24,7 +24,6 @@
 
 #include <string.h>
 #include <arpa/inet.h>
-#include <glib/gi18n-lib.h>
 
 #include "nm-default.h"
 #include "nm-setting-ip-config.h"
diff --git a/libnm-core/nm-setting-ip4-config.c b/libnm-core/nm-setting-ip4-config.c
index 81cc1f8889..562b760151 100644
--- a/libnm-core/nm-setting-ip4-config.c
+++ b/libnm-core/nm-setting-ip4-config.c
@@ -22,7 +22,6 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n-lib.h>
 
 #include "nm-setting-ip4-config.h"
 #include "nm-setting-private.h"
diff --git a/libnm-core/nm-setting-ip6-config.c b/libnm-core/nm-setting-ip6-config.c
index 7e3ae4d4da..bb4b4c3a16 100644
--- a/libnm-core/nm-setting-ip6-config.c
+++ b/libnm-core/nm-setting-ip6-config.c
@@ -22,7 +22,6 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n-lib.h>
 
 #include "nm-setting-ip6-config.h"
 #include "nm-setting-private.h"
diff --git a/libnm-core/nm-setting-olpc-mesh.c b/libnm-core/nm-setting-olpc-mesh.c
index c1d54bee89..56010de1a8 100644
--- a/libnm-core/nm-setting-olpc-mesh.c
+++ b/libnm-core/nm-setting-olpc-mesh.c
@@ -23,7 +23,6 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n-lib.h>
 
 #include "nm-setting-olpc-mesh.h"
 #include "nm-dbus-interface.h"
diff --git a/libnm-core/nm-setting-ppp.c b/libnm-core/nm-setting-ppp.c
index 01f798ea7b..2cc5a20941 100644
--- a/libnm-core/nm-setting-ppp.c
+++ b/libnm-core/nm-setting-ppp.c
@@ -22,8 +22,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n-lib.h>
-
 #include "nm-setting-ppp.h"
 #include "nm-setting-private.h"
 
diff --git a/libnm-core/nm-setting-pppoe.c b/libnm-core/nm-setting-pppoe.c
index ac6764d069..e2466eb32e 100644
--- a/libnm-core/nm-setting-pppoe.c
+++ b/libnm-core/nm-setting-pppoe.c
@@ -23,7 +23,6 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n-lib.h>
 
 #include "nm-setting-pppoe.h"
 #include "nm-setting-ppp.h"
diff --git a/libnm-core/nm-setting-team-port.c b/libnm-core/nm-setting-team-port.c
index 7fbf8620f1..78cb3cb759 100644
--- a/libnm-core/nm-setting-team-port.c
+++ b/libnm-core/nm-setting-team-port.c
@@ -23,7 +23,6 @@
 #include <string.h>
 #include <ctype.h>
 #include <stdlib.h>
-#include <glib/gi18n-lib.h>
 
 #include "nm-setting-team-port.h"
 #include "nm-utils.h"
diff --git a/libnm-core/nm-setting-team.c b/libnm-core/nm-setting-team.c
index 04b98243f1..2dfffaacc5 100644
--- a/libnm-core/nm-setting-team.c
+++ b/libnm-core/nm-setting-team.c
@@ -22,7 +22,6 @@
 
 #include <string.h>
 #include <stdlib.h>
-#include <glib/gi18n-lib.h>
 
 #include "nm-setting-team.h"
 #include "nm-utils.h"
diff --git a/libnm-core/nm-setting-vlan.c b/libnm-core/nm-setting-vlan.c
index d904ad52df..dd3746a83d 100644
--- a/libnm-core/nm-setting-vlan.c
+++ b/libnm-core/nm-setting-vlan.c
@@ -23,7 +23,6 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <glib/gi18n-lib.h>
 
 #include "nm-setting-vlan.h"
 #include "nm-utils.h"
diff --git a/libnm-core/nm-setting-vpn.c b/libnm-core/nm-setting-vpn.c
index e6fffa8797..50385112e9 100644
--- a/libnm-core/nm-setting-vpn.c
+++ b/libnm-core/nm-setting-vpn.c
@@ -24,7 +24,6 @@
 #include <string.h>
 #include <errno.h>
 #include <stdlib.h>
-#include <glib/gi18n-lib.h>
 
 #include "nm-setting-vpn.h"
 #include "nm-utils.h"
diff --git a/libnm-core/nm-setting-wimax.c b/libnm-core/nm-setting-wimax.c
index 0287cdc19a..95a099522b 100644
--- a/libnm-core/nm-setting-wimax.c
+++ b/libnm-core/nm-setting-wimax.c
@@ -24,7 +24,6 @@
 
 #include <string.h>
 #include <net/ethernet.h>
-#include <glib/gi18n-lib.h>
 
 #include "nm-setting-wimax.h"
 #include "nm-setting-private.h"
diff --git a/libnm-core/nm-setting-wired.c b/libnm-core/nm-setting-wired.c
index d381f95d62..0a92f8e849 100644
--- a/libnm-core/nm-setting-wired.c
+++ b/libnm-core/nm-setting-wired.c
@@ -24,7 +24,6 @@
 
 #include <string.h>
 #include <net/ethernet.h>
-#include <glib/gi18n-lib.h>
 
 #include "nm-setting-wired.h"
 #include "nm-utils.h"
diff --git a/libnm-core/nm-setting-wireless-security.c b/libnm-core/nm-setting-wireless-security.c
index 6df5b46176..df2190bc28 100644
--- a/libnm-core/nm-setting-wireless-security.c
+++ b/libnm-core/nm-setting-wireless-security.c
@@ -23,7 +23,6 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n-lib.h>
 
 #include "nm-setting-wireless-security.h"
 #include "nm-setting-8021x.h"
diff --git a/libnm-core/nm-setting-wireless.c b/libnm-core/nm-setting-wireless.c
index c5365c9ab7..6851bf509b 100644
--- a/libnm-core/nm-setting-wireless.c
+++ b/libnm-core/nm-setting-wireless.c
@@ -24,7 +24,6 @@
 
 #include <string.h>
 #include <net/ethernet.h>
-#include <glib/gi18n-lib.h>
 
 #include "nm-setting-wireless.h"
 #include "nm-dbus-interface.h"
diff --git a/libnm-core/nm-setting.c b/libnm-core/nm-setting.c
index f9dee4730d..739e3ba2d1 100644
--- a/libnm-core/nm-setting.c
+++ b/libnm-core/nm-setting.c
@@ -23,7 +23,6 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n-lib.h>
 
 #include "nm-default.h"
 #include "nm-setting.h"
diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c
index 6b6a35d543..ce41f1bc2a 100644
--- a/libnm-core/nm-utils.c
+++ b/libnm-core/nm-utils.c
@@ -29,7 +29,6 @@
 #include <uuid/uuid.h>
 #include <libintl.h>
 #include <gmodule.h>
-#include <glib/gi18n-lib.h>
 #include <sys/stat.h>
 
 #include "nm-default.h"
diff --git a/libnm-core/nm-vpn-editor-plugin.c b/libnm-core/nm-vpn-editor-plugin.c
index 5f86df8c74..fd79fd3bcd 100644
--- a/libnm-core/nm-vpn-editor-plugin.c
+++ b/libnm-core/nm-vpn-editor-plugin.c
@@ -25,7 +25,6 @@
 #include "nm-vpn-editor-plugin.h"
 
 #include <gio/gio.h>
-#include <glib/gi18n-lib.h>
 
 #include "nm-macros-internal.h"
 #include "gsystem-local-alloc.h"
diff --git a/libnm-core/nm-vpn-plugin-info.c b/libnm-core/nm-vpn-plugin-info.c
index 4f057d3c48..fde258df8c 100644
--- a/libnm-core/nm-vpn-plugin-info.c
+++ b/libnm-core/nm-vpn-plugin-info.c
@@ -23,7 +23,6 @@
 #include "nm-vpn-plugin-info.h"
 
 #include <gio/gio.h>
-#include <glib/gi18n-lib.h>
 #include <string.h>
 #include <errno.h>
 #include <sys/stat.h>
diff --git a/libnm-core/tests/test-crypto.c b/libnm-core/tests/test-crypto.c
index 0d68653fc0..926cddb08c 100644
--- a/libnm-core/tests/test-crypto.c
+++ b/libnm-core/tests/test-crypto.c
@@ -25,7 +25,6 @@
 
 #include <unistd.h>
 #include <stdlib.h>
-#include <glib/gi18n.h>
 #include <stdio.h>
 #include <string.h>
 
diff --git a/libnm-glib/nm-device.c b/libnm-glib/nm-device.c
index 2363167168..ccb1c1f2cb 100644
--- a/libnm-glib/nm-device.c
+++ b/libnm-glib/nm-device.c
@@ -23,7 +23,6 @@
 
 #include <string.h>
 
-#include <glib/gi18n-lib.h>
 #include <gudev/gudev.h>
 
 #include "nm-default.h"
diff --git a/libnm-glib/nm-remote-connection.c b/libnm-glib/nm-remote-connection.c
index ce750ef3eb..1bc545d555 100644
--- a/libnm-glib/nm-remote-connection.c
+++ b/libnm-glib/nm-remote-connection.c
@@ -22,7 +22,6 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n-lib.h>
 
 #include <NetworkManager.h>
 #include <nm-utils.h>
diff --git a/libnm-util/crypto.c b/libnm-util/crypto.c
index fccf05d1a6..757fdbe014 100644
--- a/libnm-util/crypto.c
+++ b/libnm-util/crypto.c
@@ -27,7 +27,6 @@
 #include <strings.h>
 #include <unistd.h>
 #include <stdlib.h>
-#include <glib/gi18n-lib.h>
 
 #include "nm-default.h"
 #include "crypto.h"
diff --git a/libnm-util/crypto_gnutls.c b/libnm-util/crypto_gnutls.c
index 1ff55e91b8..4e3e4e7cd7 100644
--- a/libnm-util/crypto_gnutls.c
+++ b/libnm-util/crypto_gnutls.c
@@ -23,8 +23,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n-lib.h>
-
 #include <gnutls/gnutls.h>
 #include <gnutls/crypto.h>
 #include <gnutls/x509.h>
diff --git a/libnm-util/crypto_nss.c b/libnm-util/crypto_nss.c
index 222c55d2dd..b71806dd2d 100644
--- a/libnm-util/crypto_nss.c
+++ b/libnm-util/crypto_nss.c
@@ -23,8 +23,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n-lib.h>
-
 #include <prinit.h>
 #include <nss.h>
 #include <pk11pub.h>
diff --git a/libnm-util/nm-connection.c b/libnm-util/nm-connection.c
index 0753fd1381..884ed2e12c 100644
--- a/libnm-util/nm-connection.c
+++ b/libnm-util/nm-connection.c
@@ -22,7 +22,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n-lib.h>
 #include <dbus/dbus-glib.h>
 #include <string.h>
 #include "nm-default.h"
diff --git a/libnm-util/nm-setting-8021x.c b/libnm-util/nm-setting-8021x.c
index 678d70ab71..30febf9ce1 100644
--- a/libnm-util/nm-setting-8021x.c
+++ b/libnm-util/nm-setting-8021x.c
@@ -24,7 +24,6 @@
 
 #include <string.h>
 #include <dbus/dbus-glib.h>
-#include <glib/gi18n-lib.h>
 
 #include "nm-setting-8021x.h"
 #include "nm-param-spec-specialized.h"
diff --git a/libnm-util/nm-setting-adsl.c b/libnm-util/nm-setting-adsl.c
index 5355011cd1..c97d0a63c2 100644
--- a/libnm-util/nm-setting-adsl.c
+++ b/libnm-util/nm-setting-adsl.c
@@ -22,7 +22,6 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n-lib.h>
 
 #include "nm-setting-adsl.h"
 #include "nm-setting-ppp.h"
diff --git a/libnm-util/nm-setting-bluetooth.c b/libnm-util/nm-setting-bluetooth.c
index 2867d73bae..76bf283145 100644
--- a/libnm-util/nm-setting-bluetooth.c
+++ b/libnm-util/nm-setting-bluetooth.c
@@ -24,7 +24,6 @@
 
 #include <string.h>
 #include <net/ethernet.h>
-#include <glib/gi18n-lib.h>
 
 #include "nm-param-spec-specialized.h"
 #include "nm-dbus-glib-types.h"
diff --git a/libnm-util/nm-setting-bond.c b/libnm-util/nm-setting-bond.c
index fa12cf0ea1..c6e860bdc5 100644
--- a/libnm-util/nm-setting-bond.c
+++ b/libnm-util/nm-setting-bond.c
@@ -27,7 +27,6 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <dbus/dbus-glib.h>
-#include <glib/gi18n-lib.h>
 
 #include "nm-setting-bond.h"
 #include "nm-param-spec-specialized.h"
diff --git a/libnm-util/nm-setting-bridge-port.c b/libnm-util/nm-setting-bridge-port.c
index b3afa50050..9da2192582 100644
--- a/libnm-util/nm-setting-bridge-port.c
+++ b/libnm-util/nm-setting-bridge-port.c
@@ -25,7 +25,6 @@
 #include <ctype.h>
 #include <stdlib.h>
 #include <dbus/dbus-glib.h>
-#include <glib/gi18n-lib.h>
 
 #include "nm-setting-bridge-port.h"
 #include "nm-utils.h"
diff --git a/libnm-util/nm-setting-bridge.c b/libnm-util/nm-setting-bridge.c
index bdaa75f977..1e475d305e 100644
--- a/libnm-util/nm-setting-bridge.c
+++ b/libnm-util/nm-setting-bridge.c
@@ -25,7 +25,6 @@
 #include <ctype.h>
 #include <stdlib.h>
 #include <dbus/dbus-glib.h>
-#include <glib/gi18n-lib.h>
 #include <linux/if_ether.h>
 
 #include "nm-setting-bridge.h"
diff --git a/libnm-util/nm-setting-cdma.c b/libnm-util/nm-setting-cdma.c
index 53f886ece3..38f0fedb08 100644
--- a/libnm-util/nm-setting-cdma.c
+++ b/libnm-util/nm-setting-cdma.c
@@ -22,7 +22,6 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n-lib.h>
 
 #include "nm-setting-cdma.h"
 #include "nm-utils.h"
diff --git a/libnm-util/nm-setting-connection.c b/libnm-util/nm-setting-connection.c
index bda89d6323..abbe99ba3d 100644
--- a/libnm-util/nm-setting-connection.c
+++ b/libnm-util/nm-setting-connection.c
@@ -23,7 +23,6 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n-lib.h>
 
 #include "nm-utils.h"
 #include "nm-dbus-glib-types.h"
diff --git a/libnm-util/nm-setting-dcb.c b/libnm-util/nm-setting-dcb.c
index 89ee387852..da3febaabe 100644
--- a/libnm-util/nm-setting-dcb.c
+++ b/libnm-util/nm-setting-dcb.c
@@ -23,7 +23,6 @@
 
 #include <string.h>
 #include <dbus/dbus-glib.h>
-#include <glib/gi18n-lib.h>
 
 #include "nm-setting-dcb.h"
 #include "nm-param-spec-specialized.h"
diff --git a/libnm-util/nm-setting-gsm.c b/libnm-util/nm-setting-gsm.c
index e422c92e61..bc9f31bcfb 100644
--- a/libnm-util/nm-setting-gsm.c
+++ b/libnm-util/nm-setting-gsm.c
@@ -23,7 +23,6 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n-lib.h>
 
 #include "nm-setting-gsm.h"
 #include "nm-utils.h"
diff --git a/libnm-util/nm-setting-infiniband.c b/libnm-util/nm-setting-infiniband.c
index 1036702fec..95fa0c6920 100644
--- a/libnm-util/nm-setting-infiniband.c
+++ b/libnm-util/nm-setting-infiniband.c
@@ -24,7 +24,6 @@
 #include <stdlib.h>
 #include <dbus/dbus-glib.h>
 #include <linux/if_infiniband.h>
-#include <glib/gi18n-lib.h>
 
 #include "nm-setting-infiniband.h"
 #include "nm-param-spec-specialized.h"
diff --git a/libnm-util/nm-setting-ip4-config.c b/libnm-util/nm-setting-ip4-config.c
index 9c6a76bb06..707cd48ba6 100644
--- a/libnm-util/nm-setting-ip4-config.c
+++ b/libnm-util/nm-setting-ip4-config.c
@@ -24,7 +24,6 @@
 
 #include <string.h>
 #include <dbus/dbus-glib.h>
-#include <glib/gi18n-lib.h>
 
 #include "nm-default.h"
 #include "nm-setting-ip4-config.h"
diff --git a/libnm-util/nm-setting-ip6-config.c b/libnm-util/nm-setting-ip6-config.c
index 1d91648348..49bd3cc6df 100644
--- a/libnm-util/nm-setting-ip6-config.c
+++ b/libnm-util/nm-setting-ip6-config.c
@@ -23,7 +23,6 @@
 
 #include <string.h>
 #include <dbus/dbus-glib.h>
-#include <glib/gi18n-lib.h>
 
 #include "nm-default.h"
 #include "nm-setting-ip6-config.h"
diff --git a/libnm-util/nm-setting-olpc-mesh.c b/libnm-util/nm-setting-olpc-mesh.c
index e4b6dae5b6..8d812869c7 100644
--- a/libnm-util/nm-setting-olpc-mesh.c
+++ b/libnm-util/nm-setting-olpc-mesh.c
@@ -25,7 +25,6 @@
 #include <string.h>
 #include <netinet/ether.h>
 #include <dbus/dbus-glib.h>
-#include <glib/gi18n-lib.h>
 
 #include "NetworkManager.h"
 #include "nm-setting-olpc-mesh.h"
diff --git a/libnm-util/nm-setting-ppp.c b/libnm-util/nm-setting-ppp.c
index a01d3e106f..06f220fe35 100644
--- a/libnm-util/nm-setting-ppp.c
+++ b/libnm-util/nm-setting-ppp.c
@@ -22,8 +22,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n-lib.h>
-
 #include "nm-setting-ppp.h"
 #include "nm-setting-private.h"
 
diff --git a/libnm-util/nm-setting-pppoe.c b/libnm-util/nm-setting-pppoe.c
index deaeb2e883..5747d30654 100644
--- a/libnm-util/nm-setting-pppoe.c
+++ b/libnm-util/nm-setting-pppoe.c
@@ -23,7 +23,6 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n-lib.h>
 
 #include "nm-setting-pppoe.h"
 #include "nm-setting-ppp.h"
diff --git a/libnm-util/nm-setting-team-port.c b/libnm-util/nm-setting-team-port.c
index 9992f58a28..7e17d5e3b5 100644
--- a/libnm-util/nm-setting-team-port.c
+++ b/libnm-util/nm-setting-team-port.c
@@ -24,7 +24,6 @@
 #include <ctype.h>
 #include <stdlib.h>
 #include <dbus/dbus-glib.h>
-#include <glib/gi18n-lib.h>
 
 #include "nm-setting-team-port.h"
 #include "nm-utils.h"
diff --git a/libnm-util/nm-setting-team.c b/libnm-util/nm-setting-team.c
index 19bc959652..0753150351 100644
--- a/libnm-util/nm-setting-team.c
+++ b/libnm-util/nm-setting-team.c
@@ -23,7 +23,6 @@
 #include <string.h>
 #include <stdlib.h>
 #include <dbus/dbus-glib.h>
-#include <glib/gi18n-lib.h>
 
 #include "nm-setting-team.h"
 #include "nm-param-spec-specialized.h"
diff --git a/libnm-util/nm-setting-vlan.c b/libnm-util/nm-setting-vlan.c
index 43b6a91c13..52676d47f0 100644
--- a/libnm-util/nm-setting-vlan.c
+++ b/libnm-util/nm-setting-vlan.c
@@ -24,7 +24,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <dbus/dbus-glib.h>
-#include <glib/gi18n-lib.h>
 
 #include "nm-setting-vlan.h"
 #include "nm-param-spec-specialized.h"
diff --git a/libnm-util/nm-setting-vpn.c b/libnm-util/nm-setting-vpn.c
index 1feeb588a0..95f08adffe 100644
--- a/libnm-util/nm-setting-vpn.c
+++ b/libnm-util/nm-setting-vpn.c
@@ -25,7 +25,6 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <dbus/dbus-glib.h>
-#include <glib/gi18n-lib.h>
 
 #include "nm-setting-vpn.h"
 #include "nm-param-spec-specialized.h"
diff --git a/libnm-util/nm-setting-wimax.c b/libnm-util/nm-setting-wimax.c
index 37f402f69f..7581f2f295 100644
--- a/libnm-util/nm-setting-wimax.c
+++ b/libnm-util/nm-setting-wimax.c
@@ -25,7 +25,6 @@
 #include <string.h>
 #include <net/ethernet.h>
 #include <dbus/dbus-glib.h>
-#include <glib/gi18n-lib.h>
 
 #include "nm-setting-wimax.h"
 #include "nm-param-spec-specialized.h"
diff --git a/libnm-util/nm-setting-wired.c b/libnm-util/nm-setting-wired.c
index aba5fb9831..5233fc5360 100644
--- a/libnm-util/nm-setting-wired.c
+++ b/libnm-util/nm-setting-wired.c
@@ -26,7 +26,6 @@
 #include <net/ethernet.h>
 #include <netinet/ether.h>
 #include <dbus/dbus-glib.h>
-#include <glib/gi18n-lib.h>
 
 #include "nm-setting-wired.h"
 #include "nm-param-spec-specialized.h"
diff --git a/libnm-util/nm-setting-wireless-security.c b/libnm-util/nm-setting-wireless-security.c
index 574ff3bd52..719dfaa6ef 100644
--- a/libnm-util/nm-setting-wireless-security.c
+++ b/libnm-util/nm-setting-wireless-security.c
@@ -24,7 +24,6 @@
 
 #include <string.h>
 #include <dbus/dbus-glib.h>
-#include <glib/gi18n-lib.h>
 
 #include "nm-setting-wireless-security.h"
 #include "nm-setting-8021x.h"
diff --git a/libnm-util/nm-setting-wireless.c b/libnm-util/nm-setting-wireless.c
index 84f1c77c72..2720f4af80 100644
--- a/libnm-util/nm-setting-wireless.c
+++ b/libnm-util/nm-setting-wireless.c
@@ -26,7 +26,6 @@
 #include <net/ethernet.h>
 #include <netinet/ether.h>
 #include <dbus/dbus-glib.h>
-#include <glib/gi18n-lib.h>
 
 #include "NetworkManager.h"
 #include "nm-setting-wireless.h"
diff --git a/libnm-util/nm-setting.c b/libnm-util/nm-setting.c
index 39c1d22207..372b06b526 100644
--- a/libnm-util/nm-setting.c
+++ b/libnm-util/nm-setting.c
@@ -23,7 +23,6 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n-lib.h>
 
 #include "nm-setting.h"
 #include "nm-setting-private.h"
diff --git a/libnm-util/nm-utils.c b/libnm-util/nm-utils.c
index c4cc4cf212..ab19f2a68d 100644
--- a/libnm-util/nm-utils.c
+++ b/libnm-util/nm-utils.c
@@ -28,7 +28,6 @@
 #include <uuid/uuid.h>
 #include <libintl.h>
 #include <gmodule.h>
-#include <glib/gi18n-lib.h>
 
 #include "nm-default.h"
 #include "nm-utils.h"
diff --git a/libnm-util/tests/test-crypto.c b/libnm-util/tests/test-crypto.c
index baf0cf45a8..5a8c4eb0ba 100644
--- a/libnm-util/tests/test-crypto.c
+++ b/libnm-util/tests/test-crypto.c
@@ -25,7 +25,6 @@
 
 #include <unistd.h>
 #include <stdlib.h>
-#include <glib/gi18n.h>
 #include <stdio.h>
 #include <string.h>
 
diff --git a/libnm/nm-device-adsl.c b/libnm/nm-device-adsl.c
index 99771548f8..b9d609dab5 100644
--- a/libnm/nm-device-adsl.c
+++ b/libnm/nm-device-adsl.c
@@ -29,7 +29,6 @@
 #include "nm-setting-connection.h"
 
 #include <string.h>
-#include <glib/gi18n-lib.h>
 
 G_DEFINE_TYPE (NMDeviceAdsl, nm_device_adsl, NM_TYPE_DEVICE)
 
diff --git a/libnm/nm-device-bond.c b/libnm/nm-device-bond.c
index f36b761f31..3bfcb94cea 100644
--- a/libnm/nm-device-bond.c
+++ b/libnm/nm-device-bond.c
@@ -21,7 +21,6 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n-lib.h>
 
 #include <nm-setting-connection.h>
 #include <nm-setting-bond.h>
diff --git a/libnm/nm-device-bridge.c b/libnm/nm-device-bridge.c
index 4ebcec3f56..5afc46e3ed 100644
--- a/libnm/nm-device-bridge.c
+++ b/libnm/nm-device-bridge.c
@@ -21,7 +21,6 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n-lib.h>
 
 #include <nm-setting-connection.h>
 #include <nm-setting-bridge.h>
diff --git a/libnm/nm-device-bt.c b/libnm/nm-device-bt.c
index 1a0ecb98fa..f89be17221 100644
--- a/libnm/nm-device-bt.c
+++ b/libnm/nm-device-bt.c
@@ -22,7 +22,6 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n-lib.h>
 
 #include <nm-setting-connection.h>
 #include <nm-setting-bluetooth.h>
diff --git a/libnm/nm-device-ethernet.c b/libnm/nm-device-ethernet.c
index ac18d30ac7..b0f710f8a2 100644
--- a/libnm/nm-device-ethernet.c
+++ b/libnm/nm-device-ethernet.c
@@ -22,7 +22,6 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n-lib.h>
 
 #include <nm-setting-connection.h>
 #include <nm-setting-wired.h>
diff --git a/libnm/nm-device-generic.c b/libnm/nm-device-generic.c
index 3ed0fa7e63..9aeb9bfafb 100644
--- a/libnm/nm-device-generic.c
+++ b/libnm/nm-device-generic.c
@@ -21,7 +21,6 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n-lib.h>
 
 #include "nm-device-generic.h"
 #include "nm-device-private.h"
diff --git a/libnm/nm-device-infiniband.c b/libnm/nm-device-infiniband.c
index c59dd0f100..ab3a0bb75d 100644
--- a/libnm/nm-device-infiniband.c
+++ b/libnm/nm-device-infiniband.c
@@ -21,7 +21,6 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n-lib.h>
 
 #include <nm-setting-connection.h>
 #include <nm-setting-infiniband.h>
diff --git a/libnm/nm-device-modem.c b/libnm/nm-device-modem.c
index e62b10b5f4..9fe5acb650 100644
--- a/libnm/nm-device-modem.c
+++ b/libnm/nm-device-modem.c
@@ -22,7 +22,6 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n-lib.h>
 
 #include <nm-setting-connection.h>
 #include <nm-setting-gsm.h>
diff --git a/libnm/nm-device-olpc-mesh.c b/libnm/nm-device-olpc-mesh.c
index 1cf3c33ebd..8e6cb1ab24 100644
--- a/libnm/nm-device-olpc-mesh.c
+++ b/libnm/nm-device-olpc-mesh.c
@@ -21,7 +21,6 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n-lib.h>
 
 #include <nm-setting-connection.h>
 #include <nm-setting-olpc-mesh.h>
diff --git a/libnm/nm-device-team.c b/libnm/nm-device-team.c
index 540786cd96..c38c58c1fd 100644
--- a/libnm/nm-device-team.c
+++ b/libnm/nm-device-team.c
@@ -21,7 +21,6 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n-lib.h>
 
 #include <nm-setting-connection.h>
 #include <nm-setting-team.h>
diff --git a/libnm/nm-device-vlan.c b/libnm/nm-device-vlan.c
index 0b95450ad7..b285eea9c6 100644
--- a/libnm/nm-device-vlan.c
+++ b/libnm/nm-device-vlan.c
@@ -21,7 +21,6 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n-lib.h>
 
 #include <nm-setting-connection.h>
 #include <nm-setting-vlan.h>
diff --git a/libnm/nm-device-wifi.c b/libnm/nm-device-wifi.c
index a6a717ffd6..644a89004f 100644
--- a/libnm/nm-device-wifi.c
+++ b/libnm/nm-device-wifi.c
@@ -22,7 +22,6 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n-lib.h>
 
 #include <nm-setting-connection.h>
 #include <nm-setting-wireless.h>
diff --git a/libnm/nm-device-wimax.c b/libnm/nm-device-wimax.c
index bc2337a9a6..55658a590e 100644
--- a/libnm/nm-device-wimax.c
+++ b/libnm/nm-device-wimax.c
@@ -22,7 +22,6 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n-lib.h>
 
 #include <nm-setting-connection.h>
 #include <nm-setting-wimax.h>
diff --git a/libnm/nm-device.c b/libnm/nm-device.c
index 5a23fab292..a792d0954a 100644
--- a/libnm/nm-device.c
+++ b/libnm/nm-device.c
@@ -23,7 +23,6 @@
 
 #include <string.h>
 
-#include <glib/gi18n-lib.h>
 #include <gudev/gudev.h>
 
 #include "nm-default.h"
diff --git a/libnm/nm-manager.c b/libnm/nm-manager.c
index 25ab1f8a24..c0d026291a 100644
--- a/libnm/nm-manager.c
+++ b/libnm/nm-manager.c
@@ -22,7 +22,6 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n-lib.h>
 #include <nm-utils.h>
 
 #include "nm-default.h"
diff --git a/libnm/nm-object.c b/libnm/nm-object.c
index 9d6bde9d4b..2aaa4d9d96 100644
--- a/libnm/nm-object.c
+++ b/libnm/nm-object.c
@@ -22,7 +22,6 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n-lib.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <nm-utils.h>
diff --git a/libnm/nm-remote-connection.c b/libnm/nm-remote-connection.c
index 83da4f9ec6..e2073784ca 100644
--- a/libnm/nm-remote-connection.c
+++ b/libnm/nm-remote-connection.c
@@ -22,7 +22,6 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n-lib.h>
 
 #include <nm-dbus-interface.h>
 #include <nm-utils.h>
diff --git a/libnm/nm-remote-settings.c b/libnm/nm-remote-settings.c
index 999859ccbd..4d240e3b38 100644
--- a/libnm/nm-remote-settings.c
+++ b/libnm/nm-remote-settings.c
@@ -22,7 +22,6 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n-lib.h>
 #include <nm-dbus-interface.h>
 #include <nm-connection.h>
 
diff --git a/libnm/nm-vpn-plugin-old.c b/libnm/nm-vpn-plugin-old.c
index a98cd43625..197bb4561a 100644
--- a/libnm/nm-vpn-plugin-old.c
+++ b/libnm/nm-vpn-plugin-old.c
@@ -25,8 +25,6 @@
 #include <signal.h>
 #include <stdlib.h>
 
-#include <glib/gi18n-lib.h>
-
 #include "nm-default.h"
 #include "nm-vpn-plugin-old.h"
 #include "nm-enum-types.h"
diff --git a/libnm/nm-vpn-service-plugin.c b/libnm/nm-vpn-service-plugin.c
index 1f25be6e82..b3b2558696 100644
--- a/libnm/nm-vpn-service-plugin.c
+++ b/libnm/nm-vpn-service-plugin.c
@@ -27,8 +27,6 @@
 #include <signal.h>
 #include <stdlib.h>
 
-#include <glib/gi18n-lib.h>
-
 #include "nm-glib.h"
 #include "nm-enum-types.h"
 #include "nm-utils.h"
diff --git a/src/NetworkManagerUtils.c b/src/NetworkManagerUtils.c
index d8e5fed1bd..8f24ee0489 100644
--- a/src/NetworkManagerUtils.c
+++ b/src/NetworkManagerUtils.c
@@ -21,7 +21,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <string.h>
diff --git a/src/devices/adsl/nm-device-adsl.c b/src/devices/adsl/nm-device-adsl.c
index 34390282d7..19b970d791 100644
--- a/src/devices/adsl/nm-device-adsl.c
+++ b/src/devices/adsl/nm-device-adsl.c
@@ -29,7 +29,6 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <glib/gi18n.h>
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/src/devices/bluetooth/nm-bluez-device.c b/src/devices/bluetooth/nm-bluez-device.c
index ba021797ea..cc44b9ed02 100644
--- a/src/devices/bluetooth/nm-bluez-device.c
+++ b/src/devices/bluetooth/nm-bluez-device.c
@@ -21,7 +21,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n.h>
 #include <string.h>
 
 #include "nm-default.h"
diff --git a/src/devices/bluetooth/nm-device-bt.c b/src/devices/bluetooth/nm-device-bt.c
index f0c94f8fd3..05b1d4e7fd 100644
--- a/src/devices/bluetooth/nm-device-bt.c
+++ b/src/devices/bluetooth/nm-device-bt.c
@@ -23,8 +23,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <glib/gi18n.h>
-
 #include "nm-default.h"
 #include "nm-bluez-common.h"
 #include "nm-bluez-device.h"
diff --git a/src/devices/nm-device-bond.c b/src/devices/nm-device-bond.c
index 822062ae12..3d2795fced 100644
--- a/src/devices/nm-device-bond.c
+++ b/src/devices/nm-device-bond.c
@@ -20,8 +20,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n.h>
-
 #include <errno.h>
 #include <stdlib.h>
 
diff --git a/src/devices/nm-device-bridge.c b/src/devices/nm-device-bridge.c
index a1fbc60970..d182d872fe 100644
--- a/src/devices/nm-device-bridge.c
+++ b/src/devices/nm-device-bridge.c
@@ -20,8 +20,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n.h>
-
 #include <stdlib.h>
 
 #include "nm-default.h"
diff --git a/src/devices/nm-device-ethernet-utils.c b/src/devices/nm-device-ethernet-utils.c
index 886edf4473..9165de31ff 100644
--- a/src/devices/nm-device-ethernet-utils.c
+++ b/src/devices/nm-device-ethernet-utils.c
@@ -19,7 +19,6 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n.h>
 
 #include <nm-connection.h>
 #include "nm-default.h"
diff --git a/src/devices/nm-device-ethernet.c b/src/devices/nm-device-ethernet.c
index fc49fd1b69..5f43a10dcf 100644
--- a/src/devices/nm-device-ethernet.c
+++ b/src/devices/nm-device-ethernet.c
@@ -21,7 +21,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n.h>
 #include <netinet/in.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/src/devices/nm-device-infiniband.c b/src/devices/nm-device-infiniband.c
index a3fcd75418..f52613b069 100644
--- a/src/devices/nm-device-infiniband.c
+++ b/src/devices/nm-device-infiniband.c
@@ -20,8 +20,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n.h>
-
 #include <linux/if_infiniband.h>
 
 #include "nm-default.h"
diff --git a/src/devices/nm-device-vlan.c b/src/devices/nm-device-vlan.c
index defa3b81a3..584d844e15 100644
--- a/src/devices/nm-device-vlan.c
+++ b/src/devices/nm-device-vlan.c
@@ -20,8 +20,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n.h>
-
 #include <sys/socket.h>
 
 #include "nm-default.h"
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index c2c8690d53..78c9e14a43 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -21,7 +21,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n.h>
 #include <dbus/dbus.h>
 #include <netinet/in.h>
 #include <string.h>
diff --git a/src/devices/team/nm-device-team.c b/src/devices/team/nm-device-team.c
index 5b5b760e00..626f808d60 100644
--- a/src/devices/team/nm-device-team.c
+++ b/src/devices/team/nm-device-team.c
@@ -24,7 +24,6 @@
 #include <unistd.h>
 #include <signal.h>
 #include <sys/wait.h>
-#include <glib/gi18n.h>
 #include <teamdctl.h>
 #include <stdlib.h>
 
diff --git a/src/devices/wifi/nm-device-olpc-mesh.c b/src/devices/wifi/nm-device-olpc-mesh.c
index 7e37a2cf81..2718e20612 100644
--- a/src/devices/wifi/nm-device-olpc-mesh.c
+++ b/src/devices/wifi/nm-device-olpc-mesh.c
@@ -26,7 +26,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n.h>
 #include <dbus/dbus.h>
 #include <netinet/in.h>
 #include <string.h>
diff --git a/src/devices/wifi/nm-device-wifi.c b/src/devices/wifi/nm-device-wifi.c
index 42326d5192..74ba055038 100644
--- a/src/devices/wifi/nm-device-wifi.c
+++ b/src/devices/wifi/nm-device-wifi.c
@@ -21,7 +21,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n.h>
 #include <dbus/dbus.h>
 #include <netinet/in.h>
 #include <string.h>
diff --git a/src/devices/wifi/nm-wifi-ap-utils.c b/src/devices/wifi/nm-wifi-ap-utils.c
index d8b87d2369..2732eb9917 100644
--- a/src/devices/wifi/nm-wifi-ap-utils.c
+++ b/src/devices/wifi/nm-wifi-ap-utils.c
@@ -23,8 +23,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include <glib/gi18n.h>
-
 #include "nm-default.h"
 #include "nm-wifi-ap-utils.h"
 #include "nm-utils.h"
diff --git a/src/devices/wwan/nm-modem-broadband.c b/src/devices/wwan/nm-modem-broadband.c
index fc782481fd..e5c77f4dcf 100644
--- a/src/devices/wwan/nm-modem-broadband.c
+++ b/src/devices/wwan/nm-modem-broadband.c
@@ -20,7 +20,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n.h>
 #include <string.h>
 #include <arpa/inet.h>
 #include <libmm-glib.h>
diff --git a/src/dhcp-manager/nm-dhcp-dhclient-utils.c b/src/dhcp-manager/nm-dhcp-dhclient-utils.c
index 3456ce7df3..a86596c077 100644
--- a/src/dhcp-manager/nm-dhcp-dhclient-utils.c
+++ b/src/dhcp-manager/nm-dhcp-dhclient-utils.c
@@ -19,7 +19,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n.h>
 #include <string.h>
 #include <ctype.h>
 #include <arpa/inet.h>
diff --git a/src/dhcp-manager/nm-dhcp-dhclient.c b/src/dhcp-manager/nm-dhcp-dhclient.c
index 4fcba5ce6a..92180903ac 100644
--- a/src/dhcp-manager/nm-dhcp-dhclient.c
+++ b/src/dhcp-manager/nm-dhcp-dhclient.c
@@ -24,7 +24,6 @@
 #include <time.h>
 #undef _XOPEN_SOURCE
 
-#include <glib/gi18n.h>
 #include <string.h>
 #include <stdlib.h>
 #include <errno.h>
diff --git a/src/dhcp-manager/nm-dhcp-dhcpcd.c b/src/dhcp-manager/nm-dhcp-dhcpcd.c
index 955e616061..ff6c568429 100644
--- a/src/dhcp-manager/nm-dhcp-dhcpcd.c
+++ b/src/dhcp-manager/nm-dhcp-dhcpcd.c
@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n.h>
 #include <string.h>
 #include <stdlib.h>
 #include <errno.h>
diff --git a/src/dhcp-manager/nm-dhcp-listener.c b/src/dhcp-manager/nm-dhcp-listener.c
index 1fb8e361c8..6fa53ff3e6 100644
--- a/src/dhcp-manager/nm-dhcp-listener.c
+++ b/src/dhcp-manager/nm-dhcp-listener.c
@@ -19,7 +19,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n.h>
 #include <dbus/dbus.h>
 #include <sys/socket.h>
 #include <sys/wait.h>
diff --git a/src/dhcp-manager/nm-dhcp-manager.c b/src/dhcp-manager/nm-dhcp-manager.c
index f7ccc01c4c..bea7032517 100644
--- a/src/dhcp-manager/nm-dhcp-manager.c
+++ b/src/dhcp-manager/nm-dhcp-manager.c
@@ -22,7 +22,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n.h>
 #include <sys/socket.h>
 #include <sys/wait.h>
 #include <signal.h>
diff --git a/src/dhcp-manager/nm-dhcp-systemd.c b/src/dhcp-manager/nm-dhcp-systemd.c
index 6fc8b6ef1c..dc4c9be321 100644
--- a/src/dhcp-manager/nm-dhcp-systemd.c
+++ b/src/dhcp-manager/nm-dhcp-systemd.c
@@ -18,7 +18,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n.h>
 #include <string.h>
 #include <stdlib.h>
 #include <errno.h>
diff --git a/src/dns-manager/nm-dns-dnsmasq.c b/src/dns-manager/nm-dns-dnsmasq.c
index 62c581e1a4..59a341aa9a 100644
--- a/src/dns-manager/nm-dns-dnsmasq.c
+++ b/src/dns-manager/nm-dns-dnsmasq.c
@@ -27,8 +27,6 @@
 #include <arpa/inet.h>
 #include <sys/stat.h>
 
-#include <glib/gi18n.h>
-
 #include "nm-default.h"
 #include "nm-dns-dnsmasq.h"
 #include "nm-utils.h"
diff --git a/src/dns-manager/nm-dns-manager.c b/src/dns-manager/nm-dns-manager.c
index 13b41856f1..f1acff1f27 100644
--- a/src/dns-manager/nm-dns-manager.c
+++ b/src/dns-manager/nm-dns-manager.c
@@ -35,8 +35,6 @@
 
 #include <linux/fs.h>
 
-#include <glib/gi18n.h>
-
 #include "nm-default.h"
 #include "nm-utils.h"
 #include "nm-core-internal.h"
diff --git a/src/main-utils.c b/src/main-utils.c
index 1c24f405ab..76dbc1500d 100644
--- a/src/main-utils.c
+++ b/src/main-utils.c
@@ -29,7 +29,6 @@
 #include <sys/stat.h>
 #include <locale.h>
 
-#include <glib/gi18n.h>
 #include <glib-unix.h>
 #include <gmodule.h>
 
diff --git a/src/main.c b/src/main.c
index 14a9c46757..a8e8805040 100644
--- a/src/main.c
+++ b/src/main.c
@@ -34,7 +34,6 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <glib/gi18n.h>
 #include <gmodule.h>
 #include <string.h>
 #include <sys/resource.h>
diff --git a/src/nm-config.c b/src/nm-config.c
index 24cca2b7fe..d805948946 100644
--- a/src/nm-config.c
+++ b/src/nm-config.c
@@ -24,8 +24,6 @@
 #include <string.h>
 #include <stdio.h>
 
-#include <glib/gi18n.h>
-
 #include "nm-default.h"
 #include "nm-config.h"
 #include "nm-utils.h"
diff --git a/src/nm-iface-helper.c b/src/nm-iface-helper.c
index 07b3d34855..6b1710f670 100644
--- a/src/nm-iface-helper.c
+++ b/src/nm-iface-helper.c
@@ -27,7 +27,6 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <glib/gi18n.h>
 #include <string.h>
 #include <sys/resource.h>
 #include <sys/stat.h>
diff --git a/src/nm-logging.c b/src/nm-logging.c
index b74f1a0ee9..f79ba3c2e4 100644
--- a/src/nm-logging.c
+++ b/src/nm-logging.c
@@ -32,8 +32,6 @@
 #include <strings.h>
 #include <string.h>
 
-#include <glib/gi18n.h>
-
 #if SYSTEMD_JOURNAL
 #define SD_JOURNAL_SUPPRESS_LOCATION
 #include <systemd/sd-journal.h>
diff --git a/src/nm-manager.c b/src/nm-manager.c
index 224f084649..b24b592317 100644
--- a/src/nm-manager.c
+++ b/src/nm-manager.c
@@ -28,7 +28,6 @@
 #include <unistd.h>
 #include <dbus/dbus-glib-lowlevel.h>
 #include <dbus/dbus-glib.h>
-#include <glib/gi18n.h>
 
 #include "nm-default.h"
 #include "nm-manager.h"
diff --git a/src/nm-sleep-monitor-systemd.c b/src/nm-sleep-monitor-systemd.c
index 620cf93524..5748cba983 100644
--- a/src/nm-sleep-monitor-systemd.c
+++ b/src/nm-sleep-monitor-systemd.c
@@ -22,7 +22,6 @@
 #include <errno.h>
 #include <string.h>
 #include <sys/stat.h>
-#include <glib/gi18n.h>
 #include <gio/gunixfdlist.h>
 
 #include "nm-default.h"
diff --git a/src/settings/plugins/ibft/plugin.c b/src/settings/plugins/ibft/plugin.c
index feb02dde1e..944209285b 100644
--- a/src/settings/plugins/ibft/plugin.c
+++ b/src/settings/plugins/ibft/plugin.c
@@ -25,7 +25,6 @@
 #include <errno.h>
 
 #include <gmodule.h>
-#include <glib/gi18n.h>
 
 #include <nm-setting-connection.h>
 
diff --git a/src/settings/plugins/ibft/reader.c b/src/settings/plugins/ibft/reader.c
index 81c83a6f6a..195c264186 100644
--- a/src/settings/plugins/ibft/reader.c
+++ b/src/settings/plugins/ibft/reader.c
@@ -31,8 +31,6 @@
 #include <sys/ioctl.h>
 #include <unistd.h>
 
-#include <glib/gi18n.h>
-
 #include "nm-default.h"
 #include "nm-core-internal.h"
 #include "nm-platform.h"
diff --git a/src/settings/plugins/ifcfg-rh/plugin.c b/src/settings/plugins/ifcfg-rh/plugin.c
index c35192492d..7e54833c91 100644
--- a/src/settings/plugins/ifcfg-rh/plugin.c
+++ b/src/settings/plugins/ifcfg-rh/plugin.c
@@ -30,7 +30,6 @@
 #include <sys/stat.h>
 
 #include <gmodule.h>
-#include <glib/gi18n.h>
 
 #include <dbus/dbus.h>
 #include <dbus/dbus-glib.h>
diff --git a/src/settings/plugins/ifcfg-rh/reader.c b/src/settings/plugins/ifcfg-rh/reader.c
index 41fe18d052..b05c3eca8e 100644
--- a/src/settings/plugins/ifcfg-rh/reader.c
+++ b/src/settings/plugins/ifcfg-rh/reader.c
@@ -31,7 +31,6 @@
 #include <sys/ioctl.h>
 #include <unistd.h>
 
-#include <glib/gi18n.h>
 #include <nm-connection.h>
 #include <nm-dbus-interface.h>
 #include <nm-setting-connection.h>
diff --git a/src/settings/plugins/ifnet/connection_parser.c b/src/settings/plugins/ifnet/connection_parser.c
index 619eb3e5de..437629c58c 100644
--- a/src/settings/plugins/ifnet/connection_parser.c
+++ b/src/settings/plugins/ifnet/connection_parser.c
@@ -25,7 +25,6 @@
 #include <arpa/inet.h>
 #include <stdlib.h>
 #include <errno.h>
-#include <glib/gi18n.h>
 
 #include "nm-system-config-interface.h"
 #include "nm-default.h"
diff --git a/src/settings/plugins/ifupdown/plugin.c b/src/settings/plugins/ifupdown/plugin.c
index 6e676cac2b..ff2f94d255 100644
--- a/src/settings/plugins/ifupdown/plugin.c
+++ b/src/settings/plugins/ifupdown/plugin.c
@@ -27,7 +27,6 @@
 #include <string.h>
 
 #include <gmodule.h>
-#include <glib/gi18n.h>
 #include <nm-setting-connection.h>
 
 #include "nm-default.h"