diff --git a/include/core/Sk64.h b/include/core/Sk64.h
index 24b94d1..b86e0be 100644
--- a/include/core/Sk64.h
+++ b/include/core/Sk64.h
@@ -11,7 +11,6 @@
 #define Sk64_DEFINED
 
 #include "SkFixed.h"
-#include "SkMath.h"
 
 /** \class Sk64
 
diff --git a/include/core/SkFixed.h b/include/core/SkFixed.h
index 625074f..0af5d9d 100644
--- a/include/core/SkFixed.h
+++ b/include/core/SkFixed.h
@@ -10,7 +10,7 @@
 #ifndef SkFixed_DEFINED
 #define SkFixed_DEFINED
 
-#include "SkMath.h"
+#include "SkTypes.h"
 
 /** \file SkFixed.h
 
diff --git a/include/core/SkPaint.h b/include/core/SkPaint.h
index a1dc59c..e2b3be7 100644
--- a/include/core/SkPaint.h
+++ b/include/core/SkPaint.h
@@ -11,7 +11,6 @@
 #define SkPaint_DEFINED
 
 #include "SkColor.h"
-#include "SkMath.h"
 #include "SkXfermode.h"
 
 class SkAutoGlyphCache;
diff --git a/include/core/SkPoint.h b/include/core/SkPoint.h
index fedc404..6063a09 100644
--- a/include/core/SkPoint.h
+++ b/include/core/SkPoint.h
@@ -10,7 +10,6 @@
 #ifndef SkPoint_DEFINED
 #define SkPoint_DEFINED
 
-#include "SkMath.h"
 #include "SkScalar.h"
 
 /** \struct SkIPoint
diff --git a/include/utils/SkParse.h b/include/utils/SkParse.h
index cde85b8..7491cd6 100644
--- a/include/utils/SkParse.h
+++ b/include/utils/SkParse.h
@@ -11,7 +11,6 @@
 #define SkParse_DEFINED
 
 #include "SkColor.h"
-#include "SkMath.h"
 
 class SkParse {
 public:
diff --git a/include/xml/SkDOM.h b/include/xml/SkDOM.h
index 900cbba..60145c8 100644
--- a/include/xml/SkDOM.h
+++ b/include/xml/SkDOM.h
@@ -11,7 +11,6 @@
 #define SkDOM_DEFINED
 
 #include "SkChunkAlloc.h"
-#include "SkMath.h"
 #include "SkScalar.h"
 #include "SkTemplates.h"
 
diff --git a/include/xml/SkXMLParser.h b/include/xml/SkXMLParser.h
index ef2db4a..bd8c2f1 100644
--- a/include/xml/SkXMLParser.h
+++ b/include/xml/SkXMLParser.h
@@ -10,7 +10,6 @@
 #ifndef SkXMLParser_DEFINED
 #define SkXMLParser_DEFINED
 
-#include "SkMath.h"
 #include "SkString.h"
 
 class SkStream;
diff --git a/src/core/Sk64.cpp b/src/core/Sk64.cpp
index 619652a..0d74904 100644
--- a/src/core/Sk64.cpp
+++ b/src/core/Sk64.cpp
@@ -8,6 +8,7 @@
 
 
 #include "Sk64.h"
+#include "SkMath.h"
 
 #define shift_left(hi, lo)          \
     hi = (hi << 1) | (lo >> 31);    \
diff --git a/src/core/SkBitmapProcState_matrix.h b/src/core/SkBitmapProcState_matrix.h
index 2b9a35d..f427e96 100644
--- a/src/core/SkBitmapProcState_matrix.h
+++ b/src/core/SkBitmapProcState_matrix.h
@@ -6,6 +6,7 @@
  * found in the LICENSE file.
  */
 
+#include "SkMath.h"
 
 
 #define SCALE_NOFILTER_NAME     MAKENAME(_nofilter_scale)
