diff --git a/include/libyuv/compare.h b/include/libyuv/compare.h
index bde7a92a7..def29e37e 100644
--- a/include/libyuv/compare.h
+++ b/include/libyuv/compare.h
@@ -8,7 +8,6 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-
 #ifndef INCLUDE_LIBYUV_COMPARE_H_
 #define INCLUDE_LIBYUV_COMPARE_H_
 
diff --git a/include/libyuv/convert.h b/include/libyuv/convert.h
index 32568f323..85b423ffc 100644
--- a/include/libyuv/convert.h
+++ b/include/libyuv/convert.h
@@ -8,7 +8,6 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-
 #ifndef INCLUDE_LIBYUV_CONVERT_H_
 #define INCLUDE_LIBYUV_CONVERT_H_
 
diff --git a/include/libyuv/format_conversion.h b/include/libyuv/format_conversion.h
index d3d36f388..0139f4c5e 100644
--- a/include/libyuv/format_conversion.h
+++ b/include/libyuv/format_conversion.h
@@ -8,7 +8,6 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-
 #ifndef INCLUDE_LIBYUV_FORMATCONVERSION_H_
 #define INCLUDE_LIBYUV_FORMATCONVERSION_H_
 
diff --git a/include/libyuv/planar_functions.h b/include/libyuv/planar_functions.h
index 73bdf8c42..5e2cb500e 100644
--- a/include/libyuv/planar_functions.h
+++ b/include/libyuv/planar_functions.h
@@ -8,7 +8,6 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-
 #ifndef INCLUDE_LIBYUV_PLANAR_FUNCTIONS_H_
 #define INCLUDE_LIBYUV_PLANAR_FUNCTIONS_H_
 
diff --git a/source/compare.cc b/source/compare.cc
index 1cbb72e3e..a58a3f641 100644
--- a/source/compare.cc
+++ b/source/compare.cc
@@ -8,12 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "libyuv/basic_types.h"
 #include "libyuv/compare.h"
-#include "libyuv/cpu_id.h"
 
-#include <math.h>
 #include <float.h>
