knetworkmanager/knetworkmanager-networkmanager1.0.patch

diff -ruN a/applet/activatableitem.h b/applet/activatableitem.h
--- a/applet/activatableitem.h	2015-03-06 08:47:44.000000000 +0900
+++ b/applet/activatableitem.h	2021-02-20 17:03:29.101762388 +0900
@@ -19,6 +19,7 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef ABSTRACTCONNECTABLEITEM_H
 #define ABSTRACTCONNECTABLEITEM_H
 
diff -ruN a/applet/activatablelistwidget.h b/applet/activatablelistwidget.h
--- a/applet/activatablelistwidget.h	2015-03-06 08:47:44.000000000 +0900
+++ b/applet/activatablelistwidget.h	2021-02-20 17:03:34.273438468 +0900
@@ -18,6 +18,7 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef ACTIVATABLELISTWIDGET_H
 #define ACTIVATABLELISTWIDGET_H
 
diff -ruN a/applet/gsminterfaceconnectionitem.h b/applet/gsminterfaceconnectionitem.h
--- a/applet/gsminterfaceconnectionitem.h	2015-03-06 08:47:44.000000000 +0900
+++ b/applet/gsminterfaceconnectionitem.h	2021-02-20 17:03:38.268188627 +0900
@@ -20,6 +20,7 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef APPLET_GSMINTERFACECONNECTIONITEM_H
 #define APPLET_GSMINTERFACECONNECTIONITEM_H
 
diff -ruN a/applet/hiddenwirelessnetworkitem.h b/applet/hiddenwirelessnetworkitem.h
--- a/applet/hiddenwirelessnetworkitem.h	2015-03-06 08:47:44.000000000 +0900
+++ b/applet/hiddenwirelessnetworkitem.h	2021-02-20 17:03:43.130884932 +0900
@@ -19,6 +19,7 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef HIDDENWIRELESSNETWORKITEM_H
 #define HIDDENWIRELESSNETWORKITEM_H
 
diff -ruN a/applet/interfaceconnectionitem.h b/applet/interfaceconnectionitem.h
--- a/applet/interfaceconnectionitem.h	2015-03-06 08:47:44.000000000 +0900
+++ b/applet/interfaceconnectionitem.h	2021-02-20 17:03:47.906587128 +0900
@@ -18,6 +18,7 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef APPLET_CONNECTIONITEM_H
 #define APPLET_CONNECTIONITEM_H
 
diff -ruN a/applet/interfacedetailswidget.h b/applet/interfacedetailswidget.h
--- a/applet/interfacedetailswidget.h	2015-03-06 08:47:44.000000000 +0900
+++ b/applet/interfacedetailswidget.h	2021-02-20 17:03:53.358247716 +0900
@@ -19,6 +19,7 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef INTERFACEDETAILSWIDGET_H
 #define INTERFACEDETAILSWIDGET_H
 
diff -ruN a/applet/interfaceitem.h b/applet/interfaceitem.h
--- a/applet/interfaceitem.h	2015-03-06 08:47:44.000000000 +0900
+++ b/applet/interfaceitem.h	2021-02-20 17:03:58.474929682 +0900
@@ -19,6 +19,7 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef APPLET_INTERFACEITEM_H
 #define APPLET_INTERFACEITEM_H
 
diff -ruN a/applet/networkmanager.h b/applet/networkmanager.h
--- a/applet/networkmanager.h	2015-03-06 08:47:44.000000000 +0900
+++ b/applet/networkmanager.h	2021-02-20 17:04:04.650546496 +0900
@@ -20,6 +20,7 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef PLASMA_NETWORKMANAGER_APPLET_H
 #define PLASMA_NETWORKMANAGER_APPLET_H
 
diff -ruN a/applet/nmpopup.h b/applet/nmpopup.h
--- a/applet/nmpopup.h	2015-03-06 08:47:44.000000000 +0900
+++ b/applet/nmpopup.h	2021-02-20 17:04:10.278197941 +0900
@@ -19,6 +19,7 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef NMPOPUP_H
 #define NMPOPUP_H
 
diff -ruN a/applet/vpninterfaceitem.cpp b/applet/vpninterfaceitem.cpp
--- a/applet/vpninterfaceitem.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/applet/vpninterfaceitem.cpp	2021-02-20 17:10:59.544092838 +0900
@@ -18,6 +18,7 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 // Qt
 #include <QLabel>
 #include <QTimer>
diff -ruN a/applet/vpninterfaceitem.h b/applet/vpninterfaceitem.h
--- a/applet/vpninterfaceitem.h	2015-03-06 08:47:44.000000000 +0900
+++ b/applet/vpninterfaceitem.h	2021-02-20 17:04:15.389881854 +0900
@@ -18,6 +18,7 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef VPNINTERFACEITEM_H
 #define VPNINTERFACEITEM_H
 
diff -ruN a/applet/wirelessinterfaceitem.h b/applet/wirelessinterfaceitem.h
--- a/applet/wirelessinterfaceitem.h	2015-03-06 08:47:44.000000000 +0900
+++ b/applet/wirelessinterfaceitem.h	2021-02-20 17:04:20.313577850 +0900
@@ -19,6 +19,7 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef WIRELESSINTERFACEITEM_H
 #define WIRELESSINTERFACEITEM_H
 
diff -ruN a/applet/wirelessnetworkitem.h b/applet/wirelessnetworkitem.h
--- a/applet/wirelessnetworkitem.h	2015-03-06 08:47:44.000000000 +0900
+++ b/applet/wirelessnetworkitem.h	2021-02-20 17:04:24.990289508 +0900
@@ -19,6 +19,7 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef APPLET_WIRELESSNETWORKITEM_H
 #define APPLET_WIRELESSNETWORKITEM_H
 
diff -ruN a/applet/wirelessstatus.h b/applet/wirelessstatus.h
--- a/applet/wirelessstatus.h	2015-03-06 08:47:44.000000000 +0900
+++ b/applet/wirelessstatus.h	2021-02-18 21:17:34.500276411 +0900
@@ -19,6 +19,7 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef WIRELESSSTATUS_H
 #define WIRELESSSTATUS_H
 
diff -ruN a/backends/NetworkManager/connectiondbus.cpp b/backends/NetworkManager/connectiondbus.cpp
--- a/backends/NetworkManager/connectiondbus.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/backends/NetworkManager/connectiondbus.cpp	2021-02-18 21:17:34.501276365 +0900
@@ -18,16 +18,9 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #include "connectiondbus.h"
 
-#include <nm-setting-connection.h>
-#include <nm-setting-wired.h>
-#include <nm-setting-wireless.h>
-#include <nm-setting-gsm.h>
-#include <nm-setting-cdma.h>
-#include <nm-setting-pppoe.h>
-#include <nm-setting-vpn.h>
-
 #include "internals/connection.h"
 #include "internals/setting.h"
 
diff -ruN a/backends/NetworkManager/connectiondbus.h b/backends/NetworkManager/connectiondbus.h
--- a/backends/NetworkManager/connectiondbus.h	2015-03-06 08:47:44.000000000 +0900
+++ b/backends/NetworkManager/connectiondbus.h	2021-02-20 15:42:49.967931888 +0900
@@ -18,6 +18,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef CONNECTIONDBUS_H
 #define CONNECTIONDBUS_H
 
diff -ruN a/backends/NetworkManager/nm09dbus_export.h b/backends/NetworkManager/nm09dbus_export.h
--- a/backends/NetworkManager/nm09dbus_export.h	2015-03-06 08:47:44.000000000 +0900
+++ b/backends/NetworkManager/nm09dbus_export.h	2021-02-20 15:43:44.752923188 +0900
@@ -17,6 +17,7 @@
     Boston, MA 02110-1301, USA.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef NM09DBUS_EXPORT_H
 #define NM09DBUS_EXPORT_H
 
diff -ruN a/backends/NetworkManager/nm-active-connectioninterface.h b/backends/NetworkManager/nm-active-connectioninterface.h
--- a/backends/NetworkManager/nm-active-connectioninterface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/backends/NetworkManager/nm-active-connectioninterface.h	2021-02-20 15:42:55.478412968 +0900
@@ -8,6 +8,7 @@
  * Do not edit! All changes made to it will be lost.
  */
 
+#include <libnm/NetworkManager.h>
 #ifndef NM_ACTIVE_CONNECTIONINTERFACE_H
 #define NM_ACTIVE_CONNECTIONINTERFACE_H
 
diff -ruN a/backends/NetworkManager/nm-agent-manager.h b/backends/NetworkManager/nm-agent-manager.h
--- a/backends/NetworkManager/nm-agent-manager.h	2015-03-06 08:47:44.000000000 +0900
+++ b/backends/NetworkManager/nm-agent-manager.h	2021-02-20 15:43:01.202877567 +0900
@@ -8,6 +8,7 @@
  * Do not edit! All changes made to it will be lost.
  */
 
+#include <libnm/NetworkManager.h>
 #ifndef NM_AGENT_MANAGER_H
 #define NM_AGENT_MANAGER_H
 
diff -ruN a/backends/NetworkManager/nmdbusactiveconnectionmonitor.cpp b/backends/NetworkManager/nmdbusactiveconnectionmonitor.cpp
--- a/backends/NetworkManager/nmdbusactiveconnectionmonitor.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/backends/NetworkManager/nmdbusactiveconnectionmonitor.cpp	2021-02-20 16:37:53.839443224 +0900
@@ -20,8 +20,7 @@
 
 #include "nmdbusactiveconnectionmonitor.h"
 
-#include <NetworkManager.h>
-#include <NetworkManagerVPN.h>
+#include <libnm/NetworkManager.h>
 
 #include <QMultiHash>
 #include <QUuid>
diff -ruN a/backends/NetworkManager/nmdbusactiveconnectionmonitor.h b/backends/NetworkManager/nmdbusactiveconnectionmonitor.h
--- a/backends/NetworkManager/nmdbusactiveconnectionmonitor.h	2015-03-06 08:47:44.000000000 +0900
+++ b/backends/NetworkManager/nmdbusactiveconnectionmonitor.h	2021-02-20 15:43:49.473506732 +0900
@@ -18,6 +18,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef BACKENDS_NETWORKMANAGER_NMDBUSACTIVECONNECTIONMONITOR_H
 #define BACKENDS_NETWORKMANAGER_NMDBUSACTIVECONNECTIONMONITOR_H
 
diff -ruN a/backends/NetworkManager/nmdbussecretagent.h b/backends/NetworkManager/nmdbussecretagent.h
--- a/backends/NetworkManager/nmdbussecretagent.h	2015-03-06 08:47:44.000000000 +0900
+++ b/backends/NetworkManager/nmdbussecretagent.h	2021-02-20 15:43:55.093013953 +0900
@@ -18,6 +18,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef NMDBUSSECRETAGENT_H
 #define NMDBUSSECRETAGENT_H
 
diff -ruN a/backends/NetworkManager/nmdbussettingsconnectionprovider.h b/backends/NetworkManager/nmdbussettingsconnectionprovider.h
--- a/backends/NetworkManager/nmdbussettingsconnectionprovider.h	2015-03-06 08:47:44.000000000 +0900
+++ b/backends/NetworkManager/nmdbussettingsconnectionprovider.h	2021-02-20 15:43:59.838600331 +0900
@@ -18,6 +18,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef NMSYSTEMSETTINGSACTIVATABLEPROVIDER_H
 #define NMSYSTEMSETTINGSACTIVATABLEPROVIDER_H
 
diff -ruN a/backends/NetworkManager/nm-device-interface.h b/backends/NetworkManager/nm-device-interface.h
--- a/backends/NetworkManager/nm-device-interface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/backends/NetworkManager/nm-device-interface.h	2021-02-20 15:43:06.028429126 +0900
@@ -8,6 +8,7 @@
  * Do not edit! All changes made to it will be lost.
  */
 
+#include <libnm/NetworkManager.h>
 #ifndef NM_DEVICE_INTERFACE_H
 #define NM_DEVICE_INTERFACE_H
 
diff -ruN a/backends/NetworkManager/nm-ip4-config-interface.h b/backends/NetworkManager/nm-ip4-config-interface.h
--- a/backends/NetworkManager/nm-ip4-config-interface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/backends/NetworkManager/nm-ip4-config-interface.h	2021-02-20 15:43:11.462927250 +0900
@@ -8,6 +8,7 @@
  * Do not edit! All changes made to it will be lost.
  */
 
+#include <libnm/NetworkManager.h>
 #ifndef NM_IP4_CONFIG_INTERFACE_H
 #define NM_IP4_CONFIG_INTERFACE_H
 
diff -ruN a/backends/NetworkManager/nm-ip6-config-interface.h b/backends/NetworkManager/nm-ip6-config-interface.h
--- a/backends/NetworkManager/nm-ip6-config-interface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/backends/NetworkManager/nm-ip6-config-interface.h	2021-02-20 15:43:15.978512712 +0900
@@ -8,6 +8,7 @@
  * Do not edit! All changes made to it will be lost.
  */
 
+#include <libnm/NetworkManager.h>
 #ifndef NM_IP6_CONFIG_INTERFACE_H
 #define NM_IP6_CONFIG_INTERFACE_H
 
diff -ruN a/backends/NetworkManager/nm-manager-interface.h b/backends/NetworkManager/nm-manager-interface.h
--- a/backends/NetworkManager/nm-manager-interface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/backends/NetworkManager/nm-manager-interface.h	2021-02-20 15:43:20.508099169 +0900
@@ -8,6 +8,7 @@
  * Do not edit! All changes made to it will be lost.
  */
 
+#include <libnm/NetworkManager.h>
 #ifndef NM_MANAGER_INTERFACE_H
 #define NM_MANAGER_INTERFACE_H
 
diff -ruN a/backends/NetworkManager/nm-secret-agentadaptor.h b/backends/NetworkManager/nm-secret-agentadaptor.h
--- a/backends/NetworkManager/nm-secret-agentadaptor.h	2015-03-06 08:47:44.000000000 +0900
+++ b/backends/NetworkManager/nm-secret-agentadaptor.h	2021-02-20 15:43:24.953695446 +0900
@@ -9,6 +9,7 @@
  * before re-generating it.
  */
 
+#include <libnm/NetworkManager.h>
 #ifndef NM_SECRET_AGENTADAPTOR_H
 #define NM_SECRET_AGENTADAPTOR_H
 
diff -ruN a/backends/NetworkManager/nm-settings-connectioninterface.h b/backends/NetworkManager/nm-settings-connectioninterface.h
--- a/backends/NetworkManager/nm-settings-connectioninterface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/backends/NetworkManager/nm-settings-connectioninterface.h	2021-02-20 15:43:29.501284699 +0900
@@ -8,6 +8,7 @@
  * Do not edit! All changes made to it will be lost.
  */
 
+#include <libnm/NetworkManager.h>
 #ifndef NM_SETTINGS_CONNECTIONINTERFACE_H
 #define NM_SETTINGS_CONNECTIONINTERFACE_H
 
diff -ruN a/backends/NetworkManager/nm-settingsinterface.h b/backends/NetworkManager/nm-settingsinterface.h
--- a/backends/NetworkManager/nm-settingsinterface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/backends/NetworkManager/nm-settingsinterface.h	2021-02-20 15:43:33.754902499 +0900
@@ -8,6 +8,7 @@
  * Do not edit! All changes made to it will be lost.
  */
 
+#include <libnm/NetworkManager.h>
 #ifndef NM_SETTINGSINTERFACE_H
 #define NM_SETTINGSINTERFACE_H
 
diff -ruN a/backends/NetworkManager/nm-vpn-connectioninterface.h b/backends/NetworkManager/nm-vpn-connectioninterface.h
--- a/backends/NetworkManager/nm-vpn-connectioninterface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/backends/NetworkManager/nm-vpn-connectioninterface.h	2021-02-20 15:43:37.934528820 +0900
@@ -8,6 +8,7 @@
  * Do not edit! All changes made to it will be lost.
  */
 
+#include <libnm/NetworkManager.h>
 #ifndef NM_VPN_CONNECTIONINTERFACE_H
 #define NM_VPN_CONNECTIONINTERFACE_H
 
diff -ruN a/backends/NetworkManager/remoteconnection.cpp b/backends/NetworkManager/remoteconnection.cpp
--- a/backends/NetworkManager/remoteconnection.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/backends/NetworkManager/remoteconnection.cpp	2021-02-18 21:17:34.502276319 +0900
@@ -20,15 +20,7 @@
 
 #include "remoteconnection.h"
 
-#include <NetworkManager.h>
-#include <nm-setting-cdma.h>
-#include <nm-setting-connection.h>
-#include <nm-setting-gsm.h>
-#include <nm-setting-bluetooth.h>
-#include <nm-setting-pppoe.h>
-#include <nm-setting-vpn.h>
-#include <nm-setting-wired.h>
-#include <nm-setting-wireless.h>
+#include <libnm/NetworkManager.h>
 
 #include <QDBusConnection>
 
diff -ruN a/backends/NetworkManager/remoteconnection.h b/backends/NetworkManager/remoteconnection.h
--- a/backends/NetworkManager/remoteconnection.h	2015-03-06 08:47:44.000000000 +0900
+++ b/backends/NetworkManager/remoteconnection.h	2021-02-20 15:44:09.723746033 +0900
@@ -18,6 +18,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef REMOTE_CONNECTION_H
 #define REMOTE_CONNECTION_H
 
diff -ruN a/backends/NetworkManager/settingdbus.h b/backends/NetworkManager/settingdbus.h
--- a/backends/NetworkManager/settingdbus.h	2015-03-06 08:47:44.000000000 +0900
+++ b/backends/NetworkManager/settingdbus.h	2021-02-20 15:44:15.047289977 +0900
@@ -18,6 +18,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef SETTINGDBUS_H
 #define SETTINGDBUS_H
 
diff -ruN a/backends/NetworkManager/settings/802-11-wirelessdbus.cpp b/backends/NetworkManager/settings/802-11-wirelessdbus.cpp
--- a/backends/NetworkManager/settings/802-11-wirelessdbus.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/backends/NetworkManager/settings/802-11-wirelessdbus.cpp	2021-02-20 15:51:26.392477122 +0900
@@ -62,8 +62,8 @@
   if (map.contains(QLatin1String(NM_SETTING_WIRELESS_SEEN_BSSIDS))) {
     setting->setSeenbssids(map.value(QLatin1String(NM_SETTING_WIRELESS_SEEN_BSSIDS)).value<QStringList>());
   }
-  if (map.contains(QLatin1String(NM_SETTING_WIRELESS_SEC))) {
-    setting->setSecurity(map.value(QLatin1String(NM_SETTING_WIRELESS_SEC)).value<QString>());
+  if (map.contains(QLatin1String("security"))) {
+    setting->setSecurity(map.value(QLatin1String("security")).value<QString>());
   } else {
     setting->setSecurity("");
   }
@@ -123,7 +123,7 @@
       map.insert(QLatin1String(NM_SETTING_WIRELESS_SEEN_BSSIDS), setting->seenbssids());
   }
   if (!setting->security().isEmpty()) {
-      map.insert(QLatin1String(NM_SETTING_WIRELESS_SEC), setting->security());
+      map.insert(QLatin1String("security"), setting->security());
   }
   return map;
 }
diff -ruN a/backends/NetworkManager/settings/802-11-wirelessdbus.h b/backends/NetworkManager/settings/802-11-wirelessdbus.h
--- a/backends/NetworkManager/settings/802-11-wirelessdbus.h	2015-03-06 08:47:44.000000000 +0900
+++ b/backends/NetworkManager/settings/802-11-wirelessdbus.h	2021-02-18 21:17:34.502276319 +0900
@@ -3,7 +3,7 @@
 #ifndef WIRELESSDBUS_H
 #define WIRELESSDBUS_H
 
-#include <nm-setting-wireless.h>
+#include <libnm/NetworkManager.h>
 
 #include <kdebug.h>
 #include <kcoreconfigskeleton.h>
diff -ruN a/backends/NetworkManager/settings/802-11-wireless-securitydbus.h b/backends/NetworkManager/settings/802-11-wireless-securitydbus.h
--- a/backends/NetworkManager/settings/802-11-wireless-securitydbus.h	2015-03-06 08:47:44.000000000 +0900
+++ b/backends/NetworkManager/settings/802-11-wireless-securitydbus.h	2021-02-18 21:17:34.503276273 +0900
@@ -3,7 +3,7 @@
 #ifndef WIRELESSSECURITYDBUS_H
 #define WIRELESSSECURITYDBUS_H
 
-#include <nm-setting-wireless-security.h>
+#include <libnm/NetworkManager.h>
 
 #include <kdebug.h>
 #include <kcoreconfigskeleton.h>
diff -ruN a/backends/NetworkManager/settings/802-1xdbus.h b/backends/NetworkManager/settings/802-1xdbus.h
--- a/backends/NetworkManager/settings/802-1xdbus.h	2015-03-06 08:47:44.000000000 +0900
+++ b/backends/NetworkManager/settings/802-1xdbus.h	2021-02-18 21:17:34.503276273 +0900
@@ -3,7 +3,7 @@
 #ifndef SECURITY8021XDBUS_H
 #define SECURITY8021XDBUS_H
 
-#include <nm-setting-8021x.h>
+#include <libnm/NetworkManager.h>
 
 #include <kdebug.h>
 #include <kcoreconfigskeleton.h>
diff -ruN a/backends/NetworkManager/settings/802-3-ethernetdbus.h b/backends/NetworkManager/settings/802-3-ethernetdbus.h
--- a/backends/NetworkManager/settings/802-3-ethernetdbus.h	2015-03-06 08:47:44.000000000 +0900
+++ b/backends/NetworkManager/settings/802-3-ethernetdbus.h	2021-02-18 21:17:34.503276273 +0900
@@ -3,7 +3,7 @@
 #ifndef WIREDDBUS_H
 #define WIREDDBUS_H
 
-#include <nm-setting-wired.h>
+#include <libnm/NetworkManager.h>
 
 #include <kdebug.h>
 #include <kcoreconfigskeleton.h>
diff -ruN a/backends/NetworkManager/settings/bluetoothdbus.h b/backends/NetworkManager/settings/bluetoothdbus.h
--- a/backends/NetworkManager/settings/bluetoothdbus.h	2015-03-06 08:47:44.000000000 +0900
+++ b/backends/NetworkManager/settings/bluetoothdbus.h	2021-02-18 21:17:34.504276227 +0900
@@ -3,7 +3,7 @@
 #ifndef BLUETOOTHDBUS_H
 #define BLUETOOTHDBUS_H
 
-#include <nm-setting-bluetooth.h>
+#include <libnm/NetworkManager.h>
 
 #include <kdebug.h>
 #include <kcoreconfigskeleton.h>
diff -ruN a/backends/NetworkManager/settings/cdmadbus.h b/backends/NetworkManager/settings/cdmadbus.h
--- a/backends/NetworkManager/settings/cdmadbus.h	2015-03-06 08:47:44.000000000 +0900
+++ b/backends/NetworkManager/settings/cdmadbus.h	2021-02-18 21:17:34.504276227 +0900
@@ -3,7 +3,7 @@
 #ifndef CDMADBUS_H
 #define CDMADBUS_H
 
-#include <nm-setting-cdma.h>
+#include <libnm/NetworkManager.h>
 
 #include <kdebug.h>
 #include <kcoreconfigskeleton.h>
diff -ruN a/backends/NetworkManager/settings/gsmdbus.cpp b/backends/NetworkManager/settings/gsmdbus.cpp
--- a/backends/NetworkManager/settings/gsmdbus.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/backends/NetworkManager/settings/gsmdbus.cpp	2021-02-20 16:32:10.848885269 +0900
@@ -35,13 +35,11 @@
   if (map.contains(QLatin1String(NM_SETTING_GSM_NETWORK_ID))) {
     setting->setNetworkid(map.value(QLatin1String(NM_SETTING_GSM_NETWORK_ID)).value<QString>());
   }
