From b3a08b3e05a6ce9e0ac8ba4a5ae812cddb87ff48 Mon Sep 17 00:00:00 2001
From: "fbarchard@google.com"
 <fbarchard@google.com@16f28f9a-4ce2-e073-06de-1de4eb20be90>
Date: Mon, 17 Jun 2013 16:37:39 +0000
Subject: [PATCH] include lint warning fixes BUG=none TEST=lint
 R=ryanpetrie@google.com

Review URL: https://webrtc-codereview.appspot.com/1676004

git-svn-id: http://libyuv.googlecode.com/svn/trunk@728 16f28f9a-4ce2-e073-06de-1de4eb20be90
---
 Android.mk               |  2 +-
 README.chromium          |  2 +-
 include/libyuv/version.h |  2 +-
 libyuv.gyp               |  2 +-
 source/fixed_math.cc     |  5 +----
 unit_test/unit_test.h    | 12 +++++++-----
 6 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/Android.mk b/Android.mk
index 5d6c4a9ab..1704b8118 100644
--- a/Android.mk
+++ b/Android.mk
@@ -16,7 +16,7 @@ LOCAL_SRC_FILES := \
     source/convert_to_argb.cc   \
     source/convert_to_i420.cc   \
     source/cpu_id.cc            \
-    source/fixed_math.cc	\
+    source/fixed_math.cc        \
     source/format_conversion.cc \
     source/planar_functions.cc  \
     source/rotate.cc            \
diff --git a/README.chromium b/README.chromium
index 7ea00bdbe..1cc07e886 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,6 +1,6 @@
 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 727
+Version: 728
 License: BSD
 License File: LICENSE
 
diff --git a/include/libyuv/version.h b/include/libyuv/version.h
index 5c63778b3..8fd69de46 100644
--- a/include/libyuv/version.h
+++ b/include/libyuv/version.h
@@ -11,6 +11,6 @@
 #ifndef INCLUDE_LIBYUV_VERSION_H_  // NOLINT
 #define INCLUDE_LIBYUV_VERSION_H_
 
-#define LIBYUV_VERSION 727
+#define LIBYUV_VERSION 728
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_  NOLINT
diff --git a/libyuv.gyp b/libyuv.gyp
index 17af22381..5a307c765 100644
--- a/libyuv.gyp
+++ b/libyuv.gyp
@@ -76,7 +76,6 @@
         'include/libyuv/scale_argb.h',
         'include/libyuv/version.h',
         'include/libyuv/video_common.h',
-        'source/fixed_math.h',
 
         # sources.
         'source/compare.cc',
@@ -93,6 +92,7 @@
         'source/convert_to_i420.cc',
         'source/cpu_id.cc',
         'source/fixed_math.cc',
+        'source/fixed_math.h',
         'source/format_conversion.cc',
         'source/mjpeg_decoder.cc',
         'source/mjpeg_validate.cc',
diff --git a/source/fixed_math.cc b/source/fixed_math.cc
index cccabed9f..25c7bd017 100644
--- a/source/fixed_math.cc
+++ b/source/fixed_math.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "libyuv/basic_types.h"
+#include "./fixed_math.h"  // NOLINT
 
 #ifdef __cplusplus
 namespace libyuv {
@@ -708,6 +708,3 @@ extern const float kRecipTable[4097] = {
 }  // extern "C"
 }  // namespace libyuv
 #endif
-
-
-
diff --git a/unit_test/unit_test.h b/unit_test/unit_test.h
index bccb356b1..ee5c0f67e 100644
--- a/unit_test/unit_test.h
+++ b/unit_test/unit_test.h
@@ -11,6 +11,13 @@
 #ifndef UNIT_TEST_UNIT_TEST_H_  // NOLINT
 #define UNIT_TEST_UNIT_TEST_H_
 
+#ifdef WIN32
+#include <windows.h>
+#else
+#include <sys/time.h>
+#include <sys/resource.h>
+#endif
+
 #include <gtest/gtest.h>
 
 #include "libyuv/basic_types.h"
@@ -42,7 +49,6 @@ static __inline int Abs(int v) {
   var = 0;
 
 #ifdef WIN32
-#include <windows.h>
 static inline double get_time() {
   LARGE_INTEGER t, f;
   QueryPerformanceCounter(&t);
@@ -53,10 +59,6 @@ static inline double get_time() {
 #define random rand
 #define srandom srand
 #else
-
-#include <sys/time.h>
-#include <sys/resource.h>
-
 static inline double get_time() {
   struct timeval t;
   struct timezone tzp;