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;