diff --git a/src/nm-config-data.h b/src/nm-config-data.h
index 017d362996..e01ad6eaf5 100644
--- a/src/nm-config-data.h
+++ b/src/nm-config-data.h
@@ -21,11 +21,6 @@
 #ifndef NM_CONFIG_DATA_H
 #define NM_CONFIG_DATA_H
 
-
-#include "nm-default.h"
-
-G_BEGIN_DECLS
-
 #define NM_TYPE_CONFIG_DATA            (nm_config_data_get_type ())
 #define NM_CONFIG_DATA(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_CONFIG_DATA, NMConfigData))
 #define NM_CONFIG_DATA_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  NM_TYPE_CONFIG_DATA, NMConfigDataClass))
@@ -215,7 +210,5 @@ GKeyFile *_nm_config_data_get_keyfile (const NMConfigData *self);
 GKeyFile *_nm_config_data_get_keyfile_user (const NMConfigData *self);
 GKeyFile *_nm_config_data_get_keyfile_intern (const NMConfigData *self);
 
-G_END_DECLS
-
 #endif /* NM_CONFIG_DATA_H */
 
diff --git a/src/nm-config.c b/src/nm-config.c
index 7d11f51df9..247b9a896b 100644
--- a/src/nm-config.c
+++ b/src/nm-config.c
@@ -21,10 +21,11 @@
 
 #include "nm-default.h"
 
+#include "nm-config.h"
+
 #include <string.h>
 #include <stdio.h>
 
-#include "nm-config.h"
 #include "nm-utils.h"
 #include "nm-device.h"
 #include "NetworkManagerUtils.h"
diff --git a/src/nm-config.h b/src/nm-config.h
index 836c7c33a3..9a153e48ba 100644
--- a/src/nm-config.h
+++ b/src/nm-config.h
@@ -22,12 +22,8 @@
 #ifndef __NETWORKMANAGER_CONFIG_H__
 #define __NETWORKMANAGER_CONFIG_H__
 
-
-#include "nm-default.h"
 #include "nm-config-data.h"
 
-G_BEGIN_DECLS
-
 #define NM_TYPE_CONFIG            (nm_config_get_type ())
 #define NM_CONFIG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_CONFIG, NMConfig))
 #define NM_CONFIG_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  NM_TYPE_CONFIG, NMConfigClass))
@@ -159,7 +155,5 @@ gboolean nm_config_set_global_dns (NMConfig *self, NMGlobalDnsConfig *global_dns
 extern guint _nm_config_match_nm_version;
 extern char *_nm_config_match_env;
 
-G_END_DECLS
-
 #endif /* __NETWORKMANAGER_CONFIG_H__ */