diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c b/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c
index 0a0ff3057f110d4fa9acdd17f3338838bd8a2ef6..c6cdcd9409568b6360ba073adaa084e3056bb52d 100644
--- a/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c
+++ b/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/drivers/staging/brcm80211/brcmsmac/wlc_antsel.c b/drivers/staging/brcm80211/brcmsmac/wlc_antsel.c
index 566be8689478b3d15eb8eb45f64e67e7e82a38e0..85a73a978d4f34e1d371ef12a2b39f6f8721a3db 100644
--- a/drivers/staging/brcm80211/brcmsmac/wlc_antsel.c
+++ b/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/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c b/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c
index b85194dd57ce1b75ab27d9324ea2a8a89906d954..5a96dc3cdb36eb0cff4c016bc12c6a926f855d24 100644
--- a/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c
+++ b/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/drivers/staging/brcm80211/brcmsmac/wlc_bsscfg.h b/drivers/staging/brcm80211/brcmsmac/wlc_bsscfg.h
index cd5cfbbce94a1bcc41a9017f9c22b641a65a3d54..bbcff4fb5147e8840c9ce8ff907f897d746fb931 100644
--- a/drivers/staging/brcm80211/brcmsmac/wlc_bsscfg.h
+++ b/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/drivers/staging/brcm80211/brcmsmac/wlc_channel.c b/drivers/staging/brcm80211/brcmsmac/wlc_channel.c
index d43948f1c6432e7be2c720347ffce4c04af6f0f4..96161c0ab65a3e22593abbb3b2538682949d5400 100644
--- a/drivers/staging/brcm80211/brcmsmac/wlc_channel.c
+++ b/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/drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c b/drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c
index 1ac659769c57272622a61c4a33528440cfdebe11..96d36001f460622b1fe84bbfba0f16b24e639966 100644
--- a/drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c
+++ b/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/drivers/staging/brcm80211/brcmsmac/wlc_stf.c b/drivers/staging/brcm80211/brcmsmac/wlc_stf.c
index a6f6e5c649c750a5052c15536885a93b7207f737..098fd59ee15351dd0b83bd726e8b7526e5c72631 100644
--- a/drivers/staging/brcm80211/brcmsmac/wlc_stf.c
+++ b/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/drivers/staging/brcm80211/include/bcmdefs.h b/drivers/staging/brcm80211/include/bcmdefs.h
index 601ec706878c51e02006862c33461d8de27700a7..22a389e1d511c4a8ce5fe85bc272b756a60299cd 100644
--- a/drivers/staging/brcm80211/include/bcmdefs.h
+++ b/drivers/staging/brcm80211/include/bcmdefs.h
@@ -157,5 +157,6 @@ typedef struct {
 
 /* handle forward declaration */
 struct wl_info;
+struct wlc_bsscfg;
 
 #endif				/* _bcmdefs_h_ */