diff --git a/src/core/SkEdge.cpp b/src/core/SkEdge.cpp
index c634ac7..aab1c76 100644
--- a/src/core/SkEdge.cpp
+++ b/src/core/SkEdge.cpp
@@ -9,6 +9,7 @@
 
 #include "SkEdge.h"
 #include "SkFDot6.h"
+#include "SkMath.h"
 
 /*
     In setLine, setQuadratic, setCubic, the first thing we do is to convert
diff --git a/src/effects/SkBlurMask.cpp b/src/effects/SkBlurMask.cpp
index 5dc9f44..b139714 100644
--- a/src/effects/SkBlurMask.cpp
+++ b/src/effects/SkBlurMask.cpp
@@ -8,6 +8,7 @@
 
 
 #include "SkBlurMask.h"
+#include "SkMath.h"
 #include "SkTemplates.h"
 
 /** The sum buffer is an array of u32 to hold the accumulated sum of all of the
diff --git a/src/effects/SkEmbossMask.cpp b/src/effects/SkEmbossMask.cpp
index dffd2be..300494b 100644
--- a/src/effects/SkEmbossMask.cpp
+++ b/src/effects/SkEmbossMask.cpp
@@ -8,6 +8,7 @@
 
 
 #include "SkEmbossMask.h"
+#include "SkMath.h"
 
 static inline int nonzero_to_one(int x) {
 #if 0
diff --git a/src/views/SkProgressView.cpp b/src/views/SkProgressView.cpp
index 8a506f4..d82b48e 100644
--- a/src/views/SkProgressView.cpp
+++ b/src/views/SkProgressView.cpp
@@ -7,6 +7,7 @@
  */
 #include "SkWidget.h"
 #include "SkCanvas.h"
+#include "SkMath.h"
 #include "SkShader.h"
 #include "SkInterpolator.h"
 #include "SkTime.h"
diff --git a/tests/BlurTest.cpp b/tests/BlurTest.cpp
index 04aef8e..cdfa8d2 100644
--- a/tests/BlurTest.cpp
+++ b/tests/BlurTest.cpp
@@ -8,6 +8,7 @@
 #include "Test.h"
 #include "SkBlurMaskFilter.h"
 #include "SkCanvas.h"
+#include "SkMath.h"
 #include "SkPaint.h"
 #include "SkRandom.h"
 
diff --git a/tests/ColorTest.cpp b/tests/ColorTest.cpp
index 69c6f26..0efb892 100644
--- a/tests/ColorTest.cpp
+++ b/tests/ColorTest.cpp
@@ -7,6 +7,7 @@
  */
 #include "Test.h"
 #include "SkColor.h"
+#include "SkMath.h"
 #include "SkUnPreMultiply.h"
 
 static void test_premul(skiatest::Reporter* reporter) {
diff --git a/tests/MathTest.cpp b/tests/MathTest.cpp
index b9e21ae..7440dfd 100644
--- a/tests/MathTest.cpp
+++ b/tests/MathTest.cpp
@@ -7,6 +7,7 @@
  */
 #include "Test.h"
 #include "SkFloatingPoint.h"
+#include "SkMath.h"
 #include "SkPoint.h"
 #include "SkRandom.h"
 
diff --git a/tests/MatrixTest.cpp b/tests/MatrixTest.cpp
index 4638fe1..abc0d54 100644
--- a/tests/MatrixTest.cpp
+++ b/tests/MatrixTest.cpp
@@ -6,6 +6,7 @@
  * found in the LICENSE file.
  */
 #include "Test.h"
+#include "SkMath.h"
 #include "SkMatrix.h"
 #include "SkRandom.h"
 
diff --git a/tests/PathCoverageTest.cpp b/tests/PathCoverageTest.cpp
index d9683c1..91de178 100644
--- a/tests/PathCoverageTest.cpp
+++ b/tests/PathCoverageTest.cpp
@@ -5,6 +5,7 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
+#include "SkMath.h"
 #include "SkPoint.h"
 #include "SkScalar.h"
 #include "Test.h"