diff --git a/BUILD.public b/BUILD.public
index ed54aba..8409445 100644
--- a/BUILD.public
+++ b/BUILD.public
@@ -8,6 +8,7 @@
 # Platform-independent SRCS
 SRCS = glob(
     [
+        "include/private/*.h",
         "google/*.cpp",
         "src/c/*.cpp",
         "src/core/*.cpp",
@@ -31,6 +32,7 @@
         "src/gpu/gl/glx/*.cpp",
         "src/opts/opts_check_x86.cpp",
         "src/opts/*SSE2*.cpp",
+        "src/opts/*sse2*.cpp",
         "src/opts/SkTextureCompression_opts_none.cpp",
 
         # TODO(mtklein): might be more maintainable with a blacklist instead?
@@ -49,7 +51,7 @@
         "src/ports/SkTLS_pthread.cpp",
         "src/ports/SkTime_Unix.cpp",
 
-	# Third Party
+        # Third Party
         "third_party/etc1/*.cpp",
         "third_party/ktx/*.cpp",
     ],
@@ -59,10 +61,25 @@
         "src/gpu/gl/GrGLCreateNativeInterface_none.cpp",
         # TODO(mtklein): files below here probably want upstream fixes
         "src/utils/SkThreadUtils_pthread_mach.cpp",  # Mac-only.  Move to ports?
-  	# Non-Mac-non-Linux.  Move to ports?
+        # Non-Mac-non-Linux.  Move to ports?
         "src/utils/SkThreadUtils_pthread_other.cpp",
         "src/utils/SkThreadUtils_win.cpp",  # Windows-only.  Move to ports?
-        "src/doc/*_XPS.cpp",
+        "src/doc/*_XPS.cpp",  # Windows-only.
+        "src/doc/SkDocument_PDF_None.cpp",  # We use SkDocument_PDF.cpp.
+    ],
+)
+
+SRCS_SSSE3 = glob(
+    [
+        "src/opts/*SSSE3*.cpp",
+        "src/opts/*ssse3*.cpp",
+    ],
+)
+
+SRCS_SSE4 = glob(
+    [
+        "src/opts/*SSE4*.cpp",
+        "src/opts/*sse4*.cpp",
     ],
 )
 
@@ -70,11 +87,14 @@
     [
         "include/**/*.h",
     ],
+    exclude = [
+        "include/animator/*.h",
+        "include/private/*.h",
+    ],
 )
 
 # Includes needed by Skia implementation.  Not public includes.
 INCLUDES = [
-    "include/animator",
     "include/c",
     "include/codec",
     "include/config",
diff --git a/tools/BUILD.public.expected b/tools/BUILD.public.expected
index 18ee72f..6890ab6 100644
--- a/tools/BUILD.public.expected
+++ b/tools/BUILD.public.expected
@@ -7,9 +7,7 @@
  'GOOGLE3',
  'SK_BUILD_FOR_UNIX',
  'SK_SAMPLES_FOR_X']
-HDRS = ['include/animator/SkAnimator.h',
- 'include/animator/SkAnimatorView.h',
- 'include/c/sk_canvas.h',
+HDRS = ['include/c/sk_canvas.h',
  'include/c/sk_data.h',
  'include/c/sk_image.h',
  'include/c/sk_maskfilter.h',
@@ -223,16 +221,6 @@
  'include/ports/SkRemotableFontMgr.h',
  'include/ports/SkTypeface_mac.h',
  'include/ports/SkTypeface_win.h',
- 'include/private/SkChecksum.h',
- 'include/private/SkFloatBits.h',
- 'include/private/SkFloatingPoint.h',
- 'include/private/SkFunction.h',
- 'include/private/SkGpuFenceSync.h',
- 'include/private/SkMiniRecorder.h',
- 'include/private/SkRecords.h',
- 'include/private/SkTHash.h',
- 'include/private/SkTLogic.h',
- 'include/private/SkWeakRefCnt.h',
  'include/svg/SkSVGCanvas.h',
  'include/utils/SkBoundaryPatch.h',
  'include/utils/SkCamera.h',
@@ -287,8 +275,7 @@
  'include/xml/SkDOM.h',
  'include/xml/SkXMLParser.h',
  'include/xml/SkXMLWriter.h']
-INCLUDES = ['include/animator',
- 'include/c',
+INCLUDES = ['include/c',
  'include/codec',
  'include/config',
  'include/core',
@@ -317,7 +304,17 @@
  'third_party/etc1',
  'third_party/ktx']
 LINKOPTS = ['-ldl']
-SRCS = ['src/c/sk_paint.cpp',
+SRCS = ['include/private/SkChecksum.h',
+ 'include/private/SkFloatBits.h',
+ 'include/private/SkFloatingPoint.h',
+ 'include/private/SkFunction.h',
+ 'include/private/SkGpuFenceSync.h',
+ 'include/private/SkMiniRecorder.h',
+ 'include/private/SkRecords.h',
+ 'include/private/SkTHash.h',
+ 'include/private/SkTLogic.h',
+ 'include/private/SkWeakRefCnt.h',
+ 'src/c/sk_paint.cpp',
  'src/c/sk_surface.cpp',
  'src/core/SkAAClip.cpp',
  'src/core/SkAdvancedTypefaceMetrics.cpp',
@@ -483,7 +480,6 @@
  'src/core/SkYUVPlanesCache.cpp',
  'src/doc/SkDocument.cpp',
  'src/doc/SkDocument_PDF.cpp',
- 'src/doc/SkDocument_PDF_None.cpp',
  'src/doc/SkDocument_XPS_None.cpp',
  'src/effects/Sk1DPathEffect.cpp',
  'src/effects/Sk2DPathEffect.cpp',
@@ -842,3 +838,5 @@
  'src/utils/SkThreadUtils_pthread_linux.cpp',
  'third_party/etc1/etc1.cpp',
  'third_party/ktx/ktx.cpp']
+SRCS_SSE4 = ['src/opts/SkBlitRow_opts_SSE4.cpp', 'src/opts/SkOpts_sse41.cpp']
+SRCS_SSSE3 = ['src/opts/SkBitmapProcState_opts_SSSE3.cpp', 'src/opts/SkOpts_ssse3.cpp']