diff options
27 files changed, 26 insertions, 27 deletions
diff --git a/libnm-glib/nm-access-point.h b/libnm-glib/nm-access-point.h index c5017bd2e0..865218b22f 100644 --- a/libnm-glib/nm-access-point.h +++ b/libnm-glib/nm-access-point.h @@ -24,7 +24,7 @@ #ifndef NM_ACCESS_POINT_H #define NM_ACCESS_POINT_H -#include <glib/gtypes.h> +#include <glib.h> #include <glib-object.h> #include <NetworkManager.h> #include "nm-object.h" diff --git a/libnm-glib/nm-active-connection.h b/libnm-glib/nm-active-connection.h index f75bfbc11b..e7b34a34b3 100644 --- a/libnm-glib/nm-active-connection.h +++ b/libnm-glib/nm-active-connection.h @@ -24,7 +24,7 @@ #ifndef NM_ACTIVE_CONNECTION_H #define NM_ACTIVE_CONNECTION_H -#include <glib/gtypes.h> +#include <glib.h> #include <glib-object.h> #include "nm-object.h" #include <nm-connection.h> diff --git a/libnm-glib/nm-client.h b/libnm-glib/nm-client.h index 5820ea566d..5af95d40bc 100644 --- a/libnm-glib/nm-client.h +++ b/libnm-glib/nm-client.h @@ -24,7 +24,7 @@ #ifndef NM_CLIENT_H #define NM_CLIENT_H -#include <glib/gtypes.h> +#include <glib.h> #include <glib-object.h> #include <dbus/dbus-glib.h> #include <NetworkManager.h> diff --git a/libnm-glib/nm-device.h b/libnm-glib/nm-device.h index 39c1e1a7c0..1087afb7ea 100644 --- a/libnm-glib/nm-device.h +++ b/libnm-glib/nm-device.h @@ -24,7 +24,7 @@ #ifndef NM_DEVICE_H #define NM_DEVICE_H -#include <glib/gtypes.h> +#include <glib.h> #include <glib-object.h> #include <dbus/dbus-glib.h> #include "nm-object.h" diff --git a/libnm-glib/nm-dhcp4-config.h b/libnm-glib/nm-dhcp4-config.h index 76903ce2b2..14e3274e37 100644 --- a/libnm-glib/nm-dhcp4-config.h +++ b/libnm-glib/nm-dhcp4-config.h @@ -24,7 +24,7 @@ #ifndef NM_DHCP4_CONFIG_H #define NM_DHCP4_CONFIG_H -#include <glib/gtypes.h> +#include <glib.h> #include <glib-object.h> #include <dbus/dbus-glib.h> #include "nm-object.h" diff --git a/libnm-glib/nm-ip4-config.h b/libnm-glib/nm-ip4-config.h index 5b17b80a83..233be68d64 100644 --- a/libnm-glib/nm-ip4-config.h +++ b/libnm-glib/nm-ip4-config.h @@ -24,7 +24,7 @@ #ifndef NM_IP4_CONFIG_H #define NM_IP4_CONFIG_H -#include <glib/gtypes.h> +#include <glib.h> #include <glib-object.h> #include <dbus/dbus-glib.h> #include "nm-object.h" diff --git a/libnm-glib/nm-object-cache.h b/libnm-glib/nm-object-cache.h index 72ed0604ab..b8cf2121b6 100644 --- a/libnm-glib/nm-object-cache.h +++ b/libnm-glib/nm-object-cache.h @@ -23,7 +23,7 @@ #ifndef NM_OBJECT_CACHE_H #define NM_OBJECT_CACHE_H -#include <glib/gtypes.h> +#include <glib.h> #include <glib-object.h> #include "nm-object.h" diff --git a/libnm-glib/nm-object.h b/libnm-glib/nm-object.h index da34d3ae7b..06cb512fcc 100644 --- a/libnm-glib/nm-object.h +++ b/libnm-glib/nm-object.h @@ -24,7 +24,7 @@ #ifndef NM_OBJECT_H #define NM_OBJECT_H -#include <glib/gtypes.h> +#include <glib.h> #include <glib-object.h> #include <dbus/dbus-glib.h> diff --git a/libnm-glib/nm-vpn-connection.h b/libnm-glib/nm-vpn-connection.h index 3c18477ef0..8be8eef970 100644 --- a/libnm-glib/nm-vpn-connection.h +++ b/libnm-glib/nm-vpn-connection.h @@ -24,7 +24,7 @@ #ifndef NM_VPN_CONNECTION_H #define NM_VPN_CONNECTION_H -#include <glib/gtypes.h> +#include <glib.h> #include <glib-object.h> #include <dbus/dbus-glib.h> #include "nm-active-connection.h" diff --git a/libnm-glib/nm-vpn-plugin.h b/libnm-glib/nm-vpn-plugin.h index 3dc2408483..88eb1e6575 100644 --- a/libnm-glib/nm-vpn-plugin.h +++ b/libnm-glib/nm-vpn-plugin.h @@ -24,7 +24,7 @@ #ifndef NM_VPN_PLUGIN_H #define NM_VPN_PLUGIN_H -#include <glib/gtypes.h> +#include <glib.h> #include <glib-object.h> #include <dbus/dbus-glib.h> #include <NetworkManagerVPN.h> diff --git a/libnm-util/nm-setting.h b/libnm-util/nm-setting.h index 474d3f6e24..680636306a 100644 --- a/libnm-util/nm-setting.h +++ b/libnm-util/nm-setting.h @@ -26,7 +26,7 @@ #ifndef NM_SETTING_H #define NM_SETTING_H -#include <glib/gtypes.h> +#include <glib.h> #include <glib-object.h> G_BEGIN_DECLS diff --git a/src/NetworkManagerAP.h b/src/NetworkManagerAP.h index 4ad4fd7837..3f2bc617e0 100644 --- a/src/NetworkManagerAP.h +++ b/src/NetworkManagerAP.h @@ -23,7 +23,6 @@ #define NM_ACCESS_POINT_H #include <glib.h> -#include <glib/gtypes.h> #include <glib-object.h> #include <time.h> #include "NetworkManager.h" diff --git a/src/dhcp-manager/nm-dhcp-manager.h b/src/dhcp-manager/nm-dhcp-manager.h index 8a8713c906..74bdd087d0 100644 --- a/src/dhcp-manager/nm-dhcp-manager.h +++ b/src/dhcp-manager/nm-dhcp-manager.h @@ -22,7 +22,7 @@ #ifndef NM_DHCP_MANAGER_H #define NM_DHCP_MANAGER_H -#include <glib/gtypes.h> +#include <glib.h> #include <glib-object.h> #include <nm-setting-ip4-config.h> diff --git a/src/dnsmasq-manager/nm-dnsmasq-manager.h b/src/dnsmasq-manager/nm-dnsmasq-manager.h index 9c73db5f12..1214d06b41 100644 --- a/src/dnsmasq-manager/nm-dnsmasq-manager.h +++ b/src/dnsmasq-manager/nm-dnsmasq-manager.h @@ -21,7 +21,7 @@ #ifndef NM_DNSMASQ_MANAGER_H #define NM_DNSMASQ_MANAGER_H -#include <glib/gtypes.h> +#include <glib.h> #include <glib-object.h> #include "nm-ip4-config.h" diff --git a/src/nm-activation-request.h b/src/nm-activation-request.h index 3f3d93aca2..bce0dfce5f 100644 --- a/src/nm-activation-request.h +++ b/src/nm-activation-request.h @@ -21,7 +21,7 @@ #ifndef NM_ACTIVATION_REQUEST_H #define NM_ACTIVATION_REQUEST_H -#include <glib/gtypes.h> +#include <glib.h> #include <glib-object.h> #include "nm-connection.h" #include "nm-active-connection.h" diff --git a/src/nm-dhcp4-config.h b/src/nm-dhcp4-config.h index 9a97445646..ffaa84304d 100644 --- a/src/nm-dhcp4-config.h +++ b/src/nm-dhcp4-config.h @@ -21,7 +21,7 @@ #ifndef NM_DHCP4_CONFIG_H #define NM_DHCP4_CONFIG_H -#include <glib/gtypes.h> +#include <glib.h> #include <glib-object.h> #define NM_TYPE_DHCP4_CONFIG (nm_dhcp4_config_get_type ()) diff --git a/src/nm-hal-manager.h b/src/nm-hal-manager.h index d2203a20a9..73d9ce8339 100644 --- a/src/nm-hal-manager.h +++ b/src/nm-hal-manager.h @@ -22,7 +22,7 @@ #ifndef NM_HAL_MANAGER_H #define NM_HAL_MANAGER_H -#include <glib/gtypes.h> +#include <glib.h> #include <glib-object.h> G_BEGIN_DECLS diff --git a/src/nm-ip4-config.h b/src/nm-ip4-config.h index 1c435adb60..c2244b80af 100644 --- a/src/nm-ip4-config.h +++ b/src/nm-ip4-config.h @@ -21,7 +21,7 @@ #ifndef NM_IP4_CONFIG_H #define NM_IP4_CONFIG_H -#include <glib/gtypes.h> +#include <glib.h> #include <glib-object.h> #include "nm-setting-ip4-config.h" diff --git a/src/nm-manager.h b/src/nm-manager.h index 3b87e8dd40..486dd15d20 100644 --- a/src/nm-manager.h +++ b/src/nm-manager.h @@ -22,7 +22,7 @@ #ifndef NM_MANAGER_H #define NM_MANAGER_H 1 -#include <glib/gtypes.h> +#include <glib.h> #include <glib-object.h> #include <dbus/dbus-glib.h> #include "nm-device.h" diff --git a/src/ppp-manager/nm-ppp-manager.h b/src/ppp-manager/nm-ppp-manager.h index 293d2b4ba4..30de95b7c0 100644 --- a/src/ppp-manager/nm-ppp-manager.h +++ b/src/ppp-manager/nm-ppp-manager.h @@ -22,7 +22,7 @@ #ifndef NM_PPP_MANAGER_H #define NM_PPP_MANAGER_H -#include <glib/gtypes.h> +#include <glib.h> #include <glib-object.h> #include "nm-ppp-status.h" diff --git a/src/ppp-manager/nm-pppd-plugin.c b/src/ppp-manager/nm-pppd-plugin.c index fcc7a03fec..67d46d580c 100644 --- a/src/ppp-manager/nm-pppd-plugin.c +++ b/src/ppp-manager/nm-pppd-plugin.c @@ -26,7 +26,7 @@ #include <sys/socket.h> #include <netinet/in.h> #include <arpa/inet.h> -#include <glib/gtypes.h> +#include <glib.h> #include <glib-object.h> #include <dbus/dbus-glib.h> diff --git a/src/vpn-manager/nm-vpn-connection.h b/src/vpn-manager/nm-vpn-connection.h index 0d26eeaef8..31a2618cb2 100644 --- a/src/vpn-manager/nm-vpn-connection.h +++ b/src/vpn-manager/nm-vpn-connection.h @@ -22,7 +22,7 @@ #ifndef NM_VPN_CONNECTION_H #define NM_VPN_CONNECTION_H -#include <glib/gtypes.h> +#include <glib.h> #include <glib-object.h> #include "NetworkManagerVPN.h" #include "nm-device.h" diff --git a/src/vpn-manager/nm-vpn-manager.h b/src/vpn-manager/nm-vpn-manager.h index 3ab7709315..3500c6d494 100644 --- a/src/vpn-manager/nm-vpn-manager.h +++ b/src/vpn-manager/nm-vpn-manager.h @@ -22,7 +22,7 @@ #ifndef NM_VPN_MANAGER_H #define NM_VPN_MANAGER_H -#include <glib/gtypes.h> +#include <glib.h> #include <glib-object.h> #include "nm-vpn-connection.h" #include "nm-activation-request.h" diff --git a/src/vpn-manager/nm-vpn-service.h b/src/vpn-manager/nm-vpn-service.h index 6a1ebed886..9c5e0eefc9 100644 --- a/src/vpn-manager/nm-vpn-service.h +++ b/src/vpn-manager/nm-vpn-service.h @@ -22,7 +22,7 @@ #ifndef NM_VPN_SERVICE_H #define NM_VPN_SERVICE_H -#include <glib/gtypes.h> +#include <glib.h> #include <glib-object.h> #include "nm-device.h" #include "nm-vpn-connection.h" diff --git a/system-settings/plugins/ifupdown/plugin.c b/system-settings/plugins/ifupdown/plugin.c index 8c2a1e64bd..d3794929fa 100644 --- a/system-settings/plugins/ifupdown/plugin.c +++ b/system-settings/plugins/ifupdown/plugin.c @@ -30,7 +30,7 @@ #include <gmodule.h> #include <glib-object.h> #include <glib/gi18n.h> -#include <glib/gslist.h> +#include <glib.h> #include <nm-setting-connection.h> #include "interface_parser.h" diff --git a/system-settings/src/nm-system-config-error.h b/system-settings/src/nm-system-config-error.h index dbfcfed354..63896fcd09 100644 --- a/system-settings/src/nm-system-config-error.h +++ b/system-settings/src/nm-system-config-error.h @@ -22,7 +22,7 @@ #ifndef NM_SYSTEM_CONFIG_ERROR_H #define NM_SYSTEM_CONFIG_ERROR_H -#include <glib/gtypes.h> +#include <glib.h> #include <glib-object.h> enum { diff --git a/system-settings/src/nm-system-config-hal-manager.h b/system-settings/src/nm-system-config-hal-manager.h index cdf854edff..0ffdfdd9d4 100644 --- a/system-settings/src/nm-system-config-hal-manager.h +++ b/system-settings/src/nm-system-config-hal-manager.h @@ -22,7 +22,7 @@ #ifndef NM_SYSTEM_CONFIG_HAL_MANAGER_H #define NM_SYSTEM_CONFIG_HAL_MANAGER_H -#include <glib/gtypes.h> +#include <glib.h> #include <glib-object.h> #include <dbus/dbus-glib.h> #include "NetworkManager.h" |