Staging: brcm80211: remove typedefs.h

It's not needed anymore, so remove it and clean up the .h inclusion mess
a bit to get everything to build properly again.

Wow, this needs some unwinding...

Cc: Brett Rudley <brudley@broadcom.com>
Cc: Henry Ptasinski <henryp@broadcom.com>
Cc: Nohee Ko <noheek@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

69 files changed, 91 insertions, 185 deletions

diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh.c
index 6b62478d998d..4c613da3553a 100644
--- a/drivers/staging/brcm80211/brcmfmac/bcmsdh.c
+++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh.c
@@ -15,7 +15,8 @@
  */
 /* ****************** BCMSDH Interface Functions *************************** */
 
-#include <typedefs.h>
+#include <linux/types.h>
+#include <bcmdefs.h>
 #include <bcmdevs.h>
 #include <bcmendian.h>
 #include <bcmutils.h>
diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c
index e7ad60d98aff..9028cd01d9d0 100644
--- a/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c
+++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c
@@ -20,7 +20,6 @@
 
 #define __UNDEF_NO_VERSION__
 
-#include <typedefs.h>
 #include <linuxver.h>
 
 #include <linux/pci.h>
diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c
index 9adf37a2f33f..f6c9c4541813 100644
--- a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c
+++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c
@@ -13,8 +13,8 @@
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-#include <typedefs.h>
-
+#include <linux/types.h>
+#include <bcmdefs.h>
 #include <bcmdevs.h>
 #include <bcmendian.h>
 #include <bcmutils.h>
diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c
index 6ee2f4862de8..ae7b566b11d7 100644
--- a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c
+++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c
@@ -13,15 +13,14 @@
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-
-#include <typedefs.h>
+#include <linux/types.h>
+#include <linux/sched.h>        /* request_irq() */
+#include <bcmdefs.h>
 #include <bcmutils.h>
 #include <sdio.h>               /* SDIO Specs */
 #include <bcmsdbus.h>           /* bcmsdh to/from specific controller APIs */
 #include <sdiovar.h>            /* to get msglevel bit values */
 
-#include <linux/sched.h>        /* request_irq() */
-
 #include <linux/mmc/core.h>
 #include <linux/mmc/card.h>
 #include <linux/mmc/sdio_func.h>
diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_cdc.c b/drivers/staging/brcm80211/brcmfmac/dhd_cdc.c
index 08aca6521f78..bcbaac9bcdcc 100644
--- a/drivers/staging/brcm80211/brcmfmac/dhd_cdc.c
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_cdc.c
@@ -14,7 +14,8 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <typedefs.h>
+#include <linux/types.h>
+#include <bcmdefs.h>
 #include <osl.h>
 
 #include <bcmutils.h>
diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_common.c b/drivers/staging/brcm80211/brcmfmac/dhd_common.c
index 41063f9f36e5..703188fc28ec 100644
--- a/drivers/staging/brcm80211/brcmfmac/dhd_common.c
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_common.c
@@ -13,10 +13,10 @@
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-#include <typedefs.h>
-#include <osl.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <bcmdefs.h>
+#include <osl.h>
 #include <bcmutils.h>
 #include <bcmendian.h>
 #include <dngl_stats.h>
diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c b/drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c
index b200ee77593a..f647034f36d6 100644
--- a/drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c
@@ -14,7 +14,6 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <typedefs.h>
 #include <linuxver.h>
 #include <osl.h>
 #include <bcmutils.h>
diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
index a3e9ca8e6e88..e2bc13d66c71 100644
--- a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
@@ -17,10 +17,6 @@
 #ifdef CONFIG_WIFI_CONTROL_FUNC
 #include <linux/platform_device.h>
 #endif
-#include <typedefs.h>
-#include <linuxver.h>
-#include <osl.h>
-
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/kthread.h>
@@ -34,8 +30,10 @@
 #include <linux/ethtool.h>
 #include <linux/fcntl.h>
 #include <linux/fs.h>
-
 #include <linux/uaccess.h>
+#include <bcmdefs.h>
+#include <linuxver.h>
+#include <osl.h>
 #include <bcmutils.h>
 #include <bcmendian.h>
 
diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
index fd4c91ee3ca4..b2281d9dfdcf 100644
--- a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
@@ -14,7 +14,8 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <typedefs.h>
+#include <linux/types.h>
+#include <bcmdefs.h>
 #include <osl.h>
 #include <bcmsdh.h>
 
diff --git a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c b/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
index 621521b9e408..9664787a9a57 100644
--- a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
+++ b/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
@@ -14,16 +14,15 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <typedefs.h>
+#include <linux/kernel.h>
+#include <linux/if_arp.h>
 #include <linuxver.h>
 #include <osl.h>
-#include <linux/kernel.h>
 
 #include <bcmutils.h>
 #include <bcmendian.h>
 #include <proto/ethernet.h>
 
-#include <linux/if_arp.h>
 #include <asm/uaccess.h>
 
 #include <dngl_stats.h>
@@ -35,7 +34,6 @@
 #include <dngl_stats.h>
 #include <dhd.h>
 
-#include <linux/kernel.h>
 #include <linux/kthread.h>
 #include <linux/netdevice.h>
 #include <linux/sched.h>
