Fix cpplint issues
Existing cpplint issues block uploading CLs, fix most of them.
Test: m checkbuild
Change-Id: I3477d388659c93c1ca517c4ad37502e0a71014ad
diff --git a/payload_generator/cow_size_estimator.cc b/payload_generator/cow_size_estimator.cc
index 8e2c66d..3a23f44 100644
--- a/payload_generator/cow_size_estimator.cc
+++ b/payload_generator/cow_size_estimator.cc
@@ -16,6 +16,7 @@
#include "update_engine/payload_generator/cow_size_estimator.h"
+#include <algorithm>
#include <functional>
#include <string>
#include <utility>
@@ -26,10 +27,10 @@
#include "update_engine/common/cow_operation_convert.h"
#include "update_engine/common/utils.h"
+#include "update_engine/payload_consumer/vabc_partition_writer.h"
#include "update_engine/payload_generator/extent_ranges.h"
#include "update_engine/payload_generator/extent_utils.h"
#include "update_engine/update_metadata.pb.h"
-#include "update_engine/payload_consumer/vabc_partition_writer.h"
namespace chromeos_update_engine {
using android::snapshot::CowWriter;
diff --git a/payload_generator/deflate_utils.h b/payload_generator/deflate_utils.h
index c055876..d69a551 100644
--- a/payload_generator/deflate_utils.h
+++ b/payload_generator/deflate_utils.h
@@ -17,9 +17,11 @@
#ifndef UPDATE_ENGINE_PAYLOAD_GENERATOR_DEFLATE_UTILS_H_
#define UPDATE_ENGINE_PAYLOAD_GENERATOR_DEFLATE_UTILS_H_
-#include <puffin/puffdiff.h>
+#include <string>
#include <vector>
+#include <puffin/puffdiff.h>
+
#include "update_engine/payload_generator/filesystem_interface.h"
#include "update_engine/payload_generator/payload_generation_config.h"
diff --git a/payload_generator/extent_utils.h b/payload_generator/extent_utils.h
index 712cc92..bd9fc8b 100644
--- a/payload_generator/extent_utils.h
+++ b/payload_generator/extent_utils.h
@@ -17,6 +17,7 @@
#ifndef UPDATE_ENGINE_PAYLOAD_GENERATOR_EXTENT_UTILS_H_
#define UPDATE_ENGINE_PAYLOAD_GENERATOR_EXTENT_UTILS_H_
+#include <limits>
#include <string>
#include <vector>
diff --git a/payload_generator/merge_sequence_generator.cc b/payload_generator/merge_sequence_generator.cc
index 6cbb57b..cb43221 100644
--- a/payload_generator/merge_sequence_generator.cc
+++ b/payload_generator/merge_sequence_generator.cc
@@ -17,6 +17,7 @@
#include "update_engine/payload_generator/merge_sequence_generator.h"
#include <algorithm>
+#include <limits>
#include "update_engine/payload_generator/delta_diff_generator.h"
#include "update_engine/payload_generator/extent_ranges.h"