diff --git a/core/jni/Android.mk b/core/jni/Android.mk
index 398d211..cb9b421 100644
--- a/core/jni/Android.mk
+++ b/core/jni/Android.mk
@@ -117,7 +117,6 @@
     android/graphics/Rasterizer.cpp \
     android/graphics/Region.cpp \
     android/graphics/Shader.cpp \
-    android/graphics/SkiaCanvas.cpp \
     android/graphics/SurfaceTexture.cpp \
     android/graphics/Typeface.cpp \
     android/graphics/TypefaceImpl.cpp \
diff --git a/core/jni/android/graphics/Canvas.h b/core/jni/android/graphics/Canvas.h
deleted file mode 100644
index 2577a90..0000000
--- a/core/jni/android/graphics/Canvas.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// This header is shared with other libraries and as such is located in a
-// separate directory.
-#include <private/graphics/Canvas.h>
diff --git a/core/jni/android_graphics_Canvas.cpp b/core/jni/android_graphics_Canvas.cpp
index b98dbca..7d5ca8d 100644
--- a/core/jni/android_graphics_Canvas.cpp
+++ b/core/jni/android_graphics_Canvas.cpp
@@ -18,7 +18,7 @@
 #include "GraphicsJNI.h"
 #include "core_jni_helpers.h"
 
-#include "Canvas.h"
+#include <Canvas.h>
 #include "SkDrawFilter.h"
 #include "SkGraphics.h"
 #include "SkPorterDuff.h"
diff --git a/libs/hwui/Android.common.mk b/libs/hwui/Android.common.mk
index b044e02..59a47de7 100644
--- a/libs/hwui/Android.common.mk
+++ b/libs/hwui/Android.common.mk
@@ -52,6 +52,7 @@
     RenderState.cpp \
     ResourceCache.cpp \
     ShadowTessellator.cpp \
+    SkiaCanvas.cpp \
     SkiaShader.cpp \
     Snapshot.cpp \
     SpotShadow.cpp \
diff --git a/libs/hwui/Android.mk b/libs/hwui/Android.mk
index aa8db26..91e289c 100644
--- a/libs/hwui/Android.mk
+++ b/libs/hwui/Android.mk
@@ -4,7 +4,6 @@
 
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 LOCAL_MODULE := libhwui
-LOCAL_MODULE_TAGS := optional
 
 include $(LOCAL_PATH)/Android.common.mk
 
diff --git a/include/private/graphics/Canvas.h b/libs/hwui/Canvas.h
similarity index 97%
rename from include/private/graphics/Canvas.h
rename to libs/hwui/Canvas.h
index ae79907..f9c8620 100644
--- a/include/private/graphics/Canvas.h
+++ b/libs/hwui/Canvas.h
@@ -17,13 +17,15 @@
 #ifndef ANDROID_GRAPHICS_CANVAS_H
 #define ANDROID_GRAPHICS_CANVAS_H
 
-#include "SkBitmap.h"
-#include "SkCanvas.h"
-#include "SkMatrix.h"
+#include <cutils/compiler.h>
+
+#include <SkBitmap.h>
+#include <SkCanvas.h>
+#include <SkMatrix.h>
 
 namespace android {
 
-class Canvas {
+class ANDROID_API Canvas {
 public:
     virtual ~Canvas() {};
 
diff --git a/libs/hwui/DisplayListRenderer.h b/libs/hwui/DisplayListRenderer.h
index 8f8d24c..631290d 100644
--- a/libs/hwui/DisplayListRenderer.h
+++ b/libs/hwui/DisplayListRenderer.h
@@ -25,8 +25,7 @@
 #include <SkTLazy.h>
 #include <cutils/compiler.h>
 
-#include <private/graphics/Canvas.h>
-
+#include "Canvas.h"
 #include "CanvasState.h"
 #include "DisplayList.h"
 #include "DisplayListLogBuffer.h"
diff --git a/core/jni/android/graphics/SkiaCanvas.cpp b/libs/hwui/SkiaCanvas.cpp
similarity index 97%
rename from core/jni/android/graphics/SkiaCanvas.cpp
rename to libs/hwui/SkiaCanvas.cpp
index 31c6514..7fdbf9a 100644
--- a/core/jni/android/graphics/SkiaCanvas.cpp
+++ b/libs/hwui/SkiaCanvas.cpp
@@ -14,30 +14,18 @@
  * limitations under the License.
  */
 
-#include "jni.h"
 #include "Canvas.h"
-#include "GraphicsJNI.h"
-#include <android_runtime/AndroidRuntime.h>
 
-#include "SkCanvas.h"
-#include "SkClipStack.h"
-#include "SkDevice.h"
-#include "SkDeque.h"
-#include "SkDrawFilter.h"
-#include "SkGraphics.h"
-#include "SkPorterDuff.h"
-#include "SkShader.h"
-#include "SkTArray.h"
-#include "SkTemplates.h"
-
-#include "MinikinUtils.h"
-
-#include "TypefaceImpl.h"
-
-#include "unicode/ubidi.h"
-#include "unicode/ushape.h"
-
-#include <utils/Log.h>
+#include <SkCanvas.h>
+#include <SkClipStack.h>
+#include <SkDevice.h>
+#include <SkDeque.h>
+#include <SkDrawFilter.h>
+#include <SkGraphics.h>
+#include <SkPorterDuff.h>
+#include <SkShader.h>
+#include <SkTArray.h>
+#include <SkTemplates.h>
 
 namespace android {