diff --git a/libweave/include/weave/device.h b/libweave/include/weave/device.h
index cdac496..0bd5ade 100644
--- a/libweave/include/weave/device.h
+++ b/libweave/include/weave/device.h
@@ -9,7 +9,6 @@
 #include <set>
 #include <string>
 
-#include <base/files/file_path.h>
 #include <weave/cloud.h>
 #include <weave/commands.h>
 #include <weave/config_store.h>
diff --git a/libweave/src/backoff_entry.cc b/libweave/src/backoff_entry.cc
index b9c5b8f..cef8b7f 100644
--- a/libweave/src/backoff_entry.cc
+++ b/libweave/src/backoff_entry.cc
@@ -9,7 +9,6 @@
 #include <limits>
 
 #include <base/logging.h>
-#include <base/numerics/safe_math.h>
 #include <base/rand_util.h>
 
 namespace weave {
diff --git a/libweave/src/commands/command_manager.cc b/libweave/src/commands/command_manager.cc
index 6ecd8ba..efad250 100644
--- a/libweave/src/commands/command_manager.cc
+++ b/libweave/src/commands/command_manager.cc
@@ -4,7 +4,6 @@
 
 #include "libweave/src/commands/command_manager.h"
 
-#include <base/files/file_enumerator.h>
 #include <base/values.h>
 #include <weave/config_store.h>
 #include <weave/enum_to_string.h>
diff --git a/libweave/src/commands/command_manager.h b/libweave/src/commands/command_manager.h
index b533579..e014fca 100644
--- a/libweave/src/commands/command_manager.h
+++ b/libweave/src/commands/command_manager.h
@@ -10,7 +10,6 @@
 #include <vector>
 
 #include <base/callback.h>
-#include <base/files/file_path.h>
 #include <base/macros.h>
 #include <base/memory/weak_ptr.h>
 #include <weave/commands.h>
diff --git a/libweave/src/commands/command_manager_unittest.cc b/libweave/src/commands/command_manager_unittest.cc
index a3b3de6..932414c 100644
--- a/libweave/src/commands/command_manager_unittest.cc
+++ b/libweave/src/commands/command_manager_unittest.cc
@@ -6,8 +6,6 @@
 
 #include <map>
 
-#include <base/files/file_util.h>
-#include <base/files/scoped_temp_dir.h>
 #include <base/json/json_writer.h>
 #include <gtest/gtest.h>
 #include <weave/mock_config_store.h>
diff --git a/libweave/src/notification/xmpp_channel.cc b/libweave/src/notification/xmpp_channel.cc
index 90d35d2..9dfa9ef 100644
--- a/libweave/src/notification/xmpp_channel.cc
+++ b/libweave/src/notification/xmpp_channel.cc
@@ -6,7 +6,6 @@
 
 #include <string>
 
-#include <base/base64.h>
 #include <base/bind.h>
 #include <weave/network.h>
 #include <weave/task_runner.h>
diff --git a/libweave/src/privet/device_delegate.cc b/libweave/src/privet/device_delegate.cc
index d5f516e..6315339 100644
--- a/libweave/src/privet/device_delegate.cc
+++ b/libweave/src/privet/device_delegate.cc
@@ -4,7 +4,6 @@
 
 #include "libweave/src/privet/device_delegate.h"
 
-#include <base/files/file_util.h>
 #include <base/guid.h>
 
 #include "libweave/src/privet/constants.h"
diff --git a/libweave/src/privet/privet_manager.cc b/libweave/src/privet/privet_manager.cc
index 16bbb4d..125fba5 100644
--- a/libweave/src/privet/privet_manager.cc
+++ b/libweave/src/privet/privet_manager.cc
@@ -9,7 +9,6 @@
 #include <string>
 
 #include <base/bind.h>
-#include <base/command_line.h>
 #include <base/json/json_reader.h>
 #include <base/json/json_writer.h>
 #include <base/memory/weak_ptr.h>
diff --git a/libweave/src/privet/security_manager.h b/libweave/src/privet/security_manager.h
index eda7946..60c59e8 100644
--- a/libweave/src/privet/security_manager.h
+++ b/libweave/src/privet/security_manager.h
@@ -12,7 +12,6 @@
 #include <vector>
 
 #include <base/callback.h>
-#include <base/files/file_path.h>
 #include <base/memory/weak_ptr.h>
 #include <weave/error.h>
 
diff --git a/libweave/src/privet/wifi_bootstrap_manager.h b/libweave/src/privet/wifi_bootstrap_manager.h
index c6f97d7..f622c77 100644
--- a/libweave/src/privet/wifi_bootstrap_manager.h
+++ b/libweave/src/privet/wifi_bootstrap_manager.h
@@ -10,7 +10,6 @@
 #include <vector>
 
 #include <base/callback.h>
-#include <base/files/file_path.h>
 #include <base/macros.h>
 #include <base/memory/weak_ptr.h>
 #include <base/scoped_observer.h>
diff --git a/libweave/src/privet/wifi_ssid_generator_unittest.cc b/libweave/src/privet/wifi_ssid_generator_unittest.cc
index 3b8c3ea..b30398b 100644
--- a/libweave/src/privet/wifi_ssid_generator_unittest.cc
+++ b/libweave/src/privet/wifi_ssid_generator_unittest.cc
@@ -4,7 +4,6 @@
 
 #include "libweave/src/privet/wifi_ssid_generator.h"
 
-#include <base/strings/utf_string_conversions.h>
 #include <gtest/gtest.h>
 
 #include "libweave/src/privet/mock_delegates.h"
diff --git a/libweave/src/states/state_change_queue.h b/libweave/src/states/state_change_queue.h
index 436f454..4b2acaf 100644
--- a/libweave/src/states/state_change_queue.h
+++ b/libweave/src/states/state_change_queue.h
@@ -9,7 +9,6 @@
 #include <vector>
 
 #include <base/macros.h>
-#include <base/threading/thread_checker.h>
 
 #include "libweave/src/states/state_change_queue_interface.h"