Merge tag 'upstream/1.5.90' into experimental

Upstream version 1.5.90

1 files changed, 3 insertions, 3 deletions

diff --git a/src/devices/team/nm-device-team.h b/src/devices/team/nm-device-team.h
index 43e8aab4..bbb1417f 100644
--- a/src/devices/team/nm-device-team.h
+++ b/src/devices/team/nm-device-team.h
@@ -21,7 +21,7 @@
 #ifndef __NETWORKMANAGER_DEVICE_TEAM_H__
 #define __NETWORKMANAGER_DEVICE_TEAM_H__
 
-#include "nm-device.h"
+#include "devices/nm-device.h"
 
 #define NM_TYPE_DEVICE_TEAM            (nm_device_team_get_type ())
 #define NM_DEVICE_TEAM(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_TEAM, NMDeviceTeam))
@@ -33,8 +33,8 @@
 /* Properties */
 #define NM_DEVICE_TEAM_CONFIG          "config"
 
-typedef NMDevice NMDeviceTeam;
-typedef NMDeviceClass NMDeviceTeamClass;
+typedef struct _NMDeviceTeam NMDeviceTeam;
+typedef struct _NMDeviceTeamClass NMDeviceTeamClass;
 
 GType nm_device_team_get_type (void);