shill: Sort headers alphabetically (build/include_alpha)
We are going to enable build/include_alpha linter warning soon,
so in preparation for this, fixed the warnings in shill.
BUG=None
TEST=cpplint.py --filter=-build/include_order,+build/include_alpha shill/*
Change-Id: I113ed7f9dd3f465a3f660599320cdb434e7cc214
Reviewed-on: https://chromium-review.googlesource.com/209636
Tested-by: Alex Vakulenko <avakulenko@chromium.org>
Reviewed-by: Ben Chan <benchan@chromium.org>
Commit-Queue: Alex Vakulenko <avakulenko@chromium.org>
diff --git a/accessor_interface.h b/accessor_interface.h
index 82eb3d9..e81c7ec 100644
--- a/accessor_interface.h
+++ b/accessor_interface.h
@@ -6,8 +6,8 @@
#define SHILL_ACCESSOR_INTERFACE_H_
#include <map>
-#include <string>
#include <memory>
+#include <string>
#include <utility>
#include <vector>
diff --git a/attribute_list.h b/attribute_list.h
index 88f9cec..b91dce9 100644
--- a/attribute_list.h
+++ b/attribute_list.h
@@ -9,8 +9,8 @@
#include <netlink/netlink.h>
#include <map>
-#include <string>
#include <memory>
+#include <string>
#include <base/bind.h>
diff --git a/cellular.cc b/cellular.cc
index 89d3f7b..9a0fbec 100644
--- a/cellular.cc
+++ b/cellular.cc
@@ -5,7 +5,7 @@
#include "shill/cellular.h"
#include <netinet/in.h>
-#include <linux/if.h> // Needs definitions from netinet/in.h
+#include <linux/if.h> // NOLINT - Needs definitions from netinet/in.h
#include <string>
#include <utility>
diff --git a/cellular_bearer.cc b/cellular_bearer.cc
index 80a1ba8..b4d0546 100644
--- a/cellular_bearer.cc
+++ b/cellular_bearer.cc
@@ -5,6 +5,7 @@
#include "shill/cellular_bearer.h"
#include <ModemManager/ModemManager.h>
+
#include <base/bind.h>
#include "shill/dbus_properties.h"
diff --git a/cellular_capability_universal.cc b/cellular_capability_universal.cc
index 6726bd8..f6ac212 100644
--- a/cellular_capability_universal.cc
+++ b/cellular_capability_universal.cc
@@ -6,8 +6,8 @@
#include <base/bind.h>
#include <base/stl_util.h>
-#include <base/strings/stringprintf.h>
#include <base/strings/string_util.h>
+#include <base/strings/stringprintf.h>
#include <chromeos/dbus/service_constants.h>
#include <ModemManager/ModemManager.h>
diff --git a/cellular_capability_universal_cdma.cc b/cellular_capability_universal_cdma.cc
index dd925f3..7b9a4bd 100644
--- a/cellular_capability_universal_cdma.cc
+++ b/cellular_capability_universal_cdma.cc
@@ -4,10 +4,10 @@
#include "shill/cellular_capability_universal_cdma.h"
-#include <chromeos/dbus/service_constants.h>
-#include <base/strings/stringprintf.h>
#include <base/strings/string_number_conversions.h>
#include <base/strings/string_util.h>
+#include <base/strings/stringprintf.h>
+#include <chromeos/dbus/service_constants.h>
#include "shill/cellular_bearer.h"
#include "shill/cellular_service.h"
diff --git a/cellular_capability_universal_cdma.h b/cellular_capability_universal_cdma.h
index b0badb1..e2973d4 100644
--- a/cellular_capability_universal_cdma.h
+++ b/cellular_capability_universal_cdma.h
@@ -5,8 +5,8 @@
#ifndef SHILL_CELLULAR_CAPABILITY_UNIVERSAL_CDMA_H_
#define SHILL_CELLULAR_CAPABILITY_UNIVERSAL_CDMA_H_
-#include "shill/cellular_capability_universal.h"
#include "shill/cellular.h"
+#include "shill/cellular_capability_universal.h"
#include "shill/mm1_modem_modemcdma_proxy_interface.h"
#include <base/memory/weak_ptr.h>
diff --git a/cellular_unittest.cc b/cellular_unittest.cc
index 8682e9f..9a1b0bc 100644
--- a/cellular_unittest.cc
+++ b/cellular_unittest.cc
@@ -5,8 +5,8 @@
#include "shill/cellular.h"
#include <sys/socket.h>
-#include <linux/if.h>
-#include <linux/netlink.h> // Needs typedefs from sys/socket.h.
+#include <linux/if.h> // NOLINT - Needs typedefs from sys/socket.h.
+#include <linux/netlink.h>
#include <base/bind.h>
#include <chromeos/dbus/service_constants.h>
diff --git a/connection_health_checker.cc b/connection_health_checker.cc
index d721326..3d78097 100644
--- a/connection_health_checker.cc
+++ b/connection_health_checker.cc
@@ -24,9 +24,9 @@
#include "shill/ip_address.h"
#include "shill/ip_address_store.h"
#include "shill/logging.h"
-#include "shill/sockets.h"
#include "shill/socket_info.h"
#include "shill/socket_info_reader.h"
+#include "shill/sockets.h"
using base::Bind;
using base::Unretained;
diff --git a/connection_health_checker.h b/connection_health_checker.h
index 7e2e9a8..0ca2685 100644
--- a/connection_health_checker.h
+++ b/connection_health_checker.h
@@ -17,8 +17,8 @@
#include <gtest/gtest_prod.h>
#include "shill/refptr_types.h"
-#include "shill/sockets.h"
#include "shill/socket_info.h"
+#include "shill/sockets.h"
namespace shill {
diff --git a/connection_health_checker_unittest.cc b/connection_health_checker_unittest.cc
index e31aaa3..84c650d 100644
--- a/connection_health_checker_unittest.cc
+++ b/connection_health_checker_unittest.cc
@@ -18,13 +18,13 @@
#include "shill/mock_async_connection.h"
#include "shill/mock_connection.h"
#include "shill/mock_control.h"
+#include "shill/mock_device_info.h"
#include "shill/mock_dns_client.h"
#include "shill/mock_dns_client_factory.h"
-#include "shill/mock_device_info.h"
#include "shill/mock_event_dispatcher.h"
#include "shill/mock_ip_address_store.h"
-#include "shill/mock_sockets.h"
#include "shill/mock_socket_info_reader.h"
+#include "shill/mock_sockets.h"
using base::Bind;
using base::Callback;
diff --git a/crypto_util_proxy_unittest.cc b/crypto_util_proxy_unittest.cc
index 73de962..7840c80 100644
--- a/crypto_util_proxy_unittest.cc
+++ b/crypto_util_proxy_unittest.cc
@@ -14,8 +14,8 @@
#include "shill/minijail.h"
#include "shill/mock_crypto_util_proxy.h"
#include "shill/mock_event_dispatcher.h"
-#include "shill/mock_glib.h"
#include "shill/mock_file_io.h"
+#include "shill/mock_glib.h"
#include "shill/mock_minijail.h"
#include "shill/mock_process_killer.h"
diff --git a/dbus_properties_proxy.h b/dbus_properties_proxy.h
index 63efc6c..4502c95 100644
--- a/dbus_properties_proxy.h
+++ b/dbus_properties_proxy.h
@@ -10,8 +10,8 @@
#include <base/basictypes.h>
-#include "shill/dbus_proxies/dbus-properties.h"
#include "shill/dbus_properties_proxy_interface.h"
+#include "shill/dbus_proxies/dbus-properties.h"
namespace shill {
diff --git a/default_profile_unittest.cc b/default_profile_unittest.cc
index 90d6191..bbdd70a 100644
--- a/default_profile_unittest.cc
+++ b/default_profile_unittest.cc
@@ -13,8 +13,8 @@
#include <gtest/gtest.h>
#include <gmock/gmock.h>
-#include "shill/key_file_store.h"
#include "shill/glib.h"
+#include "shill/key_file_store.h"
#include "shill/link_monitor.h"
#include "shill/manager.h"
#include "shill/mock_control.h"
diff --git a/device.cc b/device.cc
index f47c65b..d0bc19b 100644
--- a/device.cc
+++ b/device.cc
@@ -5,7 +5,7 @@
#include "shill/device.h"
#include <netinet/in.h>
-#include <linux/if.h> // Needs definitions from netinet/in.h
+#include <linux/if.h> // NOLINT - Needs definitions from netinet/in.h
#include <stdio.h>
#include <time.h>
diff --git a/device_unittest.cc b/device_unittest.cc
index 4029fda..65df677 100644
--- a/device_unittest.cc
+++ b/device_unittest.cc
@@ -6,7 +6,7 @@
#include <ctype.h>
#include <sys/socket.h>
-#include <linux/if.h> // Needs typedefs from sys/socket.h.
+#include <linux/if.h> // NOLINT - Needs typedefs from sys/socket.h.
#include <map>
#include <string>
diff --git a/dhcp_config.cc b/dhcp_config.cc
index 62b4062..ea9fb59 100644
--- a/dhcp_config.cc
+++ b/dhcp_config.cc
@@ -15,14 +15,14 @@
#include <base/strings/stringprintf.h>
#include <chromeos/dbus/service_constants.h>
-#include "shill/dhcpcd_proxy.h"
#include "shill/dhcp_provider.h"
+#include "shill/dhcpcd_proxy.h"
#include "shill/event_dispatcher.h"
#include "shill/glib.h"
#include "shill/ip_address.h"
#include "shill/logging.h"
-#include "shill/minijail.h"
#include "shill/metrics.h"
+#include "shill/minijail.h"
#include "shill/proxy_factory.h"
using std::string;
diff --git a/dns_client.cc b/dns_client.cc
index aabe651..06a401a 100644
--- a/dns_client.cc
+++ b/dns_client.cc
@@ -10,9 +10,9 @@
#include <sys/socket.h>
#include <map>
+#include <memory>
#include <set>
#include <string>
-#include <memory>
#include <vector>
#include <base/bind.h>
diff --git a/dns_server_tester_unittest.cc b/dns_server_tester_unittest.cc
index 9681e12..9c6eb3a 100644
--- a/dns_server_tester_unittest.cc
+++ b/dns_server_tester_unittest.cc
@@ -14,9 +14,9 @@
#include "shill/mock_connection.h"
#include "shill/mock_control.h"
#include "shill/mock_device_info.h"
-#include "shill/mock_event_dispatcher.h"
#include "shill/mock_dns_client.h"
#include "shill/mock_dns_client_factory.h"
+#include "shill/mock_event_dispatcher.h"
#include "shill/mock_time.h"
using base::Bind;
diff --git a/eap_credentials.cc b/eap_credentials.cc
index 4e0f4c9..d0c7abe 100644
--- a/eap_credentials.cc
+++ b/eap_credentials.cc
@@ -12,8 +12,8 @@
#include <chromeos/dbus/service_constants.h>
#include "shill/certificate_file.h"
-#include "shill/logging.h"
#include "shill/key_value_store.h"
+#include "shill/logging.h"
#include "shill/metrics.h"
#include "shill/property_accessor.h"
#include "shill/property_store.h"
diff --git a/eap_listener.cc b/eap_listener.cc
index c04194f..d7615fe 100644
--- a/eap_listener.cc
+++ b/eap_listener.cc
@@ -8,8 +8,8 @@
#include <linux/if_packet.h>
#include <netinet/in.h>
-#include <base/compiler_specific.h>
#include <base/bind.h>
+#include <base/compiler_specific.h>
#include "shill/eap_protocol.h"
#include "shill/event_dispatcher.h"
diff --git a/ethernet.cc b/ethernet.cc
index ac6ce29..4c1d8a0 100644
--- a/ethernet.cc
+++ b/ethernet.cc
@@ -7,7 +7,7 @@
#include <linux/ethtool.h>
#include <netinet/ether.h>
#include <netinet/in.h>
-#include <linux/if.h> // Needs definitions from netinet/ether.h
+#include <linux/if.h> // NOLINT - Needs definitions from netinet/ether.h
#include <linux/sockios.h>
#include <stdio.h>
#include <string.h>
diff --git a/ethernet.h b/ethernet.h
index 9bb2bc9..8eaafbb 100644
--- a/ethernet.h
+++ b/ethernet.h
@@ -14,9 +14,9 @@
#include "shill/certificate_file.h"
#include "shill/device.h"
-#include "shill/supplicant_eap_state_handler.h"
#include "shill/event_dispatcher.h"
#include "shill/refptr_types.h"
+#include "shill/supplicant_eap_state_handler.h"
#include "shill/supplicant_event_delegate_interface.h"
namespace shill {
diff --git a/ethernet_service.cc b/ethernet_service.cc
index 242710f..b2091f9 100644
--- a/ethernet_service.cc
+++ b/ethernet_service.cc
@@ -4,10 +4,10 @@
#include "shill/ethernet_service.h"
-#include <time.h>
-#include <stdio.h>
#include <netinet/ether.h>
-#include <linux/if.h>
+#include <linux/if.h> // NOLINT - Needs definitions from netinet/ether.h
+#include <stdio.h>
+#include <time.h>
#include <string>
diff --git a/ethernet_unittest.cc b/ethernet_unittest.cc
index 2e9b136..e999ec1 100644
--- a/ethernet_unittest.cc
+++ b/ethernet_unittest.cc
@@ -5,7 +5,7 @@
#include "shill/ethernet.h"
#include <netinet/ether.h>
-#include <linux/if.h> // Needs definitions from netinet/ether.h
+#include <linux/if.h> // NOLINT - Needs definitions from netinet/ether.h
#include <linux/sockios.h>
#include <base/memory/ref_counted.h>
@@ -16,9 +16,9 @@
#include "shill/mock_dhcp_provider.h"
#include "shill/mock_eap_credentials.h"
#include "shill/mock_eap_listener.h"
-#include "shill/mock_event_dispatcher.h"
#include "shill/mock_ethernet_eap_provider.h"
#include "shill/mock_ethernet_service.h"
+#include "shill/mock_event_dispatcher.h"
#include "shill/mock_glib.h"
#include "shill/mock_log.h"
#include "shill/mock_manager.h"
diff --git a/event_dispatcher.cc b/event_dispatcher.cc
index bdbb490..f7b4076 100644
--- a/event_dispatcher.cc
+++ b/event_dispatcher.cc
@@ -4,8 +4,8 @@
#include "shill/event_dispatcher.h"
-#include <stdio.h>
#include <glib.h>
+#include <stdio.h>
#include <base/callback.h>
#include <base/location.h>
diff --git a/external_task_unittest.cc b/external_task_unittest.cc
index e973e86..208b39a 100644
--- a/external_task_unittest.cc
+++ b/external_task_unittest.cc
@@ -17,10 +17,10 @@
#include <gtest/gtest.h>
#include "shill/event_dispatcher.h"
-#include "shill/nice_mock_control.h"
#include "shill/mock_adaptors.h"
#include "shill/mock_glib.h"
#include "shill/mock_process_killer.h"
+#include "shill/nice_mock_control.h"
using std::map;
using std::set;
diff --git a/glib_io_input_handler.cc b/glib_io_input_handler.cc
index f8c678e..6e12d36 100644
--- a/glib_io_input_handler.cc
+++ b/glib_io_input_handler.cc
@@ -5,9 +5,9 @@
#include "shill/glib_io_input_handler.h"
#include <errno.h>
+#include <glib.h>
#include <stdio.h>
#include <string.h>
-#include <glib.h>
#include <string>
#include <vector>
diff --git a/glib_io_input_handler.h b/glib_io_input_handler.h
index 7fca2c7..f8787e8 100644
--- a/glib_io_input_handler.h
+++ b/glib_io_input_handler.h
@@ -5,8 +5,8 @@
#ifndef SHILL_GLIB_IO_INPUT_HANDLER_H_
#define SHILL_GLIB_IO_INPUT_HANDLER_H_
-#include <stdio.h>
#include <glib.h>
+#include <stdio.h>
#include <base/callback.h>
diff --git a/glib_io_ready_handler.h b/glib_io_ready_handler.h
index 9836085..d18e73b 100644
--- a/glib_io_ready_handler.h
+++ b/glib_io_ready_handler.h
@@ -5,8 +5,8 @@
#ifndef SHILL_GLIB_IO_READY_HANDLER_H_
#define SHILL_GLIB_IO_READY_HANDLER_H_
-#include <stdio.h>
#include <glib.h>
+#include <stdio.h>
#include <base/callback.h>
diff --git a/http_proxy.cc b/http_proxy.cc
index 2eda85e..8f9aad3 100644
--- a/http_proxy.cc
+++ b/http_proxy.cc
@@ -6,7 +6,7 @@
#include <errno.h>
#include <netinet/in.h>
-#include <linux/if.h> // Needs definitions from netinet/in.h
+#include <linux/if.h> // NOLINT - Needs definitions from netinet/in.h
#include <stdio.h>
#include <time.h>
diff --git a/http_request_unittest.cc b/http_request_unittest.cc
index 6d822f3..0f9e785 100644
--- a/http_request_unittest.cc
+++ b/http_request_unittest.cc
@@ -13,8 +13,8 @@
#include <base/strings/stringprintf.h>
#include <gtest/gtest.h>
-#include "shill/ip_address.h"
#include "shill/http_url.h"
+#include "shill/ip_address.h"
#include "shill/mock_async_connection.h"
#include "shill/mock_connection.h"
#include "shill/mock_control.h"
diff --git a/l2tp_ipsec_driver_unittest.cc b/l2tp_ipsec_driver_unittest.cc
index 3662510..9aa79b2 100644
--- a/l2tp_ipsec_driver_unittest.cc
+++ b/l2tp_ipsec_driver_unittest.cc
@@ -8,11 +8,10 @@
#include <base/files/scoped_temp_dir.h>
#include <base/memory/weak_ptr.h>
#include <base/strings/string_util.h>
-#include <vpn-manager/service_error.h>
#include <gtest/gtest.h>
+#include <vpn-manager/service_error.h>
#include "shill/event_dispatcher.h"
-#include "shill/nice_mock_control.h"
#include "shill/mock_adaptors.h"
#include "shill/mock_certificate_file.h"
#include "shill/mock_device_info.h"
@@ -23,6 +22,7 @@
#include "shill/mock_ppp_device.h"
#include "shill/mock_ppp_device_factory.h"
#include "shill/mock_vpn_service.h"
+#include "shill/nice_mock_control.h"
using base::FilePath;
using std::find;
diff --git a/link_monitor_unittest.cc b/link_monitor_unittest.cc
index aa364f1..2c34c3a 100644
--- a/link_monitor_unittest.cc
+++ b/link_monitor_unittest.cc
@@ -14,8 +14,8 @@
#include "shill/ip_address.h"
#include "shill/logging.h"
#include "shill/mock_arp_client.h"
-#include "shill/mock_control.h"
#include "shill/mock_connection.h"
+#include "shill/mock_control.h"
#include "shill/mock_device_info.h"
#include "shill/mock_event_dispatcher.h"
#include "shill/mock_log.h"
diff --git a/manager.cc b/manager.cc
index 6faeabe..be41096 100644
--- a/manager.cc
+++ b/manager.cc
@@ -4,8 +4,8 @@
#include "shill/manager.h"
-#include <time.h>
#include <stdio.h>
+#include <time.h>
#include <algorithm>
#include <set>
diff --git a/mobile_operator_info_unittest.cc b/mobile_operator_info_unittest.cc
index 973ff9b..f3726c7 100644
--- a/mobile_operator_info_unittest.cc
+++ b/mobile_operator_info_unittest.cc
@@ -13,11 +13,6 @@
#include <gmock/gmock.h>
#include <gtest/gtest.h>
-#include "shill/event_dispatcher.h"
-#include "shill/logging.h"
-#include "shill/mobile_operator_info.h"
-#include "shill/mobile_operator_info_impl.h"
-
// These files contain binary protobuf definitions used by the following tests
// inside the namespace ::mobile_operator_db
#define IN_MOBILE_OPERATOR_INFO_UNITTEST_CC
@@ -29,6 +24,11 @@
#include "mobile_operator_db/test_protos/main_test.h"
#undef IN_MOBILE_OPERATOR_INFO_UNITTEST_CC
+#include "shill/event_dispatcher.h"
+#include "shill/logging.h"
+#include "shill/mobile_operator_info.h"
+#include "shill/mobile_operator_info_impl.h"
+
using base::FilePath;
using shill::mobile_operator_db::MobileOperatorDB;
using std::map;
diff --git a/mock_dns_client.cc b/mock_dns_client.cc
index 8df8a03..2993800 100644
--- a/mock_dns_client.cc
+++ b/mock_dns_client.cc
@@ -4,8 +4,8 @@
#include "shill/mock_dns_client.h"
-#include <vector>
#include <string>
+#include <vector>
#include "shill/ip_address.h"
diff --git a/mock_dns_server_tester.cc b/mock_dns_server_tester.cc
index daf7ec9..681a2f1 100644
--- a/mock_dns_server_tester.cc
+++ b/mock_dns_server_tester.cc
@@ -4,8 +4,9 @@
#include <string>
#include <vector>
-#include "shill/mock_dns_server_tester.h"
+
#include "shill/connection.h"
+#include "shill/mock_dns_server_tester.h"
namespace shill {
diff --git a/mock_ethernet.h b/mock_ethernet.h
index 3648242..2918547 100644
--- a/mock_ethernet.h
+++ b/mock_ethernet.h
@@ -9,8 +9,8 @@
#include <gmock/gmock.h>
-#include "shill/refptr_types.h"
#include "shill/ethernet.h"
+#include "shill/refptr_types.h"
namespace shill {
diff --git a/modem_manager.h b/modem_manager.h
index e7e1e0b..cebd30c 100644
--- a/modem_manager.h
+++ b/modem_manager.h
@@ -6,8 +6,8 @@
#define SHILL_MODEM_MANAGER_H_
#include <map>
-#include <string>
#include <memory>
+#include <string>
#include <vector>
#include <base/basictypes.h>
diff --git a/power_manager_proxy.cc b/power_manager_proxy.cc
index e5b95c7..816c382 100644
--- a/power_manager_proxy.cc
+++ b/power_manager_proxy.cc
@@ -7,8 +7,8 @@
#include <chromeos/dbus/service_constants.h>
#include <google/protobuf/message_lite.h>
-#include "shill/logging.h"
#include "power_manager/proto_bindings/suspend.pb.h"
+#include "shill/logging.h"
using std::string;
using std::vector;
diff --git a/proxy_factory.cc b/proxy_factory.cc
index 727371b..c202577 100644
--- a/proxy_factory.cc
+++ b/proxy_factory.cc
@@ -15,7 +15,7 @@
#include "shill/supplicant_process_proxy.h"
#if !defined(DISABLE_CELLULAR)
-#include "shill/dbus_objectmanager_proxy.h"
+#include "shill/dbus_objectmanager_proxy.h" // NOLINT(build/include_alpha)
#include "shill/mm1_bearer_proxy.h"
#include "shill/mm1_modem_location_proxy.h"
#include "shill/mm1_modem_modem3gpp_proxy.h"
diff --git a/routing_table.cc b/routing_table.cc
index bef96d7..4568adb 100644
--- a/routing_table.cc
+++ b/routing_table.cc
@@ -9,7 +9,7 @@
#include <linux/netlink.h>
#include <linux/rtnetlink.h>
#include <netinet/ether.h>
-#include <net/if.h>
+#include <net/if.h> // NOLINT - must be included after netinet/ether.h
#include <net/if_arp.h>
#include <string.h>
#include <sys/socket.h>
diff --git a/routing_table_unittest.cc b/routing_table_unittest.cc
index 3abdcd1..950dd34 100644
--- a/routing_table_unittest.cc
+++ b/routing_table_unittest.cc
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include <sys/socket.h>
#include <linux/rtnetlink.h>
+#include <sys/socket.h>
#include <vector>
diff --git a/rpc_task_unittest.cc b/rpc_task_unittest.cc
index 5a98eee..b403e18 100644
--- a/rpc_task_unittest.cc
+++ b/rpc_task_unittest.cc
@@ -6,8 +6,8 @@
#include <gtest/gtest.h>
-#include "shill/nice_mock_control.h"
#include "shill/mock_adaptors.h"
+#include "shill/nice_mock_control.h"
using std::map;
using std::string;
diff --git a/rtnl_handler.cc b/rtnl_handler.cc
index c6780c1..77704f5 100644
--- a/rtnl_handler.cc
+++ b/rtnl_handler.cc
@@ -2,19 +2,19 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <arpa/inet.h>
#include <errno.h>
-#include <time.h>
-#include <unistd.h>
+#include <fcntl.h>
+#include <linux/netlink.h>
+#include <linux/rtnetlink.h>
+#include <net/if.h>
+#include <net/if_arp.h>
+#include <netinet/ether.h>
#include <string.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
-#include <arpa/inet.h>
-#include <netinet/ether.h>
-#include <net/if.h>
-#include <net/if_arp.h>
-#include <linux/netlink.h>
-#include <linux/rtnetlink.h>
-#include <fcntl.h>
+#include <time.h>
+#include <unistd.h>
#include <base/bind.h>
diff --git a/rtnl_listener.cc b/rtnl_listener.cc
index 95c28c2..f1dec6f 100644
--- a/rtnl_listener.cc
+++ b/rtnl_listener.cc
@@ -3,6 +3,7 @@
// found in the LICENSE file.
#include "shill/rtnl_listener.h"
+
#include "shill/rtnl_handler.h"
using base::Callback;
diff --git a/rtnl_listener_unittest.cc b/rtnl_listener_unittest.cc
index faf2913..32de5db 100644
--- a/rtnl_listener_unittest.cc
+++ b/rtnl_listener_unittest.cc
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include <sys/socket.h>
#include <linux/netlink.h>
+#include <sys/socket.h>
#include <base/bind.h>
#include <base/memory/scoped_ptr.h>
diff --git a/rtnl_message.cc b/rtnl_message.cc
index 76928f3..feaa305 100644
--- a/rtnl_message.cc
+++ b/rtnl_message.cc
@@ -4,9 +4,9 @@
#include "shill/rtnl_message.h"
-#include <sys/socket.h>
#include <linux/netlink.h>
#include <linux/rtnetlink.h>
+#include <sys/socket.h>
#include "shill/logging.h"
diff --git a/rtnl_message_unittest.cc b/rtnl_message_unittest.cc
index adbad3a..0318bb5 100644
--- a/rtnl_message_unittest.cc
+++ b/rtnl_message_unittest.cc
@@ -3,7 +3,7 @@
// found in the LICENSE file.
#include <sys/socket.h>
-#include <linux/if.h>
+#include <linux/if.h> // NOLINT(build/include_alpha) - needs sockaddr.
#include <linux/netlink.h>
#include <linux/rtnetlink.h>
diff --git a/scope_logger.h b/scope_logger.h
index f415bce..c274eb6 100644
--- a/scope_logger.h
+++ b/scope_logger.h
@@ -6,8 +6,8 @@
#define SHILL_SCOPE_LOGGER_H_
#include <bitset>
-#include <vector>
#include <string>
+#include <vector>
#include <base/basictypes.h>
#include <base/lazy_instance.h>
diff --git a/service.cc b/service.cc
index 108cfaf..a74f13e 100644
--- a/service.cc
+++ b/service.cc
@@ -4,8 +4,8 @@
#include "shill/service.h"
-#include <time.h>
#include <stdio.h>
+#include <time.h>
#include <algorithm>
#include <map>
diff --git a/service.h b/service.h
index 5f5dc1c..e4f9aca 100644
--- a/service.h
+++ b/service.h
@@ -19,8 +19,8 @@
#include <base/memory/weak_ptr.h>
#include <gtest/gtest_prod.h> // for FRIEND_TEST
-#include "shill/adaptor_interfaces.h"
#include "shill/accessor_interface.h"
+#include "shill/adaptor_interfaces.h"
#include "shill/callbacks.h"
#include "shill/property_store.h"
#include "shill/refptr_types.h"
diff --git a/service_unittest.cc b/service_unittest.cc
index 20d2106..03f1802 100644
--- a/service_unittest.cc
+++ b/service_unittest.cc
@@ -19,8 +19,8 @@
#include "shill/event_dispatcher.h"
#include "shill/manager.h"
#include "shill/mock_adaptors.h"
-#include "shill/mock_control.h"
#include "shill/mock_connection.h"
+#include "shill/mock_control.h"
#include "shill/mock_device_info.h"
#include "shill/mock_diagnostics_reporter.h"
#include "shill/mock_eap_credentials.h"
diff --git a/supplicant_network_proxy.h b/supplicant_network_proxy.h
index 5d6362b..72f09ae 100644
--- a/supplicant_network_proxy.h
+++ b/supplicant_network_proxy.h
@@ -11,8 +11,8 @@
#include <base/basictypes.h>
#include "shill/dbus_proxies/supplicant-network.h"
-#include "shill/supplicant_network_proxy_interface.h"
#include "shill/refptr_types.h"
+#include "shill/supplicant_network_proxy_interface.h"
namespace shill {
diff --git a/traffic_monitor_unittest.cc b/traffic_monitor_unittest.cc
index 775845c..d5397b5 100644
--- a/traffic_monitor_unittest.cc
+++ b/traffic_monitor_unittest.cc
@@ -12,8 +12,8 @@
#include <gtest/gtest.h>
#include <netinet/in.h>
-#include "shill/mock_device.h"
#include "shill/mock_connection_info_reader.h"
+#include "shill/mock_device.h"
#include "shill/mock_event_dispatcher.h"
#include "shill/mock_ipconfig.h"
#include "shill/mock_socket_info_reader.h"
diff --git a/virtual_device.cc b/virtual_device.cc
index 167c4e6..c80e3e3 100644
--- a/virtual_device.cc
+++ b/virtual_device.cc
@@ -5,7 +5,7 @@
#include "shill/virtual_device.h"
#include <netinet/ether.h>
-#include <linux/if.h> // Needs definitions from netinet/ether.h
+#include <linux/if.h> // NOLINT - Needs definitions from netinet/ether.h
#include "shill/logging.h"
#include "shill/rtnl_handler.h"
diff --git a/virtual_device_unittest.cc b/virtual_device_unittest.cc
index 2eb27b2..816a5bc 100644
--- a/virtual_device_unittest.cc
+++ b/virtual_device_unittest.cc
@@ -5,7 +5,7 @@
#include "shill/virtual_device.h"
#include <sys/socket.h>
-#include <linux/if.h> // Needs typedefs from sys/socket.h.
+#include <linux/if.h> // NOLINT - Needs typedefs from sys/socket.h.
#include <gtest/gtest.h>
diff --git a/vpn_provider_unittest.cc b/vpn_provider_unittest.cc
index e313562..d4cffec 100644
--- a/vpn_provider_unittest.cc
+++ b/vpn_provider_unittest.cc
@@ -10,7 +10,6 @@
#include <gtest/gtest.h>
#include "shill/error.h"
-#include "shill/nice_mock_control.h"
#include "shill/mock_adaptors.h"
#include "shill/mock_device_info.h"
#include "shill/mock_manager.h"
@@ -19,6 +18,7 @@
#include "shill/mock_store.h"
#include "shill/mock_vpn_driver.h"
#include "shill/mock_vpn_service.h"
+#include "shill/nice_mock_control.h"
using std::string;
using testing::_;
diff --git a/vpn_service_unittest.cc b/vpn_service_unittest.cc
index be48042..68b763b 100644
--- a/vpn_service_unittest.cc
+++ b/vpn_service_unittest.cc
@@ -11,7 +11,6 @@
#include "shill/dbus_adaptor.h"
#include "shill/error.h"
-#include "shill/nice_mock_control.h"
#include "shill/mock_adaptors.h"
#include "shill/mock_connection.h"
#include "shill/mock_device_info.h"
@@ -22,6 +21,7 @@
#include "shill/mock_store.h"
#include "shill/mock_vpn_driver.h"
#include "shill/mock_vpn_provider.h"
+#include "shill/nice_mock_control.h"
#include "shill/service_property_change_test.h"
using std::string;
diff --git a/wifi_service.h b/wifi_service.h
index 2d46863..3200ae4 100644
--- a/wifi_service.h
+++ b/wifi_service.h
@@ -11,8 +11,8 @@
#include <base/memory/scoped_ptr.h>
-#include "shill/dbus_proxies/supplicant-interface.h"
#include "shill/dbus_properties.h"
+#include "shill/dbus_proxies/supplicant-interface.h"
#include "shill/event_dispatcher.h"
#include "shill/key_value_store.h"
#include "shill/refptr_types.h"
diff --git a/wimax_device_proxy.h b/wimax_device_proxy.h
index 11dc603..08eb685 100644
--- a/wimax_device_proxy.h
+++ b/wimax_device_proxy.h
@@ -10,8 +10,8 @@
#include <base/callback.h>
-#include "wimax_manager/dbus_proxies/org.chromium.WiMaxManager.Device.h"
#include "shill/wimax_device_proxy_interface.h"
+#include "wimax_manager/dbus_proxies/org.chromium.WiMaxManager.Device.h"
namespace shill {
diff --git a/wimax_manager_proxy.h b/wimax_manager_proxy.h
index 6f32761..2364f92 100644
--- a/wimax_manager_proxy.h
+++ b/wimax_manager_proxy.h
@@ -10,8 +10,8 @@
#include <base/basictypes.h>
-#include "wimax_manager/dbus_proxies/org.chromium.WiMaxManager.h"
#include "shill/wimax_manager_proxy_interface.h"
+#include "wimax_manager/dbus_proxies/org.chromium.WiMaxManager.h"
namespace shill {
diff --git a/wimax_network_proxy.h b/wimax_network_proxy.h
index 84503cf..ccd1750 100644
--- a/wimax_network_proxy.h
+++ b/wimax_network_proxy.h
@@ -9,8 +9,8 @@
#include <base/callback.h>
-#include "wimax_manager/dbus_proxies/org.chromium.WiMaxManager.Network.h"
#include "shill/wimax_network_proxy_interface.h"
+#include "wimax_manager/dbus_proxies/org.chromium.WiMaxManager.Network.h"
namespace shill {
diff --git a/wimax_service_unittest.cc b/wimax_service_unittest.cc
index 1086cff..1617f6f 100644
--- a/wimax_service_unittest.cc
+++ b/wimax_service_unittest.cc
@@ -11,7 +11,6 @@
#include <gtest/gtest.h>
#include "shill/error.h"
-#include "shill/nice_mock_control.h"
#include "shill/mock_adaptors.h"
#include "shill/mock_eap_credentials.h"
#include "shill/mock_manager.h"
@@ -20,6 +19,7 @@
#include "shill/mock_wimax.h"
#include "shill/mock_wimax_network_proxy.h"
#include "shill/mock_wimax_provider.h"
+#include "shill/nice_mock_control.h"
#include "shill/service_property_change_test.h"
using std::string;