diff --git a/[refs] b/[refs]
index f458aa28ae2b..650aecc00671 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b1562946267b14012e4d6e76c71db1f1af726913
+refs/heads/master: 89a4d0cbdee5289025c38b6b9706ad5dc5df264b
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c
index 0a0ff3057f11..c6cdcd940956 100644
--- a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c
+++ b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c
@@ -34,7 +34,6 @@
 #include "wlc_antsel.h"
 #include "wl_export.h"
 #include "wl_dbg.h"
-#include "wlc_bsscfg.h"
 #include "wlc_channel.h"
 #include "wlc_main.h"
 #include "wlc_ampdu.h"
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_antsel.c b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_antsel.c
index 566be8689478..85a73a978d4f 100644
--- a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_antsel.c
+++ b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_antsel.c
@@ -36,7 +36,6 @@
 #include "phy/wlc_phy_hal.h"
 #include "wlc_bmac.h"
 #include "wlc_channel.h"
-#include "wlc_bsscfg.h"
 #include "wlc_main.h"
 #include "wl_export.h"
 #include "wlc_phy_shim.h"
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c
index b85194dd57ce..5a96dc3cdb36 100644
--- a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c
+++ b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c
@@ -47,7 +47,6 @@
 #include "wlc_phy_shim.h"
 #include "phy/wlc_phy_hal.h"
 #include "wlc_channel.h"
-#include "wlc_bsscfg.h"
 #include "wlc_main.h"
 #include "wl_export.h"
 #include "wl_ucode.h"
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_bsscfg.h b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_bsscfg.h
index cd5cfbbce94a..bbcff4fb5147 100644
--- a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_bsscfg.h
+++ b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_bsscfg.h
@@ -23,9 +23,6 @@
 
 #define BSSCFG_IBSS(cfg)	(!(cfg)->BSS)
 
-/* forward declarations */
-typedef struct wlc_bsscfg wlc_bsscfg_t;
-
 #define NTXRATE			64	/* # tx MPDUs rate is reported for */
 #define MAXMACLIST		64	/* max # source MAC matches */
 #define BCN_TEMPLATE_COUNT 	2
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_channel.c b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_channel.c
index d43948f1c643..96161c0ab65a 100644
--- a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_channel.c
+++ b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_channel.c
@@ -35,7 +35,6 @@
 #include "wlc_bmac.h"
 #include "wlc_rate.h"
 #include "wlc_channel.h"
-#include "wlc_bsscfg.h"
 #include "wlc_main.h"
 #include "wlc_stf.h"
 #include "wl_dbg.h"
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c
index 1ac659769c57..96d36001f460 100644
--- a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c
+++ b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c
@@ -52,7 +52,6 @@
 #include "wlc_bmac.h"
 #include "wlc_phy_hal.h"
 #include "wl_export.h"
-#include "wlc_bsscfg.h"
 #include "wlc_main.h"
 #include "wlc_phy_shim.h"
 
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_stf.c b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_stf.c
index a6f6e5c649c7..098fd59ee153 100644
--- a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_stf.c
+++ b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_stf.c
@@ -36,7 +36,6 @@
 #include "wlc_key.h"
 #include "phy/wlc_phy_hal.h"
 #include "wlc_channel.h"
-#include "wlc_bsscfg.h"
 #include "wlc_main.h"
 #include "wl_export.h"
 #include "wlc_bmac.h"
diff --git a/trunk/drivers/staging/brcm80211/include/bcmdefs.h b/trunk/drivers/staging/brcm80211/include/bcmdefs.h
index 601ec706878c..22a389e1d511 100644
--- a/trunk/drivers/staging/brcm80211/include/bcmdefs.h
+++ b/trunk/drivers/staging/brcm80211/include/bcmdefs.h
@@ -157,5 +157,6 @@ typedef struct {
 
 /* handle forward declaration */
 struct wl_info;
+struct wlc_bsscfg;
 
 #endif				/* _bcmdefs_h_ */