diff --git a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h b/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h
index 34eff08aaa67..770e63f0c8ef 100644
--- a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h
+++ b/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h
@@ -18,11 +18,10 @@
 #define _wl_cfg80211_h_
 
 #include <linux/wireless.h>
-#include <typedefs.h>
-#include <proto/ethernet.h>
-#include <wlioctl.h>
 #include <linux/wireless.h>
 #include <net/cfg80211.h>
+#include <proto/ethernet.h>
+#include <wlioctl.h>
 
 struct wl_conf;
 struct wl_iface;
diff --git a/drivers/staging/brcm80211/brcmfmac/wl_iw.c b/drivers/staging/brcm80211/brcmfmac/wl_iw.c
index d6196d5cd234..979a494fda59 100644
--- a/drivers/staging/brcm80211/brcmfmac/wl_iw.c
+++ b/drivers/staging/brcm80211/brcmfmac/wl_iw.c
@@ -14,12 +14,11 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <wlioctl.h>
-
-#include <typedefs.h>
-#include <linuxver.h>
 #include <linux/kthread.h>
+#include <bcmdefs.h>
+#include <linuxver.h>
 #include <osl.h>
+#include <wlioctl.h>
 
 #include <bcmutils.h>
 #include <bcmendian.h>
diff --git a/drivers/staging/brcm80211/brcmfmac/wl_iw.h b/drivers/staging/brcm80211/brcmfmac/wl_iw.h
index e8e91442d965..edbf61f30b47 100644
--- a/drivers/staging/brcm80211/brcmfmac/wl_iw.h
+++ b/drivers/staging/brcm80211/brcmfmac/wl_iw.h
@@ -19,7 +19,6 @@
 
 #include <linux/wireless.h>
 
-#include <typedefs.h>
 #include <proto/ethernet.h>
 #include <wlioctl.h>
 
diff --git a/drivers/staging/brcm80211/include/bcm_rpc.h b/drivers/staging/brcm80211/include/bcm_rpc.h
index e1f3cfd77cda..77e5d8f71966 100644
--- a/drivers/staging/brcm80211/include/bcm_rpc.h
+++ b/drivers/staging/brcm80211/include/bcm_rpc.h
@@ -17,7 +17,6 @@
 #ifndef _BCM_RPC_H_
 #define _BCM_RPC_H_
 
-#include <typedefs.h>
 #include <rpc_osl.h>
 
 typedef struct rpc_info rpc_info_t;
diff --git a/drivers/staging/brcm80211/include/bcmdefs.h b/drivers/staging/brcm80211/include/bcmdefs.h
index 2e1f35386f18..dc52e9dbb8b5 100644
--- a/drivers/staging/brcm80211/include/bcmdefs.h
+++ b/drivers/staging/brcm80211/include/bcmdefs.h
@@ -24,10 +24,17 @@
 #define JTAG_BUS                4
 #define USB_BUS                 5
 #define SPI_BUS                 6
-/*
- * One doesn't need to include this file explicitly, gets included automatically if
- * typedefs.h is included.
- */
+
+
+#ifndef OFF
+#define OFF     0
+#endif
+
+#ifndef ON
+#define ON      1               /* ON = 1 */
+#endif
+
+#define AUTO    (-1)            /* Auto = -1 */
 
 #ifdef mips
 #define BCMFASTPATH             __attribute__ ((__section__(".text.fastpath")))
diff --git a/drivers/staging/brcm80211/include/bcmendian.h b/drivers/staging/brcm80211/include/bcmendian.h
index 52296fb9fc58..4123aefa211c 100644
--- a/drivers/staging/brcm80211/include/bcmendian.h
+++ b/drivers/staging/brcm80211/include/bcmendian.h
@@ -17,8 +17,6 @@
 #ifndef _BCMENDIAN_H_
 #define _BCMENDIAN_H_
 
