shill: Removes unnecessary header files.
Also, adds DISALLOW_COPY_AND_ASSIGN where it was missing, before.
BUG=None.
TEST=unittest.
Change-Id: I44f3f0c7c8ab080c62c03418bc93bbf1bc099dcd
Reviewed-on: https://gerrit.chromium.org/gerrit/44845
Commit-Queue: Wade Guthrie <wdg@chromium.org>
Reviewed-by: Wade Guthrie <wdg@chromium.org>
Tested-by: Wade Guthrie <wdg@chromium.org>
diff --git a/callback80211_metrics.cc b/callback80211_metrics.cc
index 087bfcf..01369c5 100644
--- a/callback80211_metrics.cc
+++ b/callback80211_metrics.cc
@@ -6,7 +6,6 @@
#include "shill/config80211.h"
#include "shill/ieee80211.h"
-#include "shill/link_monitor.h"
#include "shill/logging.h"
#include "shill/metrics.h"
#include "shill/nl80211_message.h"
diff --git a/callback80211_metrics.h b/callback80211_metrics.h
index 69cb382..a3a54be 100644
--- a/callback80211_metrics.h
+++ b/callback80211_metrics.h
@@ -5,8 +5,8 @@
// This class is a callback object that observes all nl80211 events that come
// up from the kernel.
-#ifndef SHILL_CALLBACK80211_METRICS_H
-#define SHILL_CALLBACK80211_METRICS_H
+#ifndef SHILL_CALLBACK80211_METRICS_H_
+#define SHILL_CALLBACK80211_METRICS_H_
#include <base/basictypes.h>
#include <base/memory/weak_ptr.h>
@@ -46,4 +46,4 @@
} // namespace shill
-#endif // SHILL_CALLBACK80211_METRICS_H
+#endif // SHILL_CALLBACK80211_METRICS_H_
diff --git a/config80211.cc b/config80211.cc
index fb58cb4..57daffc 100644
--- a/config80211.cc
+++ b/config80211.cc
@@ -4,20 +4,17 @@
#include "shill/config80211.h"
-#include <ctype.h>
-#include <netlink/msg.h>
+#include <netlink/netlink.h>
#include <sys/select.h>
#include <sys/time.h>
-
#include <map>
-#include <sstream>
-#include <string>
#include <base/memory/weak_ptr.h>
#include <base/stl_util.h>
#include "shill/attribute_list.h"
#include "shill/error.h"
+#include "shill/event_dispatcher.h"
#include "shill/io_handler.h"
#include "shill/logging.h"
#include "shill/netlink_socket.h"
@@ -164,6 +161,10 @@
Bind(&Config80211::OnReadError, weak_ptr_factory_.GetWeakPtr())));
}
+int Config80211::file_descriptor() const {
+ return (sock_ ? sock_->file_descriptor() : -1);
+}
+
uint16_t Config80211::GetFamily(string name) {
MessageType &message_type = message_types_[name];
if (message_type.family_id != NetlinkMessage::kIllegalMessageType) {
diff --git a/config80211.h b/config80211.h
index 2882f52..cb2e9fa 100644
--- a/config80211.h
+++ b/config80211.h
@@ -61,7 +61,6 @@
#include <gtest/gtest_prod.h> // for FRIEND_TEST
-#include <iomanip>
#include <list>
#include <map>
#include <set>
@@ -71,15 +70,16 @@
#include <base/bind.h>
#include <base/lazy_instance.h>
-#include "shill/event_dispatcher.h"
-#include "shill/io_handler.h"
-#include "shill/netlink_socket.h"
+struct nlmsghdr;
namespace shill {
class Error;
+class EventDispatcher;
struct InputData;
+class IOHandler;
class NetlinkMessage;
+class NetlinkSocket;
// Config80211 is a singleton that coordinates sending netlink messages to,
// and receiving netlink messages from, the kernel. The first use of this is
@@ -201,9 +201,7 @@
static const long kMaximumNewFamilyWaitMicroSeconds;
// Returns the file descriptor of socket used to read wifi data.
- int file_descriptor() const {
- return (sock_ ? sock_->file_descriptor() : -1);
- }
+ int file_descriptor() const;
// EventDispatcher calls this when data is available on our socket. This
// method passes each, individual, message in the input to
diff --git a/config80211_unittest.cc b/config80211_unittest.cc
index 8d4fefe..0c8a4ec 100644
--- a/config80211_unittest.cc
+++ b/config80211_unittest.cc
@@ -11,31 +11,23 @@
#include "shill/config80211.h"
-#include <net/if.h>
-#include <netlink/attr.h>
-#include <netlink/genl/genl.h>
-#include <netlink/msg.h>
#include <netlink/netlink.h>
-#include <list>
#include <string>
#include <vector>
-#include <base/bind.h>
#include <base/stl_util.h>
#include <gmock/gmock.h>
#include <gtest/gtest.h>
#include "shill/mock_netlink_socket.h"
-#include "shill/netlink_socket.h"
-#include "shill/nl80211_attribute.h"
+#include "shill/netlink_attribute.h"
#include "shill/nl80211_message.h"
#include "shill/refptr_types.h"
using base::Bind;
using base::Unretained;
using base::WeakPtr;
-using std::list;
using std::string;
using std::vector;
using testing::_;
diff --git a/control_netlink_attribute.cc b/control_netlink_attribute.cc
index 2003880..31bdb37 100644
--- a/control_netlink_attribute.cc
+++ b/control_netlink_attribute.cc
@@ -7,7 +7,6 @@
#include <netlink/attr.h>
#include "shill/logging.h"
-#include "shill/scope_logger.h"
namespace shill {
diff --git a/control_netlink_attribute.h b/control_netlink_attribute.h
index 83cd7ee..f465deb 100644
--- a/control_netlink_attribute.h
+++ b/control_netlink_attribute.h
@@ -5,7 +5,7 @@
#ifndef SHILL_CONTROL_NETLINK_ATTRIBUTE_H_
#define SHILL_CONTROL_NETLINK_ATTRIBUTE_H_
-#include <netlink/attr.h>
+#include <base/basictypes.h>
#include "shill/netlink_attribute.h"
@@ -20,6 +20,9 @@
static const int kName;
static const char kNameString[];
ControlAttributeFamilyId() : NetlinkU16Attribute(kName, kNameString) {}
+
+ private:
+ DISALLOW_COPY_AND_ASSIGN(ControlAttributeFamilyId);
};
class ControlAttributeFamilyName : public NetlinkStringAttribute {
@@ -27,6 +30,9 @@
static const int kName;
static const char kNameString[];
ControlAttributeFamilyName() : NetlinkStringAttribute(kName, kNameString) {}
+
+ private:
+ DISALLOW_COPY_AND_ASSIGN(ControlAttributeFamilyName);
};
class ControlAttributeVersion : public NetlinkU32Attribute {
@@ -34,6 +40,9 @@
static const int kName;
static const char kNameString[];
ControlAttributeVersion() : NetlinkU32Attribute(kName, kNameString) {}
+
+ private:
+ DISALLOW_COPY_AND_ASSIGN(ControlAttributeVersion);
};
class ControlAttributeHdrSize : public NetlinkU32Attribute {
@@ -41,6 +50,9 @@
static const int kName;
static const char kNameString[];
ControlAttributeHdrSize() : NetlinkU32Attribute(kName, kNameString) {}
+
+ private:
+ DISALLOW_COPY_AND_ASSIGN(ControlAttributeHdrSize);
};
class ControlAttributeMaxAttr : public NetlinkU32Attribute {
@@ -48,6 +60,9 @@
static const int kName;
static const char kNameString[];
ControlAttributeMaxAttr() : NetlinkU32Attribute(kName, kNameString) {}
+
+ private:
+ DISALLOW_COPY_AND_ASSIGN(ControlAttributeMaxAttr);
};
class ControlAttributeAttrOps : public NetlinkNestedAttribute {
@@ -56,6 +71,9 @@
static const char kNameString[];
ControlAttributeAttrOps();
virtual bool InitFromNlAttr(const nlattr *data);
+
+ private:
+ DISALLOW_COPY_AND_ASSIGN(ControlAttributeAttrOps);
};
class ControlAttributeMcastGroups : public NetlinkNestedAttribute {
@@ -64,6 +82,9 @@
static const char kNameString[];
ControlAttributeMcastGroups();
virtual bool InitFromNlAttr(const nlattr *data);
+
+ private:
+ DISALLOW_COPY_AND_ASSIGN(ControlAttributeMcastGroups);
};
} // namespace shill
diff --git a/mock_netlink_socket.h b/mock_netlink_socket.h
index 5cf30c6..ceeb888 100644
--- a/mock_netlink_socket.h
+++ b/mock_netlink_socket.h
@@ -5,16 +5,13 @@
#ifndef SHILL_MOCK_NETLINK_SOCKET_H_
#define SHILL_MOCK_NETLINK_SOCKET_H_
-#include <netlink/attr.h>
-#include <netlink/netlink.h>
-#include <string>
+#include <base/basictypes.h>
#include <gmock/gmock.h>
#include "shill/netlink_socket.h"
-
namespace shill {
class ByteString;
diff --git a/netlink_attribute.cc b/netlink_attribute.cc
index 4235c5d..3e4cc54 100644
--- a/netlink_attribute.cc
+++ b/netlink_attribute.cc
@@ -15,7 +15,6 @@
#include "shill/control_netlink_attribute.h"
#include "shill/logging.h"
#include "shill/nl80211_attribute.h"
-#include "shill/scope_logger.h"
using std::string;
diff --git a/netlink_attribute.h b/netlink_attribute.h
index 3dbfa7e..1c87a8b 100644
--- a/netlink_attribute.h
+++ b/netlink_attribute.h
@@ -9,7 +9,7 @@
#include <string>
-#include <base/memory/weak_ptr.h>
+#include <base/basictypes.h>
#include "shill/attribute_list.h"
#include "shill/byte_string.h"
@@ -144,6 +144,8 @@
std::string id_string_;
Type datatype_;
const char *datatype_string_;
+
+ DISALLOW_COPY_AND_ASSIGN(NetlinkAttribute);
};
class NetlinkU8Attribute : public NetlinkAttribute {
@@ -160,6 +162,8 @@
private:
uint8_t value_;
+
+ DISALLOW_COPY_AND_ASSIGN(NetlinkU8Attribute);
};
class NetlinkU16Attribute : public NetlinkAttribute {
@@ -176,6 +180,8 @@
private:
uint16_t value_;
+
+ DISALLOW_COPY_AND_ASSIGN(NetlinkU16Attribute);
};
class NetlinkU32Attribute : public NetlinkAttribute {
@@ -192,6 +198,8 @@
private:
uint32_t value_;
+
+ DISALLOW_COPY_AND_ASSIGN(NetlinkU32Attribute);
};
class NetlinkU64Attribute : public NetlinkAttribute {
@@ -208,6 +216,8 @@
private:
uint64_t value_;
+
+ DISALLOW_COPY_AND_ASSIGN(NetlinkU64Attribute);
};
class NetlinkFlagAttribute : public NetlinkAttribute {
@@ -224,6 +234,8 @@
private:
bool value_;
+
+ DISALLOW_COPY_AND_ASSIGN(NetlinkFlagAttribute);
};
class NetlinkStringAttribute : public NetlinkAttribute {
@@ -240,6 +252,8 @@
private:
std::string value_;
+
+ DISALLOW_COPY_AND_ASSIGN(NetlinkStringAttribute);
};
class NetlinkNestedAttribute : public NetlinkAttribute {
@@ -311,6 +325,9 @@
const nlattr &attr,
const NestedData &nested_data);
AttributeListRefPtr value_;
+
+ private:
+ DISALLOW_COPY_AND_ASSIGN(NetlinkNestedAttribute);
};
class NetlinkRawAttribute : public NetlinkAttribute {
@@ -326,6 +343,9 @@
virtual bool SetRawValue(const ByteString value);
virtual bool ToString(std::string *value) const;
virtual ByteString Encode() const;
+
+ private:
+ DISALLOW_COPY_AND_ASSIGN(NetlinkRawAttribute);
};
class NetlinkAttributeGeneric : public NetlinkRawAttribute {
@@ -335,6 +355,8 @@
private:
std::string id_string_;
+
+ DISALLOW_COPY_AND_ASSIGN(NetlinkAttributeGeneric);
};
} // namespace shill
diff --git a/netlink_socket.cc b/netlink_socket.cc
index 2d7429b..50790f6 100644
--- a/netlink_socket.cc
+++ b/netlink_socket.cc
@@ -4,34 +4,13 @@
#include "shill/netlink_socket.h"
-#include <ctype.h>
-#include <errno.h>
-#include <string.h>
-
-#include <arpa/inet.h>
#include <linux/if_packet.h>
-#include <net/if.h>
-#include <netlink/attr.h>
-#include <netlink/genl/ctrl.h>
-#include <netlink/genl/family.h>
-#include <netlink/genl/genl.h>
-#include <netlink/msg.h>
-#include <netlink/netlink.h>
#include <sys/socket.h>
-#include <iomanip>
-#include <string>
-
-#include <base/logging.h>
-#include <base/stringprintf.h>
-
#include "shill/logging.h"
#include "shill/nl80211_message.h"
#include "shill/sockets.h"
-using base::StringAppendF;
-using std::string;
-
// This is from a version of linux/socket.h that we don't have.
#define SOL_NETLINK 270
diff --git a/netlink_socket.h b/netlink_socket.h
index 502a7cb..e15245c 100644
--- a/netlink_socket.h
+++ b/netlink_socket.h
@@ -25,22 +25,14 @@
#ifndef SHILL_NETLINK_SOCKET_H_
#define SHILL_NETLINK_SOCKET_H_
-#include <iomanip>
-#include <string>
-
-#include <asm/types.h>
-#include <linux/nl80211.h>
-#include <netlink/handlers.h>
-#include <netlink/netlink.h>
-
#include <base/basictypes.h>
#include <base/bind.h>
#include <base/logging.h>
+#include <base/memory/scoped_ptr.h>
#include <gtest/gtest_prod.h> // for FRIEND_TEST
namespace shill {
-class Nl80211Message;
class Sockets;
class ByteString;
diff --git a/nl80211_attribute.cc b/nl80211_attribute.cc
index 1216039..8ff93fa 100644
--- a/nl80211_attribute.cc
+++ b/nl80211_attribute.cc
@@ -4,26 +4,9 @@
#include "shill/nl80211_attribute.h"
-#include <ctype.h>
-#include <linux/nl80211.h>
#include <netlink/attr.h>
-#include <netlink/netlink.h>
-#include <iomanip>
-#include <string>
-
-#include <base/format_macros.h>
-#include <base/stl_util.h>
-#include <base/stringprintf.h>
-
-#include "shill/attribute_list.h"
#include "shill/logging.h"
-#include "shill/scope_logger.h"
-
-using std::string;
-
-using base::StringAppendF;
-using base::StringPrintf;
namespace shill {
diff --git a/nl80211_attribute.h b/nl80211_attribute.h
index 9cc197e..92864a7 100644
--- a/nl80211_attribute.h
+++ b/nl80211_attribute.h
@@ -7,8 +7,9 @@
#include <netlink/attr.h>
+#include <base/basictypes.h>
+
#include "shill/netlink_attribute.h"
-#include "shill/refptr_types.h"
struct nlattr;
@@ -21,6 +22,9 @@
static const int kName;
static const char kNameString[];
Nl80211AttributeKeyIdx() : NetlinkU8Attribute(kName, kNameString) {}
+
+ private:
+ DISALLOW_COPY_AND_ASSIGN(Nl80211AttributeKeyIdx);
};
class Nl80211AttributeRegType : public NetlinkU8Attribute {
@@ -28,6 +32,9 @@
static const int kName;
static const char kNameString[];
Nl80211AttributeRegType() : NetlinkU8Attribute(kName, kNameString) {}
+
+ private:
+ DISALLOW_COPY_AND_ASSIGN(Nl80211AttributeRegType);
};
// U16.
@@ -37,6 +44,9 @@
static const int kName;
static const char kNameString[];
Nl80211AttributeReasonCode() : NetlinkU16Attribute(kName, kNameString) {}
+
+ private:
+ DISALLOW_COPY_AND_ASSIGN(Nl80211AttributeReasonCode);
};
class Nl80211AttributeStatusCode : public NetlinkU16Attribute {
@@ -44,6 +54,9 @@
static const int kName;
static const char kNameString[];
Nl80211AttributeStatusCode() : NetlinkU16Attribute(kName, kNameString) {}
+
+ private:
+ DISALLOW_COPY_AND_ASSIGN(Nl80211AttributeStatusCode);
};
// U32.
@@ -53,6 +66,9 @@
static const int kName;
static const char kNameString[];
Nl80211AttributeDuration() : NetlinkU32Attribute(kName, kNameString) {}
+
+ private:
+ DISALLOW_COPY_AND_ASSIGN(Nl80211AttributeDuration);
};
class Nl80211AttributeGeneration : public NetlinkU32Attribute {
@@ -60,6 +76,9 @@
static const int kName;
static const char kNameString[];
Nl80211AttributeGeneration() : NetlinkU32Attribute(kName, kNameString) {}
+
+ private:
+ DISALLOW_COPY_AND_ASSIGN(Nl80211AttributeGeneration);
};
class Nl80211AttributeIfindex : public NetlinkU32Attribute {
@@ -67,6 +86,9 @@
static const int kName;
static const char kNameString[];
Nl80211AttributeIfindex() : NetlinkU32Attribute(kName, kNameString) {}
+
+ private:
+ DISALLOW_COPY_AND_ASSIGN(Nl80211AttributeIfindex);
};
class Nl80211AttributeKeyType : public NetlinkU32Attribute {
@@ -74,6 +96,9 @@
static const int kName;
static const char kNameString[];
Nl80211AttributeKeyType() : NetlinkU32Attribute(kName, kNameString) {}
+
+ private:
+ DISALLOW_COPY_AND_ASSIGN(Nl80211AttributeKeyType);
};
class Nl80211AttributeRegInitiator : public NetlinkU32Attribute {
@@ -81,6 +106,9 @@
static const int kName;
static const char kNameString[];
Nl80211AttributeRegInitiator() : NetlinkU32Attribute(kName, kNameString) {}
+
+ private:
+ DISALLOW_COPY_AND_ASSIGN(Nl80211AttributeRegInitiator);
};
class Nl80211AttributeWiphy : public NetlinkU32Attribute {
@@ -88,6 +116,9 @@
static const int kName;
static const char kNameString[];
Nl80211AttributeWiphy() : NetlinkU32Attribute(kName, kNameString) {}
+
+ private:
+ DISALLOW_COPY_AND_ASSIGN(Nl80211AttributeWiphy);
};
class Nl80211AttributeWiphyFreq : public NetlinkU32Attribute {
@@ -95,6 +126,9 @@
static const int kName;
static const char kNameString[];
Nl80211AttributeWiphyFreq() : NetlinkU32Attribute(kName, kNameString) {}
+
+ private:
+ DISALLOW_COPY_AND_ASSIGN(Nl80211AttributeWiphyFreq);
};
// U64.
@@ -104,6 +138,9 @@
static const int kName;
static const char kNameString[];
Nl80211AttributeCookie() : NetlinkU64Attribute(kName, kNameString) {}
+
+ private:
+ DISALLOW_COPY_AND_ASSIGN(Nl80211AttributeCookie);
};
// Flag.
@@ -114,6 +151,9 @@
static const char kNameString[];
Nl80211AttributeDisconnectedByAp() :
NetlinkFlagAttribute(kName, kNameString) {}
+
+ private:
+ DISALLOW_COPY_AND_ASSIGN(Nl80211AttributeDisconnectedByAp);
};
class Nl80211AttributeSupportMeshAuth : public NetlinkFlagAttribute {
@@ -122,6 +162,9 @@
static const char kNameString[];
Nl80211AttributeSupportMeshAuth() :
NetlinkFlagAttribute(kName, kNameString) {}
+
+ private:
+ DISALLOW_COPY_AND_ASSIGN(Nl80211AttributeSupportMeshAuth);
};
class Nl80211AttributeTimedOut : public NetlinkFlagAttribute {
@@ -129,6 +172,9 @@
static const int kName;
static const char kNameString[];
Nl80211AttributeTimedOut() : NetlinkFlagAttribute(kName, kNameString) {}
+
+ private:
+ DISALLOW_COPY_AND_ASSIGN(Nl80211AttributeTimedOut);
};
// String.
@@ -138,6 +184,9 @@
static const int kName;
static const char kNameString[];
Nl80211AttributeRegAlpha2() : NetlinkStringAttribute(kName, kNameString) {}
+
+ private:
+ DISALLOW_COPY_AND_ASSIGN(Nl80211AttributeRegAlpha2);
};
class Nl80211AttributeWiphyName : public NetlinkStringAttribute {
@@ -145,6 +194,9 @@
static const int kName;
static const char kNameString[];
Nl80211AttributeWiphyName() : NetlinkStringAttribute(kName, kNameString) {}
+
+ private:
+ DISALLOW_COPY_AND_ASSIGN(Nl80211AttributeWiphyName);
};
// Nested.
@@ -155,6 +207,9 @@
static const char kNameString[];
Nl80211AttributeCqm();
virtual bool InitFromNlAttr(const nlattr *data);
+
+ private:
+ DISALLOW_COPY_AND_ASSIGN(Nl80211AttributeCqm);
};
class Nl80211AttributeScanFrequencies : public NetlinkNestedAttribute {
@@ -163,6 +218,9 @@
static const char kNameString[];
explicit Nl80211AttributeScanFrequencies();
virtual bool InitFromNlAttr(const nlattr *const_data);
+
+ private:
+ DISALLOW_COPY_AND_ASSIGN(Nl80211AttributeScanFrequencies);
};
class Nl80211AttributeScanSsids : public NetlinkNestedAttribute {
@@ -171,6 +229,9 @@
static const char kNameString[];
explicit Nl80211AttributeScanSsids();
virtual bool InitFromNlAttr(const nlattr *const_data);
+
+ private:
+ DISALLOW_COPY_AND_ASSIGN(Nl80211AttributeScanSsids);
};
class Nl80211AttributeStaInfo : public NetlinkNestedAttribute {
@@ -179,6 +240,9 @@
static const char kNameString[];
Nl80211AttributeStaInfo();
virtual bool InitFromNlAttr(const nlattr *const_data);
+
+ private:
+ DISALLOW_COPY_AND_ASSIGN(Nl80211AttributeStaInfo);
};
// Raw.
@@ -188,6 +252,9 @@
static const int kName;
static const char kNameString[];
Nl80211AttributeFrame() : NetlinkRawAttribute(kName, kNameString) {}
+
+ private:
+ DISALLOW_COPY_AND_ASSIGN(Nl80211AttributeFrame);
};
class Nl80211AttributeKeySeq : public NetlinkRawAttribute {
@@ -195,6 +262,9 @@
static const int kName;
static const char kNameString[];
Nl80211AttributeKeySeq() : NetlinkRawAttribute(kName, kNameString) {}
+
+ private:
+ DISALLOW_COPY_AND_ASSIGN(Nl80211AttributeKeySeq);
};
class Nl80211AttributeMac : public NetlinkRawAttribute {
@@ -202,6 +272,9 @@
static const int kName;
static const char kNameString[];
Nl80211AttributeMac() : NetlinkRawAttribute(kName, kNameString) {}
+
+ private:
+ DISALLOW_COPY_AND_ASSIGN(Nl80211AttributeMac);
};
class Nl80211AttributeRespIe : public NetlinkRawAttribute {
@@ -209,6 +282,9 @@
static const int kName;
static const char kNameString[];
Nl80211AttributeRespIe() : NetlinkRawAttribute(kName, kNameString) {}
+
+ private:
+ DISALLOW_COPY_AND_ASSIGN(Nl80211AttributeRespIe);
};
} // namespace shill
diff --git a/nl80211_message.cc b/nl80211_message.cc
index 99646f3..d990a76 100644
--- a/nl80211_message.cc
+++ b/nl80211_message.cc
@@ -24,35 +24,25 @@
#include "shill/nl80211_message.h"
-#include <ctype.h>
-#include <endian.h>
-#include <errno.h>
#include <limits.h>
-#include <linux/nl80211.h>
-#include <net/if.h>
-#include <netinet/in.h>
#include <netlink/attr.h>
-#include <netlink/genl/ctrl.h>
-#include <netlink/genl/family.h>
-#include <netlink/genl/genl.h>
#include <netlink/msg.h>
#include <netlink/netlink.h>
#include <algorithm>
-#include <iomanip>
+#include <map>
#include <string>
+#include <vector>
#include <base/bind.h>
#include <base/format_macros.h>
-#include <base/stl_util.h>
#include <base/stringprintf.h>
#include "shill/attribute_list.h"
#include "shill/ieee80211.h"
#include "shill/logging.h"
#include "shill/netlink_attribute.h"
-#include "shill/netlink_socket.h"
-#include "shill/scope_logger.h"
+#include "shill/refptr_types.h"
using base::Bind;
using base::LazyInstance;
diff --git a/nl80211_message.h b/nl80211_message.h
index 6edbdf0..198b467 100644
--- a/nl80211_message.h
+++ b/nl80211_message.h
@@ -2,26 +2,22 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SHILL_USER_BOUND_NLMESSAGE_H_
-#define SHILL_USER_BOUND_NLMESSAGE_H_
+#ifndef SHILL_NL80211_MESSAGE_H_
+#define SHILL_NL80211_MESSAGE_H_
-#include <linux/nl80211.h>
-
-#include <iomanip>
#include <map>
#include <string>
#include <vector>
#include <base/basictypes.h>
-#include <base/bind.h>
#include <base/lazy_instance.h>
-#include <gtest/gtest.h>
+
+#include <gtest/gtest.h> // for FRIEND_TEST.
#include "shill/attribute_list.h"
#include "shill/byte_string.h"
#include "shill/refptr_types.h"
-struct nlattr;
struct nlmsghdr;
namespace shill {
@@ -761,4 +757,4 @@
} // namespace shill
-#endif // SHILL_USER_BOUND_NLMESSAGE_H_
+#endif // SHILL_NL80211_MESSAGE_H_