-  if (map.contains(QLatin1String(NM_SETTING_GSM_NETWORK_TYPE))) {
-    setting->setNetworktype(map.value(QLatin1String(NM_SETTING_GSM_NETWORK_TYPE)).value<int>());
-  } else {
-    setting->setNetworktype(NM_SETTING_GSM_NETWORK_TYPE_ANY);
+  if (map.contains(QLatin1String("network-type"))) {
+    setting->setNetworktype(map.value(QLatin1String("network-type")).value<int>());
   }
-  if (map.contains(QLatin1String(NM_SETTING_GSM_ALLOWED_BANDS))) {
-    setting->setBand(map.value(QLatin1String(NM_SETTING_GSM_ALLOWED_BANDS)).value<int>());
+  if (map.contains(QLatin1String("allowed-bands"))) {
+    setting->setBand(map.value(QLatin1String("allowed-bands")).value<int>());
   }
   if (map.contains(QLatin1String(NM_SETTING_GSM_HOME_ONLY))) {
     setting->setHomeonly(map.value(QLatin1String(NM_SETTING_GSM_HOME_ONLY)).value<bool>());
@@ -65,9 +63,6 @@
       map.insert(QLatin1String(NM_SETTING_GSM_APN), setting->apn());
   if (!setting->networkid().isEmpty())
       map.insert(QLatin1String(NM_SETTING_GSM_NETWORK_ID), setting->networkid());
-  if (setting->networktype() != NM_SETTING_GSM_NETWORK_TYPE_ANY) {
-      map.insert(QLatin1String(NM_SETTING_GSM_NETWORK_TYPE), setting->networktype());
-  }
   insertIfTrue(map, NM_SETTING_GSM_HOME_ONLY, setting->homeonly());
 
   map.unite(toSecretsMap());
diff -ruN a/backends/NetworkManager/settings/gsmdbus.h b/backends/NetworkManager/settings/gsmdbus.h
--- a/backends/NetworkManager/settings/gsmdbus.h	2015-03-06 08:47:44.000000000 +0900
+++ b/backends/NetworkManager/settings/gsmdbus.h	2021-02-18 21:17:34.505276180 +0900
@@ -3,7 +3,7 @@
 #ifndef GSMDBUS_H
 #define GSMDBUS_H
 
-#include <nm-setting-gsm.h>
+#include <libnm/NetworkManager.h>
 
 #include <kdebug.h>
 #include <kcoreconfigskeleton.h>
diff -ruN a/backends/NetworkManager/settings/ipv4dbus.cpp b/backends/NetworkManager/settings/ipv4dbus.cpp
--- a/backends/NetworkManager/settings/ipv4dbus.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/backends/NetworkManager/settings/ipv4dbus.cpp	2021-02-20 16:49:42.195698819 +0900
@@ -24,17 +24,17 @@
 
   Knm::Ipv4Setting * setting = static_cast<Knm::Ipv4Setting*>(m_setting);
 
-  if (map.contains(QLatin1String(NM_SETTING_IP4_CONFIG_METHOD))) {
-      setting->setMethod(methodStringToEnum(map.value(QLatin1String(NM_SETTING_IP4_CONFIG_METHOD)).value<QString>())); }
+  if (map.contains(QLatin1String(NM_SETTING_IP_CONFIG_METHOD))) {
+      setting->setMethod(methodStringToEnum(map.value(QLatin1String(NM_SETTING_IP_CONFIG_METHOD)).value<QString>())); }
 
-  if (map.contains(QLatin1String(NM_SETTING_IP4_CONFIG_DNS))) {
+  if (map.contains(QLatin1String(NM_SETTING_IP_CONFIG_DNS))) {
       QList<QHostAddress> dbusDns;
       QList<uint> temp;
-      if (map.value(QLatin1String(NM_SETTING_IP4_CONFIG_DNS)).canConvert<QDBusArgument>()) {
-          QDBusArgument dnsArg = map.value(QLatin1String(NM_SETTING_IP4_CONFIG_DNS)).value<QDBusArgument>();
+      if (map.value(QLatin1String(NM_SETTING_IP_CONFIG_DNS)).canConvert<QDBusArgument>()) {
+          QDBusArgument dnsArg = map.value(QLatin1String(NM_SETTING_IP_CONFIG_DNS)).value<QDBusArgument>();
           temp = qdbus_cast<QList<uint> >(dnsArg);
       } else {
-          temp = map.value(QLatin1String(NM_SETTING_IP4_CONFIG_DNS)).value<QList<uint> >();
+          temp = map.value(QLatin1String(NM_SETTING_IP_CONFIG_DNS)).value<QList<uint> >();
       }
     
       foreach(const uint utmp, temp) {
@@ -46,20 +46,20 @@
       setting->setDns(dbusDns);
   }
 
-  if (map.contains(QLatin1String(NM_SETTING_IP4_CONFIG_DNS_SEARCH)) &&
-      !map.value(QLatin1String(NM_SETTING_IP4_CONFIG_DNS_SEARCH)).value<QStringList>().isEmpty()
+  if (map.contains(QLatin1String(NM_SETTING_IP_CONFIG_DNS_SEARCH)) &&
+      !map.value(QLatin1String(NM_SETTING_IP_CONFIG_DNS_SEARCH)).value<QStringList>().isEmpty()
      ) {
-    setting->setDnssearch(map.value(QLatin1String(NM_SETTING_IP4_CONFIG_DNS_SEARCH)).value<QStringList>());
+    setting->setDnssearch(map.value(QLatin1String(NM_SETTING_IP_CONFIG_DNS_SEARCH)).value<QStringList>());
   }
 
-  if (map.contains(QLatin1String(NM_SETTING_IP4_CONFIG_ADDRESSES))) {
+  if (map.contains(QLatin1String(NM_SETTING_IP_CONFIG_ADDRESSES))) {
       QList<Solid::Control::IPv4AddressNm09> addresses;
       QList<QList<uint> > temp;
-      if (map.value(QLatin1String(NM_SETTING_IP4_CONFIG_ADDRESSES)).canConvert< QDBusArgument>()) {
-          QDBusArgument addressArg = map.value(QLatin1String(NM_SETTING_IP4_CONFIG_ADDRESSES)).value<QDBusArgument>();
+      if (map.value(QLatin1String(NM_SETTING_IP_CONFIG_ADDRESSES)).canConvert< QDBusArgument>()) {
+          QDBusArgument addressArg = map.value(QLatin1String(NM_SETTING_IP_CONFIG_ADDRESSES)).value<QDBusArgument>();
           temp = qdbus_cast<QList<QList<uint> > >(addressArg);
       } else {
-          temp = map.value(QLatin1String(NM_SETTING_IP4_CONFIG_ADDRESSES)).value<QList<QList<uint> > >();
+          temp = map.value(QLatin1String(NM_SETTING_IP_CONFIG_ADDRESSES)).value<QList<QList<uint> > >();
       }
 
       foreach(const QList<uint> & uintList, temp) {
@@ -84,15 +84,15 @@
       setting->setAddresses(addresses);
   }
 
-  if (map.contains(QLatin1String(NM_SETTING_IP4_CONFIG_ROUTES)))
+  if (map.contains(QLatin1String(NM_SETTING_IP_CONFIG_ROUTES)))
   {
       QList<Solid::Control::IPv4RouteNm09> routes;
       QList<QList<uint> > temp;
-      if (map.value(QLatin1String(NM_SETTING_IP4_CONFIG_ROUTES)).canConvert< QDBusArgument>()) {
-          QDBusArgument routeArg = map.value(QLatin1String(NM_SETTING_IP4_CONFIG_ROUTES)).value<QDBusArgument>();
+      if (map.value(QLatin1String(NM_SETTING_IP_CONFIG_ROUTES)).canConvert< QDBusArgument>()) {
+          QDBusArgument routeArg = map.value(QLatin1String(NM_SETTING_IP_CONFIG_ROUTES)).value<QDBusArgument>();
           temp = qdbus_cast<QList<QList<uint> > >(routeArg);
       } else {
-          temp = map.value(QLatin1String(NM_SETTING_IP4_CONFIG_ROUTES)).value<QList<QList<uint> > >();
+          temp = map.value(QLatin1String(NM_SETTING_IP_CONFIG_ROUTES)).value<QList<QList<uint> > >();
       }
 
       foreach(const QList<uint> & uintList, temp) {
@@ -114,26 +114,26 @@
           setting->setRoutes(routes);
   }
 
-  if (map.contains(QLatin1String(NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS))) {
-    setting->setIgnoredhcpdns(map.value(QLatin1String(NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS)).value<bool>());
+  if (map.contains(QLatin1String(NM_SETTING_IP_CONFIG_IGNORE_AUTO_DNS))) {
+    setting->setIgnoredhcpdns(map.value(QLatin1String(NM_SETTING_IP_CONFIG_IGNORE_AUTO_DNS)).value<bool>());
   } else {
     // this is needed when the connection is being updated instead of created.
     setting->setIgnoredhcpdns(false);
   }
-  if (map.contains(QLatin1String(NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES))) {
-    setting->setIgnoreautoroute(map.value(QLatin1String(NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES)).value<bool>());
+  if (map.contains(QLatin1String(NM_SETTING_IP_CONFIG_IGNORE_AUTO_ROUTES))) {
+    setting->setIgnoreautoroute(map.value(QLatin1String(NM_SETTING_IP_CONFIG_IGNORE_AUTO_ROUTES)).value<bool>());
   }
-  if (map.contains(QLatin1String(NM_SETTING_IP4_CONFIG_NEVER_DEFAULT))) {
-    setting->setNeverdefault(map.value(QLatin1String(NM_SETTING_IP4_CONFIG_NEVER_DEFAULT)).value<bool>());
+  if (map.contains(QLatin1String(NM_SETTING_IP_CONFIG_NEVER_DEFAULT))) {
+    setting->setNeverdefault(map.value(QLatin1String(NM_SETTING_IP_CONFIG_NEVER_DEFAULT)).value<bool>());
   }
   if (map.contains(QLatin1String(NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID))) {
     setting->setDhcpclientid(map.value(QLatin1String(NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID)).value<QString>());
   }
-  if (map.contains(QLatin1String(NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME))) {
-    setting->setDhcphostname(map.value(QLatin1String(NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME)).value<QString>());
+  if (map.contains(QLatin1String(NM_SETTING_IP_CONFIG_DHCP_HOSTNAME))) {
+    setting->setDhcphostname(map.value(QLatin1String(NM_SETTING_IP_CONFIG_DHCP_HOSTNAME)).value<QString>());
   }
-  if (map.contains(QLatin1String(NM_SETTING_IP4_CONFIG_MAY_FAIL))) {
-    setting->setMayfail(map.value(QLatin1String(NM_SETTING_IP4_CONFIG_MAY_FAIL)).value<bool>());
+  if (map.contains(QLatin1String(NM_SETTING_IP_CONFIG_MAY_FAIL))) {
+    setting->setMayfail(map.value(QLatin1String(NM_SETTING_IP_CONFIG_MAY_FAIL)).value<bool>());
   } else {
     setting->setMayfail(true);
   }
@@ -164,19 +164,19 @@
   Knm::Ipv4Setting * setting = static_cast<Knm::Ipv4Setting *>(m_setting);
   switch (setting->method()) {
       case Knm::Ipv4Setting::EnumMethod::Automatic:
-          map.insert(QLatin1String(NM_SETTING_IP4_CONFIG_METHOD), QLatin1String(NM_SETTING_IP4_CONFIG_METHOD_AUTO));
+          map.insert(QLatin1String(NM_SETTING_IP_CONFIG_METHOD), QLatin1String(NM_SETTING_IP4_CONFIG_METHOD_AUTO));
           break;
       case Knm::Ipv4Setting::EnumMethod::LinkLocal:
-          map.insert(QLatin1String(NM_SETTING_IP4_CONFIG_METHOD), QLatin1String(NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL));
+          map.insert(QLatin1String(NM_SETTING_IP_CONFIG_METHOD), QLatin1String(NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL));
           break;
       case Knm::Ipv4Setting::EnumMethod::Manual:
-          map.insert(QLatin1String(NM_SETTING_IP4_CONFIG_METHOD), QLatin1String(NM_SETTING_IP4_CONFIG_METHOD_MANUAL));
+          map.insert(QLatin1String(NM_SETTING_IP_CONFIG_METHOD), QLatin1String(NM_SETTING_IP4_CONFIG_METHOD_MANUAL));
           break;
       case Knm::Ipv4Setting::EnumMethod::Shared:
-          map.insert(QLatin1String(NM_SETTING_IP4_CONFIG_METHOD), QLatin1String(NM_SETTING_IP4_CONFIG_METHOD_SHARED));
+          map.insert(QLatin1String(NM_SETTING_IP_CONFIG_METHOD), QLatin1String(NM_SETTING_IP4_CONFIG_METHOD_SHARED));
           break;
        case Knm::Ipv4Setting::EnumMethod::Disabled:
-          map.insert(QLatin1String(NM_SETTING_IP4_CONFIG_METHOD), QLatin1String(NM_SETTING_IP4_CONFIG_METHOD_DISABLED));
+          map.insert(QLatin1String(NM_SETTING_IP_CONFIG_METHOD), QLatin1String(NM_SETTING_IP4_CONFIG_METHOD_DISABLED));
           break;
   }
 
@@ -185,11 +185,11 @@
       foreach (const QHostAddress &dns, setting->dns()) {
           dbusDns << htonl(dns.toIPv4Address());
       }
-      map.insert(QLatin1String(NM_SETTING_IP4_CONFIG_DNS), QVariant::fromValue(dbusDns));
+      map.insert(QLatin1String(NM_SETTING_IP_CONFIG_DNS), QVariant::fromValue(dbusDns));
   }
 
   if (!setting->dnssearch().isEmpty()) {
-      map.insert(QLatin1String(NM_SETTING_IP4_CONFIG_DNS_SEARCH), setting->dnssearch());
+      map.insert(QLatin1String(NM_SETTING_IP_CONFIG_DNS_SEARCH), setting->dnssearch());
   }
   if (!setting->addresses().isEmpty()) {
       QList<QList<uint> > dbusAddresses;
@@ -200,7 +200,7 @@
               << htonl(addr.gateway());
           dbusAddresses << dbusAddress;
       }
-      map.insert(QLatin1String(NM_SETTING_IP4_CONFIG_ADDRESSES), QVariant::fromValue(dbusAddresses));
+      map.insert(QLatin1String(NM_SETTING_IP_CONFIG_ADDRESSES), QVariant::fromValue(dbusAddresses));
   }
   if (!setting->routes().isEmpty()) {
       QList<QList<uint> > dbusRoutes;
@@ -213,17 +213,17 @@
           dbusRoutes << dbusRoute;
       }
 
-  map.insert(QLatin1String(NM_SETTING_IP4_CONFIG_ROUTES), QVariant::fromValue(dbusRoutes));
+  map.insert(QLatin1String(NM_SETTING_IP_CONFIG_ROUTES), QVariant::fromValue(dbusRoutes));
   }
 
 
-  //map.insert(QLatin1String(NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS), setting->ignoredhcpdns());
-  insertIfTrue(map, NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS, setting->ignoredhcpdns());
-  insertIfTrue(map, NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES, setting->ignoreautoroute());
-  insertIfTrue(map, NM_SETTING_IP4_CONFIG_NEVER_DEFAULT, setting->neverdefault());
+  //map.insert(QLatin1String(NM_SETTING_IP_CONFIG_IGNORE_AUTO_DNS), setting->ignoredhcpdns());
+  insertIfTrue(map, NM_SETTING_IP_CONFIG_IGNORE_AUTO_DNS, setting->ignoredhcpdns());
+  insertIfTrue(map, NM_SETTING_IP_CONFIG_IGNORE_AUTO_ROUTES, setting->ignoreautoroute());
+  insertIfTrue(map, NM_SETTING_IP_CONFIG_NEVER_DEFAULT, setting->neverdefault());
   insertIfNonEmpty(map, NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID, setting->dhcpclientid());
-  insertIfNonEmpty(map, NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME, setting->dhcphostname());
-  insertIfFalse(map, NM_SETTING_IP4_CONFIG_MAY_FAIL, setting->mayfail());
+  insertIfNonEmpty(map, NM_SETTING_IP_CONFIG_DHCP_HOSTNAME, setting->dhcphostname());
+  insertIfFalse(map, NM_SETTING_IP_CONFIG_MAY_FAIL, setting->mayfail());
   return map;
 }
 
diff -ruN a/backends/NetworkManager/settings/ipv4dbus.h b/backends/NetworkManager/settings/ipv4dbus.h
--- a/backends/NetworkManager/settings/ipv4dbus.h	2015-03-06 08:47:44.000000000 +0900
+++ b/backends/NetworkManager/settings/ipv4dbus.h	2021-02-18 21:17:34.506276134 +0900
@@ -3,7 +3,7 @@
 #ifndef IPV4DBUS_H
 #define IPV4DBUS_H
 
-#include <nm-setting-ip4-config.h>
+#include <libnm/NetworkManager.h>
 
 #include <kdebug.h>
 #include <kcoreconfigskeleton.h>
diff -ruN a/backends/NetworkManager/settings/ipv6dbus.cpp b/backends/NetworkManager/settings/ipv6dbus.cpp
--- a/backends/NetworkManager/settings/ipv6dbus.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/backends/NetworkManager/settings/ipv6dbus.cpp	2021-02-20 16:56:20.600136899 +0900
@@ -23,17 +23,17 @@
 
   Knm::Ipv6Setting * setting = static_cast<Knm::Ipv6Setting*>(m_setting);
 
-  if (map.contains(QLatin1String(NM_SETTING_IP6_CONFIG_METHOD))) {
-      setting->setMethod(methodStringToEnum(map.value(QLatin1String(NM_SETTING_IP6_CONFIG_METHOD)).value<QString>())); }
+  if (map.contains(QLatin1String(NM_SETTING_IP_CONFIG_METHOD))) {
+      setting->setMethod(methodStringToEnum(map.value(QLatin1String(NM_SETTING_IP_CONFIG_METHOD)).value<QString>())); }
 
-  if (map.contains(QLatin1String(NM_SETTING_IP6_CONFIG_DNS))) {
+  if (map.contains(QLatin1String(NM_SETTING_IP_CONFIG_DNS))) {
       QList<QHostAddress> dbusDns;
       QList<QByteArray> temp;
-      if (map.value(QLatin1String(NM_SETTING_IP6_CONFIG_DNS)).canConvert<QDBusArgument>()) {
-          QDBusArgument dnsArg = map.value(QLatin1String(NM_SETTING_IP6_CONFIG_DNS)).value< QDBusArgument>();
+      if (map.value(QLatin1String(NM_SETTING_IP_CONFIG_DNS)).canConvert<QDBusArgument>()) {
+          QDBusArgument dnsArg = map.value(QLatin1String(NM_SETTING_IP_CONFIG_DNS)).value< QDBusArgument>();
           temp = qdbus_cast<QList<QByteArray> >(dnsArg);
       } else {
-          temp = map.value(QLatin1String(NM_SETTING_IP6_CONFIG_DNS)).value<QList<QByteArray> >();
+          temp = map.value(QLatin1String(NM_SETTING_IP_CONFIG_DNS)).value<QList<QByteArray> >();
       }
 
       foreach(const QByteArray &utmp, temp) {
@@ -50,19 +50,19 @@
       setting->setDns(dbusDns);
   }
 
-  if (map.contains(QLatin1String(NM_SETTING_IP6_CONFIG_DNS_SEARCH)) &&
-      !map.value(QLatin1String(NM_SETTING_IP6_CONFIG_DNS_SEARCH)).value<QStringList>().isEmpty()
+  if (map.contains(QLatin1String(NM_SETTING_IP_CONFIG_DNS_SEARCH)) &&
+      !map.value(QLatin1String(NM_SETTING_IP_CONFIG_DNS_SEARCH)).value<QStringList>().isEmpty()
      ) {
-    setting->setDnssearch(map.value(QLatin1String(NM_SETTING_IP6_CONFIG_DNS_SEARCH)).value<QStringList>());
+    setting->setDnssearch(map.value(QLatin1String(NM_SETTING_IP_CONFIG_DNS_SEARCH)).value<QStringList>());
   }
 
-  if (map.contains(QLatin1String(NM_SETTING_IP6_CONFIG_ADDRESSES))) {
+  if (map.contains(QLatin1String(NM_SETTING_IP_CONFIG_ADDRESSES))) {
       QList<IpV6AddressMap> temp;
-      if (map.value(QLatin1String(NM_SETTING_IP6_CONFIG_DNS)).canConvert<QDBusArgument>()) {
-          QDBusArgument addressArg = map.value(QLatin1String(NM_SETTING_IP6_CONFIG_ADDRESSES)).value< QDBusArgument>();
+      if (map.value(QLatin1String(NM_SETTING_IP_CONFIG_DNS)).canConvert<QDBusArgument>()) {
+          QDBusArgument addressArg = map.value(QLatin1String(NM_SETTING_IP_CONFIG_ADDRESSES)).value< QDBusArgument>();
           temp = qdbus_cast<QList<IpV6AddressMap> >(addressArg);
       } else {
-          temp = map.value(QLatin1String(NM_SETTING_IP6_CONFIG_ADDRESSES)).value<QList<IpV6AddressMap> >();
+          temp = map.value(QLatin1String(NM_SETTING_IP_CONFIG_ADDRESSES)).value<QList<IpV6AddressMap> >();
       }
       QList<Solid::Control::IPv6Address> addresses;
 
@@ -96,14 +96,14 @@
       setting->setAddresses(addresses);
   }
 
-  if (map.contains(QLatin1String(NM_SETTING_IP6_CONFIG_ROUTES)))
+  if (map.contains(QLatin1String(NM_SETTING_IP_CONFIG_ROUTES)))
   {
       QList<IpV6RouteMap> temp;
-      if (map.value(QLatin1String(NM_SETTING_IP6_CONFIG_ROUTES)).canConvert<QDBusArgument>()) {
-          QDBusArgument routeArg = map.value(QLatin1String(NM_SETTING_IP6_CONFIG_ROUTES)).value< QDBusArgument>();
+      if (map.value(QLatin1String(NM_SETTING_IP_CONFIG_ROUTES)).canConvert<QDBusArgument>()) {
+          QDBusArgument routeArg = map.value(QLatin1String(NM_SETTING_IP_CONFIG_ROUTES)).value< QDBusArgument>();
           temp = qdbus_cast<QList<IpV6RouteMap> >(routeArg);
       } else {
-          temp = map.value(QLatin1String(NM_SETTING_IP6_CONFIG_ROUTES)).value<QList<IpV6RouteMap> >();
+          temp = map.value(QLatin1String(NM_SETTING_IP_CONFIG_ROUTES)).value<QList<IpV6RouteMap> >();
       }
       QList<Solid::Control::IPv6Route> routes;
 
@@ -135,20 +135,20 @@
       setting->setRoutes(routes);
   }
 
-  if (map.contains(QLatin1String(NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS))) {
-    setting->setIgnoredhcpdns(map.value(QLatin1String(NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS)).value<bool>());
+  if (map.contains(QLatin1String(NM_SETTING_IP_CONFIG_IGNORE_AUTO_DNS))) {
+    setting->setIgnoredhcpdns(map.value(QLatin1String(NM_SETTING_IP_CONFIG_IGNORE_AUTO_DNS)).value<bool>());
   } else {
     // this is needed when the connection is being updated instead of created.
     setting->setIgnoredhcpdns(false);
   }
-  if (map.contains(QLatin1String(NM_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES))) {
-    setting->setIgnoreautoroute(map.value(QLatin1String(NM_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES)).value<bool>());
+  if (map.contains(QLatin1String(NM_SETTING_IP_CONFIG_IGNORE_AUTO_ROUTES))) {
+    setting->setIgnoreautoroute(map.value(QLatin1String(NM_SETTING_IP_CONFIG_IGNORE_AUTO_ROUTES)).value<bool>());
   }
-  if (map.contains(QLatin1String(NM_SETTING_IP6_CONFIG_NEVER_DEFAULT))) {
-    setting->setNeverdefault(map.value(QLatin1String(NM_SETTING_IP6_CONFIG_NEVER_DEFAULT)).value<bool>());
+  if (map.contains(QLatin1String(NM_SETTING_IP_CONFIG_NEVER_DEFAULT))) {
+    setting->setNeverdefault(map.value(QLatin1String(NM_SETTING_IP_CONFIG_NEVER_DEFAULT)).value<bool>());
   }
-  if (map.contains(QLatin1String(NM_SETTING_IP6_CONFIG_MAY_FAIL))) {
-    setting->setMayfail(map.value(QLatin1String(NM_SETTING_IP6_CONFIG_MAY_FAIL)).value<bool>());
+  if (map.contains(QLatin1String(NM_SETTING_IP_CONFIG_MAY_FAIL))) {
+    setting->setMayfail(map.value(QLatin1String(NM_SETTING_IP_CONFIG_MAY_FAIL)).value<bool>());
   } else {
     setting->setMayfail(true);
   }
@@ -185,22 +185,22 @@
   Knm::Ipv6Setting * setting = static_cast<Knm::Ipv6Setting *>(m_setting);
   switch (setting->method()) {
       case Knm::Ipv6Setting::EnumMethod::Automatic:
-          map.insert(QLatin1String(NM_SETTING_IP6_CONFIG_METHOD), QLatin1String(NM_SETTING_IP6_CONFIG_METHOD_AUTO));
+          map.insert(QLatin1String(NM_SETTING_IP_CONFIG_METHOD), QLatin1String(NM_SETTING_IP6_CONFIG_METHOD_AUTO));
           break;
       case Knm::Ipv6Setting::EnumMethod::Dhcp:
-          map.insert(QLatin1String(NM_SETTING_IP6_CONFIG_METHOD), QLatin1String(NM_SETTING_IP6_CONFIG_METHOD_DHCP));
+          map.insert(QLatin1String(NM_SETTING_IP_CONFIG_METHOD), QLatin1String(NM_SETTING_IP6_CONFIG_METHOD_DHCP));
           break;
       case Knm::Ipv6Setting::EnumMethod::LinkLocal:
-          map.insert(QLatin1String(NM_SETTING_IP6_CONFIG_METHOD), QLatin1String(NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL));
+          map.insert(QLatin1String(NM_SETTING_IP_CONFIG_METHOD), QLatin1String(NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL));
           break;
       case Knm::Ipv6Setting::EnumMethod::Manual:
-          map.insert(QLatin1String(NM_SETTING_IP6_CONFIG_METHOD), QLatin1String(NM_SETTING_IP6_CONFIG_METHOD_MANUAL));
+          map.insert(QLatin1String(NM_SETTING_IP_CONFIG_METHOD), QLatin1String(NM_SETTING_IP6_CONFIG_METHOD_MANUAL));
           break;
       case Knm::Ipv6Setting::EnumMethod::Shared:
-          map.insert(QLatin1String(NM_SETTING_IP6_CONFIG_METHOD), QLatin1String(NM_SETTING_IP6_CONFIG_METHOD_SHARED));
+          map.insert(QLatin1String(NM_SETTING_IP_CONFIG_METHOD), QLatin1String(NM_SETTING_IP6_CONFIG_METHOD_SHARED));
           break;
       case Knm::Ipv6Setting::EnumMethod::Ignore:
-          map.insert(QLatin1String(NM_SETTING_IP6_CONFIG_METHOD), QLatin1String(NM_SETTING_IP6_CONFIG_METHOD_IGNORE));
+          map.insert(QLatin1String(NM_SETTING_IP_CONFIG_METHOD), QLatin1String(NM_SETTING_IP6_CONFIG_METHOD_IGNORE));
           break;
   }
 
@@ -216,11 +216,11 @@
 
           dbusDns << assembledDnsAddress;
       }
-      map.insert(QLatin1String(NM_SETTING_IP6_CONFIG_DNS), QVariant::fromValue(dbusDns));
+      map.insert(QLatin1String(NM_SETTING_IP_CONFIG_DNS), QVariant::fromValue(dbusDns));
   }
 
   if (!setting->dnssearch().isEmpty()) {
-      map.insert(QLatin1String(NM_SETTING_IP6_CONFIG_DNS_SEARCH), setting->dnssearch());
+      map.insert(QLatin1String(NM_SETTING_IP_CONFIG_DNS_SEARCH), setting->dnssearch());
   }
   if (!setting->addresses().isEmpty()) {
       QList<IpV6AddressMap> dbusAddresses;
@@ -245,7 +245,7 @@
           dbusAddress.gateway = assembledGateway;
           dbusAddresses << dbusAddress;
       }
-      map.insert(QLatin1String(NM_SETTING_IP6_CONFIG_ADDRESSES), QVariant::fromValue(dbusAddresses));
+      map.insert(QLatin1String(NM_SETTING_IP_CONFIG_ADDRESSES), QVariant::fromValue(dbusAddresses));
   }
   if (!setting->routes().isEmpty()) {
       QList<IpV6RouteMap> dbusRoutes;
@@ -273,14 +273,14 @@
           dbusRoutes << dbusRoute;
       }
 
-      map.insert(QLatin1String(NM_SETTING_IP6_CONFIG_ROUTES), QVariant::fromValue(dbusRoutes));
+      map.insert(QLatin1String(NM_SETTING_IP_CONFIG_ROUTES), QVariant::fromValue(dbusRoutes));
   }
 
 
-  insertIfTrue(map, NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS, setting->ignoredhcpdns());
-  insertIfTrue(map, NM_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES, setting->ignoreautoroute());
-  insertIfTrue(map, NM_SETTING_IP6_CONFIG_NEVER_DEFAULT, setting->neverdefault());
-  insertIfFalse(map, NM_SETTING_IP6_CONFIG_MAY_FAIL, setting->mayfail());
+  insertIfTrue(map, NM_SETTING_IP_CONFIG_IGNORE_AUTO_DNS, setting->ignoredhcpdns());
+  insertIfTrue(map, NM_SETTING_IP_CONFIG_IGNORE_AUTO_ROUTES, setting->ignoreautoroute());
+  insertIfTrue(map, NM_SETTING_IP_CONFIG_NEVER_DEFAULT, setting->neverdefault());
+  insertIfFalse(map, NM_SETTING_IP_CONFIG_MAY_FAIL, setting->mayfail());
   map.insert(QLatin1String(NM_SETTING_IP6_CONFIG_IP6_PRIVACY), setting->privacy());
   return map;
 }
diff -ruN a/backends/NetworkManager/settings/ipv6dbus.h b/backends/NetworkManager/settings/ipv6dbus.h
--- a/backends/NetworkManager/settings/ipv6dbus.h	2015-03-06 08:47:44.000000000 +0900
+++ b/backends/NetworkManager/settings/ipv6dbus.h	2021-02-18 21:17:34.506276134 +0900
@@ -3,7 +3,7 @@
 #ifndef IPV6DBUS_H
 #define IPV6DBUS_H
 
-#include <nm-setting-ip6-config.h>
+#include <libnm/NetworkManager.h>
 
 #include <kdebug.h>
 #include <kcoreconfigskeleton.h>
diff -ruN a/backends/NetworkManager/settings/pppdbus.h b/backends/NetworkManager/settings/pppdbus.h
--- a/backends/NetworkManager/settings/pppdbus.h	2015-03-06 08:47:44.000000000 +0900
+++ b/backends/NetworkManager/settings/pppdbus.h	2021-02-18 21:17:34.507276088 +0900
@@ -3,7 +3,7 @@
 #ifndef PPPDBUS_H
 #define PPPDBUS_H
 
-#include <nm-setting-ppp.h>
+#include <libnm/NetworkManager.h>
 
 #include <kdebug.h>
 #include <kcoreconfigskeleton.h>
diff -ruN a/backends/NetworkManager/settings/pppoedbus.h b/backends/NetworkManager/settings/pppoedbus.h
--- a/backends/NetworkManager/settings/pppoedbus.h	2015-03-06 08:47:44.000000000 +0900
+++ b/backends/NetworkManager/settings/pppoedbus.h	2021-02-18 21:17:34.507276088 +0900
@@ -3,7 +3,7 @@
 #ifndef PPPOEDBUS_H
 #define PPPOEDBUS_H
 
-#include <nm-setting-pppoe.h>
+#include <libnm/NetworkManager.h>
 
 #include <kdebug.h>
 #include <kcoreconfigskeleton.h>
diff -ruN a/backends/NetworkManager/settings/serialdbus.h b/backends/NetworkManager/settings/serialdbus.h
--- a/backends/NetworkManager/settings/serialdbus.h	2015-03-06 08:47:44.000000000 +0900
+++ b/backends/NetworkManager/settings/serialdbus.h	2021-02-18 21:17:34.508276042 +0900
@@ -3,7 +3,7 @@
 #ifndef SERIALDBUS_H
 #define SERIALDBUS_H
 
-#include <nm-setting-serial.h>
+#include <libnm/NetworkManager.h>
 
 #include <kdebug.h>
 #include <kcoreconfigskeleton.h>
diff -ruN a/backends/NetworkManager/settings/vpndbus.h b/backends/NetworkManager/settings/vpndbus.h
--- a/backends/NetworkManager/settings/vpndbus.h	2015-03-06 08:47:44.000000000 +0900
+++ b/backends/NetworkManager/settings/vpndbus.h	2021-02-18 21:17:34.508276042 +0900
@@ -3,7 +3,7 @@
 #ifndef VPNDBUS_H
 #define VPNDBUS_H
 
-#include <nm-setting-vpn.h>
+#include <libnm/NetworkManager.h>
 
 #include <kdebug.h>
 #include <kcoreconfigskeleton.h>
diff -ruN a/dataengine/networkmanagementengine.h b/dataengine/networkmanagementengine.h
--- a/dataengine/networkmanagementengine.h	2015-03-06 08:47:44.000000000 +0900
+++ b/dataengine/networkmanagementengine.h	2021-02-18 21:17:34.509275995 +0900
@@ -17,7 +17,7 @@
     02110-1301, USA.
 */
 
-
+#include <libnm/NetworkManager.h>
 #ifndef NETWORKMANAGEMENTENGINE_H
 #define NETWORKMANAGEMENTENGINE_H
 
diff -ruN a/kded/nm08connections.cpp b/kded/nm08connections.cpp
--- a/kded/nm08connections.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/kded/nm08connections.cpp	2021-02-20 17:01:42.128592778 +0900
@@ -18,6 +18,8 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
+
 namespace Knm {
     class Setting;
 }
diff -ruN a/kded/nm08connections.h b/kded/nm08connections.h
--- a/kded/nm08connections.h	2015-03-06 08:47:44.000000000 +0900
+++ b/kded/nm08connections.h	2021-02-20 17:01:10.826643067 +0900
@@ -18,6 +18,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef IMPORTNM08CONNECTIONS_H
 #define IMPORTNM08CONNECTIONS_H
 
diff -ruN a/kded/service.h b/kded/service.h
--- a/kded/service.h	2015-03-06 08:47:44.000000000 +0900
+++ b/kded/service.h	2021-02-20 17:01:04.337071344 +0900
@@ -20,6 +20,7 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef KNM09_KDED_SERVICE_H
 #define KNM09_KDED_SERVICE_H
 
diff -ruN a/kded/settingsnm08/bluetoothpersistence.cpp b/kded/settingsnm08/bluetoothpersistence.cpp
--- a/kded/settingsnm08/bluetoothpersistence.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/kded/settingsnm08/bluetoothpersistence.cpp	2021-02-18 21:17:34.509275995 +0900
@@ -1,7 +1,7 @@
 // This file is generated by kconfig_compiler from bluetooth.kcfg.
 // All changes you do to this file will be lost.
 
-#include <nm-setting-bluetooth.h>
+#include <libnm/NetworkManager.h>
 
 #include "bluetoothpersistence.h"
 
diff -ruN a/libs/client/remoteactivatable.cpp b/libs/client/remoteactivatable.cpp
--- a/libs/client/remoteactivatable.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/client/remoteactivatable.cpp	2021-02-18 21:17:34.510275949 +0900
@@ -19,6 +19,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #include <KDebug>
 
 #include "remoteactivatable.h"
diff -ruN a/libs/client/remoteactivatable.h b/libs/client/remoteactivatable.h
--- a/libs/client/remoteactivatable.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/client/remoteactivatable.h	2021-02-18 21:17:34.510275949 +0900
@@ -19,6 +19,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef REMOTEACTIVATABLE_H
 #define REMOTEACTIVATABLE_H
 
diff -ruN a/libs/client/remoteactivatablelist.h b/libs/client/remoteactivatablelist.h
--- a/libs/client/remoteactivatablelist.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/client/remoteactivatablelist.h	2021-02-18 21:17:34.510275949 +0900
@@ -19,6 +19,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef REMOTEACTIVATABLELIST_H
 #define REMOTEACTIVATABLELIST_H
 
diff -ruN a/libs/client/remotegsminterfaceconnection.h b/libs/client/remotegsminterfaceconnection.h
--- a/libs/client/remotegsminterfaceconnection.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/client/remotegsminterfaceconnection.h	2021-02-18 21:17:34.510275949 +0900
@@ -19,6 +19,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef REMOTEGSMINTERFACECONNECTION_H
 #define REMOTEGSMINTERFACECONNECTION_H
 
diff -ruN a/libs/client/remoteinterfaceconnection.h b/libs/client/remoteinterfaceconnection.h
--- a/libs/client/remoteinterfaceconnection.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/client/remoteinterfaceconnection.h	2021-02-18 21:17:34.510275949 +0900
@@ -19,6 +19,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef REMOTEINTERFACECONNECTION_H
 #define REMOTEINTERFACECONNECTION_H
 
diff -ruN a/libs/client/remoteunconfiguredinterface.h b/libs/client/remoteunconfiguredinterface.h
--- a/libs/client/remoteunconfiguredinterface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/client/remoteunconfiguredinterface.h	2021-02-18 21:17:34.510275949 +0900
@@ -21,6 +21,7 @@
 
 // TODO: check if this class is really used, remove it if not.
 
+#include <libnm/NetworkManager.h>
 #ifndef REMOTEUNCONFIGUREDINTERFACE_H
 #define REMOTEUNCONFIGUREDINTERFACE_H
 
diff -ruN a/libs/client/remotevpninterfaceconnection.h b/libs/client/remotevpninterfaceconnection.h
--- a/libs/client/remotevpninterfaceconnection.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/client/remotevpninterfaceconnection.h	2021-02-18 21:17:34.511275903 +0900
@@ -19,6 +19,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef REMOTEVPNINTERFACECONNECTION_H
 #define REMOTEVPNINTERFACECONNECTION_H
 
diff -ruN a/libs/client/remotewirelessinterfaceconnection.h b/libs/client/remotewirelessinterfaceconnection.h
--- a/libs/client/remotewirelessinterfaceconnection.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/client/remotewirelessinterfaceconnection.h	2021-02-18 21:17:34.511275903 +0900
@@ -19,6 +19,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef REMOTEWIRELESSINTERFACECONNECTION_H
 #define REMOTEWIRELESSINTERFACECONNECTION_H
 
diff -ruN a/libs/client/remotewirelessnetwork.h b/libs/client/remotewirelessnetwork.h
--- a/libs/client/remotewirelessnetwork.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/client/remotewirelessnetwork.h	2021-02-18 21:17:34.511275903 +0900
@@ -19,6 +19,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef REMOTEWIRELESSNETWORKITEM_H
 #define REMOTEWIRELESSNETWORKITEM_H
 
diff -ruN a/libs/client/remotewirelessobject.h b/libs/client/remotewirelessobject.h
--- a/libs/client/remotewirelessobject.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/client/remotewirelessobject.h	2021-02-18 21:17:34.511275903 +0900
@@ -18,6 +18,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef REMOTEWIRELESSOBJECT_H
 #define REMOTEWIRELESSOBJECT_H
 
diff -ruN a/libs/internals/activatable.cpp b/libs/internals/activatable.cpp
--- a/libs/internals/activatable.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/internals/activatable.cpp	2021-02-18 21:17:34.511275903 +0900
@@ -20,6 +20,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #include "activatable.h"
 
 #include <QString>
diff -ruN a/libs/internals/activatable.h b/libs/internals/activatable.h
--- a/libs/internals/activatable.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/internals/activatable.h	2021-02-18 21:17:34.511275903 +0900
@@ -20,6 +20,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef KNM_INTERNALS_ACTIVATABLE_H
 #define KNM_INTERNALS_ACTIVATABLE_H
 
diff -ruN a/libs/internals/connection.cpp b/libs/internals/connection.cpp
--- a/libs/internals/connection.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/internals/connection.cpp	2021-02-18 21:17:34.512275857 +0900
@@ -18,7 +18,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
+#include <libnm/NetworkManager.h>
 #include <kdebug.h>
 #include <solid/control/networkmodeminterface.h>
 
diff -ruN a/libs/internals/connection.h b/libs/internals/connection.h
--- a/libs/internals/connection.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/internals/connection.h	2021-02-18 21:17:34.512275857 +0900
@@ -18,6 +18,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef KNM_INTERNALS_CONNECTION_H
 #define KNM_INTERNALS_CONNECTION_H
 
diff -ruN a/libs/internals/gsminterfaceconnection.cpp b/libs/internals/gsminterfaceconnection.cpp
--- a/libs/internals/gsminterfaceconnection.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/internals/gsminterfaceconnection.cpp	2021-02-18 21:17:34.512275857 +0900
@@ -20,6 +20,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #include <KDebug>
 
 #include <solid/control/networkmanager.h>
diff -ruN a/libs/internals/gsminterfaceconnection.h b/libs/internals/gsminterfaceconnection.h
--- a/libs/internals/gsminterfaceconnection.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/internals/gsminterfaceconnection.h	2021-02-18 21:17:34.512275857 +0900
@@ -20,6 +20,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef KNM_EXTERNALS_GSMINTERFACECONNECTION_H
 #define KNM_EXTERNALS_GSMINTERFACECONNECTION_H
 
diff -ruN a/libs/internals/gsminterfaceconnectionhelpers.h b/libs/internals/gsminterfaceconnectionhelpers.h
--- a/libs/internals/gsminterfaceconnectionhelpers.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/internals/gsminterfaceconnectionhelpers.h	2021-02-18 21:17:34.512275857 +0900
@@ -19,6 +19,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef KNM_EXTERNALS_GSMINTERFACECONNECTIONHELPERS_H
 #define KNM_EXTERNALS_GSMINTERFACECONNECTIONHELPERS_H
 
diff -ruN a/libs/internals/hiddenwirelessinterfaceconnection.h b/libs/internals/hiddenwirelessinterfaceconnection.h
--- a/libs/internals/hiddenwirelessinterfaceconnection.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/internals/hiddenwirelessinterfaceconnection.h	2021-02-18 21:17:34.512275857 +0900
@@ -18,6 +18,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef HIDDENWIRELESSINTERFACECONNECTION_H
 #define HIDDENWIRELESSINTERFACECONNECTION_H
 
diff -ruN a/libs/internals/interfaceconnection.h b/libs/internals/interfaceconnection.h
--- a/libs/internals/interfaceconnection.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/internals/interfaceconnection.h	2021-02-18 21:17:34.513275811 +0900
@@ -20,6 +20,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef KNM_EXTERNALS_INTERFACECONNECTION_H
 #define KNM_EXTERNALS_INTERFACECONNECTION_H
 
diff -ruN a/libs/internals/interfaceconnectionhelpers.h b/libs/internals/interfaceconnectionhelpers.h
--- a/libs/internals/interfaceconnectionhelpers.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/internals/interfaceconnectionhelpers.h	2021-02-18 21:17:34.513275811 +0900
@@ -18,6 +18,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef KNM_EXTERNALS_INTERFACECONNECTIONHELPERS_H
 #define KNM_EXTERNALS_INTERFACECONNECTIONHELPERS_H
 
diff -ruN a/libs/internals/knminternals_export.h b/libs/internals/knminternals_export.h
--- a/libs/internals/knminternals_export.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/internals/knminternals_export.h	2021-02-18 21:17:34.513275811 +0900
@@ -17,6 +17,7 @@
     Boston, MA 02110-1301, USA.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef KNMINTERNALS_EXPORT_H
 #define KNMINTERNALS_EXPORT_H
 
diff -ruN a/libs/internals/schemas/ipv4.kcfg b/libs/internals/schemas/ipv4.kcfg
--- a/libs/internals/schemas/ipv4.kcfg	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/internals/schemas/ipv4.kcfg	2021-02-18 21:17:34.513275811 +0900
@@ -38,7 +38,7 @@
       <label>Ignore Automatic Routes</label>
       <whatsthis>Ignore routes returned by automatic configuration mechanisms and use the manually configured routes instead</whatsthis>
     </entry>
-    <entry name="neverdefault" type="Bool" dbuskey="NM_SETTING_IP4_CONFIG_NEVER_DEFAULT">
+    <entry name="neverdefault" type="Bool" dbuskey="NM_SETTING_IP_CONFIG_NEVER_DEFAULT">
       <label>Never Default Route</label>
       <whatsthis>Never assign the default route to this connection</whatsthis>
     </entry>
diff -ruN a/libs/internals/setting.cpp b/libs/internals/setting.cpp
--- a/libs/internals/setting.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/internals/setting.cpp	2021-02-18 21:17:34.513275811 +0900
@@ -18,23 +18,9 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #include "setting.h"
 
-#include <nm-setting-cdma.h>
-#include <nm-setting-connection.h>
-#include <nm-setting-wired.h>
-#include <nm-setting-ip4-config.h>
-#include <nm-setting-ip6-config.h>
-#include <nm-setting-8021x.h>
-#include <nm-setting-gsm.h>
-#include <nm-setting-bluetooth.h>
-#include <nm-setting-ppp.h>
-#include <nm-setting-pppoe.h>
-#include <nm-setting-serial.h>
-#include <nm-setting-vpn.h>
-#include <nm-setting-wireless.h>
-#include <nm-setting-wireless-security.h>
-
 #include <QString>
 #include <QStringList>
 
diff -ruN a/libs/internals/settings/802-11-wireless.h b/libs/internals/settings/802-11-wireless.h
--- a/libs/internals/settings/802-11-wireless.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/internals/settings/802-11-wireless.h	2021-02-18 21:17:34.514275764 +0900
@@ -1,3 +1,4 @@
+#include <libnm/NetworkManager.h>
 // This file is generated by kconfig_compiler from 802-11-wireless.kcfg.
 // All changes you do to this file will be lost.
 #ifndef KNM_WIRELESSSETTING_H
diff -ruN a/libs/internals/settings/802-11-wireless-security.h b/libs/internals/settings/802-11-wireless-security.h
--- a/libs/internals/settings/802-11-wireless-security.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/internals/settings/802-11-wireless-security.h	2021-02-18 21:17:34.514275764 +0900
@@ -1,3 +1,4 @@
+#include <libnm/NetworkManager.h>
 // This file is generated by kconfig_compiler from 802-11-wireless-security.kcfg.
 // All changes you do to this file will be lost.
 #ifndef KNM_WIRELESSSECURITYSETTING_H
diff -ruN a/libs/internals/settings/802-1x.h b/libs/internals/settings/802-1x.h
--- a/libs/internals/settings/802-1x.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/internals/settings/802-1x.h	2021-02-18 21:17:34.514275764 +0900
@@ -1,3 +1,4 @@
+#include <libnm/NetworkManager.h>
 // This file is generated by kconfig_compiler from 802-1x.kcfg.
 // All changes you do to this file will be lost.
 #ifndef KNM_SECURITY8021XSETTING_H
diff -ruN a/libs/internals/settings/802-3-ethernet.h b/libs/internals/settings/802-3-ethernet.h
--- a/libs/internals/settings/802-3-ethernet.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/internals/settings/802-3-ethernet.h	2021-02-18 21:17:34.514275764 +0900
@@ -1,3 +1,4 @@
+#include <libnm/NetworkManager.h>
 // This file is generated by kconfig_compiler from 802-3-ethernet.kcfg.
 // All changes you do to this file will be lost.
 #ifndef KNM_WIREDSETTING_H
diff -ruN a/libs/internals/settings/bluetooth.h b/libs/internals/settings/bluetooth.h
--- a/libs/internals/settings/bluetooth.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/internals/settings/bluetooth.h	2021-02-18 21:17:34.514275764 +0900
@@ -1,3 +1,4 @@
+#include <libnm/NetworkManager.h>
 // This file is generated by kconfig_compiler from bluetooth.kcfg.
 // All changes you do to this file will be lost.
 #ifndef KNM_BLUETOOTH_H
diff -ruN a/libs/internals/settings/cdma.h b/libs/internals/settings/cdma.h
--- a/libs/internals/settings/cdma.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/internals/settings/cdma.h	2021-02-18 21:17:34.514275764 +0900
@@ -1,3 +1,4 @@
+#include <libnm/NetworkManager.h>
 // This file is generated by kconfig_compiler from cdma.kcfg.
 // All changes you do to this file will be lost.
 #ifndef KNM_CDMASETTING_H
diff -ruN a/libs/internals/settings/gsm.h b/libs/internals/settings/gsm.h
--- a/libs/internals/settings/gsm.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/internals/settings/gsm.h	2021-02-18 21:17:34.515275718 +0900
@@ -1,3 +1,4 @@
+#include <libnm/NetworkManager.h>
 // This file is generated by kconfig_compiler from gsm.kcfg.
 // All changes you do to this file will be lost.
 #ifndef KNM_GSMSETTING_H
diff -ruN a/libs/internals/settings/ipv4.h b/libs/internals/settings/ipv4.h
--- a/libs/internals/settings/ipv4.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/internals/settings/ipv4.h	2021-02-18 21:17:34.515275718 +0900
@@ -1,3 +1,4 @@
+#include <libnm/NetworkManager.h>
 // This file is generated by kconfig_compiler from ipv4.kcfg.
 // All changes you do to this file will be lost.
 #ifndef KNM_IPV4SETTING_H
diff -ruN a/libs/internals/settings/ipv6.h b/libs/internals/settings/ipv6.h
--- a/libs/internals/settings/ipv6.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/internals/settings/ipv6.h	2021-02-18 21:17:34.515275718 +0900
@@ -1,3 +1,4 @@
+#include <libnm/NetworkManager.h>
 // This file is generated by kconfig_compiler from ipv6.kcfg.
 // All changes you do to this file will be lost.
 #ifndef KNM_IPV6SETTING_H
diff -ruN a/libs/internals/settings/pbkdf2.h b/libs/internals/settings/pbkdf2.h
--- a/libs/internals/settings/pbkdf2.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/internals/settings/pbkdf2.h	2021-02-18 21:17:34.515275718 +0900
@@ -1,3 +1,4 @@
+#include <libnm/NetworkManager.h>
 /*
  * SHA1 hash implementation and interface functions
  * Copyright (c) 2003-2005, Jouni Malinen <jkmaline@cc.hut.fi>
diff -ruN a/libs/internals/settings/ppp.h b/libs/internals/settings/ppp.h
--- a/libs/internals/settings/ppp.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/internals/settings/ppp.h	2021-02-18 21:17:34.515275718 +0900
@@ -1,3 +1,4 @@
+#include <libnm/NetworkManager.h>
 // This file is generated by kconfig_compiler from ppp.kcfg.
 // All changes you do to this file will be lost.
 #ifndef KNM_PPPSETTING_H
diff -ruN a/libs/internals/settings/pppoe.h b/libs/internals/settings/pppoe.h
--- a/libs/internals/settings/pppoe.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/internals/settings/pppoe.h	2021-02-18 21:17:34.515275718 +0900
@@ -1,3 +1,4 @@
+#include <libnm/NetworkManager.h>
 // This file is generated by kconfig_compiler from pppoe.kcfg.
 // All changes you do to this file will be lost.
 #ifndef KNM_PPPOESETTING_H
diff -ruN a/libs/internals/settings/serial.h b/libs/internals/settings/serial.h
--- a/libs/internals/settings/serial.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/internals/settings/serial.h	2021-02-18 21:17:34.516275672 +0900
@@ -1,3 +1,4 @@
+#include <libnm/NetworkManager.h>
 // This file is generated by kconfig_compiler from serial.kcfg.
 // All changes you do to this file will be lost.
 #ifndef KNM_SERIALSETTING_H
diff -ruN a/libs/internals/settings/vpn.h b/libs/internals/settings/vpn.h
--- a/libs/internals/settings/vpn.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/internals/settings/vpn.h	2021-02-18 21:17:34.516275672 +0900
@@ -1,3 +1,4 @@
+#include <libnm/NetworkManager.h>
 // This file is generated by kconfig_compiler from vpn.kcfg.
 // All changes you do to this file will be lost.
 #ifndef KNM_VPNSETTING_H
diff -ruN a/libs/internals/settings/wephash.h b/libs/internals/settings/wephash.h
--- a/libs/internals/settings/wephash.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/internals/settings/wephash.h	2021-02-18 21:17:34.516275672 +0900
@@ -1,3 +1,4 @@
+#include <libnm/NetworkManager.h>
 /*  This file is part of the KDE project
     Copyright (C) 2008 Christopher Blauvelt <cblauvelt@gmail.com>
 
diff -ruN a/libs/internals/settings_hand_edits.diff b/libs/internals/settings_hand_edits.diff
--- a/libs/internals/settings_hand_edits.diff	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/internals/settings_hand_edits.diff	2021-02-18 21:17:34.516275672 +0900
@@ -56,18 +56,6 @@
    return map;
  }
  
-diff -ur origsettings//802-11-wirelessdbus.h settings/802-11-wirelessdbus.h
---- origsettings//802-11-wirelessdbus.h	2009-10-24 13:26:21.000000000 +0200
-+++ settings/802-11-wirelessdbus.h	2009-10-24 13:06:23.000000000 +0200
-@@ -3,7 +3,7 @@
- #ifndef WIRELESSDBUS_H
- #define WIRELESSDBUS_H
- 
--#include <nm-setting-802-11-wireless.h>
-+#include <nm-setting-wireless.h>
- 
- #include <kdebug.h>
- #include <kcoreconfigskeleton.h>
 diff -ur origsettings//802-11-wirelesspersistence.cpp settings/802-11-wirelesspersistence.cpp
 --- origsettings//802-11-wirelesspersistence.cpp	2009-10-24 13:26:21.000000000 +0200
 +++ settings/802-11-wirelesspersistence.cpp	2009-10-24 13:06:23.000000000 +0200
@@ -310,15 +298,6 @@
 diff -ur origsettings//802-11-wireless-securitydbus.h settings/802-11-wireless-securitydbus.h
 --- origsettings//802-11-wireless-securitydbus.h	2009-10-24 13:26:21.000000000 +0200
 +++ settings/802-11-wireless-securitydbus.h	2009-10-24 13:06:23.000000000 +0200
-@@ -3,7 +3,7 @@
- #ifndef WIRELESSSECURITYDBUS_H
- #define WIRELESSSECURITYDBUS_H
- 
--#include <nm-setting-802-11-wireless-security.h>
-+#include <nm-setting-wireless-security.h>
- 
- #include <kdebug.h>
- #include <kcoreconfigskeleton.h>
 @@ -16,11 +16,15 @@
  class NM09DBUS_EXPORT WirelessSecurityDbus : public SettingDbus
  {
@@ -801,18 +780,6 @@
  }
  
 Only in settings: 802-1xdbus.cpp~
-diff -ur origsettings//802-1xdbus.h settings/802-1xdbus.h
---- origsettings//802-1xdbus.h	2009-10-24 13:26:21.000000000 +0200
-+++ settings/802-1xdbus.h	2009-10-24 13:06:23.000000000 +0200
-@@ -3,7 +3,7 @@
- #ifndef SECURITY8021XDBUS_H
- #define SECURITY8021XDBUS_H
- 
--#include <nm-setting-802-1x.h>
-+#include <nm-setting-8021x.h>
- 
- #include <kdebug.h>
- #include <kcoreconfigskeleton.h>
 diff -ur origsettings//802-1x.h settings/802-1x.h
 --- origsettings//802-1x.h	2009-10-24 13:26:21.000000000 +0200
 +++ settings/802-1x.h	2009-10-24 13:06:23.000000000 +0200
@@ -1050,18 +1017,6 @@
    return map;
  }
  
-diff -ur origsettings//802-3-ethernetdbus.h settings/802-3-ethernetdbus.h
---- origsettings//802-3-ethernetdbus.h	2009-10-24 13:26:21.000000000 +0200
-+++ settings/802-3-ethernetdbus.h	2009-10-24 13:06:23.000000000 +0200
-@@ -3,7 +3,7 @@
- #ifndef WIREDDBUS_H
- #define WIREDDBUS_H
- 
--#include <nm-setting-802-3-ethernet.h>
-+#include <nm-setting-wired.h>
- 
- #include <kdebug.h>
- #include <kcoreconfigskeleton.h>
 diff -ur origsettings//802-3-ethernetpersistence.cpp settings/802-3-ethernetpersistence.cpp
 --- origsettings//802-3-ethernetpersistence.cpp	2009-10-24 13:26:21.000000000 +0200
 +++ settings/802-3-ethernetpersistence.cpp	2009-10-24 13:06:23.000000000 +0200
@@ -1309,22 +1264,10 @@
 +
 +  //map.insert(QLatin1String(NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS), setting->ignoredhcpdns());
    map.insert(QLatin1String(NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES), setting->ignoreautoroute());
-   map.insert(QLatin1String(NM_SETTING_IP4_CONFIG_NEVER_DEFAULT), setting->neverdefault());
+   map.insert(QLatin1String(NM_SETTING_IP_CONFIG_NEVER_DEFAULT), setting->neverdefault());
    map.insert(QLatin1String(NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID), setting->dhcpclientid());
 Only in settings: ipv4dbus.cpp.porig
 Only in settings: ipv4dbus.cpp.rej
-diff -ur origsettings//ipv4dbus.h settings/ipv4dbus.h
---- origsettings//ipv4dbus.h	2009-10-24 13:26:21.000000000 +0200
-+++ settings/ipv4dbus.h	2009-10-24 13:06:23.000000000 +0200
-@@ -3,7 +3,7 @@
- #ifndef IPV4DBUS_H
- #define IPV4DBUS_H
- 
--#include <nm-setting-ipv4.h>
-+#include <nm-setting-ip4-config.h>
- 
- #include <kdebug.h>
- #include <kcoreconfigskeleton.h>
 diff -ur origsettings//ipv4.h settings/ipv4.h
 --- origsettings//ipv4.h	2009-10-24 13:26:21.000000000 +0200
 +++ settings/ipv4.h	2009-10-24 13:10:26.000000000 +0200
diff -ruN a/libs/internals/tooltips.h b/libs/internals/tooltips.h
--- a/libs/internals/tooltips.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/internals/tooltips.h	2021-02-18 21:17:34.517275626 +0900
@@ -18,6 +18,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef TOOLTIPS_H
 #define TOOLTIPS_H
 
diff -ruN a/libs/internals/unconfiguredinterface.h b/libs/internals/unconfiguredinterface.h
--- a/libs/internals/unconfiguredinterface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/internals/unconfiguredinterface.h	2021-02-18 21:17:34.517275626 +0900
@@ -18,6 +18,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef KNM_INTERNALS_UNCONFIGUREDINTERFACE_H
 #define KNM_INTERNALS_UNCONFIGUREDINTERFACE_H
 
diff -ruN a/libs/internals/vpninterfaceconnection.h b/libs/internals/vpninterfaceconnection.h
--- a/libs/internals/vpninterfaceconnection.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/internals/vpninterfaceconnection.h	2021-02-18 21:17:34.517275626 +0900
@@ -18,6 +18,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef VPNINTERFACECONNECTION_H
 #define VPNINTERFACECONNECTION_H
 
diff -ruN a/libs/internals/vpninterfaceconnectionhelpers.h b/libs/internals/vpninterfaceconnectionhelpers.h
--- a/libs/internals/vpninterfaceconnectionhelpers.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/internals/vpninterfaceconnectionhelpers.h	2021-02-18 21:17:34.517275626 +0900
@@ -18,6 +18,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef KNM_EXTERNALS_VPNINTERFACECONNECTIONHELPERS_H
 #define KNM_EXTERNALS_VPNINTERFACECONNECTIONHELPERS_H
 
diff -ruN a/libs/internals/wirelessinterfaceconnection.cpp b/libs/internals/wirelessinterfaceconnection.cpp
--- a/libs/internals/wirelessinterfaceconnection.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/internals/wirelessinterfaceconnection.cpp	2021-02-18 21:17:34.517275626 +0900
@@ -20,6 +20,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #include "wirelessinterfaceconnection.h"
 
 using namespace Knm;
diff -ruN a/libs/internals/wirelessinterfaceconnection.h b/libs/internals/wirelessinterfaceconnection.h
--- a/libs/internals/wirelessinterfaceconnection.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/internals/wirelessinterfaceconnection.h	2021-02-18 21:17:34.517275626 +0900
@@ -20,6 +20,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef KNM_EXTERNALS_WIRELESSINTERFACECONNECTION_H
 #define KNM_EXTERNALS_WIRELESSINTERFACECONNECTION_H
 
diff -ruN a/libs/internals/wirelessinterfaceconnectionhelpers.cpp b/libs/internals/wirelessinterfaceconnectionhelpers.cpp
--- a/libs/internals/wirelessinterfaceconnectionhelpers.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/internals/wirelessinterfaceconnectionhelpers.cpp	2021-02-18 21:17:34.518275580 +0900
@@ -19,6 +19,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #include "wirelessinterfaceconnectionhelpers.h"
 #include "wirelessinterfaceconnectionhelpers_p.h"
 
diff -ruN a/libs/internals/wirelessinterfaceconnectionhelpers.h b/libs/internals/wirelessinterfaceconnectionhelpers.h
--- a/libs/internals/wirelessinterfaceconnectionhelpers.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/internals/wirelessinterfaceconnectionhelpers.h	2021-02-18 21:17:34.518275580 +0900
@@ -18,6 +18,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef KNM_EXTERNALS_WIRELESSINTERFACECONNECTIONHELPERS_H
 #define KNM_EXTERNALS_WIRELESSINTERFACECONNECTIONHELPERS_H
 
diff -ruN a/libs/internals/wirelessnetwork.cpp b/libs/internals/wirelessnetwork.cpp
--- a/libs/internals/wirelessnetwork.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/internals/wirelessnetwork.cpp	2021-02-18 21:17:34.518275580 +0900
@@ -19,6 +19,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #include "wirelessnetwork.h"
 
 using namespace Knm;
diff -ruN a/libs/internals/wirelessnetwork.h b/libs/internals/wirelessnetwork.h
--- a/libs/internals/wirelessnetwork.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/internals/wirelessnetwork.h	2021-02-18 21:17:34.518275580 +0900
@@ -19,6 +19,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef WIRELESSNETWORK_H
 #define WIRELESSNETWORK_H
 
diff -ruN a/libs/internals/wirelessobject.h b/libs/internals/wirelessobject.h
--- a/libs/internals/wirelessobject.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/internals/wirelessobject.h	2021-02-18 21:17:34.518275580 +0900
@@ -18,6 +18,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef WIRELESSOBJECT_H
 #define WIRELESSOBJECT_H
 
diff -ruN a/libs/internals/wirelesssecurityidentifier.h b/libs/internals/wirelesssecurityidentifier.h
--- a/libs/internals/wirelesssecurityidentifier.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/internals/wirelesssecurityidentifier.h	2021-02-18 21:17:34.518275580 +0900
@@ -18,6 +18,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef WIRELESSSECURITYIDENTIFIER_H
 #define WIRELESSSECURITYIDENTIFIER_H
 
diff -ruN a/libs/internals/wpasecretidentifier.h b/libs/internals/wpasecretidentifier.h
--- a/libs/internals/wpasecretidentifier.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/internals/wpasecretidentifier.h	2021-02-18 21:17:34.519275533 +0900
@@ -18,6 +18,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #include <QString>
 #include "../knm_export.h"
 
diff -ruN a/libs/service/activatabledebug.h b/libs/service/activatabledebug.h
--- a/libs/service/activatabledebug.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/service/activatabledebug.h	2021-02-18 21:17:34.519275533 +0900
@@ -18,6 +18,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef ACTIVATABLEDEBUG_H
 #define ACTIVATABLEDEBUG_H
 
diff -ruN a/libs/service/activatablelist.cpp b/libs/service/activatablelist.cpp
--- a/libs/service/activatablelist.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/service/activatablelist.cpp	2021-02-18 21:17:34.519275533 +0900
@@ -18,6 +18,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #include <kdebug.h>
 #include "activatablelist.h"
 
diff -ruN a/libs/service/activatablelist.h b/libs/service/activatablelist.h
--- a/libs/service/activatablelist.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/service/activatablelist.h	2021-02-18 21:17:34.519275533 +0900
@@ -18,6 +18,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef ACTIVATABLELIST_H
 #define ACTIVATABLELIST_H
 
diff -ruN a/libs/service/activatableobserver.h b/libs/service/activatableobserver.h
--- a/libs/service/activatableobserver.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/service/activatableobserver.h	2021-02-18 21:17:34.519275533 +0900
@@ -18,6 +18,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef ACTIVATABLEOBSERVER_H
 #define ACTIVATABLEOBSERVER_H
 
diff -ruN a/libs/service/configurationlauncher.h b/libs/service/configurationlauncher.h
--- a/libs/service/configurationlauncher.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/service/configurationlauncher.h	2021-02-18 21:17:34.519275533 +0900
@@ -18,6 +18,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef CONFIGURATIONLAUNCHER_H
 #define CONFIGURATIONLAUNCHER_H
 
diff -ruN a/libs/service/connectionhandler.h b/libs/service/connectionhandler.h
--- a/libs/service/connectionhandler.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/service/connectionhandler.h	2021-02-18 21:17:34.520275487 +0900
@@ -18,6 +18,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef CONNECTIONHANDLER_H
 #define CONNECTIONHANDLER_H
 
diff -ruN a/libs/service/connectionlist.h b/libs/service/connectionlist.h
--- a/libs/service/connectionlist.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/service/connectionlist.h	2021-02-18 21:17:34.520275487 +0900
@@ -19,6 +19,7 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef CONNECTION_LIST_H
 #define CONNECTION_LIST_H
 
diff -ruN a/libs/service/connectionlistpersistencedbus.h b/libs/service/connectionlistpersistencedbus.h
--- a/libs/service/connectionlistpersistencedbus.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/service/connectionlistpersistencedbus.h	2021-02-18 21:17:34.520275487 +0900
@@ -18,6 +18,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef CONNECTIONLISTPERSISTENCEDBUS_H
 #define CONNECTIONLISTPERSISTENCEDBUS_H
 
diff -ruN a/libs/service/connectionusagemonitor.h b/libs/service/connectionusagemonitor.h
--- a/libs/service/connectionusagemonitor.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/service/connectionusagemonitor.h	2021-02-18 21:17:34.520275487 +0900
@@ -18,6 +18,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef CONNECTIONUSAGEMONITOR_H
 #define CONNECTIONUSAGEMONITOR_H
 
diff -ruN a/libs/service/events.h b/libs/service/events.h
--- a/libs/service/events.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/service/events.h	2021-02-18 21:17:34.520275487 +0900
@@ -18,6 +18,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef KNM_EVENTS_H
 #define KNM_EVENTS_H
 
diff -ruN a/libs/service/gsmnetworkinterfaceactivatableprovider.h b/libs/service/gsmnetworkinterfaceactivatableprovider.h
--- a/libs/service/gsmnetworkinterfaceactivatableprovider.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/service/gsmnetworkinterfaceactivatableprovider.h	2021-02-18 21:17:34.520275487 +0900
@@ -19,6 +19,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef GSMNETWORKINTERFACEACTIVATABLEPROVIDER_H
 #define GSMNETWORKINTERFACEACTIVATABLEPROVIDER_H
 
diff -ruN a/libs/service/hiddenwirelessnetwork.h b/libs/service/hiddenwirelessnetwork.h
--- a/libs/service/hiddenwirelessnetwork.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/service/hiddenwirelessnetwork.h	2021-02-18 21:17:34.520275487 +0900
@@ -18,6 +18,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef HIDDENWIRELESSNETWORKITEM
 #define HIDDENWIRELESSNETWORKITEM
 
diff -ruN a/libs/service/networkinterfaceactivatableprovider.h b/libs/service/networkinterfaceactivatableprovider.h
--- a/libs/service/networkinterfaceactivatableprovider.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/service/networkinterfaceactivatableprovider.h	2021-02-18 21:17:34.521275441 +0900
@@ -18,6 +18,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef NETWORKINTERFACEACTIVATABLEPROVIDER_H
 #define NETWORKINTERFACEACTIVATABLEPROVIDER_H
 
diff -ruN a/libs/service/networkinterfacemonitor.cpp b/libs/service/networkinterfacemonitor.cpp
--- a/libs/service/networkinterfacemonitor.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/service/networkinterfacemonitor.cpp	2021-02-18 21:17:34.521275441 +0900
@@ -18,6 +18,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #include <QDBusPendingReply>
 
 #include <KLocale>
diff -ruN a/libs/service/networkinterfacemonitor.h b/libs/service/networkinterfacemonitor.h
--- a/libs/service/networkinterfacemonitor.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/service/networkinterfacemonitor.h	2021-02-18 21:17:34.521275441 +0900
@@ -18,6 +18,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef NETWORKINTERFACEMONITOR_H
 #define NETWORKINTERFACEMONITOR_H
 
diff -ruN a/libs/service/notificationmanager.h b/libs/service/notificationmanager.h
--- a/libs/service/notificationmanager.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/service/notificationmanager.h	2021-02-18 21:17:34.521275441 +0900
@@ -18,6 +18,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef NOTIFICATIONMANAGER_H
 #define NOTIFICATIONMANAGER_H
 
diff -ruN a/libs/service/pindialog.cpp b/libs/service/pindialog.cpp
--- a/libs/service/pindialog.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/service/pindialog.cpp	2021-02-18 21:17:34.521275441 +0900
@@ -18,6 +18,7 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #include <QIntValidator>
 
 #include "pindialog.h"
diff -ruN a/libs/service/secretsprovider.h b/libs/service/secretsprovider.h
--- a/libs/service/secretsprovider.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/service/secretsprovider.h	2021-02-18 21:17:34.521275441 +0900
@@ -18,6 +18,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef SECRETSPROVIDER_H
 #define SECRETSPROVIDER_H
 
diff -ruN a/libs/service/secretstorage.h b/libs/service/secretstorage.h
--- a/libs/service/secretstorage.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/service/secretstorage.h	2021-02-18 21:17:34.522275395 +0900
@@ -19,6 +19,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef KNM_INTERNALS_SECRETSTORAGE_H
 #define KNM_INTERNALS_SECRETSTORAGE_H
 
diff -ruN a/libs/service/sessionabstractedservice.cpp b/libs/service/sessionabstractedservice.cpp
--- a/libs/service/sessionabstractedservice.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/service/sessionabstractedservice.cpp	2021-02-18 21:17:34.522275395 +0900
@@ -19,6 +19,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #include "sessionabstractedservice.h"
 
 #include <QHash>
diff -ruN a/libs/service/sessionabstractedservice.h b/libs/service/sessionabstractedservice.h
--- a/libs/service/sessionabstractedservice.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/service/sessionabstractedservice.h	2021-02-18 21:17:34.522275395 +0900
@@ -19,6 +19,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef SESSIONABSTRACTEDSERVICE_H
 #define SESSIONABSTRACTEDSERVICE_H
 
diff -ruN a/libs/service/sortedactivatablelist.h b/libs/service/sortedactivatablelist.h
--- a/libs/service/sortedactivatablelist.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/service/sortedactivatablelist.h	2021-02-18 21:17:34.522275395 +0900
@@ -18,6 +18,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef SORTEDACTIVATABLELIST_H
 #define SORTEDACTIVATABLELIST_H
 
diff -ruN a/libs/service/vpninterfaceconnectionprovider.h b/libs/service/vpninterfaceconnectionprovider.h
--- a/libs/service/vpninterfaceconnectionprovider.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/service/vpninterfaceconnectionprovider.h	2021-02-18 21:17:34.522275395 +0900
@@ -18,6 +18,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef VPNINTERFACECONNECTIONPROVIDER_H
 #define VPNINTERFACECONNECTIONPROVIDER_H
 
diff -ruN a/libs/service/wirednetworkinterfaceactivatableprovider.h b/libs/service/wirednetworkinterfaceactivatableprovider.h
--- a/libs/service/wirednetworkinterfaceactivatableprovider.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/service/wirednetworkinterfaceactivatableprovider.h	2021-02-18 21:17:34.522275395 +0900
@@ -18,6 +18,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef WIREDNETWORKINTERFACEACTIVATABLEPROVIDER_H
 #define WIREDNETWORKINTERFACEACTIVATABLEPROVIDER_H
 
diff -ruN a/libs/service/wirelessnetworkinterfaceactivatableprovider.h b/libs/service/wirelessnetworkinterfaceactivatableprovider.h
--- a/libs/service/wirelessnetworkinterfaceactivatableprovider.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/service/wirelessnetworkinterfaceactivatableprovider.h	2021-02-18 21:17:34.523275348 +0900
@@ -18,6 +18,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef WIRELESSNETWORKINTERFACEACTIVATABLEPROVIDER_H
 #define WIRELESSNETWORKINTERFACEACTIVATABLEPROVIDER_H
 
diff -ruN a/libs/ui/802_11_wirelesswidget.h b/libs/ui/802_11_wirelesswidget.h
--- a/libs/ui/802_11_wirelesswidget.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/ui/802_11_wirelesswidget.h	2021-02-18 21:17:34.523275348 +0900
@@ -18,6 +18,7 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef WIRELESS802_11_WIDGET_H
 #define WIRELESS802_11_WIDGET_H
 
diff -ruN a/libs/ui/apitemmodel.h b/libs/ui/apitemmodel.h
--- a/libs/ui/apitemmodel.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/ui/apitemmodel.h	2021-02-18 21:17:34.523275348 +0900
@@ -19,6 +19,7 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef APITEMMODEL_H
 #define APITEMMODEL_H
 
diff -ruN a/libs/ui/bluetoothconnectioneditor.cpp b/libs/ui/bluetoothconnectioneditor.cpp
--- a/libs/ui/bluetoothconnectioneditor.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/ui/bluetoothconnectioneditor.cpp	2021-02-18 21:17:34.523275348 +0900
@@ -18,7 +18,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <nm-setting-bluetooth.h>
+#include <libnm/NetworkManager.h>
 
 #include "bluetoothconnectioneditor.h"
 
diff -ruN a/libs/ui/bluetoothwidget.cpp b/libs/ui/bluetoothwidget.cpp
--- a/libs/ui/bluetoothwidget.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/ui/bluetoothwidget.cpp	2021-02-18 21:17:34.523275348 +0900
@@ -18,8 +18,7 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <nm-setting-bluetooth.h>
-
+#include <libnm/NetworkManager.h>
 #include "bluetoothwidget.h"
 #include "settingwidget_p.h"
 #include "ui_bluetooth.h"
diff -ruN a/libs/ui/cdmawidget.h b/libs/ui/cdmawidget.h
--- a/libs/ui/cdmawidget.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/ui/cdmawidget.h	2021-02-18 21:17:34.524275302 +0900
@@ -18,6 +18,7 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef CDMAWIDGET_H
 #define CDMAWIDGET_H
 
diff -ruN a/libs/ui/connectioneditor.cpp b/libs/ui/connectioneditor.cpp
--- a/libs/ui/connectioneditor.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/ui/connectioneditor.cpp	2021-02-18 21:17:34.524275302 +0900
@@ -18,15 +18,9 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #include "connectioneditor.h"
 
-//#include <nm-setting-cdma.h>
-//#include <nm-setting-gsm.h>
-#include <nm-setting-pppoe.h>
-#include <nm-setting-vpn.h>
-#include <nm-setting-wired.h>
-#include <nm-setting-wireless.h>
-
 #include <QDBusInterface>
 #include <QDir>
 // debug only
diff -ruN a/libs/ui/connectioneditor.h b/libs/ui/connectioneditor.h
--- a/libs/ui/connectioneditor.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/ui/connectioneditor.h	2021-02-18 21:17:34.524275302 +0900
@@ -18,6 +18,7 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef CONNECTIONEDITOR_H
 #define CONNECTIONEDITOR_H
 
diff -ruN a/libs/ui/connectionprefs.h b/libs/ui/connectionprefs.h
--- a/libs/ui/connectionprefs.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/ui/connectionprefs.h	2021-02-18 21:17:34.524275302 +0900
@@ -18,6 +18,7 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef CONNECTIONPREFS_H
 #define CONNECTIONPREFS_H
 
diff -ruN a/libs/ui/connectionsecretsjob.cpp b/libs/ui/connectionsecretsjob.cpp
--- a/libs/ui/connectionsecretsjob.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/ui/connectionsecretsjob.cpp	2021-02-18 21:17:34.524275302 +0900
@@ -19,22 +19,9 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #include "connectionsecretsjob.h"
 
-#include <nm-setting-cdma.h>
-#include <nm-setting-connection.h>
-#include <nm-setting-wired.h>
-#include <nm-setting-ip4-config.h>
-#include <nm-setting-ip6-config.h>
-#include <nm-setting-8021x.h>
-#include <nm-setting-gsm.h>
-#include <nm-setting-ppp.h>
-#include <nm-setting-pppoe.h>
-#include <nm-setting-serial.h>
-#include <nm-setting-vpn.h>
-#include <nm-setting-wireless.h>
-#include <nm-setting-wireless-security.h>
-
 #include <QTimer>
 
 #include <KDialog>
diff -ruN a/libs/ui/connectionsecretsjob.h b/libs/ui/connectionsecretsjob.h
--- a/libs/ui/connectionsecretsjob.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/ui/connectionsecretsjob.h	2021-02-18 21:17:34.524275302 +0900
@@ -18,6 +18,7 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef CONNECTIONSECRETSJOB_H
 #define CONNECTIONSECRETSJOB_H
 
diff -ruN a/libs/ui/connectionwidget.h b/libs/ui/connectionwidget.h
--- a/libs/ui/connectionwidget.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/ui/connectionwidget.h	2021-02-18 21:17:34.525275256 +0900
@@ -18,6 +18,7 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef CONNECTIONWIDGET_H
 #define CONNECTIONWIDGET_H
 
diff -ruN a/libs/ui/ipv4advancedwidget.cpp b/libs/ui/ipv4advancedwidget.cpp
--- a/libs/ui/ipv4advancedwidget.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/ui/ipv4advancedwidget.cpp	2021-02-18 21:17:34.525275256 +0900
@@ -19,6 +19,7 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #include <QLineEdit>
 #include <QStandardItemModel>
 #include <QNetworkAddressEntry>
diff -ruN a/libs/ui/ipv4routeswidget.cpp b/libs/ui/ipv4routeswidget.cpp
--- a/libs/ui/ipv4routeswidget.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/ui/ipv4routeswidget.cpp	2021-02-18 21:17:34.525275256 +0900
@@ -18,6 +18,7 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #include <QLineEdit>
 #include <QStandardItem>
 #include <QStandardItemModel>
diff -ruN a/libs/ui/networkitemmodel.h b/libs/ui/networkitemmodel.h
--- a/libs/ui/networkitemmodel.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/ui/networkitemmodel.h	2021-02-18 21:17:34.525275256 +0900
@@ -19,6 +19,7 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef NETWORKITEMMODEL_H
 #define NETWORKITEMMODEL_H
 
diff -ruN a/libs/ui/scanwidget.h b/libs/ui/scanwidget.h
--- a/libs/ui/scanwidget.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/ui/scanwidget.h	2021-02-18 21:17:34.525275256 +0900
@@ -19,6 +19,7 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef SCANWIDGET_H
 #define SCANWIDGET_H
 
diff -ruN a/libs/ui/security/eapmethod.h b/libs/ui/security/eapmethod.h
--- a/libs/ui/security/eapmethod.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/ui/security/eapmethod.h	2021-02-18 21:17:34.525275256 +0900
@@ -19,6 +19,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef EAPMETHOD_H
 #define EAPMETHOD_H
 
diff -ruN a/libs/ui/security/securityeap.cpp b/libs/ui/security/securityeap.cpp
--- a/libs/ui/security/securityeap.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/ui/security/securityeap.cpp	2021-02-18 21:17:34.525275256 +0900
@@ -19,13 +19,11 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #include "securityeap.h"
 
 #include <KDebug>
 
-#include <nm-setting-wireless-security.h>
-#include <nm-setting-8021x.h>
-
 #include "eapmethodleap.h"
 #include "peapwidget.h"
 #include "ttlswidget.h"
diff -ruN a/libs/ui/security/securityleap.cpp b/libs/ui/security/securityleap.cpp
--- a/libs/ui/security/securityleap.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/ui/security/securityleap.cpp	2021-02-18 21:17:34.526275210 +0900
@@ -18,6 +18,7 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #include "securityleap.h"
 #include "securitywidget_p.h"
 
diff -ruN a/libs/ui/security/wepwidget.cpp b/libs/ui/security/wepwidget.cpp
--- a/libs/ui/security/wepwidget.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/ui/security/wepwidget.cpp	2021-02-18 21:17:34.526275210 +0900
@@ -18,6 +18,7 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #include <QWidget>
 #include <QValidator>
 
@@ -26,8 +27,6 @@
 #include "wepwidget.h"
 #include "securitywidget_p.h"
 
-#include <nm-setting-wireless-security.h>
-
 //#include "802_11_wireless_security_widget.h"
 //#include "secretstoragehelper.h"
 #include "ui_wep.h"
diff -ruN a/libs/ui/security/wepwidget.h b/libs/ui/security/wepwidget.h
--- a/libs/ui/security/wepwidget.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/ui/security/wepwidget.h	2021-02-18 21:17:34.526275210 +0900
@@ -18,6 +18,7 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef WEPWIDGET_H
 #define WEPWIDGET_H
 
diff -ruN a/libs/ui/security/wpapskwidget.cpp b/libs/ui/security/wpapskwidget.cpp
--- a/libs/ui/security/wpapskwidget.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/ui/security/wpapskwidget.cpp	2021-02-18 21:17:34.526275210 +0900
@@ -18,16 +18,12 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #include "wpapskwidget.h"
 #include "securitywidget_p.h"
 
 #include <QWidget>
 
-#include <nm-setting-wireless-security.h>
-#include <nm-setting-connection.h>
-#include <nm-setting-wireless.h>
-#include <nm-setting-8021x.h>
-
 #include <KDebug>
 #include <wpasecretidentifier.h>
 
diff -ruN a/libs/ui/settingwidget.h b/libs/ui/settingwidget.h
--- a/libs/ui/settingwidget.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/ui/settingwidget.h	2021-02-18 21:17:34.526275210 +0900
@@ -18,7 +18,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
+#include <libnm/NetworkManager.h>
 #ifndef SETTINGWIDGET_H
 #define SETTINGWIDGET_H
 
diff -ruN a/libs/ui/vpnpreferences.cpp b/libs/ui/vpnpreferences.cpp
--- a/libs/ui/vpnpreferences.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/ui/vpnpreferences.cpp	2021-02-18 21:17:34.527275164 +0900
@@ -19,6 +19,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #include "vpnpreferences.h"
 
 #include <QFile>
@@ -31,10 +32,6 @@
 #include <solid/control/networkmanager.h>
 #include <solid/control/networkinterface.h>
 
-#include <nm-setting-connection.h>
-#include <nm-setting-vpn.h>
-#include <nm-setting-ip4-config.h>
-
 #include "ipv4widget.h"
 #include "ipv6widget.h"
 #include "connectionwidget.h"
@@ -69,11 +66,11 @@
         Knm::Ipv4Setting * ipv4Setting = static_cast<Knm::Ipv4Setting*>(m_connection->setting(Knm::Setting::Ipv4));
         QList <Solid::Control::IPv4RouteNm09> routes;
         QStringMap ipv4Data = Knm::VpnSetting::stringMapFromStringList(Knm::VpnSetting::variantMapToStringList(args[5].toMap()));
-        if (ipv4Data.contains(QLatin1String(NM_SETTING_IP4_CONFIG_NEVER_DEFAULT))) {
-            ipv4Setting->setNeverdefault( static_cast<bool>(ipv4Data[QLatin1String(NM_SETTING_IP4_CONFIG_NEVER_DEFAULT)].toUInt()) );
+        if (ipv4Data.contains(QLatin1String(NM_SETTING_IP_CONFIG_NEVER_DEFAULT))) {
+            ipv4Setting->setNeverdefault( static_cast<bool>(ipv4Data[QLatin1String(NM_SETTING_IP_CONFIG_NEVER_DEFAULT)].toUInt()) );
         }
-        if (ipv4Data.contains(QLatin1String(NM_SETTING_IP4_CONFIG_ROUTES))) {
-            foreach(const QString &oneRoute, ipv4Data[NM_SETTING_IP4_CONFIG_ROUTES].split(' ')) { // Split at whitespace
+        if (ipv4Data.contains(QLatin1String(NM_SETTING_IP_CONFIG_ROUTES))) {
+            foreach(const QString &oneRoute, ipv4Data[NM_SETTING_IP_CONFIG_ROUTES].split(' ')) { // Split at whitespace
                 QStringList routeData = oneRoute.split('/');    // Host + Prefix (e.g: 192.168.2.0/24)
                 if (routeData.count() == 2) {
                     Solid::Control::IPv4RouteNm09 route(QHostAddress(routeData[0]).toIPv4Address(), routeData[1].toUInt(),0,0);
diff -ruN a/libs/ui/vpnuiplugin.cpp b/libs/ui/vpnuiplugin.cpp
--- a/libs/ui/vpnuiplugin.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/ui/vpnuiplugin.cpp	2021-02-18 21:17:34.527275164 +0900
@@ -1,3 +1,4 @@
+#include <libnm/NetworkManager.h>
 #include <KLocale>
 
 #include "vpnuiplugin.h"
diff -ruN a/libs/ui/vpnuiplugin.h b/libs/ui/vpnuiplugin.h
--- a/libs/ui/vpnuiplugin.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/ui/vpnuiplugin.h	2021-02-18 21:17:34.527275164 +0900
@@ -18,6 +18,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef VPNUIPLUGIN_H
 #define VPNUIPLUGIN_H
 
diff -ruN a/libs/ui/wiredpreferences.cpp b/libs/ui/wiredpreferences.cpp
--- a/libs/ui/wiredpreferences.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/ui/wiredpreferences.cpp	2021-02-18 21:17:34.527275164 +0900
@@ -18,10 +18,9 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #include "wiredpreferences.h"
 
-#include <nm-setting-wired.h>
-
 #include <QFile>
 
 #include <KDebug>
diff -ruN a/libs/ui/wirelesspreferences.cpp b/libs/ui/wirelesspreferences.cpp
--- a/libs/ui/wirelesspreferences.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/ui/wirelesspreferences.cpp	2021-02-18 21:17:34.527275164 +0900
@@ -19,6 +19,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #include "wirelesspreferences.h"
 
 #include <QFile>
@@ -41,9 +42,6 @@
 #include "settings/802-11-wireless.h"
 #include "settings/ipv4.h"
 
-#include <nm-setting-connection.h>
-#include <nm-setting-wireless.h>
-
 #include "wirelessnetworkinterfaceenvironment.h"
 
 WirelessPreferences::WirelessPreferences(bool setDefaults, const QVariantList &args, QWidget *parent)
diff -ruN a/libs/ui/wirelesspreferences.h b/libs/ui/wirelesspreferences.h
--- a/libs/ui/wirelesspreferences.h	2015-03-06 08:47:44.000000000 +0900
+++ b/libs/ui/wirelesspreferences.h	2021-02-18 21:17:34.527275164 +0900
@@ -18,6 +18,7 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef NM09_WIRELESS_CONNECTION_PREFERENCES_H
 #define NM09_WIRELESS_CONNECTION_PREFERENCES_H
 
diff -ruN a/settings/config/addeditdeletebuttonset.h b/settings/config/addeditdeletebuttonset.h
--- a/settings/config/addeditdeletebuttonset.h	2015-03-06 08:47:44.000000000 +0900
+++ b/settings/config/addeditdeletebuttonset.h	2021-02-20 15:41:33.303692493 +0900
@@ -18,6 +18,8 @@
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
+
+#include <libnm/NetworkManager.h>
 #ifndef ADDEDITDELETEBUTTONSET_H
 #define ADDEDITDELETEBUTTONSET_H
 
diff -ruN a/settings/config/manageconnectionwidget.cpp b/settings/config/manageconnectionwidget.cpp
--- a/settings/config/manageconnectionwidget.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/settings/config/manageconnectionwidget.cpp	2021-02-18 21:17:34.528275117 +0900
@@ -20,16 +20,12 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #include "manageconnectionwidget.h"
 #include "treewidgetitem.h"
 
 #include <unistd.h>
 
-#include <nm-setting-cdma.h>
-#include <nm-setting-connection.h>
-#include <nm-setting-gsm.h>
-#include <NetworkManager.h>
-
 #include <QDBusConnection>
 #include <QDBusInterface>
 #include <QDateTime>
diff -ruN a/settings/config/manageconnectionwidget.h b/settings/config/manageconnectionwidget.h
--- a/settings/config/manageconnectionwidget.h	2015-03-06 08:47:44.000000000 +0900
+++ b/settings/config/manageconnectionwidget.h	2021-02-20 15:41:38.925523844 +0900
@@ -18,6 +18,7 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef NM09_MANAGE_CONNECTION_WIDGET_H
 #define NM09_MANAGE_CONNECTION_WIDGET_H
 
diff -ruN a/settings/config/managetraywidget.h b/settings/config/managetraywidget.h
--- a/settings/config/managetraywidget.h	2015-03-06 08:47:44.000000000 +0900
+++ b/settings/config/managetraywidget.h	2021-02-20 15:41:44.002371833 +0900
@@ -19,6 +19,7 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef NM09_MANAGE_TRAY_WIDGET_H
 #define NM09_MANAGE_TRAY_WIDGET_H
 
diff -ruN a/settings/config/mobileconnectionwizard.cpp b/settings/config/mobileconnectionwizard.cpp
--- a/settings/config/mobileconnectionwizard.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/settings/config/mobileconnectionwizard.cpp	2021-02-20 17:09:17.156936087 +0900
@@ -19,6 +19,7 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #include <QLineEdit>
 #include <QVBoxLayout>
 
diff -ruN a/settings/config/mobileconnectionwizard.h b/settings/config/mobileconnectionwizard.h
--- a/settings/config/mobileconnectionwizard.h	2015-03-06 08:47:44.000000000 +0900
+++ b/settings/config/mobileconnectionwizard.h	2021-02-20 15:41:49.918195043 +0900
@@ -18,6 +18,7 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef MOBILECONNECTIONWIZARD_H
 #define MOBILECONNECTIONWIZARD_H
 
diff -ruN a/settings/config/mobileproviders.cpp b/settings/config/mobileproviders.cpp
--- a/settings/config/mobileproviders.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/settings/config/mobileproviders.cpp	2021-02-20 17:09:33.780980567 +0900
@@ -18,6 +18,7 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #include <QFile>
 #include <QTextStream>
 
diff -ruN a/settings/config/mobileproviders.h b/settings/config/mobileproviders.h
--- a/settings/config/mobileproviders.h	2015-03-06 08:47:44.000000000 +0900
+++ b/settings/config/mobileproviders.h	2021-02-20 15:41:56.175008452 +0900
@@ -18,6 +18,7 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef MOBILEPROVIDERS_H
 #define MOBILEPROVIDERS_H
 
diff -ruN a/settings/config/othersettingswidget.cpp b/settings/config/othersettingswidget.cpp
--- a/settings/config/othersettingswidget.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/settings/config/othersettingswidget.cpp	2021-02-20 15:49:25.100703419 +0900
@@ -19,6 +19,7 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #include <KNotifyConfigWidget>
 
 #include "othersettingswidget.h"
diff -ruN a/settings/config/othersettingswidget.h b/settings/config/othersettingswidget.h
--- a/settings/config/othersettingswidget.h	2015-03-06 08:47:44.000000000 +0900
+++ b/settings/config/othersettingswidget.h	2021-02-20 15:42:01.251857336 +0900
@@ -19,6 +19,7 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef OTHERSETTINGSWIDGET_H
 #define OTHERSETTINGSWIDGET_H
 
diff -ruN a/settings/config/treewidgetitem.h b/settings/config/treewidgetitem.h
--- a/settings/config/treewidgetitem.h	2015-03-06 08:47:44.000000000 +0900
+++ b/settings/config/treewidgetitem.h	2021-02-20 15:42:06.263708403 +0900
@@ -18,6 +18,7 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef TREEWIDGETITEM_H
 #define TREEWIDGETITEM_H
 
diff -ruN a/settings/configshell/bluetooth.cpp b/settings/configshell/bluetooth.cpp
--- a/settings/configshell/bluetooth.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/settings/configshell/bluetooth.cpp	2021-02-18 21:17:34.528275117 +0900
@@ -18,7 +18,7 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <nm-setting-bluetooth.h>
+#include <libnm/NetworkManager.h>
 
 #include <QDBusInterface>
 #include <QDBusReply>
diff -ruN a/settings/configshell/main.cpp b/settings/configshell/main.cpp
--- a/settings/configshell/main.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/settings/configshell/main.cpp	2021-02-20 17:02:55.925853473 +0900
@@ -18,6 +18,7 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #include <kaboutdata.h>
 #include <KUniqueApplication>
 #include <kcmdlineargs.h>
diff -ruN a/settings/configshell/manageconnection.cpp b/settings/configshell/manageconnection.cpp
--- a/settings/configshell/manageconnection.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/settings/configshell/manageconnection.cpp	2021-02-20 17:08:58.875990127 +0900
@@ -18,6 +18,7 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #include <QTimer>
 
 #include <KDebug>
diff -ruN a/settings/configshell/manageconnection.h b/settings/configshell/manageconnection.h
--- a/settings/configshell/manageconnection.h	2015-03-06 08:47:44.000000000 +0900
+++ b/settings/configshell/manageconnection.h	2021-02-20 17:02:29.353545452 +0900
@@ -18,6 +18,7 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #include <QDBusInterface>
 
 #include <KApplication>
diff -ruN a/solidcontrolfuture/libs/solid/control/ifaces/authentication.h b/solidcontrolfuture/libs/solid/control/ifaces/authentication.h
--- a/solidcontrolfuture/libs/solid/control/ifaces/authentication.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/libs/solid/control/ifaces/authentication.h	2021-02-18 21:17:34.528275117 +0900
@@ -17,6 +17,7 @@
 
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef SOLID_IFACES_AUTHENTICATION_H
 #define SOLID_IFACES_AUTHENTICATION_H
 
diff -ruN a/solidcontrolfuture/libs/solid/control/ifaces/modemcdmainterface.h b/solidcontrolfuture/libs/solid/control/ifaces/modemcdmainterface.h
--- a/solidcontrolfuture/libs/solid/control/ifaces/modemcdmainterface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/libs/solid/control/ifaces/modemcdmainterface.h	2021-02-18 21:17:34.528275117 +0900
@@ -17,6 +17,7 @@
 
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef SOLID_IFACES_MODEMCDMAINTERFACE_H
 #define SOLID_IFACES_MODEMCDMAINTERFACE_H
 
diff -ruN a/solidcontrolfuture/libs/solid/control/ifaces/modemgsmcardinterface.h b/solidcontrolfuture/libs/solid/control/ifaces/modemgsmcardinterface.h
--- a/solidcontrolfuture/libs/solid/control/ifaces/modemgsmcardinterface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/libs/solid/control/ifaces/modemgsmcardinterface.h	2021-02-18 21:17:34.528275117 +0900
@@ -17,6 +17,7 @@
 
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef SOLID_IFACES_MODEMGSMCARDINTERFACE_H
 #define SOLID_IFACES_MODEMGSMCARDINTERFACE_H
 
diff -ruN a/solidcontrolfuture/libs/solid/control/ifaces/modemgsmcontactsinterface.h b/solidcontrolfuture/libs/solid/control/ifaces/modemgsmcontactsinterface.h
--- a/solidcontrolfuture/libs/solid/control/ifaces/modemgsmcontactsinterface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/libs/solid/control/ifaces/modemgsmcontactsinterface.h	2021-02-18 21:17:34.528275117 +0900
@@ -17,6 +17,7 @@
 
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef SOLID_IFACES_MODEMGSMCONTACTSINTERFACE_H
 #define SOLID_IFACES_MODEMGSMCONTACTSINTERFACE_H
 
diff -ruN a/solidcontrolfuture/libs/solid/control/ifaces/modemgsmhsointerface.h b/solidcontrolfuture/libs/solid/control/ifaces/modemgsmhsointerface.h
--- a/solidcontrolfuture/libs/solid/control/ifaces/modemgsmhsointerface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/libs/solid/control/ifaces/modemgsmhsointerface.h	2021-02-18 21:17:34.529275071 +0900
@@ -17,6 +17,7 @@
 
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef SOLID_IFACES_MODEMGSMHSOINTERFACE_H
 #define SOLID_IFACES_MODEMGSMHSOINTERFACE_H
 
diff -ruN a/solidcontrolfuture/libs/solid/control/ifaces/modemgsmnetworkinterface.h b/solidcontrolfuture/libs/solid/control/ifaces/modemgsmnetworkinterface.h
--- a/solidcontrolfuture/libs/solid/control/ifaces/modemgsmnetworkinterface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/libs/solid/control/ifaces/modemgsmnetworkinterface.h	2021-02-18 21:17:34.529275071 +0900
@@ -17,6 +17,7 @@
 
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef SOLID_IFACES_MODEMGSMNETWORKINTERFACE_H
 #define SOLID_IFACES_MODEMGSMNETWORKINTERFACE_H
 
diff -ruN a/solidcontrolfuture/libs/solid/control/ifaces/modemgsmsmsinterface.h b/solidcontrolfuture/libs/solid/control/ifaces/modemgsmsmsinterface.h
--- a/solidcontrolfuture/libs/solid/control/ifaces/modemgsmsmsinterface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/libs/solid/control/ifaces/modemgsmsmsinterface.h	2021-02-18 21:17:34.529275071 +0900
@@ -17,6 +17,7 @@
 
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef SOLID_IFACES_MODEMGSMSMSINTERFACE_H
 #define SOLID_IFACES_MODEMGSMSMSINTERFACE_H
 
diff -ruN a/solidcontrolfuture/libs/solid/control/ifaces/modemgsmussdinterface.h b/solidcontrolfuture/libs/solid/control/ifaces/modemgsmussdinterface.h
--- a/solidcontrolfuture/libs/solid/control/ifaces/modemgsmussdinterface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/libs/solid/control/ifaces/modemgsmussdinterface.h	2021-02-18 21:17:34.529275071 +0900
@@ -17,6 +17,7 @@
 
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef SOLID_IFACES_MODEMGSMUSSDINTERFACE_H
 #define SOLID_IFACES_MODEMGSMUSSDINTERFACE_H
 
diff -ruN a/solidcontrolfuture/libs/solid/control/ifaces/modeminterface.h b/solidcontrolfuture/libs/solid/control/ifaces/modeminterface.h
--- a/solidcontrolfuture/libs/solid/control/ifaces/modeminterface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/libs/solid/control/ifaces/modeminterface.h	2021-02-18 21:17:34.529275071 +0900
@@ -17,6 +17,7 @@
 
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef SOLID_CONTROL_IFACES_MODEMINTERFACE_H
 #define SOLID_CONTROL_IFACES_MODEMINTERFACE_H
 
diff -ruN a/solidcontrolfuture/libs/solid/control/ifaces/modemlocationinterface.h b/solidcontrolfuture/libs/solid/control/ifaces/modemlocationinterface.h
--- a/solidcontrolfuture/libs/solid/control/ifaces/modemlocationinterface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/libs/solid/control/ifaces/modemlocationinterface.h	2021-02-18 21:17:34.529275071 +0900
@@ -17,6 +17,7 @@
 
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef SOLID_IFACES_MODEMLOCATIONINTERFACE_H
 #define SOLID_IFACES_MODEMLOCATIONINTERFACE_H
 
diff -ruN a/solidcontrolfuture/libs/solid/control/ifaces/modemmanager.h b/solidcontrolfuture/libs/solid/control/ifaces/modemmanager.h
--- a/solidcontrolfuture/libs/solid/control/ifaces/modemmanager.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/libs/solid/control/ifaces/modemmanager.h	2021-02-18 21:17:34.530275025 +0900
@@ -18,6 +18,7 @@
 
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef SOLID_IFACES_MODEMMANAGER
 #define SOLID_IFACES_MODEMMANAGER
 
diff -ruN a/solidcontrolfuture/libs/solid/control/ifaces/modemmanagerinterface.h b/solidcontrolfuture/libs/solid/control/ifaces/modemmanagerinterface.h
--- a/solidcontrolfuture/libs/solid/control/ifaces/modemmanagerinterface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/libs/solid/control/ifaces/modemmanagerinterface.h	2021-02-18 21:17:34.530275025 +0900
@@ -17,6 +17,7 @@
 
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef SOLID_IFACES_MODEMMANAGERINTERFACE_H
 #define SOLID_IFACES_MODEMMANAGERINTERFACE_H
 
diff -ruN a/solidcontrolfuture/libs/solid/control/ifaces/networkbtinterface.h b/solidcontrolfuture/libs/solid/control/ifaces/networkbtinterface.h
--- a/solidcontrolfuture/libs/solid/control/ifaces/networkbtinterface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/libs/solid/control/ifaces/networkbtinterface.h	2021-02-18 21:17:34.530275025 +0900
@@ -18,6 +18,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef SOLID_IFACES_BTNETWORKINTERFACE_H
 #define SOLID_IFACES_BTNETWORKINTERFACE_H
 
diff -ruN a/solidcontrolfuture/libs/solid/control/ifaces/networkcdmainterface.h b/solidcontrolfuture/libs/solid/control/ifaces/networkcdmainterface.h
--- a/solidcontrolfuture/libs/solid/control/ifaces/networkcdmainterface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/libs/solid/control/ifaces/networkcdmainterface.h	2021-02-18 21:17:34.530275025 +0900
@@ -18,6 +18,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef SOLID_IFACES_CDMANETWORKINTERFACE_H
 #define SOLID_IFACES_CDMANETWORKINTERFACE_H
 
diff -ruN a/solidcontrolfuture/libs/solid/control/ifaces/networkgsminterface.h b/solidcontrolfuture/libs/solid/control/ifaces/networkgsminterface.h
--- a/solidcontrolfuture/libs/solid/control/ifaces/networkgsminterface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/libs/solid/control/ifaces/networkgsminterface.h	2021-02-18 21:17:34.530275025 +0900
@@ -18,6 +18,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef SOLID_IFACES_GSMNETWORKINTERFACE_H
 #define SOLID_IFACES_GSMNETWORKINTERFACE_H
 
diff -ruN a/solidcontrolfuture/libs/solid/control/ifaces/networkinterface.h b/solidcontrolfuture/libs/solid/control/ifaces/networkinterface.h
--- a/solidcontrolfuture/libs/solid/control/ifaces/networkinterface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/libs/solid/control/ifaces/networkinterface.h	2021-02-18 21:17:34.531274979 +0900
@@ -17,6 +17,7 @@
 
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef SOLID_CONTROL_IFACES_NETWORKINTERFACE_H
 #define SOLID_CONTROL_IFACES_NETWORKINTERFACE_H
 
diff -ruN a/solidcontrolfuture/libs/solid/control/ifaces/networkmanager.h b/solidcontrolfuture/libs/solid/control/ifaces/networkmanager.h
--- a/solidcontrolfuture/libs/solid/control/ifaces/networkmanager.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/libs/solid/control/ifaces/networkmanager.h	2021-02-18 21:17:34.531274979 +0900
@@ -17,6 +17,7 @@
 
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef SOLID_IFACES_NETWORKMANAGER
 #define SOLID_IFACES_NETWORKMANAGER
 
diff -ruN a/solidcontrolfuture/libs/solid/control/ifaces/networkmodeminterface.h b/solidcontrolfuture/libs/solid/control/ifaces/networkmodeminterface.h
--- a/solidcontrolfuture/libs/solid/control/ifaces/networkmodeminterface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/libs/solid/control/ifaces/networkmodeminterface.h	2021-02-18 21:17:34.531274979 +0900
@@ -18,6 +18,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef SOLID_IFACES_MODEMNETWORKINTERFACE_H
 #define SOLID_IFACES_MODEMNETWORKINTERFACE_H
 
diff -ruN a/solidcontrolfuture/libs/solid/control/ifaces/networkserialinterface.h b/solidcontrolfuture/libs/solid/control/ifaces/networkserialinterface.h
--- a/solidcontrolfuture/libs/solid/control/ifaces/networkserialinterface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/libs/solid/control/ifaces/networkserialinterface.h	2021-02-18 21:17:34.531274979 +0900
@@ -16,6 +16,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef SOLID_IFACES_SERIALNETWORKINTERFACE_H
 #define SOLID_IFACES_SERIALNETWORKINTERFACE_H
 
diff -ruN a/solidcontrolfuture/libs/solid/control/ifaces/wirednetworkinterface.h b/solidcontrolfuture/libs/solid/control/ifaces/wirednetworkinterface.h
--- a/solidcontrolfuture/libs/solid/control/ifaces/wirednetworkinterface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/libs/solid/control/ifaces/wirednetworkinterface.h	2021-02-18 21:17:34.531274979 +0900
@@ -17,6 +17,7 @@
 
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef SOLID_IFACES_WIREDNETWORKINTERFACE_H
 #define SOLID_IFACES_WIREDNETWORKINTERFACE_H
 
diff -ruN a/solidcontrolfuture/libs/solid/control/ifaces/wirelessaccesspoint.h b/solidcontrolfuture/libs/solid/control/ifaces/wirelessaccesspoint.h
--- a/solidcontrolfuture/libs/solid/control/ifaces/wirelessaccesspoint.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/libs/solid/control/ifaces/wirelessaccesspoint.h	2021-02-18 21:17:34.531274979 +0900
@@ -18,6 +18,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef SOLIDCONTROL_IFACES_WIRELESSAP_H
 #define SOLIDCONTROL_IFACES_WIRELESSAP_H
 
diff -ruN a/solidcontrolfuture/libs/solid/control/ifaces/wirelessnetworkinterface.h b/solidcontrolfuture/libs/solid/control/ifaces/wirelessnetworkinterface.h
--- a/solidcontrolfuture/libs/solid/control/ifaces/wirelessnetworkinterface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/libs/solid/control/ifaces/wirelessnetworkinterface.h	2021-02-18 21:17:34.532274932 +0900
@@ -17,6 +17,7 @@
 
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef SOLID_IFACES_WIRELESSNETWORKINTERFACE_H
 #define SOLID_IFACES_WIRELESSNETWORKINTERFACE_H
 
diff -ruN a/solidcontrolfuture/libs/solid/control/modemcdmainterface.cpp b/solidcontrolfuture/libs/solid/control/modemcdmainterface.cpp
--- a/solidcontrolfuture/libs/solid/control/modemcdmainterface.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/libs/solid/control/modemcdmainterface.cpp	2021-02-18 21:17:34.532274932 +0900
@@ -17,6 +17,7 @@
 
 */
 
+#include <libnm/NetworkManager.h>
 #include <KDebug>
 
 #include "modemcdmainterface.h"
diff -ruN a/solidcontrolfuture/libs/solid/control/modemgsmcardinterface.cpp b/solidcontrolfuture/libs/solid/control/modemgsmcardinterface.cpp
--- a/solidcontrolfuture/libs/solid/control/modemgsmcardinterface.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/libs/solid/control/modemgsmcardinterface.cpp	2021-02-18 21:17:34.532274932 +0900
@@ -17,6 +17,7 @@
 
 */
 
+#include <libnm/NetworkManager.h>
 #include <KDebug>
 #include <KLocale>
 
diff -ruN a/solidcontrolfuture/libs/solid/control/modemgsmcardinterface.h b/solidcontrolfuture/libs/solid/control/modemgsmcardinterface.h
--- a/solidcontrolfuture/libs/solid/control/modemgsmcardinterface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/libs/solid/control/modemgsmcardinterface.h	2021-02-18 21:17:34.532274932 +0900
@@ -17,6 +17,7 @@
 
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef SOLID_CONTROL_MODEMGSMCARDINTERFACE_H
 #define SOLID_CONTROL_MODEMGSMCARDINTERFACE_H
 
diff -ruN a/solidcontrolfuture/libs/solid/control/modemgsmcontactsinterface.cpp b/solidcontrolfuture/libs/solid/control/modemgsmcontactsinterface.cpp
--- a/solidcontrolfuture/libs/solid/control/modemgsmcontactsinterface.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/libs/solid/control/modemgsmcontactsinterface.cpp	2021-02-18 21:17:34.532274932 +0900
@@ -17,6 +17,7 @@
 
 */
 
+#include <libnm/NetworkManager.h>
 #include <KDebug>
 #include <KLocale>
 
diff -ruN a/solidcontrolfuture/libs/solid/control/modemgsmcontactsinterface.h b/solidcontrolfuture/libs/solid/control/modemgsmcontactsinterface.h
--- a/solidcontrolfuture/libs/solid/control/modemgsmcontactsinterface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/libs/solid/control/modemgsmcontactsinterface.h	2021-02-18 21:17:34.532274932 +0900
@@ -17,6 +17,7 @@
 
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef SOLID_CONTROL_MODEMGSMCONTACTSINTERFACE_H
 #define SOLID_CONTROL_MODEMGSMCONTACTSINTERFACE_H
 
diff -ruN a/solidcontrolfuture/libs/solid/control/modemgsmhsointerface.cpp b/solidcontrolfuture/libs/solid/control/modemgsmhsointerface.cpp
--- a/solidcontrolfuture/libs/solid/control/modemgsmhsointerface.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/libs/solid/control/modemgsmhsointerface.cpp	2021-02-18 21:17:34.533274886 +0900
@@ -17,6 +17,7 @@
 
 */
 
+#include <libnm/NetworkManager.h>
 #include <KDebug>
 #include <KLocale>
 
diff -ruN a/solidcontrolfuture/libs/solid/control/modemgsmhsointerface.h b/solidcontrolfuture/libs/solid/control/modemgsmhsointerface.h
--- a/solidcontrolfuture/libs/solid/control/modemgsmhsointerface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/libs/solid/control/modemgsmhsointerface.h	2021-02-18 21:17:34.533274886 +0900
@@ -17,6 +17,7 @@
 
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef SOLID_CONTROL_MODEMGHSOMSINTERFACE_H
 #define SOLID_CONTROL_MODEMGHSOMSINTERFACE_H
 
diff -ruN a/solidcontrolfuture/libs/solid/control/modemgsmnetworkinterface.cpp b/solidcontrolfuture/libs/solid/control/modemgsmnetworkinterface.cpp
--- a/solidcontrolfuture/libs/solid/control/modemgsmnetworkinterface.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/libs/solid/control/modemgsmnetworkinterface.cpp	2021-02-18 21:17:34.533274886 +0900
@@ -17,6 +17,7 @@
 
 */
 
+#include <libnm/NetworkManager.h>
 #include <KDebug>
 
 #include "modemgsmnetworkinterface.h"
diff -ruN a/solidcontrolfuture/libs/solid/control/modemgsmnetworkinterface.h b/solidcontrolfuture/libs/solid/control/modemgsmnetworkinterface.h
--- a/solidcontrolfuture/libs/solid/control/modemgsmnetworkinterface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/libs/solid/control/modemgsmnetworkinterface.h	2021-02-18 21:17:34.533274886 +0900
@@ -17,6 +17,7 @@
 
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef SOLID_CONTROL_MODEMGSMNETWORKINTERFACE_H
 #define SOLID_CONTROL_MODEMGSMNETWORKINTERFACE_H
 
diff -ruN a/solidcontrolfuture/libs/solid/control/modemgsmsmsinterface.cpp b/solidcontrolfuture/libs/solid/control/modemgsmsmsinterface.cpp
--- a/solidcontrolfuture/libs/solid/control/modemgsmsmsinterface.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/libs/solid/control/modemgsmsmsinterface.cpp	2021-02-18 21:17:34.533274886 +0900
@@ -17,6 +17,7 @@
 
 */
 
+#include <libnm/NetworkManager.h>
 #include <KDebug>
 #include <KLocale>
 
diff -ruN a/solidcontrolfuture/libs/solid/control/modemgsmsmsinterface.h b/solidcontrolfuture/libs/solid/control/modemgsmsmsinterface.h
--- a/solidcontrolfuture/libs/solid/control/modemgsmsmsinterface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/libs/solid/control/modemgsmsmsinterface.h	2021-02-18 21:17:34.533274886 +0900
@@ -17,6 +17,7 @@
 
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef SOLID_CONTROL_MODEMGSMSMSINTERFACE_H
 #define SOLID_CONTROL_MODEMGSMSMSINTERFACE_H
 
diff -ruN a/solidcontrolfuture/libs/solid/control/modemgsmussdinterface.cpp b/solidcontrolfuture/libs/solid/control/modemgsmussdinterface.cpp
--- a/solidcontrolfuture/libs/solid/control/modemgsmussdinterface.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/libs/solid/control/modemgsmussdinterface.cpp	2021-02-18 21:17:34.534274840 +0900
@@ -17,6 +17,7 @@
 
 */
 
+#include <libnm/NetworkManager.h>
 #include <KDebug>
 
 #include "modemgsmussdinterface.h"
diff -ruN a/solidcontrolfuture/libs/solid/control/modemgsmussdinterface.h b/solidcontrolfuture/libs/solid/control/modemgsmussdinterface.h
--- a/solidcontrolfuture/libs/solid/control/modemgsmussdinterface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/libs/solid/control/modemgsmussdinterface.h	2021-02-18 21:17:34.534274840 +0900
@@ -17,6 +17,7 @@
 
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef SOLID_CONTROL_MODEMGSMUSSDINTERFACE_H
 #define SOLID_CONTROL_MODEMGSMUSSDINTERFACE_H
 
diff -ruN a/solidcontrolfuture/libs/solid/control/modeminterface.cpp b/solidcontrolfuture/libs/solid/control/modeminterface.cpp
--- a/solidcontrolfuture/libs/solid/control/modeminterface.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/libs/solid/control/modeminterface.cpp	2021-02-18 21:17:34.534274840 +0900
@@ -17,6 +17,7 @@
 
 */
 
+#include <libnm/NetworkManager.h>
 #include <KLocale>
 
 #include "modeminterface.h"
diff -ruN a/solidcontrolfuture/libs/solid/control/modeminterface.h b/solidcontrolfuture/libs/solid/control/modeminterface.h
--- a/solidcontrolfuture/libs/solid/control/modeminterface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/libs/solid/control/modeminterface.h	2021-02-18 21:17:34.534274840 +0900
@@ -17,6 +17,7 @@
 
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef SOLID_CONTROL_MODEMINTERFACE_H
 #define SOLID_CONTROL_MODEMINTERFACE_H
 
diff -ruN a/solidcontrolfuture/libs/solid/control/modemlocationinterface.cpp b/solidcontrolfuture/libs/solid/control/modemlocationinterface.cpp
--- a/solidcontrolfuture/libs/solid/control/modemlocationinterface.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/libs/solid/control/modemlocationinterface.cpp	2021-02-18 21:17:34.534274840 +0900
@@ -17,6 +17,7 @@
 
 */
 
+#include <libnm/NetworkManager.h>
 #include <KDebug>
 #include <KLocale>
 
diff -ruN a/solidcontrolfuture/libs/solid/control/modemlocationinterface.h b/solidcontrolfuture/libs/solid/control/modemlocationinterface.h
--- a/solidcontrolfuture/libs/solid/control/modemlocationinterface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/libs/solid/control/modemlocationinterface.h	2021-02-18 21:17:34.535274794 +0900
@@ -17,6 +17,7 @@
 
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef SOLID_CONTROL_MODEMLOCATIONINTERFACE_H
 #define SOLID_CONTROL_MODEMLOCATIONINTERFACE_H
 
diff -ruN a/solidcontrolfuture/libs/solid/control/modemmanager.h b/solidcontrolfuture/libs/solid/control/modemmanager.h
--- a/solidcontrolfuture/libs/solid/control/modemmanager.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/libs/solid/control/modemmanager.h	2021-02-18 21:17:34.535274794 +0900
@@ -17,6 +17,7 @@
 
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef SOLID_CONTROL_MODEMMANAGER
 #define SOLID_CONTROL_MODEMMANAGER
 
diff -ruN a/solidcontrolfuture/libs/solid/control/modemmanagerinterface.h b/solidcontrolfuture/libs/solid/control/modemmanagerinterface.h
--- a/solidcontrolfuture/libs/solid/control/modemmanagerinterface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/libs/solid/control/modemmanagerinterface.h	2021-02-18 21:17:34.535274794 +0900
@@ -17,6 +17,7 @@
 
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef SOLID_CONTROL_MODEMMANAGERINTERFACE_H
 #define SOLID_CONTROL_MODEMMANAGERINTERFACE_H
 
diff -ruN a/solidcontrolfuture/libs/solid/control/networkbtinterface.cpp b/solidcontrolfuture/libs/solid/control/networkbtinterface.cpp
--- a/solidcontrolfuture/libs/solid/control/networkbtinterface.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/libs/solid/control/networkbtinterface.cpp	2021-02-18 21:17:34.535274794 +0900
@@ -18,6 +18,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #include <KLocale>
 
 #include "networkbtinterface.h"
diff -ruN a/solidcontrolfuture/libs/solid/control/networkbtinterface.h b/solidcontrolfuture/libs/solid/control/networkbtinterface.h
--- a/solidcontrolfuture/libs/solid/control/networkbtinterface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/libs/solid/control/networkbtinterface.h	2021-02-18 21:17:34.535274794 +0900
@@ -18,6 +18,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef SOLID_CONTROL_BTNETWORKINTERFACE_H
 #define SOLID_CONTROL_BTNETWORKINTERFACE_H
 
diff -ruN a/solidcontrolfuture/libs/solid/control/networkcdmainterface.cpp b/solidcontrolfuture/libs/solid/control/networkcdmainterface.cpp
--- a/solidcontrolfuture/libs/solid/control/networkcdmainterface.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/libs/solid/control/networkcdmainterface.cpp	2021-02-18 21:17:34.535274794 +0900
@@ -17,6 +17,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #include "networkcdmainterface.h"
 #include "networkcdmainterface_p.h"
 
diff -ruN a/solidcontrolfuture/libs/solid/control/networkcdmainterface.h b/solidcontrolfuture/libs/solid/control/networkcdmainterface.h
--- a/solidcontrolfuture/libs/solid/control/networkcdmainterface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/libs/solid/control/networkcdmainterface.h	2021-02-18 21:17:34.536274748 +0900
@@ -18,6 +18,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef SOLID_CONTROL_CDMANETWORKINTERFACE_H
 #define SOLID_CONTROL_CDMANETWORKINTERFACE_H
 
diff -ruN a/solidcontrolfuture/libs/solid/control/networkgsminterface.cpp b/solidcontrolfuture/libs/solid/control/networkgsminterface.cpp
--- a/solidcontrolfuture/libs/solid/control/networkgsminterface.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/libs/solid/control/networkgsminterface.cpp	2021-02-18 21:17:34.536274748 +0900
@@ -18,6 +18,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #include <KLocale>
 
 #include "networkgsminterface.h"
diff -ruN a/solidcontrolfuture/libs/solid/control/networkgsminterface.h b/solidcontrolfuture/libs/solid/control/networkgsminterface.h
--- a/solidcontrolfuture/libs/solid/control/networkgsminterface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/libs/solid/control/networkgsminterface.h	2021-02-18 21:17:34.536274748 +0900
@@ -18,6 +18,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef SOLID_CONTROL_GSMNETWORKINTERFACE_H
 #define SOLID_CONTROL_GSMNETWORKINTERFACE_H
 
diff -ruN a/solidcontrolfuture/libs/solid/control/networking.cpp b/solidcontrolfuture/libs/solid/control/networking.cpp
--- a/solidcontrolfuture/libs/solid/control/networking.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/libs/solid/control/networking.cpp	2021-02-18 21:17:34.536274748 +0900
@@ -18,6 +18,7 @@
 
 */
 
+#include <libnm/NetworkManager.h>
 #include <QtNetwork/QAbstractSocket>
 #include <QtCore/QTimer>
 
diff -ruN a/solidcontrolfuture/libs/solid/control/networking.h b/solidcontrolfuture/libs/solid/control/networking.h
--- a/solidcontrolfuture/libs/solid/control/networking.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/libs/solid/control/networking.h	2021-02-18 21:17:34.536274748 +0900
@@ -18,6 +18,7 @@
 
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef SOLID_CONTROL_NETWORKING_H
 #define SOLID_CONTROL_NETWORKING_H
 
diff -ruN a/solidcontrolfuture/libs/solid/control/networkinterface.cpp b/solidcontrolfuture/libs/solid/control/networkinterface.cpp
--- a/solidcontrolfuture/libs/solid/control/networkinterface.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/libs/solid/control/networkinterface.cpp	2021-02-18 21:17:34.536274748 +0900
@@ -18,6 +18,7 @@
 
 */
 
+#include <libnm/NetworkManager.h>
 #include "networkinterface.h"
 #include "networkinterface_p.h"
 
diff -ruN a/solidcontrolfuture/libs/solid/control/networkinterface.h b/solidcontrolfuture/libs/solid/control/networkinterface.h
--- a/solidcontrolfuture/libs/solid/control/networkinterface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/libs/solid/control/networkinterface.h	2021-02-18 21:17:34.537274701 +0900
@@ -18,6 +18,7 @@
 
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef SOLID_CONTROL_NETWORKINTERFACE_H
 #define SOLID_CONTROL_NETWORKINTERFACE_H
 
diff -ruN a/solidcontrolfuture/libs/solid/control/networkipv4config.cpp b/solidcontrolfuture/libs/solid/control/networkipv4config.cpp
--- a/solidcontrolfuture/libs/solid/control/networkipv4config.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/libs/solid/control/networkipv4config.cpp	2021-02-18 21:17:34.537274701 +0900
@@ -19,6 +19,7 @@
 
 */
 
+#include <libnm/NetworkManager.h>
 #include "networkipv4confignm09.h"
 
 namespace Solid
diff -ruN a/solidcontrolfuture/libs/solid/control/networkipv4config.h b/solidcontrolfuture/libs/solid/control/networkipv4config.h
--- a/solidcontrolfuture/libs/solid/control/networkipv4config.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/libs/solid/control/networkipv4config.h	2021-02-18 21:17:34.537274701 +0900
@@ -19,6 +19,7 @@
 
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef SOLID_CONTROL_NETWORKIPV4CONFIG_H
 #define SOLID_CONTROL_NETWORKIPV4CONFIG_H
 
diff -ruN a/solidcontrolfuture/libs/solid/control/networkipv4confignm09.h b/solidcontrolfuture/libs/solid/control/networkipv4confignm09.h
--- a/solidcontrolfuture/libs/solid/control/networkipv4confignm09.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/libs/solid/control/networkipv4confignm09.h	2021-02-18 21:17:34.537274701 +0900
@@ -19,6 +19,7 @@
 
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef SOLID_CONTROL_NETWORKIPV4CONFIG_NM09_H
 #define SOLID_CONTROL_NETWORKIPV4CONFIG_NM09_H
 
diff -ruN a/solidcontrolfuture/libs/solid/control/networkmanager.h b/solidcontrolfuture/libs/solid/control/networkmanager.h
--- a/solidcontrolfuture/libs/solid/control/networkmanager.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/libs/solid/control/networkmanager.h	2021-02-18 21:17:34.537274701 +0900
@@ -18,6 +18,7 @@
 
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef SOLID_CONTROL_NETWORKMANAGER
 #define SOLID_CONTROL_NETWORKMANAGER
 
diff -ruN a/solidcontrolfuture/libs/solid/control/networkmodeminterface.cpp b/solidcontrolfuture/libs/solid/control/networkmodeminterface.cpp
--- a/solidcontrolfuture/libs/solid/control/networkmodeminterface.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/libs/solid/control/networkmodeminterface.cpp	2021-02-18 21:17:34.538274655 +0900
@@ -18,6 +18,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #include <KLocale>
 #include <KDebug>
 
diff -ruN a/solidcontrolfuture/libs/solid/control/networkmodeminterface.h b/solidcontrolfuture/libs/solid/control/networkmodeminterface.h
--- a/solidcontrolfuture/libs/solid/control/networkmodeminterface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/libs/solid/control/networkmodeminterface.h	2021-02-18 21:17:34.538274655 +0900
@@ -18,6 +18,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef SOLID_CONTROL_MODEMNETWORKINTERFACE_H
 #define SOLID_CONTROL_MODEMNETWORKINTERFACE_H
 
diff -ruN a/solidcontrolfuture/libs/solid/control/networkserialinterface.cpp b/solidcontrolfuture/libs/solid/control/networkserialinterface.cpp
--- a/solidcontrolfuture/libs/solid/control/networkserialinterface.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/libs/solid/control/networkserialinterface.cpp	2021-02-18 21:17:34.538274655 +0900
@@ -18,6 +18,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #include "networkserialinterface.h"
 #include "networkserialinterface_p.h"
 
diff -ruN a/solidcontrolfuture/libs/solid/control/networkserialinterface.h b/solidcontrolfuture/libs/solid/control/networkserialinterface.h
--- a/solidcontrolfuture/libs/solid/control/networkserialinterface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/libs/solid/control/networkserialinterface.h	2021-02-18 21:17:34.538274655 +0900
@@ -18,6 +18,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef SOLID_CONTROL_SERIALNETWORKINTERFACE_H
 #define SOLID_CONTROL_SERIALNETWORKINTERFACE_H
 
diff -ruN a/solidcontrolfuture/libs/solid/control/singletondefs.h b/solidcontrolfuture/libs/solid/control/singletondefs.h
--- a/solidcontrolfuture/libs/solid/control/singletondefs.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/libs/solid/control/singletondefs.h	2021-02-18 21:17:34.538274655 +0900
@@ -17,6 +17,7 @@
 
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef SOLID_CONTROL_SINGLETONDEFS_H
 #define SOLID_CONTROL_SINGLETONDEFS_H
 
diff -ruN a/solidcontrolfuture/libs/solid/control/wirednetworkinterface.cpp b/solidcontrolfuture/libs/solid/control/wirednetworkinterface.cpp
--- a/solidcontrolfuture/libs/solid/control/wirednetworkinterface.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/libs/solid/control/wirednetworkinterface.cpp	2021-02-18 21:17:34.538274655 +0900
@@ -18,6 +18,7 @@
 
 */
 
+#include <libnm/NetworkManager.h>
 #include "wirednetworkinterface.h"
 #include "wirednetworkinterface_p.h"
 
diff -ruN a/solidcontrolfuture/libs/solid/control/wirednetworkinterface.h b/solidcontrolfuture/libs/solid/control/wirednetworkinterface.h
--- a/solidcontrolfuture/libs/solid/control/wirednetworkinterface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/libs/solid/control/wirednetworkinterface.h	2021-02-18 21:17:34.539274609 +0900
@@ -18,6 +18,7 @@
 
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef SOLID_CONTROL_WIREDNETWORKINTERFACE_H
 #define SOLID_CONTROL_WIREDNETWORKINTERFACE_H
 
diff -ruN a/solidcontrolfuture/libs/solid/control/wirelessaccesspoint.cpp b/solidcontrolfuture/libs/solid/control/wirelessaccesspoint.cpp
--- a/solidcontrolfuture/libs/solid/control/wirelessaccesspoint.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/libs/solid/control/wirelessaccesspoint.cpp	2021-02-18 21:17:34.539274609 +0900
@@ -18,6 +18,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #include "wirelessaccesspoint.h"
 #include "frontendobject_p.h"
 #include "soliddefs_p.h"
diff -ruN a/solidcontrolfuture/libs/solid/control/wirelessaccesspoint.h b/solidcontrolfuture/libs/solid/control/wirelessaccesspoint.h
--- a/solidcontrolfuture/libs/solid/control/wirelessaccesspoint.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/libs/solid/control/wirelessaccesspoint.h	2021-02-18 21:17:34.539274609 +0900
@@ -18,6 +18,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef SOLID_CONTROL_WIRELESSAP_H
 #define SOLID_CONTROL_WIRELESSAP_H
 
diff -ruN a/solidcontrolfuture/libs/solid/control/wirelessnetworkinterface.h b/solidcontrolfuture/libs/solid/control/wirelessnetworkinterface.h
--- a/solidcontrolfuture/libs/solid/control/wirelessnetworkinterface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/libs/solid/control/wirelessnetworkinterface.h	2021-02-18 21:17:34.539274609 +0900
@@ -19,6 +19,7 @@
 
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef SOLID_CONTROL_WIRELESSNETWORKINTERFACE_H
 #define SOLID_CONTROL_WIRELESSNETWORKINTERFACE_H
 
diff -ruN a/solidcontrolfuture/solid/CMakeLists.txt b/solidcontrolfuture/solid/CMakeLists.txt
--- a/solidcontrolfuture/solid/CMakeLists.txt	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/solid/CMakeLists.txt	2021-02-20 17:46:34.026795605 +0900
@@ -1,14 +1,7 @@
 include(MacroEnsureVersion)
 
 add_subdirectory(modemmanager-0.5)
-macro_optional_find_package(NetworkManager)
-set(HAVE_NETWORKMANAGER FALSE)
-if(NETWORKMANAGER_FOUND)
-  macro_ensure_version("0.9.0" ${NETWORKMANAGER_VERSION} NM_0_9)
-  if (NM_0_9)
-    message(STATUS "Will build networkmanager-0.9")
+    message(STATUS "Will build networkmanager-1.0")
     set(HAVE_NETWORKMANAGER TRUE)
     add_subdirectory(networkmanager-0.9)
-  endif (NM_0_9)
-endif (NETWORKMANAGER_FOUND)
 macro_log_feature(HAVE_NETWORKMANAGER "NetworkManager" "A daemon for user controlled networking" "http://www.gnome.org/projects/NetworkManager" FALSE "0.9.0" "Needed for building Network Management support in Solid.")
diff -ruN a/solidcontrolfuture/solid/modemmanager-0.5/dbus/generic-types.h b/solidcontrolfuture/solid/modemmanager-0.5/dbus/generic-types.h
--- a/solidcontrolfuture/solid/modemmanager-0.5/dbus/generic-types.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/solid/modemmanager-0.5/dbus/generic-types.h	2021-02-18 21:17:34.539274609 +0900
@@ -18,6 +18,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef MODEMMANAGER_TYPES_H
 #define MODEMMANAGER_TYPES_H
 
diff -ruN a/solidcontrolfuture/solid/modemmanager-0.5/dbus/mm-manager-clientinterface.h b/solidcontrolfuture/solid/modemmanager-0.5/dbus/mm-manager-clientinterface.h
--- a/solidcontrolfuture/solid/modemmanager-0.5/dbus/mm-manager-clientinterface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/solid/modemmanager-0.5/dbus/mm-manager-clientinterface.h	2021-02-18 21:17:34.539274609 +0900
@@ -8,6 +8,7 @@
  * Do not edit! All changes made to it will be lost.
  */
 
+#include <libnm/NetworkManager.h>
 #ifndef MM_MANAGER_CLIENTINTERFACE
 #define MM_MANAGER_CLIENTINTERFACE
 
diff -ruN a/solidcontrolfuture/solid/modemmanager-0.5/dbus/mm-modem-cdmainterface.h b/solidcontrolfuture/solid/modemmanager-0.5/dbus/mm-modem-cdmainterface.h
--- a/solidcontrolfuture/solid/modemmanager-0.5/dbus/mm-modem-cdmainterface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/solid/modemmanager-0.5/dbus/mm-modem-cdmainterface.h	2021-02-18 21:17:34.540274563 +0900
@@ -8,6 +8,7 @@
  * Do not edit! All changes made to it will be lost.
  */
 
+#include <libnm/NetworkManager.h>
 #ifndef MM_MODEM_CDMAINTERFACE_H
 #define MM_MODEM_CDMAINTERFACE_H
 
diff -ruN a/solidcontrolfuture/solid/modemmanager-0.5/dbus/mm-modem-gsm-cardinterface.h b/solidcontrolfuture/solid/modemmanager-0.5/dbus/mm-modem-gsm-cardinterface.h
--- a/solidcontrolfuture/solid/modemmanager-0.5/dbus/mm-modem-gsm-cardinterface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/solid/modemmanager-0.5/dbus/mm-modem-gsm-cardinterface.h	2021-02-18 21:17:34.540274563 +0900
@@ -8,6 +8,7 @@
  * Do not edit! All changes made to it will be lost.
  */
 
+#include <libnm/NetworkManager.h>
 #ifndef MM_MODEM_GSM_CARD_H
 #define MM_MODEM_GSM_CARD_H
 
diff -ruN a/solidcontrolfuture/solid/modemmanager-0.5/dbus/mm-modem-gsm-contactsinterface.h b/solidcontrolfuture/solid/modemmanager-0.5/dbus/mm-modem-gsm-contactsinterface.h
--- a/solidcontrolfuture/solid/modemmanager-0.5/dbus/mm-modem-gsm-contactsinterface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/solid/modemmanager-0.5/dbus/mm-modem-gsm-contactsinterface.h	2021-02-18 21:17:34.540274563 +0900
@@ -8,6 +8,7 @@
  * Do not edit! All changes made to it will be lost.
  */
 
+#include <libnm/NetworkManager.h>
 #ifndef MM_MODEM_GSM_CONTACTSINTERFACE_H
 #define MM_MODEM_GSM_CONTACTSINTERFACE_H
 
diff -ruN a/solidcontrolfuture/solid/modemmanager-0.5/dbus/mm-modem-gsm-hsointerface.h b/solidcontrolfuture/solid/modemmanager-0.5/dbus/mm-modem-gsm-hsointerface.h
--- a/solidcontrolfuture/solid/modemmanager-0.5/dbus/mm-modem-gsm-hsointerface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/solid/modemmanager-0.5/dbus/mm-modem-gsm-hsointerface.h	2021-02-18 21:17:34.540274563 +0900
@@ -8,6 +8,7 @@
  * Do not edit! All changes made to it will be lost.
  */
 
+#include <libnm/NetworkManager.h>
 #ifndef MM_MODEM_GSM_HSOINTERFACE_H
 #define MM_MODEM_GSM_HSOINTERFACE_H
 
diff -ruN a/solidcontrolfuture/solid/modemmanager-0.5/dbus/mm-modem-gsm-networkinterface.h b/solidcontrolfuture/solid/modemmanager-0.5/dbus/mm-modem-gsm-networkinterface.h
--- a/solidcontrolfuture/solid/modemmanager-0.5/dbus/mm-modem-gsm-networkinterface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/solid/modemmanager-0.5/dbus/mm-modem-gsm-networkinterface.h	2021-02-18 21:17:34.540274563 +0900
@@ -8,6 +8,7 @@
  * Do not edit! All changes made to it will be lost.
  */
 
+#include <libnm/NetworkManager.h>
 #ifndef MM_MODEM_GSM_NETWORKINTERFACE_H
 #define MM_MODEM_GSM_NETWORKINTERFACE_H
 
diff -ruN a/solidcontrolfuture/solid/modemmanager-0.5/dbus/mm-modem-gsm-smsinterface.h b/solidcontrolfuture/solid/modemmanager-0.5/dbus/mm-modem-gsm-smsinterface.h
--- a/solidcontrolfuture/solid/modemmanager-0.5/dbus/mm-modem-gsm-smsinterface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/solid/modemmanager-0.5/dbus/mm-modem-gsm-smsinterface.h	2021-02-18 21:17:34.540274563 +0900
@@ -8,6 +8,7 @@
  * Do not edit! All changes made to it will be lost.
  */
 
+#include <libnm/NetworkManager.h>
 #ifndef MM_MODEM_GSM_SMSINTERFACE_H
 #define MM_MODEM_GSM_SMSINTERFACE_H
 
diff -ruN a/solidcontrolfuture/solid/modemmanager-0.5/dbus/mm-modem-gsm-ussdinterface.h b/solidcontrolfuture/solid/modemmanager-0.5/dbus/mm-modem-gsm-ussdinterface.h
--- a/solidcontrolfuture/solid/modemmanager-0.5/dbus/mm-modem-gsm-ussdinterface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/solid/modemmanager-0.5/dbus/mm-modem-gsm-ussdinterface.h	2021-02-18 21:17:34.541274517 +0900
@@ -8,6 +8,7 @@
  * Do not edit! All changes made to it will be lost.
  */
 
+#include <libnm/NetworkManager.h>
 #ifndef MM_MODEM_GSM_USSDINTERFACE_H
 #define MM_MODEM_GSM_USSDINTERFACE_H
 
diff -ruN a/solidcontrolfuture/solid/modemmanager-0.5/dbus/mm-modeminterface.h b/solidcontrolfuture/solid/modemmanager-0.5/dbus/mm-modeminterface.h
--- a/solidcontrolfuture/solid/modemmanager-0.5/dbus/mm-modeminterface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/solid/modemmanager-0.5/dbus/mm-modeminterface.h	2021-02-18 21:17:34.541274517 +0900
@@ -8,6 +8,7 @@
  * Do not edit! All changes made to it will be lost.
  */
 
+#include <libnm/NetworkManager.h>
 #ifndef MM_MODEMINTERFACE_H
 #define MM_MODEMINTERFACE_H
 
diff -ruN a/solidcontrolfuture/solid/modemmanager-0.5/dbus/mm-modem-locationinterface.h b/solidcontrolfuture/solid/modemmanager-0.5/dbus/mm-modem-locationinterface.h
--- a/solidcontrolfuture/solid/modemmanager-0.5/dbus/mm-modem-locationinterface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/solid/modemmanager-0.5/dbus/mm-modem-locationinterface.h	2021-02-18 21:17:34.541274517 +0900
@@ -8,6 +8,7 @@
  * Do not edit! All changes made to it will be lost.
  */
 
+#include <libnm/NetworkManager.h>
 #ifndef MM_MODEM_LOCATIONINTERFACE_H
 #define MM_MODEM_LOCATIONINTERFACE_H
 
diff -ruN a/solidcontrolfuture/solid/modemmanager-0.5/dbus/mm-modem-simpleinterface.h b/solidcontrolfuture/solid/modemmanager-0.5/dbus/mm-modem-simpleinterface.h
--- a/solidcontrolfuture/solid/modemmanager-0.5/dbus/mm-modem-simpleinterface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/solid/modemmanager-0.5/dbus/mm-modem-simpleinterface.h	2021-02-18 21:17:34.541274517 +0900
@@ -8,6 +8,7 @@
  * Do not edit! All changes made to it will be lost.
  */
 
+#include <libnm/NetworkManager.h>
 #ifndef MM_MODEM_SIMPLEINTERFACE_H
 #define MM_MODEM_SIMPLEINTERFACE_H
 
diff -ruN a/solidcontrolfuture/solid/modemmanager-0.5/modeminterface.cpp b/solidcontrolfuture/solid/modemmanager-0.5/modeminterface.cpp
--- a/solidcontrolfuture/solid/modemmanager-0.5/modeminterface.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/solid/modemmanager-0.5/modeminterface.cpp	2021-02-18 21:17:34.541274517 +0900
@@ -19,6 +19,7 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #include <KDebug>
 
 #include "manager.h"
diff -ruN a/solidcontrolfuture/solid/networkmanager-0.9/accesspoint.cpp b/solidcontrolfuture/solid/networkmanager-0.9/accesspoint.cpp
--- a/solidcontrolfuture/solid/networkmanager-0.9/accesspoint.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/solid/networkmanager-0.9/accesspoint.cpp	2021-02-20 21:48:15.230811341 +0900
@@ -18,6 +18,7 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #include "accesspoint.h"
 
 #include <KDebug>
@@ -26,7 +27,7 @@
 #include "wirelessnetworkinterface.h"
 
 
-class NMAccessPoint::Private
+class NMAccessPoint_::Private
 {
 public:
     Private( const QString & path ) : iface( NM_DBUS_SERVICE, path, QDBusConnection::systemBus()), capabilities(0), wpaFlags(0), rsnFlags(0), frequency(0), maxBitRate(0), mode((Solid::Control::WirelessNetworkInterfaceNm09::OperationMode)0), signalStrength(0)
@@ -46,7 +47,7 @@
     int signalStrength;
 };
 
-NMAccessPoint::NMAccessPoint( const QString& path, QObject * parent ) : Solid::Control::Ifaces::AccessPointNm09(parent), d(new Private( path ))
+NMAccessPoint_::NMAccessPoint_( const QString& path, QObject * parent ) : Solid::Control::Ifaces::AccessPointNm09(parent), d(new Private( path ))
 {
     d->uni = path;
     if (d->iface.isValid()) {
@@ -65,67 +66,67 @@
     }
 }
 
-NMAccessPoint::~NMAccessPoint()
+NMAccessPoint_::~NMAccessPoint_()
 {
     delete d;
 }
 
-QString NMAccessPoint::uni() const
+QString NMAccessPoint_::uni() const
 {
     return d->uni;
 }
 
-QString NMAccessPoint::hardwareAddress() const
+QString NMAccessPoint_::hardwareAddress() const
 {
     return d->hardwareAddress;
 }
 
-Solid::Control::AccessPointNm09::Capabilities NMAccessPoint::capabilities() const
+Solid::Control::AccessPointNm09::Capabilities NMAccessPoint_::capabilities() const
 {
     return d->capabilities;
 }
 
-Solid::Control::AccessPointNm09::WpaFlags NMAccessPoint::wpaFlags() const
+Solid::Control::AccessPointNm09::WpaFlags NMAccessPoint_::wpaFlags() const
 {
     return d->wpaFlags;
 }
 
-Solid::Control::AccessPointNm09::WpaFlags NMAccessPoint::rsnFlags() const
+Solid::Control::AccessPointNm09::WpaFlags NMAccessPoint_::rsnFlags() const
 {
     return d->rsnFlags;
 }
 
-QString NMAccessPoint::ssid() const
+QString NMAccessPoint_::ssid() const
 {
     return d->ssid;
 }
 
-QByteArray NMAccessPoint::rawSsid() const
+QByteArray NMAccessPoint_::rawSsid() const
 {
     return d->rawSsid;
 }
 
-uint NMAccessPoint::frequency() const
+uint NMAccessPoint_::frequency() const
 {
     return d->frequency;
 }
 
-uint NMAccessPoint::maxBitRate() const
+uint NMAccessPoint_::maxBitRate() const
 {
     return d->maxBitRate;
 }
 
-Solid::Control::WirelessNetworkInterfaceNm09::OperationMode NMAccessPoint::mode() const
+Solid::Control::WirelessNetworkInterfaceNm09::OperationMode NMAccessPoint_::mode() const
 {
     return d->mode;
 }
 
-int NMAccessPoint::signalStrength() const
+int NMAccessPoint_::signalStrength() const
 {
     return d->signalStrength;
 }
 
-void NMAccessPoint::propertiesChanged(const QVariantMap &properties)
+void NMAccessPoint_::propertiesChanged(const QVariantMap &properties)
 {
     QStringList propKeys = properties.keys();
     //kDebug(1441) << propKeys;
@@ -195,7 +196,7 @@
     }
 }
 
-Solid::Control::AccessPointNm09::Capabilities NMAccessPoint::convertCapabilities(int caps)
+Solid::Control::AccessPointNm09::Capabilities NMAccessPoint_::convertCapabilities(int caps)
 {
     if ( 1 == caps ) {
         return Solid::Control::AccessPointNm09::Privacy;
@@ -204,7 +205,7 @@
     }
 }
 
-Solid::Control::AccessPointNm09::WpaFlags NMAccessPoint::convertWpaFlags(uint theirFlags)
+Solid::Control::AccessPointNm09::WpaFlags NMAccessPoint_::convertWpaFlags(uint theirFlags)
 {
     return (Solid::Control::AccessPointNm09::WpaFlags)theirFlags;
 }
diff -ruN a/solidcontrolfuture/solid/networkmanager-0.9/accesspoint.h b/solidcontrolfuture/solid/networkmanager-0.9/accesspoint.h
--- a/solidcontrolfuture/solid/networkmanager-0.9/accesspoint.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/solid/networkmanager-0.9/accesspoint.h	2021-02-20 21:20:19.453799393 +0900
@@ -18,6 +18,7 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef NM09_ACCESSPOINT_H
 #define NM09_ACCESSPOINT_H
 #include "solid/control/ifaces/wirelessaccesspoint.h"
@@ -28,13 +29,13 @@
 
 #include <kdemacros.h>
 
-class KDE_EXPORT NMAccessPoint : public Solid::Control::Ifaces::AccessPointNm09
+class KDE_EXPORT NMAccessPoint_ : public Solid::Control::Ifaces::AccessPointNm09
 {
 Q_OBJECT
 Q_INTERFACES(Solid::Control::Ifaces::AccessPointNm09)
 public:
-    NMAccessPoint( const QString & path, QObject * parent = 0 );
-    virtual ~NMAccessPoint();
+    NMAccessPoint_( const QString & path, QObject * parent = 0 );
+    virtual ~NMAccessPoint_();
 
     QString uni() const;
     QString udi() const;
diff -ruN a/solidcontrolfuture/solid/networkmanager-0.9/dbus/activeconnection.h b/solidcontrolfuture/solid/networkmanager-0.9/dbus/activeconnection.h
--- a/solidcontrolfuture/solid/networkmanager-0.9/dbus/activeconnection.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/solid/networkmanager-0.9/dbus/activeconnection.h	2021-02-20 18:20:17.633862019 +0900
@@ -18,6 +18,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef ACTIVECONNECTION_H
 #define ACTIVECONNECTION_H
 
diff -ruN a/solidcontrolfuture/solid/networkmanager-0.9/dbus/generic-types.h b/solidcontrolfuture/solid/networkmanager-0.9/dbus/generic-types.h
--- a/solidcontrolfuture/solid/networkmanager-0.9/dbus/generic-types.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/solid/networkmanager-0.9/dbus/generic-types.h	2021-02-20 18:20:25.333442200 +0900
@@ -18,6 +18,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef GENERIC_TYPES_H
 #define GENERIC_TYPES_H
 
diff -ruN a/solidcontrolfuture/solid/networkmanager-0.9/dbus/nm-access-pointinterface.h b/solidcontrolfuture/solid/networkmanager-0.9/dbus/nm-access-pointinterface.h
--- a/solidcontrolfuture/solid/networkmanager-0.9/dbus/nm-access-pointinterface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/solid/networkmanager-0.9/dbus/nm-access-pointinterface.h	2021-02-20 18:20:33.066020583 +0900
@@ -8,6 +8,7 @@
  * Do not edit! All changes made to it will be lost.
  */
 
+#include <libnm/NetworkManager.h>
 #ifndef NM_ACCESS_POINTINTERFACE_H_1305476188
 #define NM_ACCESS_POINTINTERFACE_H_1305476188
 
diff -ruN a/solidcontrolfuture/solid/networkmanager-0.9/dbus/nm-active-connectioninterface.h b/solidcontrolfuture/solid/networkmanager-0.9/dbus/nm-active-connectioninterface.h
--- a/solidcontrolfuture/solid/networkmanager-0.9/dbus/nm-active-connectioninterface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/solid/networkmanager-0.9/dbus/nm-active-connectioninterface.h	2021-02-20 18:20:38.083746995 +0900
@@ -8,6 +8,7 @@
  * Do not edit! All changes made to it will be lost.
  */
 
+#include <libnm/NetworkManager.h>
 #ifndef NM_ACTIVE_CONNECTIONINTERFACE_H_1310070406
 #define NM_ACTIVE_CONNECTIONINTERFACE_H_1310070406
 
diff -ruN a/solidcontrolfuture/solid/networkmanager-0.9/dbus/nm-agent-managerinterface.h b/solidcontrolfuture/solid/networkmanager-0.9/dbus/nm-agent-managerinterface.h
--- a/solidcontrolfuture/solid/networkmanager-0.9/dbus/nm-agent-managerinterface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/solid/networkmanager-0.9/dbus/nm-agent-managerinterface.h	2021-02-20 18:20:42.357513973 +0900
@@ -8,6 +8,7 @@
  * Do not edit! All changes made to it will be lost.
  */
 
+#include <libnm/NetworkManager.h>
 #ifndef NM_AGENT_MANAGERINTERFACE_H_1305476370
 #define NM_AGENT_MANAGERINTERFACE_H_1305476370
 
diff -ruN a/solidcontrolfuture/solid/networkmanager-0.9/dbus/nm-device-btinterface.h b/solidcontrolfuture/solid/networkmanager-0.9/dbus/nm-device-btinterface.h
--- a/solidcontrolfuture/solid/networkmanager-0.9/dbus/nm-device-btinterface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/solid/networkmanager-0.9/dbus/nm-device-btinterface.h	2021-02-20 18:20:46.841269503 +0900
@@ -8,6 +8,7 @@
  * Do not edit! All changes made to it will be lost.
  */
 
+#include <libnm/NetworkManager.h>
 #ifndef NM_DEVICE_BTINTERFACE_H_1305476441
 #define NM_DEVICE_BTINTERFACE_H_1305476441
 
diff -ruN a/solidcontrolfuture/solid/networkmanager-0.9/dbus/nm-device-ethernetinterface.h b/solidcontrolfuture/solid/networkmanager-0.9/dbus/nm-device-ethernetinterface.h
--- a/solidcontrolfuture/solid/networkmanager-0.9/dbus/nm-device-ethernetinterface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/solid/networkmanager-0.9/dbus/nm-device-ethernetinterface.h	2021-02-20 18:20:51.685005406 +0900
@@ -8,6 +8,7 @@
  * Do not edit! All changes made to it will be lost.
  */
 
+#include <libnm/NetworkManager.h>
 #ifndef NM_DEVICE_ETHERNETINTERFACE_H_1305476516
 #define NM_DEVICE_ETHERNETINTERFACE_H_1305476516
 
diff -ruN a/solidcontrolfuture/solid/networkmanager-0.9/dbus/nm-deviceinterface.h b/solidcontrolfuture/solid/networkmanager-0.9/dbus/nm-deviceinterface.h
--- a/solidcontrolfuture/solid/networkmanager-0.9/dbus/nm-deviceinterface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/solid/networkmanager-0.9/dbus/nm-deviceinterface.h	2021-02-20 18:21:12.666861418 +0900
@@ -8,6 +8,7 @@
  * Do not edit! All changes made to it will be lost.
  */
 
+#include <libnm/NetworkManager.h>
 #ifndef NM_DEVICEINTERFACE_H_1310067075
 #define NM_DEVICEINTERFACE_H_1310067075
 
diff -ruN a/solidcontrolfuture/solid/networkmanager-0.9/dbus/nm-device-modeminterface.h b/solidcontrolfuture/solid/networkmanager-0.9/dbus/nm-device-modeminterface.h
--- a/solidcontrolfuture/solid/networkmanager-0.9/dbus/nm-device-modeminterface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/solid/networkmanager-0.9/dbus/nm-device-modeminterface.h	2021-02-20 18:20:56.090765190 +0900
@@ -8,6 +8,7 @@
  * Do not edit! All changes made to it will be lost.
  */
 
+#include <libnm/NetworkManager.h>
 #ifndef NM_DEVICE_MODEMINTERFACE_H_1305476565
 #define NM_DEVICE_MODEMINTERFACE_H_1305476565
 
diff -ruN a/solidcontrolfuture/solid/networkmanager-0.9/dbus/nm-device-wifiinterface.h b/solidcontrolfuture/solid/networkmanager-0.9/dbus/nm-device-wifiinterface.h
--- a/solidcontrolfuture/solid/networkmanager-0.9/dbus/nm-device-wifiinterface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/solid/networkmanager-0.9/dbus/nm-device-wifiinterface.h	2021-02-20 18:21:01.360477872 +0900
@@ -8,6 +8,7 @@
  * Do not edit! All changes made to it will be lost.
  */
 
+#include <libnm/NetworkManager.h>
 #ifndef NM_DEVICE_WIFIINTERFACE_H_1305476677
 #define NM_DEVICE_WIFIINTERFACE_H_1305476677
 
diff -ruN a/solidcontrolfuture/solid/networkmanager-0.9/dbus/nm-device-wimaxinterface.h b/solidcontrolfuture/solid/networkmanager-0.9/dbus/nm-device-wimaxinterface.h
--- a/solidcontrolfuture/solid/networkmanager-0.9/dbus/nm-device-wimaxinterface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/solid/networkmanager-0.9/dbus/nm-device-wimaxinterface.h	2021-02-20 18:21:07.110164383 +0900
@@ -8,6 +8,7 @@
  * Do not edit! All changes made to it will be lost.
  */
 
+#include <libnm/NetworkManager.h>
 #ifndef NM_DEVICE_WIMAXINTERFACE_H_1305476717
 #define NM_DEVICE_WIMAXINTERFACE_H_1305476717
 
diff -ruN a/solidcontrolfuture/solid/networkmanager-0.9/dbus/nm-dhcp4-configinterface.h b/solidcontrolfuture/solid/networkmanager-0.9/dbus/nm-dhcp4-configinterface.h
--- a/solidcontrolfuture/solid/networkmanager-0.9/dbus/nm-dhcp4-configinterface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/solid/networkmanager-0.9/dbus/nm-dhcp4-configinterface.h	2021-02-20 18:21:19.179506337 +0900
@@ -8,6 +8,7 @@
  * Do not edit! All changes made to it will be lost.
  */
 
+#include <libnm/NetworkManager.h>
 #ifndef NM_DHCP4_CONFIGINTERFACE_H_1305477009
 #define NM_DHCP4_CONFIGINTERFACE_H_1305477009
 
diff -ruN a/solidcontrolfuture/solid/networkmanager-0.9/dbus/nm-dhcp6-configinterface.h b/solidcontrolfuture/solid/networkmanager-0.9/dbus/nm-dhcp6-configinterface.h
--- a/solidcontrolfuture/solid/networkmanager-0.9/dbus/nm-dhcp6-configinterface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/solid/networkmanager-0.9/dbus/nm-dhcp6-configinterface.h	2021-02-20 18:21:23.552267927 +0900
@@ -8,6 +8,7 @@
  * Do not edit! All changes made to it will be lost.
  */
 
+#include <libnm/NetworkManager.h>
 #ifndef NM_DHCP6_CONFIGINTERFACE_H_1305477054
 #define NM_DHCP6_CONFIGINTERFACE_H_1305477054
 
diff -ruN a/solidcontrolfuture/solid/networkmanager-0.9/dbus/nm-ip4-configinterface.h b/solidcontrolfuture/solid/networkmanager-0.9/dbus/nm-ip4-configinterface.h
--- a/solidcontrolfuture/solid/networkmanager-0.9/dbus/nm-ip4-configinterface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/solid/networkmanager-0.9/dbus/nm-ip4-configinterface.h	2021-02-20 18:21:28.053022540 +0900
@@ -8,6 +8,7 @@
  * Do not edit! All changes made to it will be lost.
  */
 
+#include <libnm/NetworkManager.h>
 #ifndef NM_IP4_CONFIGINTERFACE_H_1305477263
 #define NM_IP4_CONFIGINTERFACE_H_1305477263
 
diff -ruN a/solidcontrolfuture/solid/networkmanager-0.9/dbus/nm-managerinterface.h b/solidcontrolfuture/solid/networkmanager-0.9/dbus/nm-managerinterface.h
--- a/solidcontrolfuture/solid/networkmanager-0.9/dbus/nm-managerinterface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/solid/networkmanager-0.9/dbus/nm-managerinterface.h	2021-02-20 18:21:32.257793291 +0900
@@ -8,6 +8,7 @@
  * Do not edit! All changes made to it will be lost.
  */
 
+#include <libnm/NetworkManager.h>
 #ifndef NM_MANAGERINTERFACE_H_1305482213
 #define NM_MANAGERINTERFACE_H_1305482213
 
diff -ruN a/solidcontrolfuture/solid/networkmanager-0.9/dbus/nm-secret-agentinterface.h b/solidcontrolfuture/solid/networkmanager-0.9/dbus/nm-secret-agentinterface.h
--- a/solidcontrolfuture/solid/networkmanager-0.9/dbus/nm-secret-agentinterface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/solid/networkmanager-0.9/dbus/nm-secret-agentinterface.h	2021-02-20 18:21:37.097529426 +0900
@@ -8,6 +8,7 @@
  * Do not edit! All changes made to it will be lost.
  */
 
+#include <libnm/NetworkManager.h>
 #ifndef NM_SECRET_AGENTINTERFACE_H_1305479392
 #define NM_SECRET_AGENTINTERFACE_H_1305479392
 
diff -ruN a/solidcontrolfuture/solid/networkmanager-0.9/dbus/nm-vpn-connectioninterface.h b/solidcontrolfuture/solid/networkmanager-0.9/dbus/nm-vpn-connectioninterface.h
--- a/solidcontrolfuture/solid/networkmanager-0.9/dbus/nm-vpn-connectioninterface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/solid/networkmanager-0.9/dbus/nm-vpn-connectioninterface.h	2021-02-20 18:21:41.360297017 +0900
@@ -8,6 +8,7 @@
  * Do not edit! All changes made to it will be lost.
  */
 
+#include <libnm/NetworkManager.h>
 #ifndef NM_VPN_CONNECTIONINTERFACE_H_1305479545
 #define NM_VPN_CONNECTIONINTERFACE_H_1305479545
 
diff -ruN a/solidcontrolfuture/solid/networkmanager-0.9/dbus/nm-vpn-plugininterface.h b/solidcontrolfuture/solid/networkmanager-0.9/dbus/nm-vpn-plugininterface.h
--- a/solidcontrolfuture/solid/networkmanager-0.9/dbus/nm-vpn-plugininterface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/solid/networkmanager-0.9/dbus/nm-vpn-plugininterface.h	2021-02-20 18:21:45.496071532 +0900
@@ -8,6 +8,7 @@
  * Do not edit! All changes made to it will be lost.
  */
 
+#include <libnm/NetworkManager.h>
 #ifndef NM_VPN_PLUGININTERFACE_H_1305479917
 #define NM_VPN_PLUGININTERFACE_H_1305479917
 
diff -ruN a/solidcontrolfuture/solid/networkmanager-0.9/dbus/nm-wimax-nspinterface.h b/solidcontrolfuture/solid/networkmanager-0.9/dbus/nm-wimax-nspinterface.h
--- a/solidcontrolfuture/solid/networkmanager-0.9/dbus/nm-wimax-nspinterface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/solid/networkmanager-0.9/dbus/nm-wimax-nspinterface.h	2021-02-20 18:21:50.982772397 +0900
@@ -8,6 +8,7 @@
  * Do not edit! All changes made to it will be lost.
  */
 
+#include <libnm/NetworkManager.h>
 #ifndef NM_WIMAX_NSPINTERFACE_H_1305479971
 #define NM_WIMAX_NSPINTERFACE_H_1305479971
 
diff -ruN a/solidcontrolfuture/solid/networkmanager-0.9/manager.cpp b/solidcontrolfuture/solid/networkmanager-0.9/manager.cpp
--- a/solidcontrolfuture/solid/networkmanager-0.9/manager.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/solid/networkmanager-0.9/manager.cpp	2021-02-20 18:18:17.849393797 +0900
@@ -17,6 +17,7 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #include "manager.h"
 #include "manager_p.h"
 
diff -ruN a/solidcontrolfuture/solid/networkmanager-0.9/manager.h b/solidcontrolfuture/solid/networkmanager-0.9/manager.h
--- a/solidcontrolfuture/solid/networkmanager-0.9/manager.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/solid/networkmanager-0.9/manager.h	2021-02-20 18:18:30.010730599 +0900
@@ -18,11 +18,10 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef NM09_NETWORKMANAGER_H
 #define NM09_NETWORKMANAGER_H
 
-#include <NetworkManager.h>
-
 #include "solid/control/ifaces/networkmanager.h"
 #include <QDBusObjectPath>
 #include <kdemacros.h>
diff -ruN a/solidcontrolfuture/solid/networkmanager-0.9/networkbtinterface.cpp b/solidcontrolfuture/solid/networkmanager-0.9/networkbtinterface.cpp
--- a/solidcontrolfuture/solid/networkmanager-0.9/networkbtinterface.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/solid/networkmanager-0.9/networkbtinterface.cpp	2021-02-20 18:19:00.383074344 +0900
@@ -18,6 +18,7 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #include <KDebug>
 
 #include "networkbtinterface.h"
diff -ruN a/solidcontrolfuture/solid/networkmanager-0.9/networkbtinterface.h b/solidcontrolfuture/solid/networkmanager-0.9/networkbtinterface.h
--- a/solidcontrolfuture/solid/networkmanager-0.9/networkbtinterface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/solid/networkmanager-0.9/networkbtinterface.h	2021-02-20 18:19:07.540684038 +0900
@@ -18,6 +18,7 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #include "networkmodeminterface.h"
 #include "solid/control/ifaces/networkbtinterface.h"
 
diff -ruN a/solidcontrolfuture/solid/networkmanager-0.9/networkinterface.cpp b/solidcontrolfuture/solid/networkmanager-0.9/networkinterface.cpp
--- a/solidcontrolfuture/solid/networkmanager-0.9/networkinterface.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/solid/networkmanager-0.9/networkinterface.cpp	2021-02-20 18:12:28.284463131 +0900
@@ -18,6 +18,7 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #include "networkinterface.h"
 #include "networkinterface_p.h"
 
diff -ruN a/solidcontrolfuture/solid/networkmanager-0.9/networkinterface.h b/solidcontrolfuture/solid/networkmanager-0.9/networkinterface.h
--- a/solidcontrolfuture/solid/networkmanager-0.9/networkinterface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/solid/networkmanager-0.9/networkinterface.h	2021-02-20 18:19:17.661132172 +0900
@@ -18,6 +18,7 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef NM09_NETWORKINTERFACE_H
 #define NM09_NETWORKINTERFACE_H
 
diff -ruN a/solidcontrolfuture/solid/networkmanager-0.9/networkmanagerdefinitions.h b/solidcontrolfuture/solid/networkmanager-0.9/networkmanagerdefinitions.h
--- a/solidcontrolfuture/solid/networkmanager-0.9/networkmanagerdefinitions.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/solid/networkmanager-0.9/networkmanagerdefinitions.h	2021-02-20 18:19:24.180776659 +0900
@@ -18,6 +18,7 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef KDE_NETWORKMANAGER_DEFINITIONS_H
 #define KDE_NETWORKMANAGER_DEFINITIONS_H
 
diff -ruN a/solidcontrolfuture/solid/networkmanager-0.9/networkmodeminterface.cpp b/solidcontrolfuture/solid/networkmanager-0.9/networkmodeminterface.cpp
--- a/solidcontrolfuture/solid/networkmanager-0.9/networkmodeminterface.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/solid/networkmanager-0.9/networkmodeminterface.cpp	2021-02-20 18:19:31.754363683 +0900
@@ -18,6 +18,7 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #include "networkmodeminterface.h"
 
 #include <KDebug>
diff -ruN a/solidcontrolfuture/solid/networkmanager-0.9/networkmodeminterface.h b/solidcontrolfuture/solid/networkmanager-0.9/networkmodeminterface.h
--- a/solidcontrolfuture/solid/networkmanager-0.9/networkmodeminterface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/solid/networkmanager-0.9/networkmodeminterface.h	2021-02-20 18:19:37.915027752 +0900
@@ -18,6 +18,7 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #include "networkinterface.h"
 #include "solid/control/ifaces/networkmodeminterface.h"
 #include "solid/control/modemgsmnetworkinterface.h"
diff -ruN a/solidcontrolfuture/solid/networkmanager-0.9/nmpropertyhelper.h b/solidcontrolfuture/solid/networkmanager-0.9/nmpropertyhelper.h
--- a/solidcontrolfuture/solid/networkmanager-0.9/nmpropertyhelper.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/solid/networkmanager-0.9/nmpropertyhelper.h	2021-02-20 18:26:50.028470402 +0900
@@ -1,3 +1,4 @@
+#include <libnm/NetworkManager.h>
 // class that can extract values out of a properties map into a QObject's properties
 
 #ifndef NM09_PROPERTY_HELPER_H
diff -ruN a/solidcontrolfuture/solid/networkmanager-0.9/wirednetworkinterface.h b/solidcontrolfuture/solid/networkmanager-0.9/wirednetworkinterface.h
--- a/solidcontrolfuture/solid/networkmanager-0.9/wirednetworkinterface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/solid/networkmanager-0.9/wirednetworkinterface.h	2021-02-20 18:20:00.731783619 +0900
@@ -18,6 +18,7 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef NM09_WIREDNETWORKINTERFACE_H
 #define NM09_WIREDNETWORKINTERFACE_H
 
diff -ruN a/solidcontrolfuture/solid/networkmanager-0.9/wirelessnetworkinterface.cpp b/solidcontrolfuture/solid/networkmanager-0.9/wirelessnetworkinterface.cpp
--- a/solidcontrolfuture/solid/networkmanager-0.9/wirelessnetworkinterface.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/solid/networkmanager-0.9/wirelessnetworkinterface.cpp	2021-02-20 21:55:41.110705793 +0900
@@ -119,9 +119,9 @@
 QObject * NMWirelessNetworkInterface::createAccessPoint(const QString & uni)
 {
     Q_D(NMWirelessNetworkInterface);
-    NMAccessPoint * ap = 0;
+    NMAccessPoint_ * ap = 0;
     if (d->accessPoints.contains(uni)) {
-        ap = new NMAccessPoint(uni, 0);
+        ap = new NMAccessPoint_(uni, 0);
     }
 
     return ap;
diff -ruN a/solidcontrolfuture/solid/networkmanager-0.9/wirelessnetworkinterface.h b/solidcontrolfuture/solid/networkmanager-0.9/wirelessnetworkinterface.h
--- a/solidcontrolfuture/solid/networkmanager-0.9/wirelessnetworkinterface.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/solid/networkmanager-0.9/wirelessnetworkinterface.h	2021-02-20 18:20:08.039385165 +0900
@@ -18,6 +18,7 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef NM09_WIRELESSNETWORKINTERFACE_H
 #define NM09_WIRELESSNETWORKINTERFACE_H
 
diff -ruN a/solidcontrolfuture/wirelessnetwork.h b/solidcontrolfuture/wirelessnetwork.h
--- a/solidcontrolfuture/wirelessnetwork.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/wirelessnetwork.h	2021-02-18 21:17:34.541274517 +0900
@@ -18,6 +18,7 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef SOLIDCONTROLFUTURE_WIRELESSNETWORK_H
 #define SOLIDCONTROLFUTURE_WIRELESSNETWORK_H
 
diff -ruN a/solidcontrolfuture/wirelessnetworkinterfaceenvironment.h b/solidcontrolfuture/wirelessnetworkinterfaceenvironment.h
--- a/solidcontrolfuture/wirelessnetworkinterfaceenvironment.h	2015-03-06 08:47:44.000000000 +0900
+++ b/solidcontrolfuture/wirelessnetworkinterfaceenvironment.h	2021-02-18 21:17:34.542274470 +0900
@@ -18,6 +18,7 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #ifndef WIRELESSNETWORKINTERFACEENVIRONMENT_H
 #define WIRELESSNETWORKINTERFACEENVIRONMENT_H
 
diff -ruN a/tests/qdbusfornm.cpp b/tests/qdbusfornm.cpp
--- a/tests/qdbusfornm.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/tests/qdbusfornm.cpp	2021-02-18 21:17:34.542274470 +0900
@@ -35,6 +35,7 @@
 **
 ****************************************************************************/
 
+#include <libnm/NetworkManager.h>
 #include <stdio.h>
 #include <stdlib.h>
 
diff -ruN a/vpnplugins/novellvpn/novellvpnwidget.cpp b/vpnplugins/novellvpn/novellvpnwidget.cpp
--- a/vpnplugins/novellvpn/novellvpnwidget.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/vpnplugins/novellvpn/novellvpnwidget.cpp	2021-02-18 21:17:34.542274470 +0900
@@ -18,6 +18,7 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #include "novellvpnwidget.h"
 #include "nm-novellvpn-service.h"
 
@@ -26,7 +27,6 @@
 #include <KDebug>
 #include <KLocale>
 
-#include <nm-setting-vpn.h>
 #include "settings/vpn.h"
 #include "connection.h"
 
diff -ruN a/vpnplugins/openconnect/openconnectauth.cpp b/vpnplugins/openconnect/openconnectauth.cpp
--- a/vpnplugins/openconnect/openconnectauth.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/vpnplugins/openconnect/openconnectauth.cpp	2021-02-18 21:17:34.542274470 +0900
@@ -18,12 +18,11 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #include "openconnectauth.h"
 #include "openconnectauthworkerthread.h"
 #include "ui_openconnectauth.h"
 
-#include <nm-setting-vpn.h>
-
 #include <KDialog>
 #include <QPushButton>
 #include <QString>
diff -ruN a/vpnplugins/openconnect/openconnectwidget.cpp b/vpnplugins/openconnect/openconnectwidget.cpp
--- a/vpnplugins/openconnect/openconnectwidget.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/vpnplugins/openconnect/openconnectwidget.cpp	2021-02-18 21:17:34.542274470 +0900
@@ -18,11 +18,10 @@
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #include "openconnectwidget.h"
 #include <KDialog>
 
-#include <nm-setting-vpn.h>
-
 #include "ui_openconnectprop.h"
 
 #include <QString>
diff -ruN a/vpnplugins/openswan/openswanauth.cpp b/vpnplugins/openswan/openswanauth.cpp
--- a/vpnplugins/openswan/openswanauth.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/vpnplugins/openswan/openswanauth.cpp	2021-02-18 21:17:34.543274424 +0900
@@ -18,11 +18,10 @@
     License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #include "openswanauth.h"
 #include "ui_openswanauth.h"
 
-#include <nm-setting-vpn.h>
-
 #include <QString>
 #include <KAcceleratorManager>
 
diff -ruN a/vpnplugins/openvpn/openvpn.cpp b/vpnplugins/openvpn/openvpn.cpp
--- a/vpnplugins/openvpn/openvpn.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/vpnplugins/openvpn/openvpn.cpp	2021-02-18 21:17:34.543274424 +0900
@@ -20,13 +20,12 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #include "openvpn.h"
 
 #include <KPluginFactory>
 #include <KMessageBox>
 
-#include <nm-setting-ip4-config.h>
-
 #include "openvpnwidget.h"
 #include "openvpnauth.h"
 
@@ -453,7 +452,7 @@
         }
         // Import X-NM-Routes if present
         if (key_value[0] == "X-NM-Routes") {
-            ipv4Data.insert(NM_SETTING_IP4_CONFIG_ROUTES, key_value[1]);
+            ipv4Data.insert(NM_SETTING_IP_CONFIG_ROUTES, key_value[1]);
             continue;
         }
     }
@@ -461,7 +460,7 @@
     // imported file does not contain "redirect-gateway" entry then set the
     // connection as never default.
     if (!have_redirect_gateway) {
-        ipv4Data.insert(NM_SETTING_IP4_CONFIG_NEVER_DEFAULT, "true");
+        ipv4Data.insert(NM_SETTING_IP_CONFIG_NEVER_DEFAULT, "true");
     }
     if (!have_client && !have_sk) {
         mError = VpnUiPlugin::Error;
diff -ruN a/vpnplugins/strongswan/strongswanauth.cpp b/vpnplugins/strongswan/strongswanauth.cpp
--- a/vpnplugins/strongswan/strongswanauth.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/vpnplugins/strongswan/strongswanauth.cpp	2021-02-18 21:17:34.543274424 +0900
@@ -18,11 +18,10 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #include "strongswanauth.h"
 #include "ui_strongswanauth.h"
 
-#include <nm-setting-vpn.h>
-
 #include <QDialog>
 #include <KMessageBox>
 #include <QString>
diff -ruN a/vpnplugins/strongswan/strongswanwidget.cpp b/vpnplugins/strongswan/strongswanwidget.cpp
--- a/vpnplugins/strongswan/strongswanwidget.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/vpnplugins/strongswan/strongswanwidget.cpp	2021-02-18 21:17:34.543274424 +0900
@@ -19,10 +19,9 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #include "strongswanwidget.h"
 
-#include <nm-setting-vpn.h>
-
 #include "ui_strongswanprop.h"
 
 #include <QString>
diff -ruN a/vpnplugins/vpnc/vpnc.cpp b/vpnplugins/vpnc/vpnc.cpp
--- a/vpnplugins/vpnc/vpnc.cpp	2015-03-06 08:47:44.000000000 +0900
+++ b/vpnplugins/vpnc/vpnc.cpp	2021-02-18 21:17:34.543274424 +0900
@@ -20,10 +20,9 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libnm/NetworkManager.h>
 #include "vpnc.h"
 
-#include <nm-setting-ip4-config.h>
-
 #include <KPluginFactory>
 #include <KSharedConfig>
 #include <KStandardDirs>
@@ -266,10 +265,10 @@
 
         // EnableLocalLAN and X-NM-Routes are to be added to IPv4Setting
         if (!cg.readEntry("EnableLocalLAN").isEmpty()) {
-            ipv4Data.insert(NM_SETTING_IP4_CONFIG_NEVER_DEFAULT, cg.readEntry("EnableLocalLAN"));
+            ipv4Data.insert(NM_SETTING_IP_CONFIG_NEVER_DEFAULT, cg.readEntry("EnableLocalLAN"));
         }
         if (!decrPlugin->readStringKeyValue(cg,"X-NM-Routes").isEmpty()) {
-            ipv4Data.insert(NM_SETTING_IP4_CONFIG_ROUTES, decrPlugin->readStringKeyValue(cg,"X-NM-Routes"));
+            ipv4Data.insert(NM_SETTING_IP_CONFIG_ROUTES, decrPlugin->readStringKeyValue(cg,"X-NM-Routes"));
         }
 
         // Set the '...-type' and '...-flags' value also