diff --git a/file_writer.h b/file_writer.h
index 69d6ff9..9350bb6 100644
--- a/file_writer.h
+++ b/file_writer.h
@@ -9,8 +9,10 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
-#include "base/logging.h"
-#include "update_engine/action_processor.h"
+
+#include <base/logging.h>
+
+#include "update_engine/error_code.h"
 #include "update_engine/utils.h"
 
 // FileWriter is a class that is used to (synchronously, for now) write to
diff --git a/file_writer_unittest.cc b/file_writer_unittest.cc
index 52a50a9..5d24eab 100644
--- a/file_writer_unittest.cc
+++ b/file_writer_unittest.cc
@@ -2,13 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "update_engine/file_writer.h"
+
 #include <errno.h>
 #include <string.h>
 #include <unistd.h>
+
 #include <string>
 #include <vector>
+
 #include <gtest/gtest.h>
-#include "update_engine/file_writer.h"
+
 #include "update_engine/test_utils.h"
 #include "update_engine/utils.h"