From 5a0e3ad6af8660be21ca98a971cd00f331318c05 Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Wed, 24 Mar 2010 17:04:11 +0900
Subject: include cleanup: Update gfp.h and slab.h includes to prepare for
 breaking implicit slab.h inclusion from percpu.h

percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files.  percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.

percpu.h -> slab.h dependency is about to be removed.  Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability.  As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.

  http://userweb.kernel.org/~tj/misc/slabh-sweep.py

The script does the followings.

* Scan files for gfp and slab usages and update includes such that
  only the necessary includes are there.  ie. if only gfp is used,
  gfp.h, if slab is used, slab.h.

* When the script inserts a new include, it looks at the include
  blocks and try to put the new include such that its order conforms
  to its surrounding.  It's put in the include block which contains
  core kernel includes, in the same order that the rest are ordered -
  alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
  doesn't seem to be any matching order.

* If the script can't find a place to put a new include (mostly
  because the file doesn't have fitting include block), it prints out
  an error message indicating which .h file needs to be added to the
  file.

The conversion was done in the following steps.

1. The initial automatic conversion of all .c files updated slightly
   over 4000 files, deleting around 700 includes and adding ~480 gfp.h
   and ~3000 slab.h inclusions.  The script emitted errors for ~400
   files.

2. Each error was manually checked.  Some didn't need the inclusion,
   some needed manual addition while adding it to implementation .h or
   embedding .c file was more appropriate for others.  This step added
   inclusions to around 150 files.

3. The script was run again and the output was compared to the edits
   from #2 to make sure no file was left behind.

4. Several build tests were done and a couple of problems were fixed.
   e.g. lib/decompress_*.c used malloc/free() wrappers around slab
   APIs requiring slab.h to be added manually.

5. The script was run on all .h files but without automatically
   editing them as sprinkling gfp.h and slab.h inclusions around .h
   files could easily lead to inclusion dependency hell.  Most gfp.h
   inclusion directives were ignored as stuff from gfp.h was usually
   wildly available and often used in preprocessor macros.  Each
   slab.h inclusion directive was examined and added manually as
   necessary.

6. percpu.h was updated not to include slab.h.

