#include <linux/firmware.h>
#include <net/mac80211.h>
-#include <proto/802.1d.h>
-#include <bcmdefs.h>
+#include <proto/802.11.h>
#include <osl.h>
+#include <bcmdefs.h>
+#include <bcmwifi.h>
#include <bcmutils.h>
#include <pcicfg.h>
#include <wlioctl.h>
#include <sbhnddma.h>
+#include "phy/wlc_phy_int.h"
+#include "d11.h"
+#include "wlc_types.h"
#include "wlc_cfg.h"
#include "phy/phy_version.h"
#include "wlc_key.h"
-#include "sbhndpio.h"
-#include "phy/wlc_phy_hal.h"
#include "wlc_channel.h"
#include "wlc_scb.h"
#include "wlc_pub.h"