+#include <math.h>
+
+#include "libyuv/basic_types.h"
+#include "libyuv/cpu_id.h"
 
 namespace libyuv {
 
diff --git a/source/convert.cc b/source/convert.cc
index 1079d1ecb..3795fcfbf 100644
--- a/source/convert.cc
+++ b/source/convert.cc
@@ -10,6 +10,12 @@
 
 #include "libyuv/convert.h"
 
+//#define SCALEOPT //Currently for windows only. June 2010
+
+#ifdef SCALEOPT
+#include <emmintrin.h>
+#endif
+
 #include "conversion_tables.h"
 #include "libyuv/basic_types.h"
 #include "libyuv/cpu_id.h"
@@ -19,12 +25,6 @@
 #include "row.h"
 #include "video_common.h"
 
-//#define SCALEOPT //Currently for windows only. June 2010
-
-#ifdef SCALEOPT
-#include <emmintrin.h>
-#endif
-
 namespace libyuv {
 
 static inline uint8 Clip(int32 val) {
diff --git a/source/cpu_id.cc b/source/cpu_id.cc
index 4bbb90fbe..418cd57b9 100644
--- a/source/cpu_id.cc
+++ b/source/cpu_id.cc
@@ -9,7 +9,6 @@
  */
 
 #include "libyuv/cpu_id.h"
-#include "libyuv/basic_types.h"  // for CPU_X86
 
 #ifdef _MSC_VER
 #include <intrin.h>
@@ -18,6 +17,8 @@
 #include <cpu-features.h>
 #endif
 
+#include "libyuv/basic_types.h"  // for CPU_X86
+
 // TODO(fbarchard): Use cpuid.h when gcc 4.4 is used on OSX and Linux.
 #if (defined(__pic__) || defined(__APPLE__)) && defined(__i386__)
 static inline void __cpuid(int cpu_info[4], int info_type) {
diff --git a/source/format_conversion.cc b/source/format_conversion.cc
index 96b95a5e3..f2cd8011a 100644
--- a/source/format_conversion.cc
+++ b/source/format_conversion.cc
@@ -8,11 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "row.h"
+
 #include <assert.h>
 
+#include "libyuv/basic_types.h"
 #include "libyuv/cpu_id.h"
 #include "video_common.h"
-#include "row.h"
 
 namespace libyuv {
 
diff --git a/source/rotate.cc b/source/rotate.cc
index dc5371f3c..d85a8cf76 100644
--- a/source/rotate.cc
+++ b/source/rotate.cc
@@ -8,11 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "libyuv/planar_functions.h"
 #include "libyuv/rotate.h"
-#include "rotate_priv.h"
 
 #include "libyuv/cpu_id.h"
+#include "libyuv/planar_functions.h"
+#include "rotate_priv.h"
 
 namespace libyuv {
 
diff --git a/source/row_common.cc b/source/row_common.cc
index 74a303238..c762ab32a 100644
--- a/source/row_common.cc
+++ b/source/row_common.cc
@@ -10,6 +10,8 @@
 
 #include "row.h"
 
+#include "libyuv/basic_types.h"
+
 extern "C" {
 
 void ABGRToARGBRow_C(const uint8* src_abgr, uint8* dst_argb, int pix) {
diff --git a/source/row_posix.cc b/source/row_posix.cc
index 30ce811fe..2bb7575a0 100644
--- a/source/row_posix.cc
+++ b/source/row_posix.cc
@@ -10,6 +10,8 @@
 
 #include "row.h"
 
+#include "libyuv/basic_types.h"
+
 extern "C" {
 
 #ifdef HAS_ARGBTOYROW_SSSE3
diff --git a/unit_test/compare_test.cc b/unit_test/compare_test.cc
index 3c48c4508..654b47937 100644
--- a/unit_test/compare_test.cc
+++ b/unit_test/compare_test.cc
@@ -8,14 +8,16 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "libyuv/basic_types.h"
-#include "libyuv/compare.h"
-#include "libyuv/cpu_id.h"
 #include "unit_test.h"
+
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 
+#include "libyuv/basic_types.h"
+#include "libyuv/compare.h"
+#include "libyuv/cpu_id.h"
+
 namespace libyuv {
 
 TEST_F(libyuvTest, BenchmarkSumSquareError_C) {
@@ -329,4 +331,4 @@ TEST_F(libyuvTest, Ssim) {
   free_aligned_buffer_16(src_b)
 }
 
-}
+}  // namespace libyuv
diff --git a/unit_test/rotate_test.cc b/unit_test/rotate_test.cc
index c92f176b3..0c134d58b 100644
--- a/unit_test/rotate_test.cc
+++ b/unit_test/rotate_test.cc
@@ -8,12 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "libyuv/rotate.h"
-#include "../source/rotate_priv.h"
 #include "unit_test.h"
+
 #include <stdlib.h>
 #include <time.h>
 
+#include "libyuv/rotate.h"
+#include "../source/rotate_priv.h"
+
 namespace libyuv {
 
 void print_array(uint8 *array, int w, int h) {
@@ -1446,4 +1448,4 @@ TEST_F(libyuvTest, NV12ToI420RotateNegHeight180) {
   EXPECT_EQ(0, y_err + uv_err);
 }
 
-}  // namespace
+}  // namespace libyuv
diff --git a/unit_test/scale_test.cc b/unit_test/scale_test.cc
index 7dbd6c18a..392353c33 100644
--- a/unit_test/scale_test.cc
+++ b/unit_test/scale_test.cc
@@ -8,12 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "libyuv/cpu_id.h"
-#include "libyuv/scale.h"
 #include "unit_test.h"
+
 #include <stdlib.h>
 #include <time.h>
 
+#include "libyuv/cpu_id.h"
+#include "libyuv/scale.h"
+
 namespace libyuv {
 
 static int TestFilter(int src_width, int src_height,
@@ -211,4 +213,4 @@ TEST_F(libyuvTest, ScaleDownBy38) {
   EXPECT_EQ(0, err);
 }
 
-}  // namespace
+}  // namespace libyuv