diff --git a/libweave/examples/ubuntu/avahi_client.cc b/libweave/examples/ubuntu/avahi_client.cc
index 9c8cc0d..a767402 100644
--- a/libweave/examples/ubuntu/avahi_client.cc
+++ b/libweave/examples/ubuntu/avahi_client.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 "libweave/examples/ubuntu/avahi_client.h"
+#include "examples/ubuntu/avahi_client.h"
 
 #include <cstdlib>
 #include <vector>
diff --git a/libweave/examples/ubuntu/bluez_client.cc b/libweave/examples/ubuntu/bluez_client.cc
index bb376d4..a1f13d3 100644
--- a/libweave/examples/ubuntu/bluez_client.cc
+++ b/libweave/examples/ubuntu/bluez_client.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 "libweave/examples/ubuntu/bluez_client.h"
+#include "examples/ubuntu/bluez_client.h"
 
 namespace weave {
 namespace examples {
diff --git a/libweave/examples/ubuntu/curl_http_client.cc b/libweave/examples/ubuntu/curl_http_client.cc
index 2be12d7..10e3155 100644
--- a/libweave/examples/ubuntu/curl_http_client.cc
+++ b/libweave/examples/ubuntu/curl_http_client.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 "libweave/examples/ubuntu/curl_http_client.h"
+#include "examples/ubuntu/curl_http_client.h"
 
 #include <base/bind.h>
 #include <curl/curl.h>
diff --git a/libweave/examples/ubuntu/event_http_server.cc b/libweave/examples/ubuntu/event_http_server.cc
index fff49cd..31b569d 100644
--- a/libweave/examples/ubuntu/event_http_server.cc
+++ b/libweave/examples/ubuntu/event_http_server.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 "libweave/examples/ubuntu/event_http_server.h"
+#include "examples/ubuntu/event_http_server.h"
 
 #include <vector>
 
@@ -11,7 +11,7 @@
 #include <event2/bufferevent_ssl.h>
 #include <openssl/err.h>
 
-#include "libweave/examples/ubuntu/event_task_runner.h"
+#include "examples/ubuntu/event_task_runner.h"
 
 namespace weave {
 namespace examples {
diff --git a/libweave/examples/ubuntu/event_task_runner.cc b/libweave/examples/ubuntu/event_task_runner.cc
index e80d7a5..7365fb3 100644
--- a/libweave/examples/ubuntu/event_task_runner.cc
+++ b/libweave/examples/ubuntu/event_task_runner.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 "libweave/examples/ubuntu/event_task_runner.h"
+#include "examples/ubuntu/event_task_runner.h"
 
 #include <signal.h>
 
diff --git a/libweave/examples/ubuntu/file_config_store.cc b/libweave/examples/ubuntu/file_config_store.cc
index d8440b1..44f5c86 100644
--- a/libweave/examples/ubuntu/file_config_store.cc
+++ b/libweave/examples/ubuntu/file_config_store.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 "libweave/examples/ubuntu/file_config_store.h"
+#include "examples/ubuntu/file_config_store.h"
 
 #include <sys/stat.h>
 #include <sys/utsname.h>
diff --git a/libweave/examples/ubuntu/main.cc b/libweave/examples/ubuntu/main.cc
index 4e7f07c..0bb423d 100644
--- a/libweave/examples/ubuntu/main.cc
+++ b/libweave/examples/ubuntu/main.cc
@@ -7,13 +7,13 @@
 #include <weave/device.h>
 #include <weave/error.h>
 
-#include "libweave/examples/ubuntu/avahi_client.h"
-#include "libweave/examples/ubuntu/bluez_client.h"
-#include "libweave/examples/ubuntu/curl_http_client.h"
-#include "libweave/examples/ubuntu/event_http_server.h"
-#include "libweave/examples/ubuntu/event_task_runner.h"
-#include "libweave/examples/ubuntu/file_config_store.h"
-#include "libweave/examples/ubuntu/network_manager.h"
+#include "examples/ubuntu/avahi_client.h"
+#include "examples/ubuntu/bluez_client.h"
+#include "examples/ubuntu/curl_http_client.h"
+#include "examples/ubuntu/event_http_server.h"
+#include "examples/ubuntu/event_task_runner.h"
+#include "examples/ubuntu/file_config_store.h"
+#include "examples/ubuntu/network_manager.h"
 
 namespace {
 void ShowUsage(const std::string& name) {
diff --git a/libweave/examples/ubuntu/network_manager.cc b/libweave/examples/ubuntu/network_manager.cc
index 33da720..b910b55 100644
--- a/libweave/examples/ubuntu/network_manager.cc
+++ b/libweave/examples/ubuntu/network_manager.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 "libweave/examples/ubuntu/network_manager.h"
+#include "examples/ubuntu/network_manager.h"
 
 #include <arpa/inet.h>
 #include <linux/wireless.h>
@@ -14,7 +14,7 @@
 #include <base/bind.h>
 #include <weave/provider/task_runner.h>
 
-#include "libweave/examples/ubuntu/ssl_stream.h"
+#include "examples/ubuntu/ssl_stream.h"
 
 namespace weave {
 namespace examples {
diff --git a/libweave/examples/ubuntu/ssl_stream.cc b/libweave/examples/ubuntu/ssl_stream.cc
index 920648f..58626cc 100644
--- a/libweave/examples/ubuntu/ssl_stream.cc
+++ b/libweave/examples/ubuntu/ssl_stream.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 "libweave/examples/ubuntu/ssl_stream.h"
+#include "examples/ubuntu/ssl_stream.h"
 
 #include <base/bind.h>
 #include <weave/provider/task_runner.h>
diff --git a/libweave/external/crypto/p224.cc b/libweave/external/crypto/p224.cc
index 99fd2d1..8ec4034 100644
--- a/libweave/external/crypto/p224.cc
+++ b/libweave/external/crypto/p224.cc
@@ -7,7 +7,7 @@
 //
 // See http://www.imperialviolet.org/2010/12/04/ecc.html ([1]) for background.
 
-#include "libweave/external/crypto/p224.h"
+#include "external/crypto/p224.h"
 
 #include <string.h>
 
diff --git a/libweave/external/crypto/p224_spake.cc b/libweave/external/crypto/p224_spake.cc
index 890002a..1db768e 100644
--- a/libweave/external/crypto/p224_spake.cc
+++ b/libweave/external/crypto/p224_spake.cc
@@ -5,14 +5,14 @@
 // This code implements SPAKE2, a variant of EKE:
 //  http://www.di.ens.fr/~pointche/pub.php?reference=AbPo04
 
-#include "libweave/external/crypto/p224_spake.h"
+#include "external/crypto/p224_spake.h"
 
 #include <algorithm>
 
 #include <base/logging.h>
 #include <base/rand_util.h>
 
-#include "libweave/external/crypto/p224.h"
+#include "external/crypto/p224.h"
 
 namespace weave {
 namespace crypto {
diff --git a/libweave/external/crypto/p224_spake.h b/libweave/external/crypto/p224_spake.h
index 547f8dc..14bde6d 100644
--- a/libweave/external/crypto/p224_spake.h
+++ b/libweave/external/crypto/p224_spake.h
@@ -9,8 +9,8 @@
 
 #include <base/gtest_prod_util.h>
 
-#include "libweave/external/crypto/p224.h"
-#include "libweave/external/crypto/sha2.h"
+#include "external/crypto/p224.h"
+#include "external/crypto/sha2.h"
 
 namespace weave {
 namespace crypto {
diff --git a/libweave/external/crypto/p224_spake_unittest.cc b/libweave/external/crypto/p224_spake_unittest.cc
index 03c9072..21cda88 100644
--- a/libweave/external/crypto/p224_spake_unittest.cc
+++ b/libweave/external/crypto/p224_spake_unittest.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 "libweave/external/crypto/p224_spake.h"
+#include "external/crypto/p224_spake.h"
 
 #include <string>
 
diff --git a/libweave/external/crypto/p224_unittest.cc b/libweave/external/crypto/p224_unittest.cc
index c0d3b2f..6bfda46 100644
--- a/libweave/external/crypto/p224_unittest.cc
+++ b/libweave/external/crypto/p224_unittest.cc
@@ -7,7 +7,7 @@
 
 #include <gtest/gtest.h>
 
-#include "libweave/external/crypto/p224.h"
+#include "external/crypto/p224.h"
 
 namespace weave {
 namespace crypto {
diff --git a/libweave/external/crypto/sha2.cc b/libweave/external/crypto/sha2.cc
index d4e3ac9..4ad40ba 100644
--- a/libweave/external/crypto/sha2.cc
+++ b/libweave/external/crypto/sha2.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 "libweave/external/crypto/sha2.h"
+#include "external/crypto/sha2.h"
 
 #include <algorithm>
 #include <openssl/sha.h>
diff --git a/libweave/external/crypto/sha2_unittest.cc b/libweave/external/crypto/sha2_unittest.cc
index a128840..cd89043 100644
--- a/libweave/external/crypto/sha2_unittest.cc
+++ b/libweave/external/crypto/sha2_unittest.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 "libweave/external/crypto/sha2.h"
+#include "external/crypto/sha2.h"
 
 #include <base/basictypes.h>
 #include <gtest/gtest.h>
diff --git a/libweave/src/backoff_entry.cc b/libweave/src/backoff_entry.cc
index cef8b7f..4cc1241 100644
--- a/libweave/src/backoff_entry.cc
+++ b/libweave/src/backoff_entry.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 "libweave/src/backoff_entry.h"
+#include "src/backoff_entry.h"
 
 #include <algorithm>
 #include <cmath>
diff --git a/libweave/src/backoff_entry_unittest.cc b/libweave/src/backoff_entry_unittest.cc
index 5b198a0..598e7c4 100644
--- a/libweave/src/backoff_entry_unittest.cc
+++ b/libweave/src/backoff_entry_unittest.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 "libweave/src/backoff_entry.h"
+#include "src/backoff_entry.h"
 
 #include <gtest/gtest.h>
 
diff --git a/libweave/src/base_api_handler.cc b/libweave/src/base_api_handler.cc
index 40a3a47..6db8628 100644
--- a/libweave/src/base_api_handler.cc
+++ b/libweave/src/base_api_handler.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "libweave/src/base_api_handler.h"
+#include "src/base_api_handler.h"
 
 #include <base/bind.h>
 
-#include "libweave/src/commands/command_instance.h"
-#include "libweave/src/commands/command_manager.h"
-#include "libweave/src/device_registration_info.h"
-#include "libweave/src/states/state_manager.h"
+#include "src/commands/command_instance.h"
+#include "src/commands/command_manager.h"
+#include "src/device_registration_info.h"
+#include "src/states/state_manager.h"
 
 namespace weave {
 
diff --git a/libweave/src/base_api_handler_unittest.cc b/libweave/src/base_api_handler_unittest.cc
index 52f9574..2a3613a 100644
--- a/libweave/src/base_api_handler_unittest.cc
+++ b/libweave/src/base_api_handler_unittest.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 "libweave/src/base_api_handler.h"
+#include "src/base_api_handler.h"
 
 #include <base/strings/string_number_conversions.h>
 #include <base/values.h>
@@ -10,12 +10,12 @@
 #include <weave/provider/test/mock_config_store.h>
 #include <weave/provider/test/mock_http_client.h>
 
-#include "libweave/src/commands/command_manager.h"
-#include "libweave/src/commands/unittest_utils.h"
-#include "libweave/src/config.h"
-#include "libweave/src/device_registration_info.h"
-#include "libweave/src/states/mock_state_change_queue_interface.h"
-#include "libweave/src/states/state_manager.h"
+#include "src/commands/command_manager.h"
+#include "src/commands/unittest_utils.h"
+#include "src/config.h"
+#include "src/device_registration_info.h"
+#include "src/states/mock_state_change_queue_interface.h"
+#include "src/states/state_manager.h"
 
 using testing::_;
 using testing::Invoke;
diff --git a/libweave/src/commands/cloud_command_proxy.cc b/libweave/src/commands/cloud_command_proxy.cc
index 23517b5..9f6ada3 100644
--- a/libweave/src/commands/cloud_command_proxy.cc
+++ b/libweave/src/commands/cloud_command_proxy.cc
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "libweave/src/commands/cloud_command_proxy.h"
+#include "src/commands/cloud_command_proxy.h"
 
 #include <base/bind.h>
 #include <weave/enum_to_string.h>
 #include <weave/provider/task_runner.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 "src/commands/command_instance.h"
+#include "src/commands/prop_constraints.h"
+#include "src/commands/prop_types.h"
+#include "src/commands/schema_constants.h"
 
 namespace weave {
 
diff --git a/libweave/src/commands/cloud_command_proxy.h b/libweave/src/commands/cloud_command_proxy.h
index 5195294..c5be02e 100644
--- a/libweave/src/commands/cloud_command_proxy.h
+++ b/libweave/src/commands/cloud_command_proxy.h
@@ -15,9 +15,9 @@
 #include <base/scoped_observer.h>
 #include <weave/command.h>
 
-#include "libweave/src/backoff_entry.h"
-#include "libweave/src/commands/cloud_command_update_interface.h"
-#include "libweave/src/states/state_change_queue_interface.h"
+#include "src/backoff_entry.h"
+#include "src/commands/cloud_command_update_interface.h"
+#include "src/states/state_change_queue_interface.h"
 
 namespace weave {
 
diff --git a/libweave/src/commands/cloud_command_proxy_unittest.cc b/libweave/src/commands/cloud_command_proxy_unittest.cc
index d96508d..b462439 100644
--- a/libweave/src/commands/cloud_command_proxy_unittest.cc
+++ b/libweave/src/commands/cloud_command_proxy_unittest.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 "libweave/src/commands/cloud_command_proxy.h"
+#include "src/commands/cloud_command_proxy.h"
 
 #include <memory>
 #include <queue>
@@ -11,10 +11,10 @@
 #include <gtest/gtest.h>
 #include <weave/provider/test/fake_task_runner.h>
 
-#include "libweave/src/commands/command_dictionary.h"
-#include "libweave/src/commands/command_instance.h"
-#include "libweave/src/commands/unittest_utils.h"
-#include "libweave/src/states/mock_state_change_queue_interface.h"
+#include "src/commands/command_dictionary.h"
+#include "src/commands/command_instance.h"
+#include "src/commands/unittest_utils.h"
+#include "src/states/mock_state_change_queue_interface.h"
 
 using testing::SaveArg;
 using testing::Invoke;
diff --git a/libweave/src/commands/command_definition.cc b/libweave/src/commands/command_definition.cc
index f00efdd..78121ac 100644
--- a/libweave/src/commands/command_definition.cc
+++ b/libweave/src/commands/command_definition.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "libweave/src/commands/command_definition.h"
+#include "src/commands/command_definition.h"
 
 #include <vector>
 
 #include <weave/error.h>
 
-#include "libweave/src/commands/schema_constants.h"
-#include "libweave/src/string_utils.h"
+#include "src/commands/schema_constants.h"
+#include "src/string_utils.h"
 
 namespace weave {
 
diff --git a/libweave/src/commands/command_definition.h b/libweave/src/commands/command_definition.h
index 512f08d..06d7afd 100644
--- a/libweave/src/commands/command_definition.h
+++ b/libweave/src/commands/command_definition.h
@@ -11,7 +11,7 @@
 #include <base/macros.h>
 #include <weave/commands.h>
 
-#include "libweave/src/commands/object_schema.h"
+#include "src/commands/object_schema.h"
 
 namespace weave {
 
diff --git a/libweave/src/commands/command_definition_unittest.cc b/libweave/src/commands/command_definition_unittest.cc
index 8f40502..f3e5de8 100644
--- a/libweave/src/commands/command_definition_unittest.cc
+++ b/libweave/src/commands/command_definition_unittest.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 "libweave/src/commands/command_definition.h"
+#include "src/commands/command_definition.h"
 
 #include <gtest/gtest.h>
 
diff --git a/libweave/src/commands/command_dictionary.cc b/libweave/src/commands/command_dictionary.cc
index 85b06fb..0dcb441 100644
--- a/libweave/src/commands/command_dictionary.cc
+++ b/libweave/src/commands/command_dictionary.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "libweave/src/commands/command_dictionary.h"
+#include "src/commands/command_dictionary.h"
 
 #include <base/values.h>
 #include <weave/enum_to_string.h>
 
-#include "libweave/src/commands/command_definition.h"
-#include "libweave/src/commands/schema_constants.h"
-#include "libweave/src/string_utils.h"
+#include "src/commands/command_definition.h"
+#include "src/commands/schema_constants.h"
+#include "src/string_utils.h"
 
 namespace weave {
 
diff --git a/libweave/src/commands/command_dictionary.h b/libweave/src/commands/command_dictionary.h
index 1f18257..f0f3bbd 100644
--- a/libweave/src/commands/command_dictionary.h
+++ b/libweave/src/commands/command_dictionary.h
@@ -14,7 +14,7 @@
 #include <base/macros.h>
 #include <weave/error.h>
 
-#include "libweave/src/commands/command_definition.h"
+#include "src/commands/command_definition.h"
 
 namespace base {
 class Value;
diff --git a/libweave/src/commands/command_dictionary_unittest.cc b/libweave/src/commands/command_dictionary_unittest.cc
index a307184..ac9e261 100644
--- a/libweave/src/commands/command_dictionary_unittest.cc
+++ b/libweave/src/commands/command_dictionary_unittest.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "libweave/src/commands/command_dictionary.h"
+#include "src/commands/command_dictionary.h"
 
 #include <gtest/gtest.h>
 
-#include "libweave/src/commands/unittest_utils.h"
+#include "src/commands/unittest_utils.h"
 
 namespace weave {
 
diff --git a/libweave/src/commands/command_instance.cc b/libweave/src/commands/command_instance.cc
index 774589f..ea2c773 100644
--- a/libweave/src/commands/command_instance.cc
+++ b/libweave/src/commands/command_instance.cc
@@ -2,20 +2,20 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "libweave/src/commands/command_instance.h"
+#include "src/commands/command_instance.h"
 
 #include <base/values.h>
 #include <weave/enum_to_string.h>
 #include <weave/error.h>
 #include <weave/export.h>
 
-#include "libweave/src/commands/command_definition.h"
-#include "libweave/src/commands/command_dictionary.h"
-#include "libweave/src/commands/command_queue.h"
-#include "libweave/src/commands/prop_types.h"
-#include "libweave/src/commands/schema_constants.h"
-#include "libweave/src/commands/schema_utils.h"
-#include "libweave/src/json_error_codes.h"
+#include "src/commands/command_definition.h"
+#include "src/commands/command_dictionary.h"
+#include "src/commands/command_queue.h"
+#include "src/commands/prop_types.h"
+#include "src/commands/schema_constants.h"
+#include "src/commands/schema_utils.h"
+#include "src/json_error_codes.h"
 
 namespace weave {
 
diff --git a/libweave/src/commands/command_instance.h b/libweave/src/commands/command_instance.h
index 3f81893..0b82a81 100644
--- a/libweave/src/commands/command_instance.h
+++ b/libweave/src/commands/command_instance.h
@@ -15,8 +15,8 @@
 #include <weave/error.h>
 #include <weave/command.h>
 
-#include "libweave/src/commands/prop_values.h"
-#include "libweave/src/commands/schema_utils.h"
+#include "src/commands/prop_values.h"
+#include "src/commands/schema_utils.h"
 
 namespace base {
 class Value;
diff --git a/libweave/src/commands/command_instance_unittest.cc b/libweave/src/commands/command_instance_unittest.cc
index 78932b0..811d9bb 100644
--- a/libweave/src/commands/command_instance_unittest.cc
+++ b/libweave/src/commands/command_instance_unittest.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "libweave/src/commands/command_instance.h"
+#include "src/commands/command_instance.h"
 
 #include <gtest/gtest.h>
 
-#include "libweave/src/commands/command_dictionary.h"
-#include "libweave/src/commands/prop_types.h"
-#include "libweave/src/commands/schema_utils.h"
-#include "libweave/src/commands/unittest_utils.h"
+#include "src/commands/command_dictionary.h"
+#include "src/commands/prop_types.h"
+#include "src/commands/schema_utils.h"
+#include "src/commands/unittest_utils.h"
 
 namespace weave {
 
diff --git a/libweave/src/commands/command_manager.cc b/libweave/src/commands/command_manager.cc
index 8a3237e..f1ff3d0 100644
--- a/libweave/src/commands/command_manager.cc
+++ b/libweave/src/commands/command_manager.cc
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "libweave/src/commands/command_manager.h"
+#include "src/commands/command_manager.h"
 
 #include <base/values.h>
 #include <weave/enum_to_string.h>
 #include <weave/error.h>
 #include <weave/provider/config_store.h>
 
-#include "libweave/src/commands/schema_constants.h"
-#include "libweave/src/utils.h"
+#include "src/commands/schema_constants.h"
+#include "src/utils.h"
 
 namespace weave {
 
diff --git a/libweave/src/commands/command_manager.h b/libweave/src/commands/command_manager.h
index 6db1ef4..c982d2d 100644
--- a/libweave/src/commands/command_manager.h
+++ b/libweave/src/commands/command_manager.h
@@ -14,8 +14,8 @@
 #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 "src/commands/command_dictionary.h"
+#include "src/commands/command_queue.h"
 
 namespace weave {
 
diff --git a/libweave/src/commands/command_manager_unittest.cc b/libweave/src/commands/command_manager_unittest.cc
index b97799d..7aa560f 100644
--- a/libweave/src/commands/command_manager_unittest.cc
+++ b/libweave/src/commands/command_manager_unittest.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 "libweave/src/commands/command_manager.h"
+#include "src/commands/command_manager.h"
 
 #include <map>
 
@@ -10,8 +10,8 @@
 #include <gtest/gtest.h>
 #include <weave/provider/test/mock_config_store.h>
 
-#include "libweave/src/bind_lambda.h"
-#include "libweave/src/commands/unittest_utils.h"
+#include "src/bind_lambda.h"
+#include "src/commands/unittest_utils.h"
 
 using testing::Return;
 
diff --git a/libweave/src/commands/command_queue.cc b/libweave/src/commands/command_queue.cc
index 8031715..f172f8e 100644
--- a/libweave/src/commands/command_queue.cc
+++ b/libweave/src/commands/command_queue.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 "libweave/src/commands/command_queue.h"
+#include "src/commands/command_queue.h"
 
 #include <base/bind.h>
 #include <base/time/time.h>
diff --git a/libweave/src/commands/command_queue.h b/libweave/src/commands/command_queue.h
index 66cc2d2..36a2449 100644
--- a/libweave/src/commands/command_queue.h
+++ b/libweave/src/commands/command_queue.h
@@ -17,7 +17,7 @@
 #include <base/time/time.h>
 #include <weave/commands.h>
 
-#include "libweave/src/commands/command_instance.h"
+#include "src/commands/command_instance.h"
 
 namespace weave {
 
diff --git a/libweave/src/commands/command_queue_unittest.cc b/libweave/src/commands/command_queue_unittest.cc
index f0abfe2..f88a74e 100644
--- a/libweave/src/commands/command_queue_unittest.cc
+++ b/libweave/src/commands/command_queue_unittest.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 "libweave/src/commands/command_queue.h"
+#include "src/commands/command_queue.h"
 
 #include <set>
 #include <string>
@@ -12,9 +12,9 @@
 #include <base/memory/weak_ptr.h>
 #include <gtest/gtest.h>
 
-#include "libweave/src/commands/command_definition.h"
-#include "libweave/src/commands/object_schema.h"
-#include "libweave/src/string_utils.h"
+#include "src/commands/command_definition.h"
+#include "src/commands/object_schema.h"
+#include "src/string_utils.h"
 
 namespace weave {
 
diff --git a/libweave/src/commands/object_schema.cc b/libweave/src/commands/object_schema.cc
index 23d13f2..c43bd14 100644
--- a/libweave/src/commands/object_schema.cc
+++ b/libweave/src/commands/object_schema.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 "libweave/src/commands/object_schema.h"
+#include "src/commands/object_schema.h"
 
 #include <algorithm>
 #include <limits>
@@ -11,10 +11,10 @@
 #include <base/values.h>
 #include <weave/enum_to_string.h>
 
-#include "libweave/src/commands/prop_types.h"
-#include "libweave/src/commands/prop_values.h"
-#include "libweave/src/commands/schema_constants.h"
-#include "libweave/src/string_utils.h"
+#include "src/commands/prop_types.h"
+#include "src/commands/prop_values.h"
+#include "src/commands/schema_constants.h"
+#include "src/string_utils.h"
 
 namespace weave {
 
diff --git a/libweave/src/commands/object_schema_unittest.cc b/libweave/src/commands/object_schema_unittest.cc
index 65179a9..4108aa8 100644
--- a/libweave/src/commands/object_schema_unittest.cc
+++ b/libweave/src/commands/object_schema_unittest.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 "libweave/src/commands/object_schema.h"
+#include "src/commands/object_schema.h"
 
 #include <algorithm>
 #include <limits>
@@ -14,10 +14,10 @@
 #include <base/values.h>
 #include <gtest/gtest.h>
 
-#include "libweave/src/commands/prop_constraints.h"
-#include "libweave/src/commands/prop_types.h"
-#include "libweave/src/commands/schema_constants.h"
-#include "libweave/src/commands/unittest_utils.h"
+#include "src/commands/prop_constraints.h"
+#include "src/commands/prop_types.h"
+#include "src/commands/schema_constants.h"
+#include "src/commands/unittest_utils.h"
 
 namespace weave {
 
diff --git a/libweave/src/commands/prop_constraints.cc b/libweave/src/commands/prop_constraints.cc
index cedf3bb..bb52ba1 100644
--- a/libweave/src/commands/prop_constraints.cc
+++ b/libweave/src/commands/prop_constraints.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "libweave/src/commands/prop_constraints.h"
+#include "src/commands/prop_constraints.h"
 
 #include <base/json/json_writer.h>
 #include <base/logging.h>
 
-#include "libweave/src/commands/prop_values.h"
-#include "libweave/src/commands/schema_constants.h"
-#include "libweave/src/string_utils.h"
+#include "src/commands/prop_values.h"
+#include "src/commands/schema_constants.h"
+#include "src/string_utils.h"
 
 namespace weave {
 
diff --git a/libweave/src/commands/prop_constraints.h b/libweave/src/commands/prop_constraints.h
index be06f6f..b2bdebe 100644
--- a/libweave/src/commands/prop_constraints.h
+++ b/libweave/src/commands/prop_constraints.h
@@ -13,10 +13,10 @@
 #include <base/values.h>
 #include <weave/error.h>
 
-#include "libweave/src/commands/prop_values.h"
-#include "libweave/src/commands/schema_constants.h"
-#include "libweave/src/commands/schema_utils.h"
-#include "libweave/src/string_utils.h"
+#include "src/commands/prop_values.h"
+#include "src/commands/schema_constants.h"
+#include "src/commands/schema_utils.h"
+#include "src/string_utils.h"
 
 namespace weave {
 
diff --git a/libweave/src/commands/prop_types.cc b/libweave/src/commands/prop_types.cc
index af08ef0..c06170a 100644
--- a/libweave/src/commands/prop_types.cc
+++ b/libweave/src/commands/prop_types.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 "libweave/src/commands/prop_types.h"
+#include "src/commands/prop_types.h"
 
 #include <algorithm>
 #include <limits>
@@ -12,9 +12,9 @@
 #include <base/logging.h>
 #include <base/values.h>
 
-#include "libweave/src/commands/object_schema.h"
-#include "libweave/src/commands/prop_values.h"
-#include "libweave/src/commands/schema_constants.h"
+#include "src/commands/object_schema.h"
+#include "src/commands/prop_values.h"
+#include "src/commands/schema_constants.h"
 
 namespace weave {
 
diff --git a/libweave/src/commands/prop_types.h b/libweave/src/commands/prop_types.h
index 0960c3a..4b0b721 100644
--- a/libweave/src/commands/prop_types.h
+++ b/libweave/src/commands/prop_types.h
@@ -15,8 +15,8 @@
 
 #include <weave/error.h>
 
-#include "libweave/src/commands/prop_constraints.h"
-#include "libweave/src/commands/prop_values.h"
+#include "src/commands/prop_constraints.h"
+#include "src/commands/prop_values.h"
 
 namespace weave {
 
diff --git a/libweave/src/commands/prop_values.cc b/libweave/src/commands/prop_values.cc
index 4d92921..2e78ce5 100644
--- a/libweave/src/commands/prop_values.cc
+++ b/libweave/src/commands/prop_values.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "libweave/src/commands/prop_values.h"
+#include "src/commands/prop_values.h"
 
-#include "libweave/src/commands/prop_types.h"
+#include "src/commands/prop_types.h"
 
 namespace weave {
 
diff --git a/libweave/src/commands/prop_values.h b/libweave/src/commands/prop_values.h
index cb8a662..9f7ed72 100644
--- a/libweave/src/commands/prop_values.h
+++ b/libweave/src/commands/prop_values.h
@@ -11,7 +11,7 @@
 
 #include <weave/error.h>
 
-#include "libweave/src/commands/schema_utils.h"
+#include "src/commands/schema_utils.h"
 
 namespace base {
 class Value;
diff --git a/libweave/src/commands/schema_constants.cc b/libweave/src/commands/schema_constants.cc
index 9c7bc45..9affe73 100644
--- a/libweave/src/commands/schema_constants.cc
+++ b/libweave/src/commands/schema_constants.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 "libweave/src/commands/schema_constants.h"
+#include "src/commands/schema_constants.h"
 
 namespace weave {
 
diff --git a/libweave/src/commands/schema_utils.cc b/libweave/src/commands/schema_utils.cc
index b48b89b..1191264 100644
--- a/libweave/src/commands/schema_utils.cc
+++ b/libweave/src/commands/schema_utils.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 "libweave/src/commands/schema_utils.h"
+#include "src/commands/schema_utils.h"
 
 #include <algorithm>
 #include <set>
@@ -11,9 +11,9 @@
 #include <base/json/json_writer.h>
 #include <base/logging.h>
 
-#include "libweave/src/commands/object_schema.h"
-#include "libweave/src/commands/prop_types.h"
-#include "libweave/src/commands/prop_values.h"
+#include "src/commands/object_schema.h"
+#include "src/commands/prop_types.h"
+#include "src/commands/prop_values.h"
 
 namespace weave {
 namespace {
diff --git a/libweave/src/commands/schema_utils_unittest.cc b/libweave/src/commands/schema_utils_unittest.cc
index 4ac735f..09122f3 100644
--- a/libweave/src/commands/schema_utils_unittest.cc
+++ b/libweave/src/commands/schema_utils_unittest.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 "libweave/src/commands/schema_utils.h"
+#include "src/commands/schema_utils.h"
 
 #include <memory>
 #include <string>
@@ -11,11 +11,11 @@
 #include <base/values.h>
 #include <gtest/gtest.h>
 
-#include "libweave/src/commands/object_schema.h"
-#include "libweave/src/commands/prop_types.h"
-#include "libweave/src/commands/prop_values.h"
-#include "libweave/src/commands/schema_constants.h"
-#include "libweave/src/commands/unittest_utils.h"
+#include "src/commands/object_schema.h"
+#include "src/commands/prop_types.h"
+#include "src/commands/prop_values.h"
+#include "src/commands/schema_constants.h"
+#include "src/commands/unittest_utils.h"
 
 namespace weave {
 
diff --git a/libweave/src/commands/unittest_utils.h b/libweave/src/commands/unittest_utils.h
index 78eeefd..b1cde46 100644
--- a/libweave/src/commands/unittest_utils.h
+++ b/libweave/src/commands/unittest_utils.h
@@ -12,8 +12,8 @@
 #include <gtest/gtest.h>
 #include <weave/test/unittest_utils.h>
 
-#include "libweave/src/commands/prop_types.h"
-#include "libweave/src/commands/prop_values.h"
+#include "src/commands/prop_types.h"
+#include "src/commands/prop_values.h"
 
 namespace weave {
 namespace test {
diff --git a/libweave/src/commands/user_role.cc b/libweave/src/commands/user_role.cc
index f6b8c7d..d45d02b 100644
--- a/libweave/src/commands/user_role.cc
+++ b/libweave/src/commands/user_role.cc
@@ -8,7 +8,7 @@
 #include <weave/enum_to_string.h>
 #include <weave/export.h>
 
-#include "libweave/src/commands/schema_constants.h"
+#include "src/commands/schema_constants.h"
 
 namespace weave {
 
diff --git a/libweave/src/config.cc b/libweave/src/config.cc
index 0f01e2c..2567f61 100644
--- a/libweave/src/config.cc
+++ b/libweave/src/config.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 "libweave/src/config.h"
+#include "src/config.h"
 
 #include <set>
 
@@ -14,8 +14,8 @@
 #include <base/values.h>
 #include <weave/enum_to_string.h>
 
-#include "libweave/src/privet/privet_types.h"
-#include "libweave/src/string_utils.h"
+#include "src/privet/privet_types.h"
+#include "src/string_utils.h"
 
 namespace weave {
 
diff --git a/libweave/src/config.h b/libweave/src/config.h
index c59cf86..e014f20 100644
--- a/libweave/src/config.h
+++ b/libweave/src/config.h
@@ -13,7 +13,7 @@
 #include <weave/error.h>
 #include <weave/provider/config_store.h>
 
-#include "libweave/src/privet/security_delegate.h"
+#include "src/privet/security_delegate.h"
 
 namespace weave {
 
diff --git a/libweave/src/config_unittest.cc b/libweave/src/config_unittest.cc
index ada7fde..9f08b18 100644
--- a/libweave/src/config_unittest.cc
+++ b/libweave/src/config_unittest.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 "libweave/src/config.h"
+#include "src/config.h"
 
 #include <set>
 
@@ -11,7 +11,7 @@
 #include <gtest/gtest.h>
 #include <weave/provider/test/mock_config_store.h>
 
-#include "libweave/src/commands/unittest_utils.h"
+#include "src/commands/unittest_utils.h"
 
 using testing::_;
 using testing::Invoke;
diff --git a/libweave/src/data_encoding.cc b/libweave/src/data_encoding.cc
index 28a63ea..d863b16 100644
--- a/libweave/src/data_encoding.cc
+++ b/libweave/src/data_encoding.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 "libweave/src/data_encoding.h"
+#include "src/data_encoding.h"
 
 #include <memory>
 
@@ -10,8 +10,8 @@
 #include <base/strings/string_util.h>
 #include <base/strings/stringprintf.h>
 
-#include "libweave/src/string_utils.h"
-#include "libweave/third_party/modp_b64/modp_b64/modp_b64.h"
+#include "src/string_utils.h"
+#include "third_party/modp_b64/modp_b64/modp_b64.h"
 
 namespace weave {
 
diff --git a/libweave/src/data_encoding_unittest.cc b/libweave/src/data_encoding_unittest.cc
index 6a546f8..ac981c3 100644
--- a/libweave/src/data_encoding_unittest.cc
+++ b/libweave/src/data_encoding_unittest.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 "libweave/src/data_encoding.h"
+#include "src/data_encoding.h"
 
 #include <algorithm>
 #include <numeric>
diff --git a/libweave/src/device_manager.cc b/libweave/src/device_manager.cc
index 1180488..17c628b 100644
--- a/libweave/src/device_manager.cc
+++ b/libweave/src/device_manager.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 "libweave/src/device_manager.h"
+#include "src/device_manager.h"
 
 #include <string>
 
 #include <base/bind.h>
 
-#include "libweave/src/base_api_handler.h"
-#include "libweave/src/commands/command_manager.h"
-#include "libweave/src/config.h"
-#include "libweave/src/device_registration_info.h"
-#include "libweave/src/privet/privet_manager.h"
-#include "libweave/src/states/state_change_queue.h"
-#include "libweave/src/states/state_manager.h"
+#include "src/base_api_handler.h"
+#include "src/commands/command_manager.h"
+#include "src/config.h"
+#include "src/device_registration_info.h"
+#include "src/privet/privet_manager.h"
+#include "src/states/state_change_queue.h"
+#include "src/states/state_manager.h"
 
 namespace weave {
 
diff --git a/libweave/src/device_registration_info.cc b/libweave/src/device_registration_info.cc
index ec23829..a5d2f11 100644
--- a/libweave/src/device_registration_info.cc
+++ b/libweave/src/device_registration_info.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 "libweave/src/device_registration_info.h"
+#include "src/device_registration_info.h"
 
 #include <algorithm>
 #include <memory>
@@ -19,18 +19,18 @@
 #include <weave/provider/network.h>
 #include <weave/provider/task_runner.h>
 
-#include "libweave/src/bind_lambda.h"
-#include "libweave/src/commands/cloud_command_proxy.h"
-#include "libweave/src/commands/command_definition.h"
-#include "libweave/src/commands/command_manager.h"
-#include "libweave/src/commands/schema_constants.h"
-#include "libweave/src/data_encoding.h"
-#include "libweave/src/http_constants.h"
-#include "libweave/src/json_error_codes.h"
-#include "libweave/src/notification/xmpp_channel.h"
-#include "libweave/src/states/state_manager.h"
-#include "libweave/src/string_utils.h"
-#include "libweave/src/utils.h"
+#include "src/bind_lambda.h"
+#include "src/commands/cloud_command_proxy.h"
+#include "src/commands/command_definition.h"
+#include "src/commands/command_manager.h"
+#include "src/commands/schema_constants.h"
+#include "src/data_encoding.h"
+#include "src/http_constants.h"
+#include "src/json_error_codes.h"
+#include "src/notification/xmpp_channel.h"
+#include "src/states/state_manager.h"
+#include "src/string_utils.h"
+#include "src/utils.h"
 
 namespace weave {
 
diff --git a/libweave/src/device_registration_info.h b/libweave/src/device_registration_info.h
index 8a6a157..f73d450 100644
--- a/libweave/src/device_registration_info.h
+++ b/libweave/src/device_registration_info.h
@@ -19,15 +19,15 @@
 #include <weave/cloud.h>
 #include <weave/provider/http_client.h>
 
-#include "libweave/src/backoff_entry.h"
-#include "libweave/src/commands/cloud_command_update_interface.h"
-#include "libweave/src/commands/command_manager.h"
-#include "libweave/src/config.h"
-#include "libweave/src/data_encoding.h"
-#include "libweave/src/notification/notification_channel.h"
-#include "libweave/src/notification/notification_delegate.h"
-#include "libweave/src/notification/pull_channel.h"
-#include "libweave/src/states/state_change_queue_interface.h"
+#include "src/backoff_entry.h"
+#include "src/commands/cloud_command_update_interface.h"
+#include "src/commands/command_manager.h"
+#include "src/config.h"
+#include "src/data_encoding.h"
+#include "src/notification/notification_channel.h"
+#include "src/notification/notification_delegate.h"
+#include "src/notification/pull_channel.h"
+#include "src/states/state_change_queue_interface.h"
 
 namespace base {
 class DictionaryValue;
diff --git a/libweave/src/device_registration_info_unittest.cc b/libweave/src/device_registration_info_unittest.cc
index 9e53155..44d432c 100644
--- a/libweave/src/device_registration_info_unittest.cc
+++ b/libweave/src/device_registration_info_unittest.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 "libweave/src/device_registration_info.h"
+#include "src/device_registration_info.h"
 
 #include <base/json/json_reader.h>
 #include <base/json/json_writer.h>
@@ -11,12 +11,12 @@
 #include <weave/provider/test/mock_config_store.h>
 #include <weave/provider/test/mock_http_client.h>
 
-#include "libweave/src/bind_lambda.h"
-#include "libweave/src/commands/command_manager.h"
-#include "libweave/src/commands/unittest_utils.h"
-#include "libweave/src/http_constants.h"
-#include "libweave/src/states/mock_state_change_queue_interface.h"
-#include "libweave/src/states/state_manager.h"
+#include "src/bind_lambda.h"
+#include "src/commands/command_manager.h"
+#include "src/commands/unittest_utils.h"
+#include "src/http_constants.h"
+#include "src/states/mock_state_change_queue_interface.h"
+#include "src/states/state_manager.h"
 
 using testing::_;
 using testing::AtLeast;
diff --git a/libweave/src/http_constants.cc b/libweave/src/http_constants.cc
index c409c1a..e80aae4 100644
--- a/libweave/src/http_constants.cc
+++ b/libweave/src/http_constants.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 "libweave/src/http_constants.h"
+#include "src/http_constants.h"
 
 namespace weave {
 namespace http {
diff --git a/libweave/src/json_error_codes.cc b/libweave/src/json_error_codes.cc
index 8b40bf0..2a53ab5 100644
--- a/libweave/src/json_error_codes.cc
+++ b/libweave/src/json_error_codes.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 "libweave/src/json_error_codes.h"
+#include "src/json_error_codes.h"
 
 namespace weave {
 namespace errors {
diff --git a/libweave/src/notification/notification_parser.cc b/libweave/src/notification/notification_parser.cc
index e0816e3..8f23757 100644
--- a/libweave/src/notification/notification_parser.cc
+++ b/libweave/src/notification/notification_parser.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 "libweave/src/notification/notification_parser.h"
+#include "src/notification/notification_parser.h"
 
 #include <base/logging.h>
 
diff --git a/libweave/src/notification/notification_parser.h b/libweave/src/notification/notification_parser.h
index 9474570..e77c9e7 100644
--- a/libweave/src/notification/notification_parser.h
+++ b/libweave/src/notification/notification_parser.h
@@ -9,7 +9,7 @@
 
 #include <base/values.h>
 
-#include "libweave/src/notification/notification_delegate.h"
+#include "src/notification/notification_delegate.h"
 
 namespace weave {
 
diff --git a/libweave/src/notification/notification_parser_unittest.cc b/libweave/src/notification/notification_parser_unittest.cc
index 3572542..fae7e0d 100644
--- a/libweave/src/notification/notification_parser_unittest.cc
+++ b/libweave/src/notification/notification_parser_unittest.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "libweave/src/notification/notification_parser.h"
+#include "src/notification/notification_parser.h"
 
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include "libweave/src/commands/unittest_utils.h"
+#include "src/commands/unittest_utils.h"
 
 using testing::SaveArg;
 using testing::Invoke;
diff --git a/libweave/src/notification/pull_channel.cc b/libweave/src/notification/pull_channel.cc
index 78bfdcf..f71066c 100644
--- a/libweave/src/notification/pull_channel.cc
+++ b/libweave/src/notification/pull_channel.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "libweave/src/notification/pull_channel.h"
+#include "src/notification/pull_channel.h"
 
 #include <base/bind.h>
 #include <base/location.h>
 #include <weave/provider/task_runner.h>
 
-#include "libweave/src/notification/notification_delegate.h"
+#include "src/notification/notification_delegate.h"
 
 namespace weave {
 
diff --git a/libweave/src/notification/pull_channel.h b/libweave/src/notification/pull_channel.h
index ef40403..8f33f8f 100644
--- a/libweave/src/notification/pull_channel.h
+++ b/libweave/src/notification/pull_channel.h
@@ -12,7 +12,7 @@
 #include <base/memory/weak_ptr.h>
 #include <base/time/time.h>
 
-#include "libweave/src/notification/notification_channel.h"
+#include "src/notification/notification_channel.h"
 
 namespace weave {
 
diff --git a/libweave/src/notification/xml_node.cc b/libweave/src/notification/xml_node.cc
index 443ac51..d838613 100644
--- a/libweave/src/notification/xml_node.cc
+++ b/libweave/src/notification/xml_node.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "libweave/src/notification/xml_node.h"
+#include "src/notification/xml_node.h"
 
 #include <base/strings/stringprintf.h>
 
-#include "libweave/src/string_utils.h"
+#include "src/string_utils.h"
 
 namespace weave {
 
diff --git a/libweave/src/notification/xml_node_unittest.cc b/libweave/src/notification/xml_node_unittest.cc
index de3fddd..09d25d3 100644
--- a/libweave/src/notification/xml_node_unittest.cc
+++ b/libweave/src/notification/xml_node_unittest.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "libweave/src/notification/xml_node.h"
+#include "src/notification/xml_node.h"
 
 #include <memory>
 
 #include <gtest/gtest.h>
 
-#include "libweave/src/notification/xmpp_stream_parser.h"
+#include "src/notification/xmpp_stream_parser.h"
 
 namespace weave {
 namespace {
diff --git a/libweave/src/notification/xmpp_channel.cc b/libweave/src/notification/xmpp_channel.cc
index ca717c2..fae2022 100644
--- a/libweave/src/notification/xmpp_channel.cc
+++ b/libweave/src/notification/xmpp_channel.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 "libweave/src/notification/xmpp_channel.h"
+#include "src/notification/xmpp_channel.h"
 
 #include <string>
 
@@ -10,13 +10,13 @@
 #include <weave/provider/network.h>
 #include <weave/provider/task_runner.h>
 
-#include "libweave/src/backoff_entry.h"
-#include "libweave/src/data_encoding.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/privet/openssl_utils.h"
-#include "libweave/src/utils.h"
+#include "src/backoff_entry.h"
+#include "src/data_encoding.h"
+#include "src/notification/notification_delegate.h"
+#include "src/notification/notification_parser.h"
+#include "src/notification/xml_node.h"
+#include "src/privet/openssl_utils.h"
+#include "src/utils.h"
 
 namespace weave {
 
diff --git a/libweave/src/notification/xmpp_channel.h b/libweave/src/notification/xmpp_channel.h
index c6ab337..27e1f1b 100644
--- a/libweave/src/notification/xmpp_channel.h
+++ b/libweave/src/notification/xmpp_channel.h
@@ -15,10 +15,10 @@
 #include <base/memory/weak_ptr.h>
 #include <weave/stream.h>
 
-#include "libweave/src/backoff_entry.h"
-#include "libweave/src/notification/notification_channel.h"
-#include "libweave/src/notification/xmpp_iq_stanza_handler.h"
-#include "libweave/src/notification/xmpp_stream_parser.h"
+#include "src/backoff_entry.h"
+#include "src/notification/notification_channel.h"
+#include "src/notification/xmpp_iq_stanza_handler.h"
+#include "src/notification/xmpp_stream_parser.h"
 
 namespace weave {
 
diff --git a/libweave/src/notification/xmpp_channel_unittest.cc b/libweave/src/notification/xmpp_channel_unittest.cc
index e783727..c6e0be1 100644
--- a/libweave/src/notification/xmpp_channel_unittest.cc
+++ b/libweave/src/notification/xmpp_channel_unittest.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 "libweave/src/notification/xmpp_channel.h"
+#include "src/notification/xmpp_channel.h"
 
 #include <algorithm>
 #include <queue>
@@ -12,7 +12,7 @@
 #include <weave/provider/test/mock_network.h>
 #include <weave/test/fake_stream.h>
 
-#include "libweave/src/bind_lambda.h"
+#include "src/bind_lambda.h"
 
 using testing::_;
 using testing::Invoke;
diff --git a/libweave/src/notification/xmpp_iq_stanza_handler.cc b/libweave/src/notification/xmpp_iq_stanza_handler.cc
index 0a0d87b..4b21e2d 100644
--- a/libweave/src/notification/xmpp_iq_stanza_handler.cc
+++ b/libweave/src/notification/xmpp_iq_stanza_handler.cc
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "libweave/src/notification/xmpp_iq_stanza_handler.h"
+#include "src/notification/xmpp_iq_stanza_handler.h"
 
 #include <base/bind.h>
 #include <base/strings/string_number_conversions.h>
 #include <base/strings/stringprintf.h>
 #include <weave/provider/task_runner.h>
 
-#include "libweave/src/notification/xml_node.h"
-#include "libweave/src/notification/xmpp_channel.h"
+#include "src/notification/xml_node.h"
+#include "src/notification/xmpp_channel.h"
 
 namespace weave {
 
diff --git a/libweave/src/notification/xmpp_iq_stanza_handler.h b/libweave/src/notification/xmpp_iq_stanza_handler.h
index 1de633f..9a463d4 100644
--- a/libweave/src/notification/xmpp_iq_stanza_handler.h
+++ b/libweave/src/notification/xmpp_iq_stanza_handler.h
@@ -14,7 +14,7 @@
 #include <base/time/time.h>
 #include <base/memory/weak_ptr.h>
 
-#include "libweave/src/notification/xmpp_stream_parser.h"
+#include "src/notification/xmpp_stream_parser.h"
 
 namespace weave {
 
diff --git a/libweave/src/notification/xmpp_iq_stanza_handler_unittest.cc b/libweave/src/notification/xmpp_iq_stanza_handler_unittest.cc
index 2fa7d97..72f3719 100644
--- a/libweave/src/notification/xmpp_iq_stanza_handler_unittest.cc
+++ b/libweave/src/notification/xmpp_iq_stanza_handler_unittest.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 "libweave/src/notification/xmpp_iq_stanza_handler.h"
+#include "src/notification/xmpp_iq_stanza_handler.h"
 
 #include <map>
 #include <memory>
@@ -11,10 +11,10 @@
 #include <gtest/gtest.h>
 #include <weave/provider/test/fake_task_runner.h>
 
-#include "libweave/src/bind_lambda.h"
-#include "libweave/src/notification/xml_node.h"
-#include "libweave/src/notification/xmpp_channel.h"
-#include "libweave/src/notification/xmpp_stream_parser.h"
+#include "src/bind_lambda.h"
+#include "src/notification/xml_node.h"
+#include "src/notification/xmpp_channel.h"
+#include "src/notification/xmpp_stream_parser.h"
 
 using testing::_;
 
diff --git a/libweave/src/notification/xmpp_stream_parser.cc b/libweave/src/notification/xmpp_stream_parser.cc
index 0aeac3e..607e4d6 100644
--- a/libweave/src/notification/xmpp_stream_parser.cc
+++ b/libweave/src/notification/xmpp_stream_parser.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "libweave/src/notification/xmpp_stream_parser.h"
+#include "src/notification/xmpp_stream_parser.h"
 
-#include "libweave/src/notification/xml_node.h"
+#include "src/notification/xml_node.h"
 
 namespace weave {
 
diff --git a/libweave/src/notification/xmpp_stream_parser_unittest.cc b/libweave/src/notification/xmpp_stream_parser_unittest.cc
index 57ad51d..3c9bade 100644
--- a/libweave/src/notification/xmpp_stream_parser_unittest.cc
+++ b/libweave/src/notification/xmpp_stream_parser_unittest.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "libweave/src/notification/xmpp_stream_parser.h"
+#include "src/notification/xmpp_stream_parser.h"
 
 #include <memory>
 #include <vector>
 #include <gtest/gtest.h>
 
-#include "libweave/src/notification/xml_node.h"
+#include "src/notification/xml_node.h"
 
 namespace weave {
 namespace {
diff --git a/libweave/src/privet/cloud_delegate.cc b/libweave/src/privet/cloud_delegate.cc
index b1e7c16..1f69581 100644
--- a/libweave/src/privet/cloud_delegate.cc
+++ b/libweave/src/privet/cloud_delegate.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 "libweave/src/privet/cloud_delegate.h"
+#include "src/privet/cloud_delegate.h"
 
 #include <map>
 #include <vector>
@@ -14,12 +14,12 @@
 #include <weave/error.h>
 #include <weave/provider/task_runner.h>
 
-#include "libweave/src/backoff_entry.h"
-#include "libweave/src/commands/command_manager.h"
-#include "libweave/src/config.h"
-#include "libweave/src/device_registration_info.h"
-#include "libweave/src/privet/constants.h"
-#include "libweave/src/states/state_manager.h"
+#include "src/backoff_entry.h"
+#include "src/commands/command_manager.h"
+#include "src/config.h"
+#include "src/device_registration_info.h"
+#include "src/privet/constants.h"
+#include "src/states/state_manager.h"
 
 namespace weave {
 namespace privet {
diff --git a/libweave/src/privet/cloud_delegate.h b/libweave/src/privet/cloud_delegate.h
index 8152f78..9069fb3 100644
--- a/libweave/src/privet/cloud_delegate.h
+++ b/libweave/src/privet/cloud_delegate.h
@@ -13,8 +13,8 @@
 #include <base/memory/ref_counted.h>
 #include <base/observer_list.h>
 
-#include "libweave/src/privet/privet_types.h"
-#include "libweave/src/privet/security_delegate.h"
+#include "src/privet/privet_types.h"
+#include "src/privet/security_delegate.h"
 
 namespace base {
 class DictionaryValue;
diff --git a/libweave/src/privet/constants.cc b/libweave/src/privet/constants.cc
index ccea586..ade70af 100644
--- a/libweave/src/privet/constants.cc
+++ b/libweave/src/privet/constants.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 "libweave/src/privet/constants.h"
+#include "src/privet/constants.h"
 
 namespace weave {
 namespace privet {
diff --git a/libweave/src/privet/device_delegate.cc b/libweave/src/privet/device_delegate.cc
index 58340a5..3b2e247 100644
--- a/libweave/src/privet/device_delegate.cc
+++ b/libweave/src/privet/device_delegate.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "libweave/src/privet/device_delegate.h"
+#include "src/privet/device_delegate.h"
 
 #include <base/guid.h>
 
-#include "libweave/src/privet/constants.h"
+#include "src/privet/constants.h"
 
 namespace weave {
 namespace privet {
diff --git a/libweave/src/privet/mock_delegates.h b/libweave/src/privet/mock_delegates.h
index 8d29a1e..eb4bd6e 100644
--- a/libweave/src/privet/mock_delegates.h
+++ b/libweave/src/privet/mock_delegates.h
@@ -13,11 +13,11 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include "libweave/src/privet/cloud_delegate.h"
-#include "libweave/src/privet/device_delegate.h"
-#include "libweave/src/privet/identity_delegate.h"
-#include "libweave/src/privet/security_delegate.h"
-#include "libweave/src/privet/wifi_delegate.h"
+#include "src/privet/cloud_delegate.h"
+#include "src/privet/device_delegate.h"
+#include "src/privet/identity_delegate.h"
+#include "src/privet/security_delegate.h"
+#include "src/privet/wifi_delegate.h"
 
 using testing::_;
 using testing::Return;
diff --git a/libweave/src/privet/openssl_utils.cc b/libweave/src/privet/openssl_utils.cc
index a7a4137..c590a34 100644
--- a/libweave/src/privet/openssl_utils.cc
+++ b/libweave/src/privet/openssl_utils.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 "libweave/src/privet/openssl_utils.h"
+#include "src/privet/openssl_utils.h"
 
 #include <algorithm>
 
diff --git a/libweave/src/privet/privet_handler.cc b/libweave/src/privet/privet_handler.cc
index b91d8e3..9790c76 100644
--- a/libweave/src/privet/privet_handler.cc
+++ b/libweave/src/privet/privet_handler.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 "libweave/src/privet/privet_handler.h"
+#include "src/privet/privet_handler.h"
 
 #include <memory>
 #include <set>
@@ -16,14 +16,14 @@
 #include <base/values.h>
 #include <weave/enum_to_string.h>
 
-#include "libweave/src/http_constants.h"
-#include "libweave/src/privet/cloud_delegate.h"
-#include "libweave/src/privet/constants.h"
-#include "libweave/src/privet/device_delegate.h"
-#include "libweave/src/privet/identity_delegate.h"
-#include "libweave/src/privet/security_delegate.h"
-#include "libweave/src/privet/wifi_delegate.h"
-#include "libweave/src/string_utils.h"
+#include "src/http_constants.h"
+#include "src/privet/cloud_delegate.h"
+#include "src/privet/constants.h"
+#include "src/privet/device_delegate.h"
+#include "src/privet/identity_delegate.h"
+#include "src/privet/security_delegate.h"
+#include "src/privet/wifi_delegate.h"
+#include "src/string_utils.h"
 
 namespace weave {
 namespace privet {
diff --git a/libweave/src/privet/privet_handler.h b/libweave/src/privet/privet_handler.h
index 5cc8e8a..bda4127 100644
--- a/libweave/src/privet/privet_handler.h
+++ b/libweave/src/privet/privet_handler.h
@@ -13,7 +13,7 @@
 #include <base/memory/weak_ptr.h>
 #include <base/scoped_observer.h>
 
-#include "libweave/src/privet/cloud_delegate.h"
+#include "src/privet/cloud_delegate.h"
 
 namespace base {
 class Value;
diff --git a/libweave/src/privet/privet_handler_unittest.cc b/libweave/src/privet/privet_handler_unittest.cc
index 2980115..853648c 100644
--- a/libweave/src/privet/privet_handler_unittest.cc
+++ b/libweave/src/privet/privet_handler_unittest.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 "libweave/src/privet/privet_handler.h"
+#include "src/privet/privet_handler.h"
 
 #include <set>
 #include <string>
@@ -16,8 +16,8 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include "libweave/src/privet/constants.h"
-#include "libweave/src/privet/mock_delegates.h"
+#include "src/privet/constants.h"
+#include "src/privet/mock_delegates.h"
 
 using testing::_;
 using testing::DoAll;
diff --git a/libweave/src/privet/privet_manager.cc b/libweave/src/privet/privet_manager.cc
index e84fdf1..d0ebdd7 100644
--- a/libweave/src/privet/privet_manager.cc
+++ b/libweave/src/privet/privet_manager.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 "libweave/src/privet/privet_manager.h"
+#include "src/privet/privet_manager.h"
 
 #include <memory>
 #include <set>
@@ -17,14 +17,14 @@
 #include <base/values.h>
 #include <weave/provider/network.h>
 
-#include "libweave/src/device_registration_info.h"
-#include "libweave/src/http_constants.h"
-#include "libweave/src/privet/cloud_delegate.h"
-#include "libweave/src/privet/constants.h"
-#include "libweave/src/privet/device_delegate.h"
-#include "libweave/src/privet/privet_handler.h"
-#include "libweave/src/privet/publisher.h"
-#include "libweave/src/string_utils.h"
+#include "src/device_registration_info.h"
+#include "src/http_constants.h"
+#include "src/privet/cloud_delegate.h"
+#include "src/privet/constants.h"
+#include "src/privet/device_delegate.h"
+#include "src/privet/privet_handler.h"
+#include "src/privet/publisher.h"
+#include "src/string_utils.h"
 
 namespace weave {
 namespace privet {
diff --git a/libweave/src/privet/privet_manager.h b/libweave/src/privet/privet_manager.h
index a388967..3daecbd 100644
--- a/libweave/src/privet/privet_manager.h
+++ b/libweave/src/privet/privet_manager.h
@@ -14,9 +14,9 @@
 #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 "src/privet/cloud_delegate.h"
+#include "src/privet/security_manager.h"
+#include "src/privet/wifi_bootstrap_manager.h"
 
 namespace libwebserv {
 class ProtocolHandler;
diff --git a/libweave/src/privet/privet_types.cc b/libweave/src/privet/privet_types.cc
index dd26b93..b5b7d78 100644
--- a/libweave/src/privet/privet_types.cc
+++ b/libweave/src/privet/privet_types.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 "libweave/src/privet/privet_types.h"
+#include "src/privet/privet_types.h"
 
 #include <string>
 
diff --git a/libweave/src/privet/publisher.cc b/libweave/src/privet/publisher.cc
index cd9cd66..0726b18 100644
--- a/libweave/src/privet/publisher.cc
+++ b/libweave/src/privet/publisher.cc
@@ -2,18 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "libweave/src/privet/publisher.h"
+#include "src/privet/publisher.h"
 
 #include <map>
 
 #include <weave/error.h>
 #include <weave/provider/dns_service_discovery.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 "libweave/src/string_utils.h"
+#include "src/privet/cloud_delegate.h"
+#include "src/privet/device_delegate.h"
+#include "src/privet/wifi_bootstrap_manager.h"
+#include "src/privet/wifi_ssid_generator.h"
+#include "src/string_utils.h"
 
 namespace weave {
 namespace privet {
diff --git a/libweave/src/privet/publisher.h b/libweave/src/privet/publisher.h
index c1a9325..68845af 100644
--- a/libweave/src/privet/publisher.h
+++ b/libweave/src/privet/publisher.h
@@ -11,7 +11,7 @@
 
 #include <base/macros.h>
 
-#include "libweave/src/privet/identity_delegate.h"
+#include "src/privet/identity_delegate.h"
 
 namespace weave {
 
diff --git a/libweave/src/privet/security_delegate.h b/libweave/src/privet/security_delegate.h
index 4dfd05c..46eb425 100644
--- a/libweave/src/privet/security_delegate.h
+++ b/libweave/src/privet/security_delegate.h
@@ -12,7 +12,7 @@
 #include <base/time/time.h>
 #include <weave/privet.h>
 
-#include "libweave/src/privet/privet_types.h"
+#include "src/privet/privet_types.h"
 
 namespace weave {
 namespace privet {
diff --git a/libweave/src/privet/security_manager.cc b/libweave/src/privet/security_manager.cc
index 96b114f..8d896d9 100644
--- a/libweave/src/privet/security_manager.cc
+++ b/libweave/src/privet/security_manager.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 "libweave/src/privet/security_manager.h"
+#include "src/privet/security_manager.h"
 
 #include <algorithm>
 #include <limits>
@@ -18,11 +18,11 @@
 #include <base/time/time.h>
 #include <weave/provider/task_runner.h>
 
-#include "libweave/external/crypto/p224_spake.h"
-#include "libweave/src/data_encoding.h"
-#include "libweave/src/privet/constants.h"
-#include "libweave/src/privet/openssl_utils.h"
-#include "libweave/src/string_utils.h"
+#include "external/crypto/p224_spake.h"
+#include "src/data_encoding.h"
+#include "src/privet/constants.h"
+#include "src/privet/openssl_utils.h"
+#include "src/string_utils.h"
 
 namespace weave {
 namespace privet {
diff --git a/libweave/src/privet/security_manager.h b/libweave/src/privet/security_manager.h
index 4855778..c1adfc8 100644
--- a/libweave/src/privet/security_manager.h
+++ b/libweave/src/privet/security_manager.h
@@ -16,7 +16,7 @@
 #include <base/memory/weak_ptr.h>
 #include <weave/error.h>
 
-#include "libweave/src/privet/security_delegate.h"
+#include "src/privet/security_delegate.h"
 
 namespace crypto {
 class P224EncryptedKeyExchange;
diff --git a/libweave/src/privet/security_manager_unittest.cc b/libweave/src/privet/security_manager_unittest.cc
index ed225ae..7e4ea05 100644
--- a/libweave/src/privet/security_manager_unittest.cc
+++ b/libweave/src/privet/security_manager_unittest.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 "libweave/src/privet/security_manager.h"
+#include "src/privet/security_manager.h"
 
 #include <algorithm>
 #include <cctype>
@@ -21,9 +21,9 @@
 #include <gtest/gtest.h>
 #include <weave/provider/test/fake_task_runner.h>
 
-#include "libweave/external/crypto/p224_spake.h"
-#include "libweave/src/data_encoding.h"
-#include "libweave/src/privet/openssl_utils.h"
+#include "external/crypto/p224_spake.h"
+#include "src/data_encoding.h"
+#include "src/privet/openssl_utils.h"
 
 using testing::Eq;
 using testing::_;
diff --git a/libweave/src/privet/wifi_bootstrap_manager.cc b/libweave/src/privet/wifi_bootstrap_manager.cc
index 924835a..7fc9db5 100644
--- a/libweave/src/privet/wifi_bootstrap_manager.cc
+++ b/libweave/src/privet/wifi_bootstrap_manager.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 "libweave/src/privet/wifi_bootstrap_manager.h"
+#include "src/privet/wifi_bootstrap_manager.h"
 
 #include <base/logging.h>
 #include <base/memory/weak_ptr.h>
@@ -11,9 +11,9 @@
 #include <weave/provider/task_runner.h>
 #include <weave/provider/wifi.h>
 
-#include "libweave/src/bind_lambda.h"
-#include "libweave/src/privet/constants.h"
-#include "libweave/src/config.h"
+#include "src/bind_lambda.h"
+#include "src/privet/constants.h"
+#include "src/config.h"
 
 namespace weave {
 namespace privet {
diff --git a/libweave/src/privet/wifi_bootstrap_manager.h b/libweave/src/privet/wifi_bootstrap_manager.h
index fb6a517..52886f9 100644
--- a/libweave/src/privet/wifi_bootstrap_manager.h
+++ b/libweave/src/privet/wifi_bootstrap_manager.h
@@ -16,9 +16,9 @@
 #include <base/time/time.h>
 #include <weave/privet.h>
 
-#include "libweave/src/privet/privet_types.h"
-#include "libweave/src/privet/wifi_delegate.h"
-#include "libweave/src/privet/wifi_ssid_generator.h"
+#include "src/privet/privet_types.h"
+#include "src/privet/wifi_delegate.h"
+#include "src/privet/wifi_ssid_generator.h"
 
 namespace weave {
 
diff --git a/libweave/src/privet/wifi_delegate.h b/libweave/src/privet/wifi_delegate.h
index 3a44dc4..0cdf219 100644
--- a/libweave/src/privet/wifi_delegate.h
+++ b/libweave/src/privet/wifi_delegate.h
@@ -9,7 +9,7 @@
 #include <set>
 #include <string>
 
-#include "libweave/src/privet/privet_types.h"
+#include "src/privet/privet_types.h"
 
 namespace weave {
 namespace privet {
diff --git a/libweave/src/privet/wifi_ssid_generator.cc b/libweave/src/privet/wifi_ssid_generator.cc
index 280fcb9..4a1a589 100644
--- a/libweave/src/privet/wifi_ssid_generator.cc
+++ b/libweave/src/privet/wifi_ssid_generator.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 "libweave/src/privet/wifi_ssid_generator.h"
+#include "src/privet/wifi_ssid_generator.h"
 
 #include <bitset>
 
@@ -11,9 +11,9 @@
 #include <base/strings/string_number_conversions.h>
 #include <base/strings/stringprintf.h>
 
-#include "libweave/src/privet/cloud_delegate.h"
-#include "libweave/src/privet/device_delegate.h"
-#include "libweave/src/privet/wifi_delegate.h"
+#include "src/privet/cloud_delegate.h"
+#include "src/privet/device_delegate.h"
+#include "src/privet/wifi_delegate.h"
 
 namespace weave {
 namespace privet {
diff --git a/libweave/src/privet/wifi_ssid_generator_unittest.cc b/libweave/src/privet/wifi_ssid_generator_unittest.cc
index eb7b94e..85e2c1b 100644
--- a/libweave/src/privet/wifi_ssid_generator_unittest.cc
+++ b/libweave/src/privet/wifi_ssid_generator_unittest.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "libweave/src/privet/wifi_ssid_generator.h"
+#include "src/privet/wifi_ssid_generator.h"
 
 #include <gtest/gtest.h>
 
-#include "libweave/src/privet/mock_delegates.h"
-#include "libweave/src/privet/openssl_utils.h"
+#include "src/privet/mock_delegates.h"
+#include "src/privet/openssl_utils.h"
 
 namespace weave {
 namespace privet {
diff --git a/libweave/src/states/error_codes.cc b/libweave/src/states/error_codes.cc
index b86baee..4cf1699 100644
--- a/libweave/src/states/error_codes.cc
+++ b/libweave/src/states/error_codes.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 "libweave/src/states/error_codes.h"
+#include "src/states/error_codes.h"
 
 namespace weave {
 namespace errors {
diff --git a/libweave/src/states/mock_state_change_queue_interface.h b/libweave/src/states/mock_state_change_queue_interface.h
index fb02347..2eab88a 100644
--- a/libweave/src/states/mock_state_change_queue_interface.h
+++ b/libweave/src/states/mock_state_change_queue_interface.h
@@ -9,7 +9,7 @@
 
 #include <gmock/gmock.h>
 
-#include "libweave/src/states/state_change_queue_interface.h"
+#include "src/states/state_change_queue_interface.h"
 
 namespace weave {
 
diff --git a/libweave/src/states/state_change_queue.cc b/libweave/src/states/state_change_queue.cc
index 8f787ca..4a2906c 100644
--- a/libweave/src/states/state_change_queue.cc
+++ b/libweave/src/states/state_change_queue.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 "libweave/src/states/state_change_queue.h"
+#include "src/states/state_change_queue.h"
 
 #include <base/logging.h>
 
diff --git a/libweave/src/states/state_change_queue.h b/libweave/src/states/state_change_queue.h
index 3289209..a4b85d1 100644
--- a/libweave/src/states/state_change_queue.h
+++ b/libweave/src/states/state_change_queue.h
@@ -10,7 +10,7 @@
 
 #include <base/macros.h>
 
-#include "libweave/src/states/state_change_queue_interface.h"
+#include "src/states/state_change_queue_interface.h"
 
 namespace weave {
 
diff --git a/libweave/src/states/state_change_queue_interface.h b/libweave/src/states/state_change_queue_interface.h
index 5adae58..a50d0ba 100644
--- a/libweave/src/states/state_change_queue_interface.h
+++ b/libweave/src/states/state_change_queue_interface.h
@@ -10,7 +10,7 @@
 #include <base/callback_list.h>
 #include <base/time/time.h>
 
-#include "libweave/src/commands/schema_utils.h"
+#include "src/commands/schema_utils.h"
 
 namespace weave {
 
diff --git a/libweave/src/states/state_change_queue_unittest.cc b/libweave/src/states/state_change_queue_unittest.cc
index 002647e..427ff5b 100644
--- a/libweave/src/states/state_change_queue_unittest.cc
+++ b/libweave/src/states/state_change_queue_unittest.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "libweave/src/states/state_change_queue.h"
+#include "src/states/state_change_queue.h"
 
 #include <gtest/gtest.h>
 
-#include "libweave/src/bind_lambda.h"
-#include "libweave/src/commands/unittest_utils.h"
+#include "src/bind_lambda.h"
+#include "src/commands/unittest_utils.h"
 
 namespace weave {
 
diff --git a/libweave/src/states/state_manager.cc b/libweave/src/states/state_manager.cc
index 64a7db9..a3acc41 100644
--- a/libweave/src/states/state_manager.cc
+++ b/libweave/src/states/state_manager.cc
@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "libweave/src/states/state_manager.h"
+#include "src/states/state_manager.h"
 
 #include <base/logging.h>
 #include <base/values.h>
 #include <weave/provider/config_store.h>
 
-#include "libweave/src/json_error_codes.h"
-#include "libweave/src/states/error_codes.h"
-#include "libweave/src/states/state_change_queue_interface.h"
-#include "libweave/src/string_utils.h"
-#include "libweave/src/utils.h"
+#include "src/json_error_codes.h"
+#include "src/states/error_codes.h"
+#include "src/states/state_change_queue_interface.h"
+#include "src/string_utils.h"
+#include "src/utils.h"
 
 namespace weave {
 
diff --git a/libweave/src/states/state_manager.h b/libweave/src/states/state_manager.h
index 8f6b237..88e28c0 100644
--- a/libweave/src/states/state_manager.h
+++ b/libweave/src/states/state_manager.h
@@ -17,8 +17,8 @@
 #include <weave/error.h>
 #include <weave/state.h>
 
-#include "libweave/src/states/state_change_queue_interface.h"
-#include "libweave/src/states/state_package.h"
+#include "src/states/state_change_queue_interface.h"
+#include "src/states/state_package.h"
 
 namespace base {
 class DictionaryValue;
diff --git a/libweave/src/states/state_manager_unittest.cc b/libweave/src/states/state_manager_unittest.cc
index 1ae60d7..b7ae37e 100644
--- a/libweave/src/states/state_manager_unittest.cc
+++ b/libweave/src/states/state_manager_unittest.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 "libweave/src/states/state_manager.h"
+#include "src/states/state_manager.h"
 
 #include <cstdlib>  // for abs().
 #include <vector>
@@ -13,10 +13,10 @@
 #include <gtest/gtest.h>
 #include <weave/provider/test/mock_config_store.h>
 
-#include "libweave/src/commands/schema_constants.h"
-#include "libweave/src/commands/unittest_utils.h"
-#include "libweave/src/states/error_codes.h"
-#include "libweave/src/states/mock_state_change_queue_interface.h"
+#include "src/commands/schema_constants.h"
+#include "src/commands/unittest_utils.h"
+#include "src/states/error_codes.h"
+#include "src/states/mock_state_change_queue_interface.h"
 
 namespace weave {
 
diff --git a/libweave/src/states/state_package.cc b/libweave/src/states/state_package.cc
index c2e18dc..b6a5353 100644
--- a/libweave/src/states/state_package.cc
+++ b/libweave/src/states/state_package.cc
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "libweave/src/states/state_package.h"
+#include "src/states/state_package.h"
 
 #include <base/logging.h>
 #include <base/values.h>
 
-#include "libweave/src/commands/prop_types.h"
-#include "libweave/src/commands/prop_values.h"
-#include "libweave/src/commands/schema_utils.h"
-#include "libweave/src/states/error_codes.h"
+#include "src/commands/prop_types.h"
+#include "src/commands/prop_values.h"
+#include "src/commands/schema_utils.h"
+#include "src/states/error_codes.h"
 
 namespace weave {
 
diff --git a/libweave/src/states/state_package.h b/libweave/src/states/state_package.h
index 70e4df2..ea640a1 100644
--- a/libweave/src/states/state_package.h
+++ b/libweave/src/states/state_package.h
@@ -12,8 +12,8 @@
 #include <base/macros.h>
 #include <weave/error.h>
 
-#include "libweave/src/commands/object_schema.h"
-#include "libweave/src/commands/prop_values.h"
+#include "src/commands/object_schema.h"
+#include "src/commands/prop_values.h"
 
 namespace base {
 class DictionaryValue;
diff --git a/libweave/src/states/state_package_unittest.cc b/libweave/src/states/state_package_unittest.cc
index 8174ac6..f830997 100644
--- a/libweave/src/states/state_package_unittest.cc
+++ b/libweave/src/states/state_package_unittest.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 "libweave/src/states/state_package.h"
+#include "src/states/state_package.h"
 
 #include <memory>
 #include <string>
@@ -10,9 +10,9 @@
 #include <base/values.h>
 #include <gtest/gtest.h>
 
-#include "libweave/src/commands/schema_constants.h"
-#include "libweave/src/commands/unittest_utils.h"
-#include "libweave/src/states/error_codes.h"
+#include "src/commands/schema_constants.h"
+#include "src/commands/unittest_utils.h"
+#include "src/states/error_codes.h"
 
 namespace weave {
 
diff --git a/libweave/src/string_utils.cc b/libweave/src/string_utils.cc
index d73e508..67688b9 100644
--- a/libweave/src/string_utils.cc
+++ b/libweave/src/string_utils.cc
@@ -8,7 +8,7 @@
 
 #include <base/strings/string_util.h>
 
-#include "libweave/src/string_utils.h"
+#include "src/string_utils.h"
 
 namespace weave {
 
diff --git a/libweave/src/string_utils_unittest.cc b/libweave/src/string_utils_unittest.cc
index 083ebb8..2473a79 100644
--- a/libweave/src/string_utils_unittest.cc
+++ b/libweave/src/string_utils_unittest.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 "libweave/src/string_utils.h"
+#include "src/string_utils.h"
 
 #include <list>
 #include <set>
diff --git a/libweave/src/test/mock_command.cc b/libweave/src/test/mock_command.cc
index 91bd9a8..43b528b 100644
--- a/libweave/src/test/mock_command.cc
+++ b/libweave/src/test/mock_command.cc
@@ -9,7 +9,7 @@
 
 #include <base/values.h>
 
-#include "libweave/src/commands/unittest_utils.h"
+#include "src/commands/unittest_utils.h"
 
 namespace weave {
 namespace test {
diff --git a/libweave/src/test/unittest_utils.cc b/libweave/src/test/unittest_utils.cc
index 6f55e81..0078894 100644
--- a/libweave/src/test/unittest_utils.cc
+++ b/libweave/src/test/unittest_utils.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 "libweave/src/commands/unittest_utils.h"
+#include "src/commands/unittest_utils.h"
 
 #include <base/json/json_reader.h>
 #include <base/json/json_writer.h>
diff --git a/libweave/src/utils.cc b/libweave/src/utils.cc
index 317eb5d..6827db5 100644
--- a/libweave/src/utils.cc
+++ b/libweave/src/utils.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "libweave/src/utils.h"
+#include "src/utils.h"
 
 #include <base/bind_helpers.h>
 #include <base/json/json_reader.h>
 
-#include "libweave/src/json_error_codes.h"
+#include "src/json_error_codes.h"
 
 namespace weave {
 
diff --git a/libweave/src/weave_unittest.cc b/libweave/src/weave_unittest.cc
index e787c84..4361906 100644
--- a/libweave/src/weave_unittest.cc
+++ b/libweave/src/weave_unittest.cc
@@ -16,7 +16,7 @@
 #include <weave/provider/test/mock_wifi.h>
 #include <weave/test/unittest_utils.h>
 
-#include "libweave/src/bind_lambda.h"
+#include "src/bind_lambda.h"
 
 using testing::_;
 using testing::AtMost;