diff --git a/buffet/dbus_command_dispatcher.cc b/buffet/dbus_command_dispatcher.cc
index 9bbb55e..1af0983 100644
--- a/buffet/dbus_command_dispatcher.cc
+++ b/buffet/dbus_command_dispatcher.cc
@@ -5,10 +5,10 @@
 #include "buffet/dbus_command_dispatcher.h"
 
 #include <chromeos/dbus/exported_object_manager.h>
+#include <weave/command.h>
 
 #include "buffet/dbus_command_proxy.h"
 #include "buffet/dbus_constants.h"
-#include "weave/command.h"
 
 using chromeos::dbus_utils::AsyncEventSequencer;
 using chromeos::dbus_utils::ExportedObjectManager;
diff --git a/buffet/dbus_command_dispatcher.h b/buffet/dbus_command_dispatcher.h
index ae8e499..fa17ad6 100644
--- a/buffet/dbus_command_dispatcher.h
+++ b/buffet/dbus_command_dispatcher.h
@@ -10,8 +10,7 @@
 
 #include <base/macros.h>
 #include <base/memory/weak_ptr.h>
-
-#include "weave/commands.h"
+#include <weave/commands.h>
 
 namespace chromeos {
 namespace dbus_utils {
diff --git a/buffet/dbus_command_proxy.cc b/buffet/dbus_command_proxy.cc
index f89ec52..064c801 100644
--- a/buffet/dbus_command_proxy.cc
+++ b/buffet/dbus_command_proxy.cc
@@ -6,9 +6,9 @@
 
 #include <chromeos/dbus/async_event_sequencer.h>
 #include <chromeos/dbus/exported_object_manager.h>
+#include <weave/enum_to_string.h>
 
 #include "buffet/dbus_conversion.h"
-#include "weave/enum_to_string.h"
 
 using chromeos::dbus_utils::AsyncEventSequencer;
 using chromeos::dbus_utils::ExportedObjectManager;
diff --git a/buffet/dbus_command_proxy.h b/buffet/dbus_command_proxy.h
index 7be3938..c13ee0a 100644
--- a/buffet/dbus_command_proxy.h
+++ b/buffet/dbus_command_proxy.h
@@ -11,9 +11,9 @@
 #include <base/scoped_observer.h>
 #include <chromeos/dbus/data_serialization.h>
 #include <chromeos/dbus/dbus_object.h>
+#include <weave/command.h>
 
 #include "buffet/org.chromium.Buffet.Command.h"
-#include "weave/command.h"
 
 namespace chromeos {
 namespace dbus_utils {
diff --git a/buffet/dbus_command_proxy_unittest.cc b/buffet/dbus_command_proxy_unittest.cc
index 93f5d01..18dd8e0 100644
--- a/buffet/dbus_command_proxy_unittest.cc
+++ b/buffet/dbus_command_proxy_unittest.cc
@@ -14,13 +14,13 @@
 #include <chromeos/dbus/dbus_object.h>
 #include <chromeos/dbus/dbus_object_test_helpers.h>
 #include <gtest/gtest.h>
+#include <weave/command.h>
+#include <weave/enum_to_string.h>
+#include <weave/mock_command.h>
+#include <weave/mock_commands.h>
+#include <weave/unittest_utils.h>
 
 #include "buffet/dbus_constants.h"
-#include "weave/command.h"
-#include "weave/enum_to_string.h"
-#include "weave/mock_command.h"
-#include "weave/mock_commands.h"
-#include "weave/unittest_utils.h"
 
 namespace buffet {
 
diff --git a/buffet/dbus_conversion_unittest.cc b/buffet/dbus_conversion_unittest.cc
index 7a00c35..0d94576 100644
--- a/buffet/dbus_conversion_unittest.cc
+++ b/buffet/dbus_conversion_unittest.cc
@@ -14,8 +14,7 @@
 #include <base/values.h>
 #include <chromeos/variant_dictionary.h>
 #include <gtest/gtest.h>
-
-#include "weave/unittest_utils.h"
+#include <weave/unittest_utils.h>
 
 namespace buffet {
 
diff --git a/buffet/manager.cc b/buffet/manager.cc
index b4fca5c..cc83686 100644
--- a/buffet/manager.cc
+++ b/buffet/manager.cc
@@ -22,13 +22,13 @@
 #include <dbus/bus.h>
 #include <dbus/object_path.h>
 #include <dbus/values_util.h>
+#include <weave/enum_to_string.h>
 
 #include "buffet/dbus_command_dispatcher.h"
 #include "buffet/dbus_conversion.h"
 #include "buffet/peerd_client.h"
 #include "buffet/shill_client.h"
 #include "buffet/webserv_client.h"
-#include "weave/enum_to_string.h"
 
 using chromeos::dbus_utils::AsyncEventSequencer;
 using chromeos::dbus_utils::ExportedObjectManager;
diff --git a/buffet/manager.h b/buffet/manager.h
index 880d753..821acff 100644
--- a/buffet/manager.h
+++ b/buffet/manager.h
@@ -18,9 +18,9 @@
 #include <chromeos/dbus/dbus_object.h>
 #include <chromeos/dbus/exported_property_set.h>
 #include <chromeos/errors/error.h>
+#include <weave/device.h>
 
 #include "buffet/org.chromium.Buffet.Manager.h"
-#include "weave/device.h"
 
 namespace chromeos {
 namespace dbus_utils {
diff --git a/buffet/peerd_client.h b/buffet/peerd_client.h
index 89322cd..ac75e19 100644
--- a/buffet/peerd_client.h
+++ b/buffet/peerd_client.h
@@ -11,9 +11,9 @@
 
 #include <base/callback.h>
 #include <base/memory/ref_counted.h>
+#include <weave/mdns.h>
 
 #include "peerd/dbus-proxies.h"
-#include "weave/mdns.h"
 
 namespace dbus {
 class Bus;
diff --git a/buffet/shill_client.cc b/buffet/shill_client.cc
index 9db5e85..c549fd4 100644
--- a/buffet/shill_client.cc
+++ b/buffet/shill_client.cc
@@ -12,9 +12,9 @@
 #include <chromeos/dbus/service_constants.h>
 #include <chromeos/errors/error.h>
 #include <chromeos/errors/error_codes.h>
+#include <weave/enum_to_string.h>
 
 #include "buffet/ap_manager_client.h"
-#include "weave/enum_to_string.h"
 
 using chromeos::Any;
 using chromeos::VariantDictionary;
diff --git a/buffet/shill_client.h b/buffet/shill_client.h
index 2538674..4d54d60 100644
--- a/buffet/shill_client.h
+++ b/buffet/shill_client.h
@@ -16,9 +16,9 @@
 #include <base/memory/ref_counted.h>
 #include <base/memory/weak_ptr.h>
 #include <dbus/bus.h>
+#include <weave/network.h>
 
 #include "shill/dbus-proxies.h"
-#include "weave/network.h"
 
 namespace buffet {
 
diff --git a/buffet/webserv_client.h b/buffet/webserv_client.h
index cbfbf23..d7b5433 100644
--- a/buffet/webserv_client.h
+++ b/buffet/webserv_client.h
@@ -10,8 +10,7 @@
 #include <vector>
 
 #include <base/memory/weak_ptr.h>
-
-#include "weave/http_server.h"
+#include <weave/http_server.h>
 
 namespace dbus {
 class Bus;
diff --git a/libweave/include/weave/commands.h b/libweave/include/weave/commands.h
index 820fb44..37ca095 100644
--- a/libweave/include/weave/commands.h
+++ b/libweave/include/weave/commands.h
@@ -10,8 +10,7 @@
 #include <base/callback.h>
 #include <base/values.h>
 #include <chromeos/errors/error.h>
-
-#include "weave/command.h"
+#include <weave/command.h>
 
 namespace weave {
 
diff --git a/libweave/include/weave/config.h b/libweave/include/weave/config.h
index 74aabe8..523adf7 100644
--- a/libweave/include/weave/config.h
+++ b/libweave/include/weave/config.h
@@ -9,9 +9,8 @@
 #include <string>
 
 #include <base/callback.h>
-
-#include "weave/enum_to_string.h"
-#include "weave/privet.h"
+#include <weave/enum_to_string.h>
+#include <weave/privet.h>
 
 namespace weave {
 
diff --git a/libweave/include/weave/device.h b/libweave/include/weave/device.h
index e587938..539e429 100644
--- a/libweave/include/weave/device.h
+++ b/libweave/include/weave/device.h
@@ -10,15 +10,14 @@
 #include <string>
 
 #include <base/files/file_path.h>
-
-#include "weave/cloud.h"
-#include "weave/commands.h"
-#include "weave/config.h"
-#include "weave/http_server.h"
-#include "weave/mdns.h"
-#include "weave/network.h"
-#include "weave/privet.h"
-#include "weave/state.h"
+#include <weave/cloud.h>
+#include <weave/commands.h>
+#include <weave/config.h>
+#include <weave/http_server.h>
+#include <weave/mdns.h>
+#include <weave/network.h>
+#include <weave/privet.h>
+#include <weave/state.h>
 
 namespace weave {
 
diff --git a/libweave/include/weave/mock_command.h b/libweave/include/weave/mock_command.h
index 8addfea..1444cd4 100644
--- a/libweave/include/weave/mock_command.h
+++ b/libweave/include/weave/mock_command.h
@@ -5,13 +5,12 @@
 #ifndef LIBWEAVE_INCLUDE_WEAVE_MOCK_COMMAND_H_
 #define LIBWEAVE_INCLUDE_WEAVE_MOCK_COMMAND_H_
 
-#include "weave/command.h"
+#include <weave/command.h>
 
 #include <memory>
 #include <string>
 
 #include <base/values.h>
-
 #include <gmock/gmock.h>
 
 namespace weave {
diff --git a/libweave/include/weave/mock_commands.h b/libweave/include/weave/mock_commands.h
index 3cca6ab..21ae120 100644
--- a/libweave/include/weave/mock_commands.h
+++ b/libweave/include/weave/mock_commands.h
@@ -5,7 +5,7 @@
 #ifndef LIBWEAVE_INCLUDE_WEAVE_MOCK_COMMANDS_H_
 #define LIBWEAVE_INCLUDE_WEAVE_MOCK_COMMANDS_H_
 
-#include "weave/commands.h"
+#include <weave/commands.h>
 
 #include <string>
 
diff --git a/libweave/include/weave/network.h b/libweave/include/weave/network.h
index 0e5cc26..7df2d41 100644
--- a/libweave/include/weave/network.h
+++ b/libweave/include/weave/network.h
@@ -9,6 +9,7 @@
 #include <string>
 
 #include <base/callback.h>
+#include <chromeos/errors/error.h>
 
 namespace weave {
 
diff --git a/libweave/src/buffet_config.cc b/libweave/src/buffet_config.cc
index ee15693..97ae16e 100644
--- a/libweave/src/buffet_config.cc
+++ b/libweave/src/buffet_config.cc
@@ -10,10 +10,10 @@
 #include <base/logging.h>
 #include <base/strings/string_number_conversions.h>
 #include <chromeos/strings/string_utils.h>
+#include <weave/enum_to_string.h>
 
 #include "libweave/src/storage_impls.h"
 #include "libweave/src/storage_interface.h"
-#include "weave/enum_to_string.h"
 
 namespace {
 
diff --git a/libweave/src/buffet_config.h b/libweave/src/buffet_config.h
index f2c4891..004e8b2 100644
--- a/libweave/src/buffet_config.h
+++ b/libweave/src/buffet_config.h
@@ -13,9 +13,9 @@
 #include <base/files/file_path.h>
 #include <chromeos/errors/error.h>
 #include <chromeos/key_value_store.h>
+#include <weave/config.h>
 
 #include "libweave/src/privet/security_delegate.h"
-#include "weave/config.h"
 
 namespace weave {
 
diff --git a/libweave/src/commands/cloud_command_proxy.cc b/libweave/src/commands/cloud_command_proxy.cc
index b277802..045817f 100644
--- a/libweave/src/commands/cloud_command_proxy.cc
+++ b/libweave/src/commands/cloud_command_proxy.cc
@@ -5,12 +5,12 @@
 #include "libweave/src/commands/cloud_command_proxy.h"
 
 #include <base/bind.h>
+#include <weave/enum_to_string.h>
 
 #include "libweave/src/commands/command_instance.h"
 #include "libweave/src/commands/prop_constraints.h"
 #include "libweave/src/commands/prop_types.h"
 #include "libweave/src/commands/schema_constants.h"
-#include "weave/enum_to_string.h"
 
 namespace weave {
 
diff --git a/libweave/src/commands/cloud_command_proxy.h b/libweave/src/commands/cloud_command_proxy.h
index 5f7d21c..7bd4ba8 100644
--- a/libweave/src/commands/cloud_command_proxy.h
+++ b/libweave/src/commands/cloud_command_proxy.h
@@ -16,10 +16,10 @@
 #include <base/scoped_observer.h>
 #include <base/task_runner.h>
 #include <chromeos/backoff_entry.h>
+#include <weave/command.h>
 
 #include "libweave/src/commands/cloud_command_update_interface.h"
 #include "libweave/src/states/state_change_queue_interface.h"
-#include "weave/command.h"
 
 namespace weave {
 
diff --git a/libweave/src/commands/command_definition.h b/libweave/src/commands/command_definition.h
index 769427a..0ef8fec 100644
--- a/libweave/src/commands/command_definition.h
+++ b/libweave/src/commands/command_definition.h
@@ -9,9 +9,9 @@
 #include <string>
 
 #include <base/macros.h>
+#include <weave/commands.h>
 
 #include "libweave/src/commands/object_schema.h"
-#include "weave/commands.h"
 
 namespace weave {
 
diff --git a/libweave/src/commands/command_dictionary.cc b/libweave/src/commands/command_dictionary.cc
index 8359be5..02c3ddd 100644
--- a/libweave/src/commands/command_dictionary.cc
+++ b/libweave/src/commands/command_dictionary.cc
@@ -6,10 +6,10 @@
 
 #include <base/values.h>
 #include <chromeos/strings/string_utils.h>
+#include <weave/enum_to_string.h>
 
 #include "libweave/src/commands/command_definition.h"
 #include "libweave/src/commands/schema_constants.h"
-#include "weave/enum_to_string.h"
 
 namespace weave {
 
diff --git a/libweave/src/commands/command_instance.cc b/libweave/src/commands/command_instance.cc
index 4e89dca..1470cdb 100644
--- a/libweave/src/commands/command_instance.cc
+++ b/libweave/src/commands/command_instance.cc
@@ -7,6 +7,7 @@
 #include <base/values.h>
 #include <chromeos/errors/error.h>
 #include <chromeos/errors/error_codes.h>
+#include <weave/enum_to_string.h>
 
 #include "libweave/src/commands/command_definition.h"
 #include "libweave/src/commands/command_dictionary.h"
@@ -14,7 +15,6 @@
 #include "libweave/src/commands/prop_types.h"
 #include "libweave/src/commands/schema_constants.h"
 #include "libweave/src/commands/schema_utils.h"
-#include "weave/enum_to_string.h"
 
 namespace weave {
 
diff --git a/libweave/src/commands/command_instance.h b/libweave/src/commands/command_instance.h
index d709e2f..65726ac 100644
--- a/libweave/src/commands/command_instance.h
+++ b/libweave/src/commands/command_instance.h
@@ -13,10 +13,10 @@
 #include <base/macros.h>
 #include <base/observer_list.h>
 #include <chromeos/errors/error.h>
+#include <weave/command.h>
 
 #include "libweave/src/commands/prop_values.h"
 #include "libweave/src/commands/schema_utils.h"
-#include "weave/command.h"
 
 namespace base {
 class Value;
diff --git a/libweave/src/commands/command_manager.cc b/libweave/src/commands/command_manager.cc
index 0cb36b0..3d28dec 100644
--- a/libweave/src/commands/command_manager.cc
+++ b/libweave/src/commands/command_manager.cc
@@ -7,10 +7,10 @@
 #include <base/files/file_enumerator.h>
 #include <base/values.h>
 #include <chromeos/errors/error.h>
+#include <weave/enum_to_string.h>
 
 #include "libweave/src/commands/schema_constants.h"
 #include "libweave/src/utils.h"
-#include "weave/enum_to_string.h"
 
 namespace weave {
 
diff --git a/libweave/src/commands/command_manager.h b/libweave/src/commands/command_manager.h
index 377862c..d49373f 100644
--- a/libweave/src/commands/command_manager.h
+++ b/libweave/src/commands/command_manager.h
@@ -13,10 +13,10 @@
 #include <base/files/file_path.h>
 #include <base/macros.h>
 #include <base/memory/weak_ptr.h>
+#include <weave/commands.h>
 
 #include "libweave/src/commands/command_dictionary.h"
 #include "libweave/src/commands/command_queue.h"
-#include "weave/commands.h"
 
 namespace weave {
 
diff --git a/libweave/src/commands/command_queue.h b/libweave/src/commands/command_queue.h
index f279c38..851a283 100644
--- a/libweave/src/commands/command_queue.h
+++ b/libweave/src/commands/command_queue.h
@@ -14,9 +14,9 @@
 
 #include <base/callback.h>
 #include <base/macros.h>
+#include <weave/commands.h>
 
 #include "libweave/src/commands/command_instance.h"
-#include "weave/commands.h"
 
 namespace weave {
 
diff --git a/libweave/src/commands/mock_command.cc b/libweave/src/commands/mock_command.cc
index 2b35de7..ee36347 100644
--- a/libweave/src/commands/mock_command.cc
+++ b/libweave/src/commands/mock_command.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "weave/mock_command.h"
+#include <weave/mock_command.h>
 
 #include <memory>
 #include <string>
diff --git a/libweave/src/commands/unittest_utils.h b/libweave/src/commands/unittest_utils.h
index 0659069..c232f84 100644
--- a/libweave/src/commands/unittest_utils.h
+++ b/libweave/src/commands/unittest_utils.h
@@ -10,10 +10,10 @@
 
 #include <base/values.h>
 #include <gtest/gtest.h>
+#include <weave/unittest_utils.h>
 
 #include "libweave/src/commands/prop_types.h"
 #include "libweave/src/commands/prop_values.h"
-#include "weave/unittest_utils.h"
 
 namespace weave {
 namespace unittests {
diff --git a/libweave/src/commands/user_role.cc b/libweave/src/commands/user_role.cc
index 0cad7ad..e1a3620 100644
--- a/libweave/src/commands/user_role.cc
+++ b/libweave/src/commands/user_role.cc
@@ -4,9 +4,10 @@
 
 #include <chromeos/errors/error.h>
 
+#include <weave/commands.h>
+#include <weave/enum_to_string.h>
+
 #include "libweave/src/commands/schema_constants.h"
-#include "weave/commands.h"
-#include "weave/enum_to_string.h"
 
 namespace weave {
 
diff --git a/libweave/src/device_manager.h b/libweave/src/device_manager.h
index 56b9a47..2474281 100644
--- a/libweave/src/device_manager.h
+++ b/libweave/src/device_manager.h
@@ -6,8 +6,7 @@
 #define LIBWEAVE_SRC_DEVICE_MANAGER_H_
 
 #include <base/memory/weak_ptr.h>
-
-#include "weave/device.h"
+#include <weave/device.h>
 
 namespace weave {
 
diff --git a/libweave/src/device_registration_info.cc b/libweave/src/device_registration_info.cc
index da310a6..9c06383 100644
--- a/libweave/src/device_registration_info.cc
+++ b/libweave/src/device_registration_info.cc
@@ -22,6 +22,7 @@
 #include <chromeos/mime_utils.h>
 #include <chromeos/strings/string_utils.h>
 #include <chromeos/url_utils.h>
+#include <weave/network.h>
 
 #include "libweave/src/commands/cloud_command_proxy.h"
 #include "libweave/src/commands/command_definition.h"
@@ -30,7 +31,6 @@
 #include "libweave/src/notification/xmpp_channel.h"
 #include "libweave/src/states/state_manager.h"
 #include "libweave/src/utils.h"
-#include "weave/network.h"
 
 namespace weave {
 
diff --git a/libweave/src/device_registration_info.h b/libweave/src/device_registration_info.h
index 82fe399..2cf3e91 100644
--- a/libweave/src/device_registration_info.h
+++ b/libweave/src/device_registration_info.h
@@ -22,6 +22,8 @@
 #include <chromeos/data_encoding.h>
 #include <chromeos/errors/error.h>
 #include <chromeos/http/http_transport.h>
+#include <weave/cloud.h>
+#include <weave/config.h>
 
 #include "libweave/src/buffet_config.h"
 #include "libweave/src/commands/cloud_command_update_interface.h"
@@ -31,8 +33,6 @@
 #include "libweave/src/notification/pull_channel.h"
 #include "libweave/src/states/state_change_queue_interface.h"
 #include "libweave/src/storage_interface.h"
-#include "weave/cloud.h"
-#include "weave/config.h"
 
 namespace base {
 class DictionaryValue;
diff --git a/libweave/src/notification/xmpp_channel.cc b/libweave/src/notification/xmpp_channel.cc
index 76abb7e..141fd6c 100644
--- a/libweave/src/notification/xmpp_channel.cc
+++ b/libweave/src/notification/xmpp_channel.cc
@@ -11,12 +11,12 @@
 #include <chromeos/data_encoding.h>
 #include <chromeos/streams/file_stream.h>
 #include <chromeos/streams/tls_stream.h>
+#include <weave/network.h>
 
 #include "libweave/src/notification/notification_delegate.h"
 #include "libweave/src/notification/notification_parser.h"
 #include "libweave/src/notification/xml_node.h"
 #include "libweave/src/utils.h"
-#include "weave/network.h"
 
 namespace weave {
 
diff --git a/libweave/src/privet/privet_handler.cc b/libweave/src/privet/privet_handler.cc
index 7fee03b..25f8008 100644
--- a/libweave/src/privet/privet_handler.cc
+++ b/libweave/src/privet/privet_handler.cc
@@ -17,6 +17,7 @@
 #include <base/values.h>
 #include <chromeos/http/http_request.h>
 #include <chromeos/strings/string_utils.h>
+#include <weave/enum_to_string.h>
 
 #include "libweave/src/privet/cloud_delegate.h"
 #include "libweave/src/privet/constants.h"
@@ -24,7 +25,6 @@
 #include "libweave/src/privet/identity_delegate.h"
 #include "libweave/src/privet/security_delegate.h"
 #include "libweave/src/privet/wifi_delegate.h"
-#include "weave/enum_to_string.h"
 
 namespace weave {
 namespace privet {
diff --git a/libweave/src/privet/privet_manager.cc b/libweave/src/privet/privet_manager.cc
index 1f3fd5b..2f35fd9 100644
--- a/libweave/src/privet/privet_manager.cc
+++ b/libweave/src/privet/privet_manager.cc
@@ -22,6 +22,7 @@
 #include <chromeos/mime_utils.h>
 #include <chromeos/strings/string_utils.h>
 #include <chromeos/syslog_logging.h>
+#include <weave/network.h>
 
 #include "libweave/src/device_registration_info.h"
 #include "libweave/src/privet/cloud_delegate.h"
@@ -29,7 +30,6 @@
 #include "libweave/src/privet/device_delegate.h"
 #include "libweave/src/privet/privet_handler.h"
 #include "libweave/src/privet/publisher.h"
-#include "weave/network.h"
 
 namespace weave {
 namespace privet {
diff --git a/libweave/src/privet/privet_manager.h b/libweave/src/privet/privet_manager.h
index e79cc9c..b24c2b5 100644
--- a/libweave/src/privet/privet_manager.h
+++ b/libweave/src/privet/privet_manager.h
@@ -12,11 +12,11 @@
 
 #include <base/memory/weak_ptr.h>
 #include <base/scoped_observer.h>
+#include <weave/device.h>
 
 #include "libweave/src/privet/cloud_delegate.h"
 #include "libweave/src/privet/security_manager.h"
 #include "libweave/src/privet/wifi_bootstrap_manager.h"
-#include "weave/device.h"
 
 namespace libwebserv {
 class ProtocolHandler;
diff --git a/libweave/src/privet/privet_types.cc b/libweave/src/privet/privet_types.cc
index e3f3307..6ab0f76 100644
--- a/libweave/src/privet/privet_types.cc
+++ b/libweave/src/privet/privet_types.cc
@@ -6,9 +6,9 @@
 
 #include <string>
 
-#include "weave/enum_to_string.h"
-#include "weave/network.h"
-#include "weave/privet.h"
+#include <weave/enum_to_string.h>
+#include <weave/network.h>
+#include <weave/privet.h>
 
 namespace weave {
 
diff --git a/libweave/src/privet/publisher.cc b/libweave/src/privet/publisher.cc
index 877aa02..367dbd8 100644
--- a/libweave/src/privet/publisher.cc
+++ b/libweave/src/privet/publisher.cc
@@ -8,12 +8,12 @@
 
 #include <chromeos/errors/error.h>
 #include <chromeos/strings/string_utils.h>
+#include <weave/mdns.h>
 
 #include "libweave/src/privet/cloud_delegate.h"
 #include "libweave/src/privet/device_delegate.h"
 #include "libweave/src/privet/wifi_bootstrap_manager.h"
 #include "libweave/src/privet/wifi_ssid_generator.h"
-#include "weave/mdns.h"
 
 using chromeos::string_utils::Join;
 
diff --git a/libweave/src/privet/security_delegate.h b/libweave/src/privet/security_delegate.h
index e7444e9..d82ef4a 100644
--- a/libweave/src/privet/security_delegate.h
+++ b/libweave/src/privet/security_delegate.h
@@ -11,9 +11,9 @@
 
 #include <base/time/time.h>
 #include <chromeos/secure_blob.h>
+#include <weave/privet.h>
 
 #include "libweave/src/privet/privet_types.h"
-#include "weave/privet.h"
 
 namespace weave {
 namespace privet {
diff --git a/libweave/src/privet/wifi_bootstrap_manager.cc b/libweave/src/privet/wifi_bootstrap_manager.cc
index c523f2c..84ceb3e 100644
--- a/libweave/src/privet/wifi_bootstrap_manager.cc
+++ b/libweave/src/privet/wifi_bootstrap_manager.cc
@@ -9,10 +9,10 @@
 #include <base/message_loop/message_loop.h>
 #include <chromeos/bind_lambda.h>
 #include <chromeos/key_value_store.h>
+#include <weave/enum_to_string.h>
+#include <weave/network.h>
 
 #include "libweave/src/privet/constants.h"
-#include "weave/enum_to_string.h"
-#include "weave/network.h"
 
 namespace weave {
 namespace privet {
diff --git a/libweave/src/registration_status.cc b/libweave/src/registration_status.cc
index 550360e..866fcaa 100644
--- a/libweave/src/registration_status.cc
+++ b/libweave/src/registration_status.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 "weave/cloud.h"
-#include "weave/enum_to_string.h"
+#include <weave/cloud.h>
+#include <weave/enum_to_string.h>
 
 namespace weave {
 
diff --git a/libweave/src/states/state_manager.h b/libweave/src/states/state_manager.h
index 50a3836..30825bd 100644
--- a/libweave/src/states/state_manager.h
+++ b/libweave/src/states/state_manager.h
@@ -15,10 +15,10 @@
 #include <base/callback.h>
 #include <base/macros.h>
 #include <chromeos/errors/error.h>
+#include <weave/state.h>
 
 #include "libweave/src/states/state_change_queue_interface.h"
 #include "libweave/src/states/state_package.h"
-#include "weave/state.h"
 
 namespace base {
 class DictionaryValue;