-#include <typedefs.h>
-
 /* Reverse the bytes in a 16-bit value */
 #define BCMSWAP16(val) \
         ((u16)((((u16)(val) & (u16)0x00ffU) << 8) | \
diff --git a/drivers/staging/brcm80211/include/bcmnvram.h b/drivers/staging/brcm80211/include/bcmnvram.h
index adb2eb766c3f..63e31a4749c3 100644
--- a/drivers/staging/brcm80211/include/bcmnvram.h
+++ b/drivers/staging/brcm80211/include/bcmnvram.h
@@ -19,7 +19,6 @@
 
 #ifndef _LANGUAGE_ASSEMBLY
 
-#include <typedefs.h>
 #include <bcmdefs.h>
 
 struct nvram_header {
diff --git a/drivers/staging/brcm80211/include/d11.h b/drivers/staging/brcm80211/include/d11.h
index 5789e0828ebb..c07548c70e30 100644
--- a/drivers/staging/brcm80211/include/d11.h
+++ b/drivers/staging/brcm80211/include/d11.h
@@ -17,7 +17,7 @@
 #ifndef _D11_H
 #define _D11_H
 
-#include <typedefs.h>
+#include <bcmdefs.h>
 #include <bcmdevs.h>
 #include <hndsoc.h>
 #include <sbhndpio.h>
diff --git a/drivers/staging/brcm80211/include/dbus.h b/drivers/staging/brcm80211/include/dbus.h
index 52666632470e..81ffea79d008 100644
--- a/drivers/staging/brcm80211/include/dbus.h
+++ b/drivers/staging/brcm80211/include/dbus.h
@@ -17,8 +17,6 @@
 #ifndef __DBUS_H__
 #define __DBUS_H__
 
-#include "typedefs.h"
-
 #ifdef BCMDBG
 #define DBUSERR(args)        do { if (net_ratelimit()) printf args; } while (0)
 #define DBUSTRACE(args)
diff --git a/drivers/staging/brcm80211/include/dhdioctl.h b/drivers/staging/brcm80211/include/dhdioctl.h
index 78fd02de1376..4d06e506f154 100644
--- a/drivers/staging/brcm80211/include/dhdioctl.h
+++ b/drivers/staging/brcm80211/include/dhdioctl.h
@@ -17,8 +17,6 @@
 #ifndef _dhdioctl_h_
 #define _dhdioctl_h_
 
-#include <typedefs.h>
-
 /* require default structure packing */
 #define BWL_DEFAULT_PACKING
 #include <packed_section_start.h>
diff --git a/drivers/staging/brcm80211/include/hndrte_armtrap.h b/drivers/staging/brcm80211/include/hndrte_armtrap.h
index 8dc636d2ad6e..28f092c9e027 100644
--- a/drivers/staging/brcm80211/include/hndrte_armtrap.h
+++ b/drivers/staging/brcm80211/include/hndrte_armtrap.h
@@ -47,8 +47,6 @@
 
 #ifndef _LANGUAGE_ASSEMBLY
 
-#include <typedefs.h>
-
 typedef struct _trap_struct {
         u32 type;
         u32 epc;
diff --git a/drivers/staging/brcm80211/include/hndrte_cons.h b/drivers/staging/brcm80211/include/hndrte_cons.h
index 9e8442f50340..5caa53fb6552 100644
--- a/drivers/staging/brcm80211/include/hndrte_cons.h
+++ b/drivers/staging/brcm80211/include/hndrte_cons.h
@@ -14,8 +14,6 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <typedefs.h>
-
 #define CBUF_LEN        (128)
 
 #define LOG_BUF_LEN     1024
diff --git a/drivers/staging/brcm80211/include/linux_osl.h b/drivers/staging/brcm80211/include/linux_osl.h
index 7edf47f20a9e..c9c860b6e474 100644
--- a/drivers/staging/brcm80211/include/linux_osl.h
+++ b/drivers/staging/brcm80211/include/linux_osl.h
@@ -17,9 +17,6 @@
 #ifndef _linux_osl_h_
 #define _linux_osl_h_
 
-#ifdef BRCM_FULLMAC
-#include <typedefs.h>
-#endif
 
 /* Linux Kernel: File Operations: start */
 extern void *osl_os_open_image(char *filename);
diff --git a/drivers/staging/brcm80211/include/msgtrace.h b/drivers/staging/brcm80211/include/msgtrace.h
index 25b16615543e..9d9e53da088a 100644
--- a/drivers/staging/brcm80211/include/msgtrace.h
+++ b/drivers/staging/brcm80211/include/msgtrace.h
@@ -17,8 +17,6 @@
 #ifndef _MSGTRACE_H
 #define _MSGTRACE_H
 
-#include <typedefs.h>
-
 /* This marks the start of a packed structure section. */
 #include <packed_section_start.h>
 
diff --git a/drivers/staging/brcm80211/include/proto/802.11.h b/drivers/staging/brcm80211/include/proto/802.11.h
index db26cf106620..ffde19c5ac5c 100644
--- a/drivers/staging/brcm80211/include/proto/802.11.h
+++ b/drivers/staging/brcm80211/include/proto/802.11.h
@@ -17,7 +17,6 @@
 #ifndef _802_11_H_
 #define _802_11_H_
 
-#include <typedefs.h>
 #include <proto/wpa.h>
 #include <packed_section_start.h>
 
diff --git a/drivers/staging/brcm80211/include/proto/bcmeth.h b/drivers/staging/brcm80211/include/proto/bcmeth.h
index c5da92b9ccd4..f7d3d8dfd3ae 100644
--- a/drivers/staging/brcm80211/include/proto/bcmeth.h
+++ b/drivers/staging/brcm80211/include/proto/bcmeth.h
@@ -17,7 +17,6 @@
 #ifndef _BCMETH_H_
 #define _BCMETH_H_
 
-#include <typedefs.h>
 #include <packed_section_start.h>
 
 #define BCMILCP_SUBTYPE_RATE            1
diff --git a/drivers/staging/brcm80211/include/proto/bcmevent.h b/drivers/staging/brcm80211/include/proto/bcmevent.h
index 0a7231df0cea..865d15767a00 100644
--- a/drivers/staging/brcm80211/include/proto/bcmevent.h
+++ b/drivers/staging/brcm80211/include/proto/bcmevent.h
@@ -17,7 +17,6 @@
 #ifndef _BCMEVENT_H_
 #define _BCMEVENT_H_
 
-#include <typedefs.h>
 #include <packed_section_start.h>
 
 #define BCM_EVENT_MSG_VERSION           1
diff --git a/drivers/staging/brcm80211/include/proto/bcmip.h b/drivers/staging/brcm80211/include/proto/bcmip.h
index 37ff7188d941..1ac391a40527 100644
--- a/drivers/staging/brcm80211/include/proto/bcmip.h
+++ b/drivers/staging/brcm80211/include/proto/bcmip.h
@@ -17,7 +17,6 @@
 #ifndef _bcmip_h_
 #define _bcmip_h_
 
-#include <typedefs.h>
 #include <packed_section_start.h>
 
 #define IP_VER_OFFSET           0x0
diff --git a/drivers/staging/brcm80211/include/proto/ethernet.h b/drivers/staging/brcm80211/include/proto/ethernet.h
index d208d5f606a7..cc17b428dd3f 100644
--- a/drivers/staging/brcm80211/include/proto/ethernet.h
+++ b/drivers/staging/brcm80211/include/proto/ethernet.h
@@ -17,7 +17,6 @@
 #ifndef _NET_ETHERNET_H_
 #define _NET_ETHERNET_H_
 
-#include "typedefs.h"
 #include <packed_section_start.h>
 
 #define ETHER_ADDR_LEN          6
diff --git a/drivers/staging/brcm80211/include/proto/vlan.h b/drivers/staging/brcm80211/include/proto/vlan.h
index 9e1f17836ae3..f8b4ce257e7b 100644
--- a/drivers/staging/brcm80211/include/proto/vlan.h
+++ b/drivers/staging/brcm80211/include/proto/vlan.h
@@ -17,7 +17,6 @@
 #ifndef _vlan_h_
 #define _vlan_h_
 
-#include <typedefs.h>
 #include <packed_section_start.h>
 
 #define VLAN_VID_MASK           0xfff
diff --git a/drivers/staging/brcm80211/include/proto/wpa.h b/drivers/staging/brcm80211/include/proto/wpa.h
index 5c63e593e6cb..ec84c9f2b5ee 100644
--- a/drivers/staging/brcm80211/include/proto/wpa.h
+++ b/drivers/staging/brcm80211/include/proto/wpa.h
@@ -17,7 +17,6 @@
 #ifndef _proto_wpa_h_
 #define _proto_wpa_h_
 
-#include <typedefs.h>
 #include <proto/ethernet.h>
 
 #include <packed_section_start.h>
diff --git a/drivers/staging/brcm80211/include/qmath.h b/drivers/staging/brcm80211/include/qmath.h
index 4002eb06acaa..5f525dbcd46e 100644
--- a/drivers/staging/brcm80211/include/qmath.h
+++ b/drivers/staging/brcm80211/include/qmath.h
@@ -17,8 +17,6 @@
 #ifndef __QMATH_H__
 #define __QMATH_H__
 
-#include <typedefs.h>
-
 s16 qm_sat32(s32 op);
 
 s32 qm_mul321616(s16 op1, s16 op2);
diff --git a/drivers/staging/brcm80211/include/sdiovar.h b/drivers/staging/brcm80211/include/sdiovar.h
index 2112cb6f901b..7686fde03960 100644
--- a/drivers/staging/brcm80211/include/sdiovar.h
+++ b/drivers/staging/brcm80211/include/sdiovar.h
@@ -17,8 +17,6 @@
 #ifndef _sdiovar_h_
 #define _sdiovar_h_
 
-#include <typedefs.h>
-
 /* require default structure packing */
 #define BWL_DEFAULT_PACKING
 #include <packed_section_start.h>
diff --git a/drivers/staging/brcm80211/include/typedefs.h b/drivers/staging/brcm80211/include/typedefs.h
deleted file mode 100644
index 266734a5ae98..000000000000
--- a/drivers/staging/brcm80211/include/typedefs.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2010 Broadcom Corporation
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef _TYPEDEFS_H_
-#define _TYPEDEFS_H_
-
-#include <linux/types.h>
-
-#ifndef OFF
-#define OFF     0
-#endif
-
-#ifndef ON
-#define ON      1               /* ON = 1 */
-#endif
-
-#define AUTO    (-1)            /* Auto = -1 */
-
-
-/*
- * Including the bcmdefs.h here, to make sure everyone including typedefs.h
- * gets this automatically
-*/
-#include <bcmdefs.h>
-
-#endif                          /* _TYPEDEFS_H_ */
diff --git a/drivers/staging/brcm80211/include/wlioctl.h b/drivers/staging/brcm80211/include/wlioctl.h
index 0b81807c2f98..96866fb8898c 100644
--- a/drivers/staging/brcm80211/include/wlioctl.h
+++ b/drivers/staging/brcm80211/include/wlioctl.h
@@ -17,7 +17,6 @@
 #ifndef _wlioctl_h_
 #define _wlioctl_h_
 
-#include <typedefs.h>
 #include <proto/ethernet.h>
 #ifdef BRCM_FULLMAC
 #include <proto/bcmeth.h>
diff --git a/drivers/staging/brcm80211/phy/wlc_phy_cmn.c b/drivers/staging/brcm80211/phy/wlc_phy_cmn.c
index 21bb8f10fc10..8287261120f4 100644
--- a/drivers/staging/brcm80211/phy/wlc_phy_cmn.c
+++ b/drivers/staging/brcm80211/phy/wlc_phy_cmn.c
@@ -16,10 +16,10 @@
 
 #include <wlc_cfg.h>
 
-#include <typedefs.h>
-#include <osl.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <bcmdefs.h>
+#include <osl.h>
 #include <linuxver.h>
 #include <bcmendian.h>
 #include <bcmnvram.h>
diff --git a/drivers/staging/brcm80211/phy/wlc_phy_hal.h b/drivers/staging/brcm80211/phy/wlc_phy_hal.h
index 6ad1b824a72e..52260b2d0eba 100644
--- a/drivers/staging/brcm80211/phy/wlc_phy_hal.h
+++ b/drivers/staging/brcm80211/phy/wlc_phy_hal.h
@@ -17,7 +17,6 @@
 #ifndef _wlc_phy_h_
 #define _wlc_phy_h_
 
-#include <typedefs.h>
 #include <wlioctl.h>
 #include <siutils.h>
 #include <d11.h>
diff --git a/drivers/staging/brcm80211/phy/wlc_phy_int.h b/drivers/staging/brcm80211/phy/wlc_phy_int.h
index 8ec630115902..9513b87fa163 100644
--- a/drivers/staging/brcm80211/phy/wlc_phy_int.h
+++ b/drivers/staging/brcm80211/phy/wlc_phy_int.h
@@ -17,7 +17,8 @@
 #ifndef _wlc_phy_int_h_
 #define _wlc_phy_int_h_
 
-#include <typedefs.h>
+#include <linux/kernel.h>
+#include <bcmdefs.h>
 #include <bcmutils.h>
 
 #include <bcmsrom_fmt.h>
diff --git a/drivers/staging/brcm80211/phy/wlc_phy_lcn.c b/drivers/staging/brcm80211/phy/wlc_phy_lcn.c
index c41db98ddcce..3d3112ed4e20 100644
--- a/drivers/staging/brcm80211/phy/wlc_phy_lcn.c
+++ b/drivers/staging/brcm80211/phy/wlc_phy_lcn.c
@@ -14,14 +14,14 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include <linux/kernel.h>
+#include <linux/string.h>
+#include <linux/bitops.h>
 #include <wlc_cfg.h>
 #include <qmath.h>
 #include <osl.h>
-#include <linux/kernel.h>
-#include <linux/string.h>
 #include <linuxver.h>
 #include <siutils.h>
-#include <linux/bitops.h>
 #include <hndpmu.h>
 
 #include <wlc_phy_radio.h>
diff --git a/drivers/staging/brcm80211/phy/wlc_phy_lcn.h b/drivers/staging/brcm80211/phy/wlc_phy_lcn.h
index b7623ba13a48..b7bfc7230dfc 100644
--- a/drivers/staging/brcm80211/phy/wlc_phy_lcn.h
+++ b/drivers/staging/brcm80211/phy/wlc_phy_lcn.h
@@ -17,8 +17,6 @@
 #ifndef _wlc_phy_lcn_h_
 #define _wlc_phy_lcn_h_
 
-#include <typedefs.h>
-
 struct phy_info_lcnphy {
         int lcnphy_txrf_sp_9_override;
         u8 lcnphy_full_cal_channel;
diff --git a/drivers/staging/brcm80211/phy/wlc_phy_n.c b/drivers/staging/brcm80211/phy/wlc_phy_n.c
index 6e3dbfd7815c..950008f122b1 100644
--- a/drivers/staging/brcm80211/phy/wlc_phy_n.c
+++ b/drivers/staging/brcm80211/phy/wlc_phy_n.c
@@ -14,10 +14,10 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <wlc_cfg.h>
-#include <typedefs.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <bcmdefs.h>
+#include <wlc_cfg.h>
 #include <linuxver.h>
 #include <osl.h>
 #include <siutils.h>
diff --git a/drivers/staging/brcm80211/phy/wlc_phytbl_lcn.c b/drivers/staging/brcm80211/phy/wlc_phytbl_lcn.c
index e3d6dd183791..6ce9e5d96830 100644
--- a/drivers/staging/brcm80211/phy/wlc_phytbl_lcn.c
+++ b/drivers/staging/brcm80211/phy/wlc_phytbl_lcn.c
@@ -14,8 +14,7 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <typedefs.h>
-
+#include <linux/types.h>
 #include <wlc_phy_int.h>
 #include <wlc_phytbl_lcn.h>
 
diff --git a/drivers/staging/brcm80211/phy/wlc_phytbl_n.c b/drivers/staging/brcm80211/phy/wlc_phytbl_n.c
index bbc4cfae73e3..7cc2c563c727 100644
--- a/drivers/staging/brcm80211/phy/wlc_phytbl_n.c
+++ b/drivers/staging/brcm80211/phy/wlc_phytbl_n.c
@@ -14,7 +14,7 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <typedefs.h>
+#include <linux/kernel.h>
 
 #include <wlc_phy_int.h>
 #include <wlc_phytbl_n.h>
diff --git a/drivers/staging/brcm80211/sys/wl_mac80211.c b/drivers/staging/brcm80211/sys/wl_mac80211.c
index ff9cbccd54b8..ad635ee7758e 100644
--- a/drivers/staging/brcm80211/sys/wl_mac80211.c
+++ b/drivers/staging/brcm80211/sys/wl_mac80211.c
@@ -16,13 +16,13 @@
 
 #define __UNDEF_NO_VERSION__
 
-#include <typedefs.h>
-#include <linuxver.h>
-#include <osl.h>
 #include <linux/kernel.h>
 #include <linux/etherdevice.h>
 #include <linux/string.h>
 #include <linux/pci_ids.h>
+#include <bcmdefs.h>
+#include <linuxver.h>
+#include <osl.h>
 #define WLC_MAXBSSCFG           1       /* single BSS configs */
 
 #include <wlc_cfg.h>
diff --git a/drivers/staging/brcm80211/sys/wl_ucode.h b/drivers/staging/brcm80211/sys/wl_ucode.h
index 3254f5aa46c3..a1ba37209f96 100644
--- a/drivers/staging/brcm80211/sys/wl_ucode.h
+++ b/drivers/staging/brcm80211/sys/wl_ucode.h
@@ -14,7 +14,6 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <typedefs.h>
 typedef struct d11init {
         u16 addr;
         u16 size;
diff --git a/drivers/staging/brcm80211/sys/wl_ucode_loader.c b/drivers/staging/brcm80211/sys/wl_ucode_loader.c
index 93a3a016db59..0b41a9cb1ec9 100644
--- a/drivers/staging/brcm80211/sys/wl_ucode_loader.c
+++ b/drivers/staging/brcm80211/sys/wl_ucode_loader.c
@@ -15,7 +15,8 @@
  */
 
 typedef struct wl_info wl_info_t;
-#include <typedefs.h>
+#include <linux/types.h>
+#include <bcmdefs.h>
 #include <d11ucode_ext.h>
 #include <wl_ucode.h>
 
diff --git a/drivers/staging/brcm80211/sys/wlc_alloc.c b/drivers/staging/brcm80211/sys/wlc_alloc.c
index f9953df851bb..2dc89f9c2635 100644
--- a/drivers/staging/brcm80211/sys/wlc_alloc.c
+++ b/drivers/staging/brcm80211/sys/wlc_alloc.c
@@ -13,11 +13,10 @@
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-
-#include <wlc_cfg.h>
-#include <typedefs.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <bcmdefs.h>
+#include <wlc_cfg.h>
 #include <linuxver.h>
 #include <osl.h>
 #include <bcmutils.h>
diff --git a/drivers/staging/brcm80211/sys/wlc_ampdu.c b/drivers/staging/brcm80211/sys/wlc_ampdu.c
index 1edc5346438a..a4e49f3c1363 100644
--- a/drivers/staging/brcm80211/sys/wlc_ampdu.c
+++ b/drivers/staging/brcm80211/sys/wlc_ampdu.c
@@ -13,9 +13,9 @@
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-
+#include <linux/kernel.h>
 #include <wlc_cfg.h>
-#include <typedefs.h>
+#include <bcmdefs.h>
 #include <linuxver.h>
 #include <bcmdefs.h>
 #include <osl.h>
diff --git a/drivers/staging/brcm80211/sys/wlc_antsel.c b/drivers/staging/brcm80211/sys/wlc_antsel.c
index 1f5e62ac7a54..5ff8831d2fa8 100644
--- a/drivers/staging/brcm80211/sys/wlc_antsel.c
+++ b/drivers/staging/brcm80211/sys/wlc_antsel.c
@@ -18,7 +18,6 @@
 
 #ifdef WLANTSEL
 
-#include <typedefs.h>
 #include <linux/kernel.h>
 #include <linuxver.h>
 #include <bcmdefs.h>
diff --git a/drivers/staging/brcm80211/sys/wlc_bmac.c b/drivers/staging/brcm80211/sys/wlc_bmac.c
index 5f386d3e3bcc..b70f9d099233 100644
--- a/drivers/staging/brcm80211/sys/wlc_bmac.c
+++ b/drivers/staging/brcm80211/sys/wlc_bmac.c
@@ -18,12 +18,11 @@
 #error "This file needs WLC_LOW"
 #endif
 
+#include <linux/kernel.h>
 #include <wlc_cfg.h>
-#include <typedefs.h>
 #include <linuxver.h>
 #include <bcmdefs.h>
 #include <osl.h>
-#include <linux/kernel.h>
 #include <proto/802.11.h>
 #include <bcmwifi.h>
 #include <bcmutils.h>
diff --git a/drivers/staging/brcm80211/sys/wlc_channel.c b/drivers/staging/brcm80211/sys/wlc_channel.c
index 259f40945a7d..509280337e34 100644
--- a/drivers/staging/brcm80211/sys/wlc_channel.c
+++ b/drivers/staging/brcm80211/sys/wlc_channel.c
@@ -14,12 +14,11 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <wlc_cfg.h>
-#include <typedefs.h>
-#include <bcmdefs.h>
-#include <osl.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <bcmdefs.h>
+#include <wlc_cfg.h>
+#include <osl.h>
 #include <linuxver.h>
 #include <bcmutils.h>
 #include <siutils.h>
diff --git a/drivers/staging/brcm80211/sys/wlc_event.c b/drivers/staging/brcm80211/sys/wlc_event.c
index a2fdf485f405..7c17e5f67c5f 100644
--- a/drivers/staging/brcm80211/sys/wlc_event.c
+++ b/drivers/staging/brcm80211/sys/wlc_event.c
@@ -14,8 +14,8 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <typedefs.h>
 #include <linux/kernel.h>
+#include <bcmdefs.h>
 #include <linuxver.h>
 #include <bcmutils.h>
 #include <siutils.h>
diff --git a/drivers/staging/brcm80211/sys/wlc_mac80211.c b/drivers/staging/brcm80211/sys/wlc_mac80211.c
index e695a4839e98..feaffcc64ec6 100644
--- a/drivers/staging/brcm80211/sys/wlc_mac80211.c
+++ b/drivers/staging/brcm80211/sys/wlc_mac80211.c
@@ -13,14 +13,12 @@
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-
-#include <wlc_cfg.h>
-#include <typedefs.h>
 #include <linux/kernel.h>
-#include <linuxver.h>
+#include <linux/ctype.h>
 #include <bcmdefs.h>
+#include <wlc_cfg.h>
+#include <linuxver.h>
 #include <osl.h>
-#include <linux/ctype.h>
 #include <bcmutils.h>
 #include <bcmwifi.h>
 #include <siutils.h>
diff --git a/drivers/staging/brcm80211/sys/wlc_phy_shim.c b/drivers/staging/brcm80211/sys/wlc_phy_shim.c
index 6980935af97e..bf8e2e1a15f6 100644
--- a/drivers/staging/brcm80211/sys/wlc_phy_shim.c
+++ b/drivers/staging/brcm80211/sys/wlc_phy_shim.c
@@ -21,12 +21,11 @@
  *   access to wlc_hw pointer.
  */
 
+#include <linux/kernel.h>
+#include <bcmdefs.h>
 #include <wlc_cfg.h>
-#include <typedefs.h>
 #include <linuxver.h>
-#include <linux/kernel.h>
 #include <bcmutils.h>
-#include <bcmdefs.h>
 #include <osl.h>
 
 #include <proto/802.11.h>
diff --git a/drivers/staging/brcm80211/sys/wlc_rate.c b/drivers/staging/brcm80211/sys/wlc_rate.c
index d4dcd058c416..d2d72568756d 100644
--- a/drivers/staging/brcm80211/sys/wlc_rate.c
+++ b/drivers/staging/brcm80211/sys/wlc_rate.c
@@ -13,11 +13,10 @@
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-
+#include <linux/kernel.h>
+#include <bcmdefs.h>
 #include <wlc_cfg.h>
-#include <typedefs.h>
 #include <osl.h>
-#include <linux/kernel.h>
 #include <linuxver.h>
 #include <bcmutils.h>
 #include <siutils.h>
diff --git a/drivers/staging/brcm80211/sys/wlc_stf.c b/drivers/staging/brcm80211/sys/wlc_stf.c
index a1db289a1209..4728ad90e295 100644
--- a/drivers/staging/brcm80211/sys/wlc_stf.c
+++ b/drivers/staging/brcm80211/sys/wlc_stf.c
@@ -14,9 +14,8 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <wlc_cfg.h>
-#include <typedefs.h>
 #include <linux/kernel.h>
+#include <wlc_cfg.h>
 #include <linuxver.h>
 #include <bcmdefs.h>
 #include <osl.h>
diff --git a/drivers/staging/brcm80211/util/aiutils.c b/drivers/staging/brcm80211/util/aiutils.c
index 65461d0d91da..75a7e3a5c009 100644
--- a/drivers/staging/brcm80211/util/aiutils.c
+++ b/drivers/staging/brcm80211/util/aiutils.c
@@ -14,11 +14,10 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <typedefs.h>
-#include <bcmdefs.h>
-#include <osl.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <bcmdefs.h>
+#include <osl.h>
 #include <linuxver.h>
 #include <bcmutils.h>
 #include <siutils.h>
diff --git a/drivers/staging/brcm80211/util/bcmotp.c b/drivers/staging/brcm80211/util/bcmotp.c
index 4a0161396d17..c909832c7ee1 100644
--- a/drivers/staging/brcm80211/util/bcmotp.c
+++ b/drivers/staging/brcm80211/util/bcmotp.c
@@ -14,11 +14,10 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <typedefs.h>
-#include <bcmdefs.h>
-#include <osl.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <bcmdefs.h>
+#include <osl.h>
 #include <linuxver.h>
 #include <bcmdevs.h>
 #include <bcmutils.h>
diff --git a/drivers/staging/brcm80211/util/bcmsrom.c b/drivers/staging/brcm80211/util/bcmsrom.c
index 62c055a83309..1282ef7eb922 100644
--- a/drivers/staging/brcm80211/util/bcmsrom.c
+++ b/drivers/staging/brcm80211/util/bcmsrom.c
@@ -13,12 +13,10 @@
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-
-#include <typedefs.h>
-#include <bcmdefs.h>
-#include <osl.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <bcmdefs.h>
+#include <osl.h>
 #include <linuxver.h>
 #include <stdarg.h>
 #include <bcmutils.h>
diff --git a/drivers/staging/brcm80211/util/bcmutils.c b/drivers/staging/brcm80211/util/bcmutils.c
index 5635e8698acc..7ac64b6c00f6 100644
--- a/drivers/staging/brcm80211/util/bcmutils.c
+++ b/drivers/staging/brcm80211/util/bcmutils.c
@@ -14,13 +14,12 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <typedefs.h>
-#include <bcmdefs.h>
-#include <stdarg.h>
-#include <osl.h>
 #include <linux/ctype.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <bcmdefs.h>
+#include <stdarg.h>
+#include <osl.h>
 #include <linuxver.h>
 #include <bcmutils.h>
 #include <siutils.h>
diff --git a/drivers/staging/brcm80211/util/bcmwifi.c b/drivers/staging/brcm80211/util/bcmwifi.c
index b83b12f0094d..1bb6c78eece7 100644
--- a/drivers/staging/brcm80211/util/bcmwifi.c
+++ b/drivers/staging/brcm80211/util/bcmwifi.c
@@ -13,12 +13,9 @@
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-
-#include <typedefs.h>
-
-#include <osl.h>
 #include <linux/ctype.h>
 #include <linux/kernel.h>
+#include <bcmdefs.h>
 #include <bcmutils.h>
 #include <bcmwifi.h>
 
diff --git a/drivers/staging/brcm80211/util/hnddma.c b/drivers/staging/brcm80211/util/hnddma.c
index 3edef39962a7..fe503e7de563 100644
--- a/drivers/staging/brcm80211/util/hnddma.c
+++ b/drivers/staging/brcm80211/util/hnddma.c
@@ -14,7 +14,6 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <typedefs.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linuxver.h>
diff --git a/drivers/staging/brcm80211/util/hndpmu.c b/drivers/staging/brcm80211/util/hndpmu.c
index f8deb1c51607..a8f3306c1d2b 100644
--- a/drivers/staging/brcm80211/util/hndpmu.c
+++ b/drivers/staging/brcm80211/util/hndpmu.c
@@ -13,13 +13,11 @@
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-
-#include <typedefs.h>
-#include <bcmdefs.h>
-#include <osl.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <linuxver.h>
-#include <linux/kernel.h>
+#include <bcmdefs.h>
+#include <osl.h>
 #include <bcmutils.h>
 #include <siutils.h>
 #include <bcmdevs.h>
diff --git a/drivers/staging/brcm80211/util/linux_osl.c b/drivers/staging/brcm80211/util/linux_osl.c
index 34450a4f0cbf..2bb5b8722df6 100644
--- a/drivers/staging/brcm80211/util/linux_osl.c
+++ b/drivers/staging/brcm80211/util/linux_osl.c
@@ -14,19 +14,18 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <typedefs.h>
+#include <linux/delay.h>
+#include <linux/fs.h>
+#ifdef mips
+#include <asm/paccess.h>
+#endif                          /* mips */
 #include <bcmendian.h>
 #include <linuxver.h>
 #include <bcmdefs.h>
 #include <osl.h>
 #include <bcmutils.h>
-#include <linux/delay.h>
-#ifdef mips
-#include <asm/paccess.h>
-#endif                          /* mips */
 #include <pcicfg.h>
 
-#include <linux/fs.h>
 
 #define PCI_CFG_RETRY           10
 
diff --git a/drivers/staging/brcm80211/util/nicpci.c b/drivers/staging/brcm80211/util/nicpci.c
index 9ffbe10dbd7f..23f86dd7b159 100644
--- a/drivers/staging/brcm80211/util/nicpci.c
+++ b/drivers/staging/brcm80211/util/nicpci.c
@@ -14,7 +14,6 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <typedefs.h>
 #include <linux/string.h>
 #include <linuxver.h>
 #include <bcmdefs.h>
diff --git a/drivers/staging/brcm80211/util/nvram/nvram_ro.c b/drivers/staging/brcm80211/util/nvram/nvram_ro.c
index 7c5f88ddb4b1..f80375cd6801 100644
--- a/drivers/staging/brcm80211/util/nvram/nvram_ro.c
+++ b/drivers/staging/brcm80211/util/nvram/nvram_ro.c
@@ -15,9 +15,8 @@
  */
 
 #include <linux/slab.h>
-#include <typedefs.h>
-#include <bcmdefs.h>
 #include <linux/string.h>
+#include <bcmdefs.h>
 #include <osl.h>
 #include <bcmutils.h>
 #include <siutils.h>
diff --git a/drivers/staging/brcm80211/util/qmath.c b/drivers/staging/brcm80211/util/qmath.c
index 108fc2b04468..40c9929de2bb 100644
--- a/drivers/staging/brcm80211/util/qmath.c
+++ b/drivers/staging/brcm80211/util/qmath.c
@@ -14,6 +14,7 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include <linux/types.h>
 #include "qmath.h"
 
 /*
diff --git a/drivers/staging/brcm80211/util/sbutils.c b/drivers/staging/brcm80211/util/sbutils.c
index ca49a805c996..e4c0baba553d 100644
--- a/drivers/staging/brcm80211/util/sbutils.c
+++ b/drivers/staging/brcm80211/util/sbutils.c
@@ -14,7 +14,7 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <typedefs.h>
+#include <linux/types.h>
 #include <bcmdefs.h>
 #include <osl.h>
 #include <bcmutils.h>
diff --git a/drivers/staging/brcm80211/util/siutils.c b/drivers/staging/brcm80211/util/siutils.c
index 15e4ff449a2f..f3ea7e1a7aef 100644
--- a/drivers/staging/brcm80211/util/siutils.c
+++ b/drivers/staging/brcm80211/util/siutils.c
@@ -14,11 +14,10 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <typedefs.h>
-#include <bcmdefs.h>
-#include <osl.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <bcmdefs.h>
+#include <osl.h>
 #include <linuxver.h>
 #include <bcmutils.h>
 #include <siutils.h>