7. Build test were done on the following configurations and failures
   were fixed.  CONFIG_GCOV_KERNEL was turned off for all tests (as my
   distributed build env didn't work with gcov compiles) and a few
   more options had to be turned off depending on archs to make things
   build (like ipr on powerpc/64 which failed due to missing writeq).

   * x86 and x86_64 UP and SMP allmodconfig and a custom test config.
   * powerpc and powerpc64 SMP allmodconfig
   * sparc and sparc64 SMP allmodconfig
   * ia64 SMP allmodconfig
   * s390 SMP allmodconfig
   * alpha SMP allmodconfig
   * um on x86_64 SMP allmodconfig

8. percpu.h modifications were reverted so that it could be applied as
   a separate patch and serve as bisection point.

Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.

Signed-off-by: Tejun Heo <tj@kernel.org>
Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
---
 net/802/garp.c                           | 1 +
 net/802/p8022.c                          | 1 +
 net/802/p8023.c                          | 1 +
 net/802/psnap.c                          | 1 +
 net/802/stp.c                            | 1 +
 net/802/tr.c                             | 1 +
 net/8021q/vlan.c                         | 1 +
 net/8021q/vlan_dev.c                     | 1 +
 net/9p/client.c                          | 1 +
 net/9p/protocol.c                        | 1 +
 net/9p/trans_fd.c                        | 1 +
 net/9p/trans_rdma.c                      | 1 +
 net/9p/trans_virtio.c                    | 1 +
 net/9p/util.c                            | 1 +
 net/appletalk/aarp.c                     | 1 +
 net/appletalk/ddp.c                      | 1 +
 net/atm/addr.c                           | 1 +
 net/atm/atm_sysfs.c                      | 1 +
 net/atm/br2684.c                         | 1 +
 net/atm/clip.c                           | 1 +
 net/atm/common.c                         | 1 +
 net/atm/lec.c                            | 1 +
 net/atm/mpc.c                            | 1 +
 net/atm/mpoa_caches.c                    | 1 +
 net/atm/mpoa_proc.c                      | 1 +
 net/atm/pppoatm.c                        | 1 +
 net/atm/proc.c                           | 1 +
 net/atm/raw.c                            | 1 +
 net/atm/resources.c                      | 1 +
 net/atm/signaling.c                      | 1 +
 net/ax25/af_ax25.c                       | 1 +
 net/ax25/ax25_dev.c                      | 1 +
 net/ax25/ax25_ds_subr.c                  | 1 +
 net/ax25/ax25_iface.c                    | 1 +
 net/ax25/ax25_in.c                       | 1 +
 net/ax25/ax25_ip.c                       | 1 +
 net/ax25/ax25_out.c                      | 1 +
 net/ax25/ax25_route.c                    | 1 +
 net/ax25/ax25_subr.c                     | 1 +
 net/ax25/ax25_uid.c                      | 1 +
 net/ax25/sysctl_net_ax25.c               | 1 +
 net/bluetooth/af_bluetooth.c             | 1 -
 net/bluetooth/bnep/core.c                | 1 +
 net/bluetooth/bnep/netdev.c              | 1 +
 net/bluetooth/bnep/sock.c                | 2 +-
 net/bluetooth/cmtp/sock.c                | 2 +-
 net/bluetooth/hci_sysfs.c                | 1 +
 net/bluetooth/hidp/sock.c                | 2 +-
 net/bluetooth/rfcomm/core.c              | 1 +
 net/bridge/br_fdb.c                      | 1 +
 net/bridge/br_forward.c                  | 1 +
 net/bridge/br_if.c                       | 1 +
 net/bridge/br_input.c                    | 1 +
 net/bridge/br_ioctl.c                    | 1 +
 net/bridge/br_netfilter.c                | 1 +
 net/bridge/br_netlink.c                  | 1 +
 net/bridge/br_stp_bpdu.c                 | 1 +
 net/bridge/netfilter/ebt_ulog.c          | 1 +
 net/bridge/netfilter/ebtables.c          | 1 +
 net/can/bcm.c                            | 1 +
 net/can/raw.c                            | 1 +
 net/compat.c                             | 1 +
 net/core/datagram.c                      | 1 +
 net/core/dev.c                           | 1 +
 net/core/drop_monitor.c                  | 1 +
 net/core/dst.c                           | 1 +
 net/core/ethtool.c                       | 1 +
 net/core/fib_rules.c                     | 1 +
 net/core/filter.c                        | 1 +
 net/core/gen_estimator.c                 | 1 +
 net/core/iovec.c                         | 1 -
 net/core/link_watch.c                    | 1 -
 net/core/neighbour.c                     | 1 +
 net/core/net-sysfs.c                     | 1 +
 net/core/net-traces.c                    | 1 +
 net/core/netpoll.c                       | 1 +
 net/core/scm.c                           | 1 +
 net/core/sysctl_net_core.c               | 1 +
 net/dcb/dcbnl.c                          | 1 +
 net/dccp/ccid.c                          | 2 ++
 net/dccp/ccids/ccid2.c                   | 1 +
 net/dccp/feat.c                          | 1 +
 net/dccp/input.c                         | 1 +
 net/dccp/ipv4.c                          | 1 +
 net/dccp/ipv6.c                          | 1 +
 net/dccp/minisocks.c                     | 1 +
 net/dccp/output.c                        | 1 +
 net/dccp/probe.c                         | 1 +
 net/dccp/proto.c                         | 1 +
 net/decnet/dn_dev.c                      | 1 +
 net/decnet/dn_fib.c                      | 1 +
 net/decnet/dn_neigh.c                    | 1 +
 net/decnet/dn_nsp_in.c                   | 1 +
 net/decnet/dn_nsp_out.c                  | 1 +
 net/decnet/dn_route.c                    | 1 +
 net/decnet/dn_table.c                    | 1 +
 net/decnet/netfilter/dn_rtmsg.c          | 1 +
 net/dsa/dsa.c                            | 1 +
 net/dsa/tag_dsa.c                        | 1 +
 net/dsa/tag_edsa.c                       | 1 +
 net/dsa/tag_trailer.c                    | 1 +
 net/econet/af_econet.c                   | 1 +
 net/ethernet/pe2.c                       | 1 +
 net/ieee802154/af_ieee802154.c           | 1 +
 net/ieee802154/dgram.c                   | 1 +
 net/ieee802154/netlink.c                 | 1 +
 net/ieee802154/nl-mac.c                  | 1 +
 net/ieee802154/nl-phy.c                  | 1 +
 net/ieee802154/raw.c                     | 1 +
 net/ieee802154/wpan-class.c              | 1 +
 net/ipv4/af_inet.c                       | 1 +
 net/ipv4/ah4.c                           | 1 +
 net/ipv4/arp.c                           | 1 +
 net/ipv4/cipso_ipv4.c                    | 1 +
 net/ipv4/devinet.c                       | 1 +
 net/ipv4/fib_frontend.c                  | 1 +
 net/ipv4/fib_hash.c                      | 1 +
 net/ipv4/fib_semantics.c                 | 1 +
 net/ipv4/fib_trie.c                      | 1 +
 net/ipv4/icmp.c                          | 1 +
 net/ipv4/igmp.c                          | 1 +
 net/ipv4/inet_diag.c                     | 1 +
 net/ipv4/inet_fragment.c                 | 1 +
 net/ipv4/inet_timewait_sock.c            | 1 +
 net/ipv4/ip_forward.c                    | 1 +
 net/ipv4/ip_fragment.c                   | 1 +
 net/ipv4/ip_gre.c                        | 1 +
 net/ipv4/ip_input.c                      | 1 +
 net/ipv4/ip_options.c                    | 1 +
 net/ipv4/ip_output.c                     | 1 +
 net/ipv4/ip_sockglue.c                   | 1 +
 net/ipv4/ipconfig.c                      | 1 +
 net/ipv4/ipip.c                          | 1 +
 net/ipv4/ipmr.c                          | 1 +
 net/ipv4/netfilter.c                     | 1 +
 net/ipv4/netfilter/arptable_filter.c     | 1 +
 net/ipv4/netfilter/ip_queue.c            | 1 +
 net/ipv4/netfilter/ipt_CLUSTERIP.c       | 1 +
 net/ipv4/netfilter/ipt_REJECT.c          | 1 +
 net/ipv4/netfilter/ipt_ULOG.c            | 1 +
 net/ipv4/netfilter/iptable_filter.c      | 1 +
 net/ipv4/netfilter/iptable_mangle.c      | 1 +
 net/ipv4/netfilter/iptable_raw.c         | 1 +
 net/ipv4/netfilter/iptable_security.c    | 1 +
 net/ipv4/netfilter/nf_nat_core.c         | 1 +
 net/ipv4/netfilter/nf_nat_helper.c       | 1 +
 net/ipv4/netfilter/nf_nat_rule.c         | 1 +
 net/ipv4/netfilter/nf_nat_snmp_basic.c   | 1 +
 net/ipv4/netfilter/nf_nat_standalone.c   | 1 +
 net/ipv4/raw.c                           | 1 -
 net/ipv4/route.c                         | 1 +
 net/ipv4/sysctl_net_ipv4.c               | 1 +
 net/ipv4/tcp.c                           | 1 +
 net/ipv4/tcp_cong.c                      | 1 +
 net/ipv4/tcp_input.c                     | 1 +
 net/ipv4/tcp_ipv4.c                      | 1 +
 net/ipv4/tcp_minisocks.c                 | 1 +
 net/ipv4/tcp_output.c                    | 1 +
 net/ipv4/tcp_probe.c                     | 1 +
 net/ipv4/tcp_timer.c                     | 1 +
 net/ipv4/tunnel4.c                       | 1 +
 net/ipv4/udp.c                           | 1 +
 net/ipv4/xfrm4_input.c                   | 1 +
 net/ipv4/xfrm4_mode_tunnel.c             | 1 +
 net/ipv6/addrconf.c                      | 1 +
 net/ipv6/addrlabel.c                     | 1 +
 net/ipv6/af_inet6.c                      | 1 +
 net/ipv6/ah6.c                           | 1 +
 net/ipv6/anycast.c                       | 1 +
 net/ipv6/datagram.c                      | 1 +
 net/ipv6/exthdrs.c                       | 1 +
 net/ipv6/icmp.c                          | 1 +
 net/ipv6/inet6_connection_sock.c         | 1 +
 net/ipv6/ip6_fib.c                       | 1 +
 net/ipv6/ip6_flowlabel.c                 | 1 +
 net/ipv6/ip6_input.c                     | 1 +
 net/ipv6/ip6_output.c                    | 1 +
 net/ipv6/ip6_tunnel.c                    | 1 +
 net/ipv6/ip6mr.c                         | 1 +
 net/ipv6/ipv6_sockglue.c                 | 1 +
 net/ipv6/mcast.c                         | 1 +
 net/ipv6/ndisc.c                         | 1 +
 net/ipv6/netfilter/ip6_queue.c           | 1 +
 net/ipv6/netfilter/ip6t_REJECT.c         | 1 +
 net/ipv6/netfilter/ip6table_filter.c     | 1 +
 net/ipv6/netfilter/ip6table_mangle.c     | 1 +
 net/ipv6/netfilter/ip6table_raw.c        | 1 +
 net/ipv6/netfilter/ip6table_security.c   | 1 +
 net/ipv6/netfilter/nf_conntrack_reasm.c  | 1 +
 net/ipv6/raw.c                           | 1 +
 net/ipv6/reassembly.c                    | 1 +
 net/ipv6/route.c                         | 1 +
 net/ipv6/sit.c                           | 1 +
 net/ipv6/sysctl_net_ipv6.c               | 1 +
 net/ipv6/tcp_ipv6.c                      | 1 +
 net/ipv6/tunnel6.c                       | 1 +
 net/ipv6/udp.c                           | 1 +
 net/ipv6/xfrm6_mode_tunnel.c             | 1 +
 net/ipv6/xfrm6_tunnel.c                  | 1 +
 net/ipx/af_ipx.c                         | 1 +
 net/ipx/ipx_route.c                      | 1 +
 net/irda/af_irda.c                       | 1 +
 net/irda/discovery.c                     | 1 +
 net/irda/ircomm/ircomm_core.c            | 1 +
 net/irda/ircomm/ircomm_lmp.c             | 1 +
 net/irda/ircomm/ircomm_param.c           | 1 +
 net/irda/ircomm/ircomm_tty.c             | 1 +
 net/irda/irda_device.c                   | 1 +
 net/irda/iriap.c                         | 1 +
 net/irda/iriap_event.c                   | 2 ++
 net/irda/irias_object.c                  | 1 +
 net/irda/irlan/irlan_client.c            | 1 +
 net/irda/irlan/irlan_common.c            | 1 +
 net/irda/irlan/irlan_provider.c          | 1 +
 net/irda/irlap_event.c                   | 1 +
 net/irda/irlap_frame.c                   | 1 +
 net/irda/irnet/irnet_irda.c              | 1 +
 net/irda/irnet/irnet_ppp.c               | 1 +
 net/irda/irnetlink.c                     | 1 +
 net/irda/irqueue.c                       | 1 +
 net/irda/irttp.c                         | 1 +
 net/key/af_key.c                         | 1 +
 net/lapb/lapb_iface.c                    | 1 +
 net/lapb/lapb_in.c                       | 1 +
 net/lapb/lapb_out.c                      | 1 +
 net/lapb/lapb_subr.c                     | 1 +
 net/llc/af_llc.c                         | 1 +
 net/llc/llc_c_ac.c                       | 1 +
 net/llc/llc_conn.c                       | 1 +
 net/llc/llc_if.c                         | 1 +
 net/llc/llc_input.c                      | 1 +
 net/llc/llc_sap.c                        | 1 +
 net/llc/llc_station.c                    | 1 +
 net/mac80211/agg-rx.c                    | 1 +
 net/mac80211/agg-tx.c                    | 1 +
 net/mac80211/cfg.c                       | 1 +
 net/mac80211/debugfs_key.c               | 1 +
 net/mac80211/debugfs_netdev.c            | 1 +
 net/mac80211/ibss.c                      | 1 +
 net/mac80211/iface.c                     | 1 +
 net/mac80211/key.c                       | 1 +
 net/mac80211/led.c                       | 1 +
 net/mac80211/mesh.c                      | 1 +
 net/mac80211/mesh_hwmp.c                 | 1 +
 net/mac80211/mesh_pathtbl.c              | 1 +
 net/mac80211/mesh_plink.c                | 1 +
 net/mac80211/mlme.c                      | 1 +
 net/mac80211/rate.c                      | 1 +
 net/mac80211/rc80211_minstrel.c          | 1 +
 net/mac80211/rc80211_minstrel_debugfs.c  | 1 +
 net/mac80211/rc80211_pid_algo.c          | 1 +
 net/mac80211/rc80211_pid_debugfs.c       | 1 +
 net/mac80211/rx.c                        | 1 +
 net/mac80211/scan.c                      | 1 +
 net/mac80211/wep.c                       | 1 +
 net/mac80211/work.c                      | 1 +
 net/mac80211/wpa.c                       | 2 +-
 net/netfilter/core.c                     | 1 +
 net/netfilter/ipvs/ip_vs_app.c           | 1 +
 net/netfilter/ipvs/ip_vs_conn.c          | 1 +
 net/netfilter/ipvs/ip_vs_core.c          | 1 +
 net/netfilter/ipvs/ip_vs_ctl.c           | 1 +
 net/netfilter/ipvs/ip_vs_dh.c            | 1 +
 net/netfilter/ipvs/ip_vs_est.c           | 1 -
 net/netfilter/ipvs/ip_vs_ftp.c           | 1 +
 net/netfilter/ipvs/ip_vs_lblc.c          | 1 +
 net/netfilter/ipvs/ip_vs_lblcr.c         | 1 +
 net/netfilter/ipvs/ip_vs_proto.c         | 1 +
 net/netfilter/ipvs/ip_vs_sh.c            | 1 +
 net/netfilter/ipvs/ip_vs_wrr.c           | 1 +
 net/netfilter/ipvs/ip_vs_xmit.c          | 1 +
 net/netfilter/nf_conntrack_acct.c        | 1 +
 net/netfilter/nf_conntrack_amanda.c      | 1 +
 net/netfilter/nf_conntrack_ecache.c      | 1 +
 net/netfilter/nf_conntrack_ftp.c         | 1 +
 net/netfilter/nf_conntrack_h323_main.c   | 1 +
 net/netfilter/nf_conntrack_helper.c      | 1 -
 net/netfilter/nf_conntrack_irc.c         | 1 +
 net/netfilter/nf_conntrack_netlink.c     | 1 +
 net/netfilter/nf_conntrack_proto.c       | 1 +
 net/netfilter/nf_conntrack_proto_dccp.c  | 1 +
 net/netfilter/nf_conntrack_proto_gre.c   | 1 +
 net/netfilter/nf_conntrack_sane.c        | 1 +
 net/netfilter/nf_conntrack_standalone.c  | 1 +
 net/netfilter/nf_queue.c                 | 1 +
 net/netfilter/nfnetlink_log.c            | 1 +
 net/netfilter/nfnetlink_queue.c          | 1 +
 net/netfilter/x_tables.c                 | 1 +
 net/netfilter/xt_CT.c                    | 1 +
 net/netfilter/xt_LED.c                   | 1 +
 net/netfilter/xt_RATEEST.c               | 1 +
 net/netfilter/xt_TCPMSS.c                | 1 +
 net/netfilter/xt_connlimit.c             | 1 +
 net/netfilter/xt_dccp.c                  | 1 +
 net/netfilter/xt_limit.c                 | 1 +
 net/netfilter/xt_quota.c                 | 1 +
 net/netfilter/xt_recent.c                | 1 +
 net/netfilter/xt_statistic.c             | 1 +
 net/netfilter/xt_string.c                | 1 +
 net/netlabel/netlabel_cipso_v4.c         | 1 +
 net/netlabel/netlabel_domainhash.c       | 1 +
 net/netlabel/netlabel_kapi.c             | 1 +
 net/netlabel/netlabel_mgmt.c             | 1 +
 net/netlabel/netlabel_unlabeled.c        | 1 +
 net/netlabel/netlabel_user.c             | 1 +
 net/netlink/genetlink.c                  | 1 +
 net/netrom/af_netrom.c                   | 1 +
 net/netrom/nr_dev.c                      | 1 +
 net/netrom/nr_in.c                       | 1 +
 net/netrom/nr_loopback.c                 | 1 +
 net/netrom/nr_out.c                      | 1 +
 net/netrom/nr_route.c                    | 1 +
 net/netrom/nr_subr.c                     | 1 +
 net/packet/af_packet.c                   | 1 +
 net/phonet/af_phonet.c                   | 1 +
 net/phonet/datagram.c                    | 1 +
 net/phonet/pep.c                         | 1 +
 net/phonet/pn_dev.c                      | 1 +
 net/phonet/pn_netlink.c                  | 1 +
 net/phonet/socket.c                      | 1 +
 net/rds/af_rds.c                         | 1 +
 net/rds/cong.c                           | 1 +
 net/rds/connection.c                     | 1 +
 net/rds/ib.c                             | 1 +
 net/rds/ib_cm.c                          | 1 +
 net/rds/ib_rdma.c                        | 1 +
 net/rds/ib_recv.c                        | 1 +
 net/rds/info.c                           | 1 +
 net/rds/iw.c                             | 1 +
 net/rds/iw_cm.c                          | 1 +
 net/rds/iw_rdma.c                        | 1 +
 net/rds/iw_recv.c                        | 1 +
 net/rds/loop.c                           | 1 +
 net/rds/message.c                        | 1 +
 net/rds/page.c                           | 1 +
 net/rds/rdma.c                           | 1 +
 net/rds/recv.c                           | 1 +
 net/rds/send.c                           | 1 +
 net/rds/tcp.c                            | 1 +
 net/rds/tcp_listen.c                     | 1 +
 net/rds/tcp_recv.c                       | 1 +
 net/rfkill/core.c                        | 1 +
 net/rose/af_rose.c                       | 1 +
 net/rose/rose_dev.c                      | 1 +
 net/rose/rose_link.c                     | 1 +
 net/rose/rose_loopback.c                 | 1 +
 net/rose/rose_out.c                      | 1 +
 net/rose/rose_route.c                    | 1 +
 net/rose/rose_subr.c                     | 1 +
 net/rxrpc/af_rxrpc.c                     | 1 +
 net/rxrpc/ar-accept.c                    | 1 +
 net/rxrpc/ar-ack.c                       | 1 +
 net/rxrpc/ar-call.c                      | 1 +
 net/rxrpc/ar-connection.c                | 1 +
 net/rxrpc/ar-input.c                     | 1 +
 net/rxrpc/ar-key.c                       | 1 +
 net/rxrpc/ar-local.c                     | 1 +
 net/rxrpc/ar-output.c                    | 1 +
 net/rxrpc/ar-peer.c                      | 1 +
 net/rxrpc/ar-transport.c                 | 1 +
 net/rxrpc/rxkad.c                        | 1 +
 net/sched/act_api.c                      | 1 +
 net/sched/act_ipt.c                      | 1 +
 net/sched/act_mirred.c                   | 1 +
 net/sched/act_pedit.c                    | 1 +
 net/sched/act_police.c                   | 1 +
 net/sched/act_simple.c                   | 1 +
 net/sched/cls_api.c                      | 1 +
 net/sched/cls_basic.c                    | 1 +
 net/sched/cls_cgroup.c                   | 1 +
 net/sched/cls_flow.c                     | 1 +
 net/sched/cls_fw.c                       | 1 +
 net/sched/cls_route.c                    | 1 +
 net/sched/cls_tcindex.c                  | 1 +
 net/sched/cls_u32.c                      | 1 +
 net/sched/em_meta.c                      | 1 +
 net/sched/em_nbyte.c                     | 1 +
 net/sched/em_text.c                      | 1 +
 net/sched/ematch.c                       | 1 +
 net/sched/sch_api.c                      | 1 +
 net/sched/sch_atm.c                      | 1 +
 net/sched/sch_cbq.c                      | 1 +
 net/sched/sch_drr.c                      | 1 +
 net/sched/sch_dsmark.c                   | 1 +
 net/sched/sch_fifo.c                     | 1 +
 net/sched/sch_generic.c                  | 1 +
 net/sched/sch_gred.c                     | 1 +
 net/sched/sch_htb.c                      | 1 +
 net/sched/sch_mq.c                       | 1 +
 net/sched/sch_multiq.c                   | 1 +
 net/sched/sch_netem.c                    | 1 +
 net/sched/sch_prio.c                     | 1 +
 net/sched/sch_sfq.c                      | 1 +
 net/sched/sch_teql.c                     | 1 +
 net/sctp/auth.c                          | 1 +
 net/sctp/bind_addr.c                     | 1 +
 net/sctp/chunk.c                         | 1 +
 net/sctp/input.c                         | 1 +
 net/sctp/inqueue.c                       | 1 +
 net/sctp/ipv6.c                          | 1 +
 net/sctp/output.c                        | 1 +
 net/sctp/outqueue.c                      | 1 +
 net/sctp/primitive.c                     | 1 +
 net/sctp/protocol.c                      | 1 +
 net/sctp/sm_make_chunk.c                 | 1 +
 net/sctp/sm_sideeffect.c                 | 1 +
 net/sctp/sm_statefuns.c                  | 1 +
 net/sctp/socket.c                        | 1 +
 net/sctp/ssnmap.c                        | 1 +
 net/sctp/transport.c                     | 1 +
 net/sctp/tsnmap.c                        | 1 +
 net/sctp/ulpevent.c                      | 1 +
 net/sctp/ulpqueue.c                      | 1 +
 net/socket.c                             | 1 +
 net/sunrpc/addr.c                        | 1 +
 net/sunrpc/auth_generic.c                | 1 +
 net/sunrpc/auth_gss/gss_generic_token.c  | 1 -
 net/sunrpc/auth_gss/gss_krb5_crypto.c    | 1 -
 net/sunrpc/auth_gss/gss_krb5_seal.c      | 1 -
 net/sunrpc/auth_gss/gss_krb5_seqnum.c    | 1 -
 net/sunrpc/auth_gss/gss_krb5_unseal.c    | 1 -
 net/sunrpc/auth_gss/gss_krb5_wrap.c      | 1 -
 net/sunrpc/auth_gss/gss_spkm3_seal.c     | 1 -
 net/sunrpc/auth_gss/svcauth_gss.c        | 1 +
 net/sunrpc/auth_unix.c                   | 1 +
 net/sunrpc/backchannel_rqst.c            | 1 +
 net/sunrpc/rpcb_clnt.c                   | 1 +
 net/sunrpc/socklib.c                     | 1 +
 net/sunrpc/stats.c                       | 1 +
 net/sunrpc/svc.c                         | 1 +
 net/sunrpc/svc_xprt.c                    | 1 +
 net/sunrpc/svcauth_unix.c                | 1 +
 net/sunrpc/xdr.c                         | 1 +
 net/sunrpc/xprtrdma/svc_rdma.c           | 1 +
 net/sunrpc/xprtrdma/svc_rdma_transport.c | 1 +
 net/sunrpc/xprtrdma/transport.c          | 1 +
 net/sunrpc/xprtrdma/verbs.c              | 1 +
 net/tipc/core.h                          | 1 +
 net/tipc/eth_media.c                     | 1 +
 net/tipc/socket.c                        | 2 +-
 net/unix/garbage.c                       | 1 -
 net/unix/sysctl_net_unix.c               | 1 +
 net/wimax/op-msg.c                       | 1 +
 net/wimax/stack.c                        | 1 +
 net/wireless/core.c                      | 1 +
 net/wireless/debugfs.c                   | 1 +
 net/wireless/ibss.c                      | 1 +
 net/wireless/mlme.c                      | 1 +
 net/wireless/nl80211.c                   | 1 +
 net/wireless/reg.c                       | 1 +
 net/wireless/scan.c                      | 1 +
 net/wireless/sme.c                       | 1 +
 net/wireless/util.c                      | 1 +
 net/wireless/wext-compat.c               | 1 +
 net/wireless/wext-core.c                 | 1 +
 net/wireless/wext-priv.c                 | 1 +
 net/wireless/wext-sme.c                  | 1 +
 net/x25/af_x25.c                         | 1 +
 net/x25/x25_dev.c                        | 1 +
 net/x25/x25_forward.c                    | 1 +
 net/x25/x25_in.c                         | 1 +
 net/x25/x25_link.c                       | 1 +
 net/x25/x25_out.c                        | 1 +
 net/x25/x25_route.c                      | 1 +
 net/x25/x25_subr.c                       | 1 +
 net/xfrm/xfrm_ipcomp.c                   | 2 +-
 net/xfrm/xfrm_output.c                   | 1 +
 net/xfrm/xfrm_state.c                    | 1 +
 net/xfrm/xfrm_sysctl.c                   | 1 +
 469 files changed, 457 insertions(+), 20 deletions(-)

(limited to 'net')

diff --git a/net/802/garp.c b/net/802/garp.c
index 1dcb0660c49d..9ed7c0e7dc17 100644
--- a/net/802/garp.c
+++ b/net/802/garp.c
@@ -14,6 +14,7 @@
 #include <linux/etherdevice.h>
 #include <linux/rtnetlink.h>
 #include <linux/llc.h>
+#include <linux/slab.h>
 #include <net/llc.h>
 #include <net/llc_pdu.h>
 #include <net/garp.h>
diff --git a/net/802/p8022.c b/net/802/p8022.c
index 2530f35241cd..7f353c4f437a 100644
--- a/net/802/p8022.c
+++ b/net/802/p8022.c
@@ -18,6 +18,7 @@
 #include <linux/module.h>
 #include <linux/netdevice.h>
 #include <linux/skbuff.h>
+#include <linux/slab.h>
 #include <net/datalink.h>
 #include <linux/mm.h>
 #include <linux/in.h>
diff --git a/net/802/p8023.c b/net/802/p8023.c
index 6ab1835041a7..1256a40da43c 100644
--- a/net/802/p8023.c
+++ b/net/802/p8023.c
@@ -18,6 +18,7 @@
 #include <linux/module.h>
 #include <linux/netdevice.h>
 #include <linux/skbuff.h>
+#include <linux/slab.h>
 
 #include <net/datalink.h>
 #include <net/p8022.h>
diff --git a/net/802/psnap.c b/net/802/psnap.c
index 6fea0750662b..21cde8fd5795 100644
--- a/net/802/psnap.c
+++ b/net/802/psnap.c
@@ -14,6 +14,7 @@
 #include <linux/module.h>
 #include <linux/netdevice.h>
 #include <linux/skbuff.h>
+#include <linux/slab.h>
 #include <net/datalink.h>
 #include <net/llc.h>
 #include <net/psnap.h>
diff --git a/net/802/stp.c b/net/802/stp.c
index 0b7a24452d11..53c8f77f0ccd 100644
--- a/net/802/stp.c
+++ b/net/802/stp.c
@@ -11,6 +11,7 @@
 #include <linux/skbuff.h>
 #include <linux/etherdevice.h>
 #include <linux/llc.h>
+#include <linux/slab.h>
 #include <net/llc.h>
 #include <net/llc_pdu.h>
 #include <net/stp.h>
diff --git a/net/802/tr.c b/net/802/tr.c
index 44acce47fcdc..1c6e596074df 100644
--- a/net/802/tr.c
+++ b/net/802/tr.c
@@ -36,6 +36,7 @@
 #include <linux/seq_file.h>
 #include <linux/init.h>
 #include <linux/sysctl.h>
+#include <linux/slab.h>
 #include <net/arp.h>
 #include <net/net_namespace.h>
 
diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
index db783d7af5a3..97da977c2a23 100644
--- a/net/8021q/vlan.c
+++ b/net/8021q/vlan.c
@@ -22,6 +22,7 @@
 #include <linux/module.h>
 #include <linux/netdevice.h>
 #include <linux/skbuff.h>
+#include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/rculist.h>
 #include <net/p8022.h>
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
index 2fd057c81bbf..29b6348c8d4d 100644
--- a/net/8021q/vlan_dev.c
+++ b/net/8021q/vlan_dev.c
@@ -21,6 +21,7 @@
  */
 
 #include <linux/module.h>
+#include <linux/slab.h>
 #include <linux/skbuff.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
diff --git a/net/9p/client.c b/net/9p/client.c
index e3e5bf4469ce..6e6b928a5972 100644
--- a/net/9p/client.c
+++ b/net/9p/client.c
@@ -29,6 +29,7 @@
 #include <linux/poll.h>
 #include <linux/idr.h>
 #include <linux/mutex.h>
+#include <linux/slab.h>
 #include <linux/sched.h>
 #include <linux/uaccess.h>
 #include <net/9p/9p.h>
diff --git a/net/9p/protocol.c b/net/9p/protocol.c
index 94f5a8f65e9c..e7541d5b0118 100644
--- a/net/9p/protocol.c
+++ b/net/9p/protocol.c
@@ -28,6 +28,7 @@
 #include <linux/module.h>
 #include <linux/errno.h>
 #include <linux/uaccess.h>
+#include <linux/slab.h>
 #include <linux/sched.h>
 #include <linux/types.h>
 #include <net/9p/9p.h>
diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c
index 31d0b05582a9..98ce9bcb0e15 100644
--- a/net/9p/trans_fd.c
+++ b/net/9p/trans_fd.c
@@ -38,6 +38,7 @@
 #include <linux/idr.h>
 #include <linux/file.h>
 #include <linux/parser.h>
+#include <linux/slab.h>
 #include <net/9p/9p.h>
 #include <net/9p/client.h>
 #include <net/9p/transport.h>
diff --git a/net/9p/trans_rdma.c b/net/9p/trans_rdma.c
index 2c95a89c0f46..041101ab4aa5 100644
--- a/net/9p/trans_rdma.c
+++ b/net/9p/trans_rdma.c
@@ -40,6 +40,7 @@
 #include <linux/file.h>
 #include <linux/parser.h>
 #include <linux/semaphore.h>
+#include <linux/slab.h>
 #include <net/9p/9p.h>
 #include <net/9p/client.h>
 #include <net/9p/transport.h>
diff --git a/net/9p/trans_virtio.c b/net/9p/trans_virtio.c
index afde1a89fbb3..7eb78ecc1618 100644
--- a/net/9p/trans_virtio.c
+++ b/net/9p/trans_virtio.c
@@ -37,6 +37,7 @@
 #include <linux/inet.h>
 #include <linux/idr.h>
 #include <linux/file.h>
+#include <linux/slab.h>
 #include <net/9p/9p.h>
 #include <linux/parser.h>
 #include <net/9p/client.h>
diff --git a/net/9p/util.c b/net/9p/util.c
index dc4ec05ad93d..e048701a72d2 100644
--- a/net/9p/util.c
+++ b/net/9p/util.c
@@ -30,6 +30,7 @@
 #include <linux/sched.h>
 #include <linux/parser.h>
 #include <linux/idr.h>
+#include <linux/slab.h>
 #include <net/9p/9p.h>
 
 /**
diff --git a/net/appletalk/aarp.c b/net/appletalk/aarp.c
index f2b3b56aa779..50dce7981321 100644
--- a/net/appletalk/aarp.c
+++ b/net/appletalk/aarp.c
@@ -30,6 +30,7 @@
  */
 
 #include <linux/if_arp.h>
+#include <linux/slab.h>
 #include <net/sock.h>
 #include <net/datalink.h>
 #include <net/psnap.h>
diff --git a/net/appletalk/ddp.c b/net/appletalk/ddp.c
index 9fc4da56fb1d..7b02967fbbe7 100644
--- a/net/appletalk/ddp.c
+++ b/net/appletalk/ddp.c
@@ -57,6 +57,7 @@
 #include <linux/smp_lock.h>
 #include <linux/termios.h>	/* For TIOCOUTQ/INQ */
 #include <linux/compat.h>
+#include <linux/slab.h>
 #include <net/datalink.h>
 #include <net/psnap.h>
 #include <net/sock.h>
diff --git a/net/atm/addr.c b/net/atm/addr.c
index cf3ae8b47572..dcda35c66f15 100644
--- a/net/atm/addr.c
+++ b/net/atm/addr.c
@@ -4,6 +4,7 @@
 
 #include <linux/atm.h>
 #include <linux/atmdev.h>
+#include <linux/slab.h>
 #include <linux/uaccess.h>
 
 #include "signaling.h"
diff --git a/net/atm/atm_sysfs.c b/net/atm/atm_sysfs.c
index f693b78eb467..799c631f0fed 100644
--- a/net/atm/atm_sysfs.c
+++ b/net/atm/atm_sysfs.c
@@ -1,6 +1,7 @@
 /* ATM driver model support. */
 
 #include <linux/kernel.h>
+#include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/kobject.h>
 #include <linux/atmdev.h>
diff --git a/net/atm/br2684.c b/net/atm/br2684.c
index 4d64d87e7578..d6c7ceaf13e9 100644
--- a/net/atm/br2684.c
+++ b/net/atm/br2684.c
@@ -18,6 +18,7 @@
 #include <linux/rtnetlink.h>
 #include <linux/ip.h>
 #include <linux/uaccess.h>
+#include <linux/slab.h>
 #include <net/arp.h>
 #include <linux/atm.h>
 #include <linux/atmdev.h>
diff --git a/net/atm/clip.c b/net/atm/clip.c
index ebfa022008f7..313aba11316b 100644
--- a/net/atm/clip.c
+++ b/net/atm/clip.c
@@ -30,6 +30,7 @@
 #include <linux/seq_file.h>
 #include <linux/rcupdate.h>
 #include <linux/jhash.h>
+#include <linux/slab.h>
 #include <net/route.h> /* for struct rtable and routing */
 #include <net/icmp.h> /* icmp_send */
 #include <linux/param.h> /* for HZ */
diff --git a/net/atm/common.c b/net/atm/common.c
index 74d095a081e3..97ed94aa0cbc 100644
--- a/net/atm/common.c
+++ b/net/atm/common.c
@@ -18,6 +18,7 @@
 #include <linux/skbuff.h>
 #include <linux/bitops.h>
 #include <linux/init.h>
+#include <linux/slab.h>
 #include <net/sock.h>		/* struct sock */
 #include <linux/uaccess.h>
 #include <linux/poll.h>
diff --git a/net/atm/lec.c b/net/atm/lec.c
index 5da5753157f9..feeaf5718472 100644
--- a/net/atm/lec.c
+++ b/net/atm/lec.c
@@ -6,6 +6,7 @@
 
 #define pr_fmt(fmt) KBUILD_MODNAME ":%s: " fmt, __func__
 
+#include <linux/slab.h>
 #include <linux/kernel.h>
 #include <linux/bitops.h>
 #include <linux/capability.h>
diff --git a/net/atm/mpc.c b/net/atm/mpc.c
index a6521c8aa88b..436f2e177657 100644
--- a/net/atm/mpc.c
+++ b/net/atm/mpc.c
@@ -2,6 +2,7 @@
 
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/slab.h>
 #include <linux/timer.h>
 #include <linux/init.h>
 #include <linux/bitops.h>
diff --git a/net/atm/mpoa_caches.c b/net/atm/mpoa_caches.c
index 4c141810eb6d..e773d8336918 100644
--- a/net/atm/mpoa_caches.c
+++ b/net/atm/mpoa_caches.c
@@ -1,5 +1,6 @@
 #include <linux/types.h>
 #include <linux/atmmpc.h>
+#include <linux/slab.h>
 #include <linux/time.h>
 
 #include "mpoa_caches.h"
diff --git a/net/atm/mpoa_proc.c b/net/atm/mpoa_proc.c
index b9bdb98427e4..53e500292271 100644
--- a/net/atm/mpoa_proc.c
+++ b/net/atm/mpoa_proc.c
@@ -12,6 +12,7 @@
 #include <linux/uaccess.h>
 #include <linux/atmmpc.h>
 #include <linux/atm.h>
+#include <linux/gfp.h>
 #include "mpc.h"
 #include "mpoa_caches.h"
 
diff --git a/net/atm/pppoatm.c b/net/atm/pppoatm.c
index 400839273c67..e49bb6d948a1 100644
--- a/net/atm/pppoatm.c
+++ b/net/atm/pppoatm.c
@@ -38,6 +38,7 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/skbuff.h>
+#include <linux/slab.h>
 #include <linux/atm.h>
 #include <linux/atmdev.h>
 #include <linux/capability.h>
diff --git a/net/atm/proc.c b/net/atm/proc.c
index 7a96b2376bd7..696e218436e5 100644
--- a/net/atm/proc.c
+++ b/net/atm/proc.c
@@ -22,6 +22,7 @@
 #include <linux/netdevice.h>
 #include <linux/atmclip.h>
 #include <linux/init.h> /* for __init */
+#include <linux/slab.h>
 #include <net/net_namespace.h>
 #include <net/atmclip.h>
 #include <linux/uaccess.h>
diff --git a/net/atm/raw.c b/net/atm/raw.c
index d0c4bd047dc4..b4f7b9ff3c74 100644
--- a/net/atm/raw.c
+++ b/net/atm/raw.c
@@ -10,6 +10,7 @@
 #include <linux/kernel.h>
 #include <linux/skbuff.h>
 #include <linux/mm.h>
+#include <linux/slab.h>
 
 #include "common.h"
 #include "protocols.h"
diff --git a/net/atm/resources.c b/net/atm/resources.c
index 90082904f20d..d29e58261511 100644
--- a/net/atm/resources.c
+++ b/net/atm/resources.c
@@ -19,6 +19,7 @@
 #include <linux/capability.h>
 #include <linux/delay.h>
 #include <linux/mutex.h>
+#include <linux/slab.h>
 
 #include <net/sock.h>	 /* for struct sock */
 
diff --git a/net/atm/signaling.c b/net/atm/signaling.c
index ad1d28ae512b..6ba6e466ee54 100644
--- a/net/atm/signaling.c
+++ b/net/atm/signaling.c
@@ -14,6 +14,7 @@
 #include <linux/atmsvc.h>
 #include <linux/atmdev.h>
 #include <linux/bitops.h>
+#include <linux/slab.h>
 
 #include "resources.h"
 #include "signaling.h"
diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c
index a5beedf43e2d..65c5801261f9 100644
--- a/net/ax25/af_ax25.c
+++ b/net/ax25/af_ax25.c
@@ -25,6 +25,7 @@
 #include <linux/string.h>
 #include <linux/sockios.h>
 #include <linux/net.h>
+#include <linux/slab.h>
 #include <net/ax25.h>
 #include <linux/inet.h>
 #include <linux/netdevice.h>
diff --git a/net/ax25/ax25_dev.c b/net/ax25/ax25_dev.c
index a7a0e0c9698b..c1cb982f6e86 100644
--- a/net/ax25/ax25_dev.c
+++ b/net/ax25/ax25_dev.c
@@ -9,6 +9,7 @@
 #include <linux/errno.h>
 #include <linux/types.h>
 #include <linux/socket.h>
+#include <linux/slab.h>
 #include <linux/in.h>
 #include <linux/kernel.h>
 #include <linux/timer.h>
diff --git a/net/ax25/ax25_ds_subr.c b/net/ax25/ax25_ds_subr.c
index b5e59787be2f..85816e612dc0 100644
--- a/net/ax25/ax25_ds_subr.c
+++ b/net/ax25/ax25_ds_subr.c
@@ -17,6 +17,7 @@
 #include <linux/sockios.h>
 #include <linux/spinlock.h>
 #include <linux/net.h>
+#include <linux/gfp.h>
 #include <net/ax25.h>
 #include <linux/inet.h>
 #include <linux/netdevice.h>
diff --git a/net/ax25/ax25_iface.c b/net/ax25/ax25_iface.c
index 71338f112108..5a0dda8df492 100644
--- a/net/ax25/ax25_iface.c
+++ b/net/ax25/ax25_iface.c
@@ -17,6 +17,7 @@
 #include <linux/string.h>
 #include <linux/sockios.h>
 #include <linux/net.h>
+#include <linux/slab.h>
 #include <net/ax25.h>
 #include <linux/inet.h>
 #include <linux/netdevice.h>
diff --git a/net/ax25/ax25_in.c b/net/ax25/ax25_in.c
index de56d3983de0..9bb776541203 100644
--- a/net/ax25/ax25_in.c
+++ b/net/ax25/ax25_in.c
@@ -18,6 +18,7 @@
 #include <linux/string.h>
 #include <linux/sockios.h>
 #include <linux/net.h>
+#include <linux/slab.h>
 #include <net/ax25.h>
 #include <linux/inet.h>
 #include <linux/netdevice.h>
diff --git a/net/ax25/ax25_ip.c b/net/ax25/ax25_ip.c
index f047a57aa95c..cf0c47a26530 100644
--- a/net/ax25/ax25_ip.c
+++ b/net/ax25/ax25_ip.c
@@ -16,6 +16,7 @@
 #include <linux/string.h>
 #include <linux/sockios.h>
 #include <linux/net.h>
+#include <linux/slab.h>
 #include <net/ax25.h>
 #include <linux/inet.h>
 #include <linux/netdevice.h>
diff --git a/net/ax25/ax25_out.c b/net/ax25/ax25_out.c
index 14912600ec57..37507d806f65 100644
--- a/net/ax25/ax25_out.c
+++ b/net/ax25/ax25_out.c
@@ -19,6 +19,7 @@
 #include <linux/sockios.h>
 #include <linux/spinlock.h>
 #include <linux/net.h>
+#include <linux/slab.h>
 #include <net/ax25.h>
 #include <linux/inet.h>
 #include <linux/netdevice.h>
diff --git a/net/ax25/ax25_route.c b/net/ax25/ax25_route.c
index c833ba4c45a5..7805945a5fd6 100644
--- a/net/ax25/ax25_route.c
+++ b/net/ax25/ax25_route.c
@@ -23,6 +23,7 @@
 #include <linux/string.h>
 #include <linux/sockios.h>
 #include <linux/net.h>
+#include <linux/slab.h>
 #include <net/ax25.h>
 #include <linux/inet.h>
 #include <linux/netdevice.h>
diff --git a/net/ax25/ax25_subr.c b/net/ax25/ax25_subr.c
index 034aa10a5198..c6715ee4ab8f 100644
--- a/net/ax25/ax25_subr.c
+++ b/net/ax25/ax25_subr.c
@@ -18,6 +18,7 @@
 #include <linux/string.h>
 #include <linux/sockios.h>
 #include <linux/net.h>
+#include <linux/slab.h>
 #include <net/ax25.h>
 #include <linux/inet.h>
 #include <linux/netdevice.h>
diff --git a/net/ax25/ax25_uid.c b/net/ax25/ax25_uid.c
index 9f13f6eefcba..d349be9578f5 100644
--- a/net/ax25/ax25_uid.c
+++ b/net/ax25/ax25_uid.c
@@ -18,6 +18,7 @@
 #include <linux/sockios.h>
 #include <linux/net.h>
 #include <linux/spinlock.h>
+#include <linux/slab.h>
 #include <net/ax25.h>
 #include <linux/inet.h>
 #include <linux/netdevice.h>
diff --git a/net/ax25/sysctl_net_ax25.c b/net/ax25/sysctl_net_ax25.c
index 5159be6b2625..ebe0ef3f1d83 100644
--- a/net/ax25/sysctl_net_ax25.c
+++ b/net/ax25/sysctl_net_ax25.c
@@ -7,6 +7,7 @@
  * Copyright (C) 1996 Mike Shaver (shaver@zeroknowledge.com)
  */
 #include <linux/mm.h>
+#include <linux/slab.h>
 #include <linux/sysctl.h>
 #include <linux/spinlock.h>
 #include <net/ax25.h>
diff --git a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c
index 087cc51f5927..404a8500fd03 100644
--- a/net/bluetooth/af_bluetooth.c
+++ b/net/bluetooth/af_bluetooth.c
@@ -31,7 +31,6 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
-#include <linux/slab.h>
 #include <linux/skbuff.h>
 #include <linux/init.h>
 #include <linux/poll.h>
diff --git a/net/bluetooth/bnep/core.c b/net/bluetooth/bnep/core.c
index ef09c7b3a858..8062dad6d10d 100644
--- a/net/bluetooth/bnep/core.c
+++ b/net/bluetooth/bnep/core.c
@@ -35,6 +35,7 @@
 #include <linux/freezer.h>
 #include <linux/errno.h>
 #include <linux/net.h>
+#include <linux/slab.h>
 #include <net/sock.h>
 
 #include <linux/socket.h>
diff --git a/net/bluetooth/bnep/netdev.c b/net/bluetooth/bnep/netdev.c
index b6234b73c4cf..5643a2391e76 100644
--- a/net/bluetooth/bnep/netdev.c
+++ b/net/bluetooth/bnep/netdev.c
@@ -26,6 +26,7 @@
 */
 
 #include <linux/module.h>
+#include <linux/slab.h>
 
 #include <linux/socket.h>
 #include <linux/netdevice.h>
diff --git a/net/bluetooth/bnep/sock.c b/net/bluetooth/bnep/sock.c
index 2ff6ac7b2ed4..2862f53b66b1 100644
--- a/net/bluetooth/bnep/sock.c
+++ b/net/bluetooth/bnep/sock.c
@@ -30,7 +30,6 @@
 #include <linux/capability.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
-#include <linux/slab.h>
 #include <linux/poll.h>
 #include <linux/fcntl.h>
 #include <linux/skbuff.h>
@@ -39,6 +38,7 @@
 #include <linux/file.h>
 #include <linux/init.h>
 #include <linux/compat.h>
+#include <linux/gfp.h>
 #include <net/sock.h>
 
 #include <asm/system.h>
diff --git a/net/bluetooth/cmtp/sock.c b/net/bluetooth/cmtp/sock.c
index 978cc3a718ad..7ea1979a8e4f 100644
--- a/net/bluetooth/cmtp/sock.c
+++ b/net/bluetooth/cmtp/sock.c
@@ -26,7 +26,6 @@
 #include <linux/capability.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
-#include <linux/slab.h>
 #include <linux/poll.h>
 #include <linux/fcntl.h>
 #include <linux/skbuff.h>
@@ -34,6 +33,7 @@
 #include <linux/ioctl.h>
 #include <linux/file.h>
 #include <linux/compat.h>
+#include <linux/gfp.h>
 #include <net/sock.h>
 
 #include <linux/isdn/capilli.h>
diff --git a/net/bluetooth/hci_sysfs.c b/net/bluetooth/hci_sysfs.c
index 05fd125f74fe..0e8e1a59856c 100644
--- a/net/bluetooth/hci_sysfs.c
+++ b/net/bluetooth/hci_sysfs.c
@@ -1,6 +1,7 @@
 /* Bluetooth HCI driver model support. */
 
 #include <linux/kernel.h>
+#include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/debugfs.h>
 #include <linux/seq_file.h>
diff --git a/net/bluetooth/hidp/sock.c b/net/bluetooth/hidp/sock.c
index 9cfef68b9fec..250dfd46237d 100644
--- a/net/bluetooth/hidp/sock.c
+++ b/net/bluetooth/hidp/sock.c
@@ -26,7 +26,6 @@
 #include <linux/capability.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
-#include <linux/slab.h>
 #include <linux/poll.h>
 #include <linux/fcntl.h>
 #include <linux/skbuff.h>
@@ -35,6 +34,7 @@
 #include <linux/file.h>
 #include <linux/init.h>
 #include <linux/compat.h>
+#include <linux/gfp.h>
 #include <net/sock.h>
 
 #include "hidp.h"
diff --git a/net/bluetooth/rfcomm/core.c b/net/bluetooth/rfcomm/core.c
index 13f114e8b0f9..7dca91bb8c57 100644
--- a/net/bluetooth/rfcomm/core.c
+++ b/net/bluetooth/rfcomm/core.c
@@ -38,6 +38,7 @@
 #include <linux/net.h>
 #include <linux/mutex.h>
 #include <linux/kthread.h>
+#include <linux/slab.h>
 
 #include <net/sock.h>
 #include <asm/uaccess.h>
diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c
index 3b8e038ab32c..9101a4e56201 100644
--- a/net/bridge/br_fdb.c
+++ b/net/bridge/br_fdb.c
@@ -20,6 +20,7 @@
 #include <linux/etherdevice.h>
 #include <linux/jhash.h>
 #include <linux/random.h>
+#include <linux/slab.h>
 #include <asm/atomic.h>
 #include <asm/unaligned.h>
 #include "br_private.h"
diff --git a/net/bridge/br_forward.c b/net/bridge/br_forward.c
index 8dbec83e50ca..7a241c396981 100644
--- a/net/bridge/br_forward.c
+++ b/net/bridge/br_forward.c
@@ -12,6 +12,7 @@
  */
 
 #include <linux/err.h>
+#include <linux/slab.h>
 #include <linux/kernel.h>
 #include <linux/netdevice.h>
 #include <linux/skbuff.h>
diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index b6a3872f5681..0b6b1f2ff7ac 100644
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@ -19,6 +19,7 @@
 #include <linux/init.h>
 #include <linux/rtnetlink.h>
 #include <linux/if_ether.h>
+#include <linux/slab.h>
 #include <net/sock.h>
 
 #include "br_private.h"
diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c
index d74d570fc848..a82dde2d2ead 100644
--- a/net/bridge/br_input.c
+++ b/net/bridge/br_input.c
@@ -11,6 +11,7 @@
  *	2 of the License, or (at your option) any later version.
  */
 
+#include <linux/slab.h>
 #include <linux/kernel.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
diff --git a/net/bridge/br_ioctl.c b/net/bridge/br_ioctl.c
index 2af6e4a90262..995afc4b04dc 100644
--- a/net/bridge/br_ioctl.c
+++ b/net/bridge/br_ioctl.c
@@ -15,6 +15,7 @@
 #include <linux/kernel.h>
 #include <linux/if_bridge.h>
 #include <linux/netdevice.h>
+#include <linux/slab.h>
 #include <linux/times.h>
 #include <net/net_namespace.h>
 #include <asm/uaccess.h>
diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c
index 268e2e725888..4c4977d12fd6 100644
--- a/net/bridge/br_netfilter.c
+++ b/net/bridge/br_netfilter.c
@@ -23,6 +23,7 @@
 
 #include <linux/module.h>
 #include <linux/kernel.h>
+#include <linux/slab.h>
 #include <linux/ip.h>
 #include <linux/netdevice.h>
 #include <linux/skbuff.h>
diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
index fcffb3fb1177..aa56ac2c8829 100644
--- a/net/bridge/br_netlink.c
+++ b/net/bridge/br_netlink.c
@@ -11,6 +11,7 @@
  */
 
 #include <linux/kernel.h>
+#include <linux/slab.h>
 #include <net/rtnetlink.h>
 #include <net/net_namespace.h>
 #include <net/sock.h>
diff --git a/net/bridge/br_stp_bpdu.c b/net/bridge/br_stp_bpdu.c
index 81ae40b3f655..d66cce11f3bf 100644
--- a/net/bridge/br_stp_bpdu.c
+++ b/net/bridge/br_stp_bpdu.c
@@ -15,6 +15,7 @@
 #include <linux/netfilter_bridge.h>
 #include <linux/etherdevice.h>
 #include <linux/llc.h>
+#include <linux/slab.h>
 #include <net/net_namespace.h>
 #include <net/llc.h>
 #include <net/llc_pdu.h>
diff --git a/net/bridge/netfilter/ebt_ulog.c b/net/bridge/netfilter/ebt_ulog.c
index c6ac657074a6..f9560f3dbdc7 100644
--- a/net/bridge/netfilter/ebt_ulog.c
+++ b/net/bridge/netfilter/ebt_ulog.c
@@ -29,6 +29,7 @@
  */
 
 #include <linux/module.h>
+#include <linux/slab.h>
 #include <linux/spinlock.h>
 #include <linux/socket.h>
 #include <linux/skbuff.h>
diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
index dfb58056a89a..f0865fd1e3ec 100644
--- a/net/bridge/netfilter/ebtables.c
+++ b/net/bridge/netfilter/ebtables.c
@@ -23,6 +23,7 @@
 #include <linux/netfilter_bridge/ebtables.h>
 #include <linux/spinlock.h>
 #include <linux/mutex.h>
+#include <linux/slab.h>
 #include <asm/uaccess.h>
 #include <linux/smp.h>
 #include <linux/cpumask.h>
diff --git a/net/can/bcm.c b/net/can/bcm.c
index e32af52238a2..a2dee522b43e 100644
--- a/net/can/bcm.c
+++ b/net/can/bcm.c
@@ -56,6 +56,7 @@
 #include <linux/can.h>
 #include <linux/can/core.h>
 #include <linux/can/bcm.h>
+#include <linux/slab.h>
 #include <net/sock.h>
 #include <net/net_namespace.h>
 
diff --git a/net/can/raw.c b/net/can/raw.c
index abca920440b5..3a7dffb6519c 100644
--- a/net/can/raw.c
+++ b/net/can/raw.c
@@ -45,6 +45,7 @@
 #include <linux/init.h>
 #include <linux/uio.h>
 #include <linux/net.h>
+#include <linux/slab.h>
 #include <linux/netdevice.h>
 #include <linux/socket.h>
 #include <linux/if_arp.h>
diff --git a/net/compat.c b/net/compat.c
index a1fb1b079a82..ec24d9edb025 100644
--- a/net/compat.c
+++ b/net/compat.c
@@ -12,6 +12,7 @@
  */
 
 #include <linux/kernel.h>
+#include <linux/gfp.h>
 #include <linux/fs.h>
 #include <linux/types.h>
 #include <linux/file.h>
diff --git a/net/core/datagram.c b/net/core/datagram.c
index 95c2e0840d0d..2dccd4ee591b 100644
--- a/net/core/datagram.c
+++ b/net/core/datagram.c
@@ -48,6 +48,7 @@
 #include <linux/poll.h>
 #include <linux/highmem.h>
 #include <linux/spinlock.h>
+#include <linux/slab.h>
 
 #include <net/protocol.h>
 #include <linux/skbuff.h>
diff --git a/net/core/dev.c b/net/core/dev.c
index 59d4394d2ce8..1c8a0ce473a8 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -80,6 +80,7 @@
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/hash.h>
+#include <linux/slab.h>
 #include <linux/sched.h>
 #include <linux/mutex.h>
 #include <linux/string.h>
diff --git a/net/core/drop_monitor.c b/net/core/drop_monitor.c
index f8c874975350..cf208d8042b1 100644
--- a/net/core/drop_monitor.c
+++ b/net/core/drop_monitor.c
@@ -21,6 +21,7 @@
 #include <linux/percpu.h>
 #include <linux/timer.h>
 #include <linux/bitops.h>
+#include <linux/slab.h>
 #include <net/genetlink.h>
 #include <net/netevent.h>
 
diff --git a/net/core/dst.c b/net/core/dst.c
index cb1b3488b739..f307bc18f6a0 100644
--- a/net/core/dst.c
+++ b/net/core/dst.c
@@ -12,6 +12,7 @@
 #include <linux/workqueue.h>
 #include <linux/mm.h>
 #include <linux/module.h>
+#include <linux/slab.h>
 #include <linux/netdevice.h>
 #include <linux/skbuff.h>
 #include <linux/string.h>
diff --git a/net/core/ethtool.c b/net/core/ethtool.c
index f4cb6b6299d9..9d55c57f318a 100644
--- a/net/core/ethtool.c
+++ b/net/core/ethtool.c
@@ -18,6 +18,7 @@
 #include <linux/ethtool.h>
 #include <linux/netdevice.h>
 #include <linux/bitops.h>
+#include <linux/slab.h>
 #include <asm/uaccess.h>
 
 /*
diff --git a/net/core/fib_rules.c b/net/core/fib_rules.c
index 9a24377146bf..d2c3e7dc2e5f 100644
--- a/net/core/fib_rules.c
+++ b/net/core/fib_rules.c
@@ -10,6 +10,7 @@
 
 #include <linux/types.h>
 #include <linux/kernel.h>
+#include <linux/slab.h>
 #include <linux/list.h>
 #include <net/net_namespace.h>
 #include <net/sock.h>
diff --git a/net/core/filter.c b/net/core/filter.c
index d38ef7fd50f0..ff943bed21af 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -25,6 +25,7 @@
 #include <linux/inet.h>
 #include <linux/netdevice.h>
 #include <linux/if_packet.h>
+#include <linux/gfp.h>
 #include <net/ip.h>
 #include <net/protocol.h>
 #include <net/netlink.h>
diff --git a/net/core/gen_estimator.c b/net/core/gen_estimator.c
index 493775f4f2f1..cf8e70392fe0 100644
--- a/net/core/gen_estimator.c
+++ b/net/core/gen_estimator.c
@@ -32,6 +32,7 @@
 #include <linux/rtnetlink.h>
 #include <linux/init.h>
 #include <linux/rbtree.h>
+#include <linux/slab.h>
 #include <net/sock.h>
 #include <net/gen_stats.h>
 
diff --git a/net/core/iovec.c b/net/core/iovec.c
index 16ad45d4882b..1e7f4e91a935 100644
--- a/net/core/iovec.c
+++ b/net/core/iovec.c
@@ -20,7 +20,6 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/mm.h>
-#include <linux/slab.h>
 #include <linux/net.h>
 #include <linux/in6.h>
 #include <asm/uaccess.h>
diff --git a/net/core/link_watch.c b/net/core/link_watch.c
index 5910b555a54a..bdbce2f5875b 100644
--- a/net/core/link_watch.c
+++ b/net/core/link_watch.c
@@ -19,7 +19,6 @@
 #include <linux/rtnetlink.h>
 #include <linux/jiffies.h>
 #include <linux/spinlock.h>
-#include <linux/slab.h>
 #include <linux/workqueue.h>
 #include <linux/bitops.h>
 #include <asm/types.h>
diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index 6cee6434da67..bff37908bd55 100644
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@ -15,6 +15,7 @@
  *	Harald Welte		Add neighbour cache statistics like rtstat
  */
 
+#include <linux/slab.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
index 099c753c4213..59cfc7d8fc45 100644
--- a/net/core/net-sysfs.c
+++ b/net/core/net-sysfs.c
@@ -13,6 +13,7 @@
 #include <linux/kernel.h>
 #include <linux/netdevice.h>
 #include <linux/if_arp.h>
+#include <linux/slab.h>
 #include <net/sock.h>
 #include <linux/rtnetlink.h>
 #include <linux/wireless.h>
diff --git a/net/core/net-traces.c b/net/core/net-traces.c
index f1e982c508bb..afa6380ed88a 100644
--- a/net/core/net-traces.c
+++ b/net/core/net-traces.c
@@ -19,6 +19,7 @@
 #include <linux/workqueue.h>
 #include <linux/netlink.h>
 #include <linux/net_dropmon.h>
+#include <linux/slab.h>
 
 #include <asm/unaligned.h>
 #include <asm/bitops.h>
diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index 6f9206b36dc2..a58f59b97597 100644
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -22,6 +22,7 @@
 #include <linux/delay.h>
 #include <linux/rcupdate.h>
 #include <linux/workqueue.h>
+#include <linux/slab.h>
 #include <net/tcp.h>
 #include <net/udp.h>
 #include <asm/unaligned.h>
diff --git a/net/core/scm.c b/net/core/scm.c
index 9b264634acfd..b88f6f9d0b97 100644
--- a/net/core/scm.c
+++ b/net/core/scm.c
@@ -26,6 +26,7 @@
 #include <linux/security.h>
 #include <linux/pid.h>
 #include <linux/nsproxy.h>
+#include <linux/slab.h>
 
 #include <asm/system.h>
 #include <asm/uaccess.h>
diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c
index 06124872af5b..b7b6b8208f75 100644
--- a/net/core/sysctl_net_core.c
+++ b/net/core/sysctl_net_core.c
@@ -12,6 +12,7 @@
 #include <linux/netdevice.h>
 #include <linux/ratelimit.h>
 #include <linux/init.h>
+#include <linux/slab.h>
 
 #include <net/ip.h>
 #include <net/sock.h>
diff --git a/net/dcb/dcbnl.c b/net/dcb/dcbnl.c
index 813e399220a7..19ac2b985485 100644
--- a/net/dcb/dcbnl.c
+++ b/net/dcb/dcbnl.c
@@ -19,6 +19,7 @@
 
 #include <linux/netdevice.h>
 #include <linux/netlink.h>
+#include <linux/slab.h>
 #include <net/netlink.h>
 #include <net/rtnetlink.h>
 #include <linux/dcbnl.h>
diff --git a/net/dccp/ccid.c b/net/dccp/ccid.c
index 49d27c556bec..36479ca61e03 100644
--- a/net/dccp/ccid.c
+++ b/net/dccp/ccid.c
@@ -11,6 +11,8 @@
  *	published by the Free Software Foundation.
  */
 
+#include <linux/slab.h>
+
 #include "ccid.h"
 #include "ccids/lib/tfrc.h"
 
diff --git a/net/dccp/ccids/ccid2.c b/net/dccp/ccids/ccid2.c
index a47a8c918ee8..9b3ae9922be1 100644
--- a/net/dccp/ccids/ccid2.c
+++ b/net/dccp/ccids/ccid2.c
@@ -23,6 +23,7 @@
 /*
  * This implementation should follow RFC 4341
  */
+#include <linux/slab.h>
 #include "../feat.h"
 #include "../ccid.h"
 #include "../dccp.h"
diff --git a/net/dccp/feat.c b/net/dccp/feat.c
index 972b8dc918d6..df7dd26cf07e 100644
--- a/net/dccp/feat.c
+++ b/net/dccp/feat.c
@@ -22,6 +22,7 @@
  *  2 of the License, or (at your option) any later version.
  */
 #include <linux/module.h>
+#include <linux/slab.h>
 #include "ccid.h"
 #include "feat.h"
 
diff --git a/net/dccp/input.c b/net/dccp/input.c
index 7648f316310f..9ec717426024 100644
--- a/net/dccp/input.c
+++ b/net/dccp/input.c
@@ -12,6 +12,7 @@
 
 #include <linux/dccp.h>
 #include <linux/skbuff.h>
+#include <linux/slab.h>
 
 #include <net/sock.h>
 
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
index 4071eaf2b361..52ffa1cde15a 100644
--- a/net/dccp/ipv4.c
+++ b/net/dccp/ipv4.c
@@ -12,6 +12,7 @@
 
 #include <linux/dccp.h>
 #include <linux/icmp.h>
+#include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/skbuff.h>
 #include <linux/random.h>
diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c
index af3394df63b7..3b11e41a2929 100644
--- a/net/dccp/ipv6.c
+++ b/net/dccp/ipv6.c
@@ -14,6 +14,7 @@
 
 #include <linux/module.h>
 #include <linux/random.h>
+#include <linux/slab.h>
 #include <linux/xfrm.h>
 
 #include <net/addrconf.h>
diff --git a/net/dccp/minisocks.c b/net/dccp/minisocks.c
index 0d508c359fa9..128b089d3aef 100644
--- a/net/dccp/minisocks.c
+++ b/net/dccp/minisocks.c
@@ -11,6 +11,7 @@
  */
 
 #include <linux/dccp.h>
+#include <linux/gfp.h>
 #include <linux/kernel.h>
 #include <linux/skbuff.h>
 #include <linux/timer.h>
diff --git a/net/dccp/output.c b/net/dccp/output.c
index d6bb753bf6ad..fc3f436440b4 100644
--- a/net/dccp/output.c
+++ b/net/dccp/output.c
@@ -13,6 +13,7 @@
 #include <linux/dccp.h>
 #include <linux/kernel.h>
 #include <linux/skbuff.h>
+#include <linux/slab.h>
 
 #include <net/inet_sock.h>
 #include <net/sock.h>
diff --git a/net/dccp/probe.c b/net/dccp/probe.c
index f5b3464f1242..078e48d442fd 100644
--- a/net/dccp/probe.c
+++ b/net/dccp/probe.c
@@ -30,6 +30,7 @@
 #include <linux/module.h>
 #include <linux/kfifo.h>
 #include <linux/vmalloc.h>
+#include <linux/gfp.h>
 #include <net/net_namespace.h>
 
 #include "dccp.h"
diff --git a/net/dccp/proto.c b/net/dccp/proto.c
index aa4cef374fd0..a0e38d8018f5 100644
--- a/net/dccp/proto.c
+++ b/net/dccp/proto.c
@@ -20,6 +20,7 @@
 #include <linux/if_arp.h>
 #include <linux/init.h>
 #include <linux/random.h>
+#include <linux/slab.h>
 #include <net/checksum.h>
 
 #include <net/inet_sock.h>
diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c
index 238af093495b..cead68eb254c 100644
--- a/net/decnet/dn_dev.c
+++ b/net/decnet/dn_dev.c
@@ -40,6 +40,7 @@
 #include <linux/skbuff.h>
 #include <linux/sysctl.h>
 #include <linux/notifier.h>
+#include <linux/slab.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>
 #include <net/net_namespace.h>
diff --git a/net/decnet/dn_fib.c b/net/decnet/dn_fib.c
index e9d48700e83a..4ab96c15166d 100644
--- a/net/decnet/dn_fib.c
+++ b/net/decnet/dn_fib.c
@@ -20,6 +20,7 @@
 #include <linux/string.h>
 #include <linux/net.h>
 #include <linux/socket.h>
+#include <linux/slab.h>
 #include <linux/sockios.h>
 #include <linux/init.h>
 #include <linux/skbuff.h>
diff --git a/net/decnet/dn_neigh.c b/net/decnet/dn_neigh.c
index 794b5bf95af1..deb723dba44b 100644
--- a/net/decnet/dn_neigh.c
+++ b/net/decnet/dn_neigh.c
@@ -28,6 +28,7 @@
 #include <linux/module.h>
 #include <linux/socket.h>
 #include <linux/if_arp.h>
+#include <linux/slab.h>
 #include <linux/if_ether.h>
 #include <linux/init.h>
 #include <linux/proc_fs.h>
diff --git a/net/decnet/dn_nsp_in.c b/net/decnet/dn_nsp_in.c
index 932408dca86d..25a37299bc65 100644
--- a/net/decnet/dn_nsp_in.c
+++ b/net/decnet/dn_nsp_in.c
@@ -57,6 +57,7 @@
 #include <linux/netdevice.h>
 #include <linux/inet.h>
 #include <linux/route.h>
+#include <linux/slab.h>
 #include <net/sock.h>
 #include <net/tcp_states.h>
 #include <asm/system.h>
diff --git a/net/decnet/dn_nsp_out.c b/net/decnet/dn_nsp_out.c
index a65e929ce76c..baeb1eaf011b 100644
--- a/net/decnet/dn_nsp_out.c
+++ b/net/decnet/dn_nsp_out.c
@@ -50,6 +50,7 @@
 #include <linux/netdevice.h>
 #include <linux/inet.h>
 #include <linux/route.h>
+#include <linux/slab.h>
 #include <net/sock.h>
 #include <asm/system.h>
 #include <linux/fcntl.h>
diff --git a/net/decnet/dn_route.c b/net/decnet/dn_route.c
index a7bf03ca0a36..70ebe74027d5 100644
--- a/net/decnet/dn_route.c
+++ b/net/decnet/dn_route.c
@@ -66,6 +66,7 @@
 #include <linux/inet.h>
 #include <linux/route.h>
 #include <linux/in_route.h>
+#include <linux/slab.h>
 #include <net/sock.h>
 #include <linux/mm.h>
 #include <linux/proc_fs.h>
diff --git a/net/decnet/dn_table.c b/net/decnet/dn_table.c
index b9a33bb5e9cc..f2abd3755690 100644
--- a/net/decnet/dn_table.c
+++ b/net/decnet/dn_table.c
@@ -15,6 +15,7 @@
 #include <linux/string.h>
 #include <linux/net.h>
 #include <linux/socket.h>
+#include <linux/slab.h>
 #include <linux/sockios.h>
 #include <linux/init.h>
 #include <linux/skbuff.h>
diff --git a/net/decnet/netfilter/dn_rtmsg.c b/net/decnet/netfilter/dn_rtmsg.c
index 6d2bd3202048..64a7f39e069f 100644
--- a/net/decnet/netfilter/dn_rtmsg.c
+++ b/net/decnet/netfilter/dn_rtmsg.c
@@ -14,6 +14,7 @@
  */
 #include <linux/module.h>
 #include <linux/skbuff.h>
+#include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/netdevice.h>
 #include <linux/netfilter.h>
diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
index 71489f69a42c..6112a12578b2 100644
--- a/net/dsa/dsa.c
+++ b/net/dsa/dsa.c
@@ -11,6 +11,7 @@
 #include <linux/list.h>
 #include <linux/netdevice.h>
 #include <linux/platform_device.h>
+#include <linux/slab.h>
 #include <net/dsa.h>
 #include "dsa_priv.h"
 
diff --git a/net/dsa/tag_dsa.c b/net/dsa/tag_dsa.c
index cdf2d28a0297..98dfe80b4538 100644
--- a/net/dsa/tag_dsa.c
+++ b/net/dsa/tag_dsa.c
@@ -11,6 +11,7 @@
 #include <linux/etherdevice.h>
 #include <linux/list.h>
 #include <linux/netdevice.h>
+#include <linux/slab.h>
 #include "dsa_priv.h"
 
 #define DSA_HLEN	4
diff --git a/net/dsa/tag_edsa.c b/net/dsa/tag_edsa.c
index 8f53948cff4f..6f383322ad25 100644
--- a/net/dsa/tag_edsa.c
+++ b/net/dsa/tag_edsa.c
@@ -11,6 +11,7 @@
 #include <linux/etherdevice.h>
 #include <linux/list.h>
 #include <linux/netdevice.h>
+#include <linux/slab.h>
 #include "dsa_priv.h"
 
 #define DSA_HLEN	4
diff --git a/net/dsa/tag_trailer.c b/net/dsa/tag_trailer.c
index a85c829853c0..d6d7d0add3cb 100644
--- a/net/dsa/tag_trailer.c
+++ b/net/dsa/tag_trailer.c
@@ -11,6 +11,7 @@
 #include <linux/etherdevice.h>
 #include <linux/list.h>
 #include <linux/netdevice.h>
+#include <linux/slab.h>
 #include "dsa_priv.h"
 
 netdev_tx_t trailer_xmit(struct sk_buff *skb, struct net_device *dev)
diff --git a/net/econet/af_econet.c b/net/econet/af_econet.c
index 29b4931aae52..2a5a8053e000 100644
--- a/net/econet/af_econet.c
+++ b/net/econet/af_econet.c
@@ -30,6 +30,7 @@
 #include <linux/wireless.h>
 #include <linux/skbuff.h>
 #include <linux/udp.h>
+#include <linux/slab.h>
 #include <net/sock.h>
 #include <net/inet_common.h>
 #include <linux/stat.h>
diff --git a/net/ethernet/pe2.c b/net/ethernet/pe2.c
index d60e15d9365e..eb00796758c3 100644
--- a/net/ethernet/pe2.c
+++ b/net/ethernet/pe2.c
@@ -3,6 +3,7 @@
 #include <linux/module.h>
 #include <linux/netdevice.h>
 #include <linux/skbuff.h>
+#include <linux/slab.h>
 
 #include <net/datalink.h>
 
diff --git a/net/ieee802154/af_ieee802154.c b/net/ieee802154/af_ieee802154.c
index bad1c49fd960..79886d546bab 100644
--- a/net/ieee802154/af_ieee802154.c
+++ b/net/ieee802154/af_ieee802154.c
@@ -28,6 +28,7 @@
 #include <linux/if.h>
 #include <linux/termios.h>	/* For TIOCOUTQ/INQ */
 #include <linux/list.h>
+#include <linux/slab.h>
 #include <net/datalink.h>
 #include <net/psnap.h>
 #include <net/sock.h>
diff --git a/net/ieee802154/dgram.c b/net/ieee802154/dgram.c
index 9aac5aee1575..1a3334c2609a 100644
--- a/net/ieee802154/dgram.c
+++ b/net/ieee802154/dgram.c
@@ -25,6 +25,7 @@
 #include <linux/module.h>
 #include <linux/if_arp.h>
 #include <linux/list.h>
+#include <linux/slab.h>
 #include <net/sock.h>
 #include <net/af_ieee802154.h>
 #include <net/ieee802154.h>
diff --git a/net/ieee802154/netlink.c b/net/ieee802154/netlink.c
index 33137b99e471..c8097ae2482f 100644
--- a/net/ieee802154/netlink.c
+++ b/net/ieee802154/netlink.c
@@ -23,6 +23,7 @@
  */
 
 #include <linux/kernel.h>
+#include <linux/gfp.h>
 #include <net/genetlink.h>
 #include <linux/nl802154.h>
 
diff --git a/net/ieee802154/nl-mac.c b/net/ieee802154/nl-mac.c
index 135c1678fb11..71ee1108d4f8 100644
--- a/net/ieee802154/nl-mac.c
+++ b/net/ieee802154/nl-mac.c
@@ -22,6 +22,7 @@
  * Maxim Osipov <maxim.osipov@siemens.com>
  */
 
+#include <linux/gfp.h>
 #include <linux/kernel.h>
 #include <linux/if_arp.h>
 #include <linux/netdevice.h>
diff --git a/net/ieee802154/nl-phy.c b/net/ieee802154/nl-phy.c
index 199a2d9d12f9..ed0eab39f531 100644
--- a/net/ieee802154/nl-phy.c
+++ b/net/ieee802154/nl-phy.c
@@ -23,6 +23,7 @@
  */
 
 #include <linux/kernel.h>
+#include <linux/slab.h>
 #include <net/netlink.h>
 #include <net/genetlink.h>
 #include <net/wpan-phy.h>
diff --git a/net/ieee802154/raw.c b/net/ieee802154/raw.c
index 9c9b85c00033..10970ca85748 100644
--- a/net/ieee802154/raw.c
+++ b/net/ieee802154/raw.c
@@ -25,6 +25,7 @@
 #include <linux/module.h>
 #include <linux/if_arp.h>
 #include <linux/list.h>
+#include <linux/slab.h>
 #include <net/sock.h>
 #include <net/af_ieee802154.h>
 
diff --git a/net/ieee802154/wpan-class.c b/net/ieee802154/wpan-class.c
index 268691256a6d..3d803a1b9fb6 100644
--- a/net/ieee802154/wpan-class.c
+++ b/net/ieee802154/wpan-class.c
@@ -16,6 +16,7 @@
  *
  */
 
+#include <linux/slab.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/device.h>
diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
index 33b7dffa7732..2ed85714540f 100644
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -86,6 +86,7 @@
 #include <linux/poll.h>
 #include <linux/netfilter_ipv4.h>
 #include <linux/random.h>
+#include <linux/slab.h>
 
 #include <asm/uaccess.h>
 #include <asm/system.h>
diff --git a/net/ipv4/ah4.c b/net/ipv4/ah4.c
index 987b47dc69ad..880a5ec6dce0 100644
--- a/net/ipv4/ah4.c
+++ b/net/ipv4/ah4.c
@@ -1,6 +1,7 @@
 #include <crypto/hash.h>
 #include <linux/err.h>
 #include <linux/module.h>
+#include <linux/slab.h>
 #include <net/ip.h>
 #include <net/xfrm.h>
 #include <net/ah.h>
diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c
index c4dd13542802..6e747065c202 100644
--- a/net/ipv4/arp.c
+++ b/net/ipv4/arp.c
@@ -98,6 +98,7 @@
 #include <linux/net.h>
 #include <linux/rcupdate.h>
 #include <linux/jhash.h>
+#include <linux/slab.h>
 #ifdef CONFIG_SYSCTL
 #include <linux/sysctl.h>
 #endif
diff --git a/net/ipv4/cipso_ipv4.c b/net/ipv4/cip