diff --git a/gyp/SampleApp.gyp b/gyp/SampleApp.gyp
index 0d65e8b0..a2ee5c9 100644
--- a/gyp/SampleApp.gyp
+++ b/gyp/SampleApp.gyp
@@ -104,6 +104,7 @@
         '../samplecode/SampleXfermodes.cpp',
         '../samplecode/SampleXfermodesBlur.cpp',
         '../samplecode/TransitionView.cpp',
+        '../samplecode/TransitionView.h',
 
         # DrawingBoard
         #'../experimental/DrawingBoard/SkColorPalette.h',
diff --git a/gyp/iOSSampleApp.gyp b/gyp/iOSSampleApp.gyp
index f9c8a58..5cd2c9c 100644
--- a/gyp/iOSSampleApp.gyp
+++ b/gyp/iOSSampleApp.gyp
@@ -133,6 +133,7 @@
         '../src/utils/SkInterpolator.cpp',
         '../include/utils/SkInterpolator.h',
         '../samplecode/TransitionView.cpp',
+        '../samplecode/TransitionView.h',
       ],
       'sources!': [
         '../samplecode/SampleSkLayer.cpp', #relies on SkMatrix44 which doesn't compile
diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp
index f8f8111..cfdd4ae 100644
--- a/samplecode/SampleApp.cpp
+++ b/samplecode/SampleApp.cpp
@@ -37,6 +37,7 @@
 
 #include "SkGPipe.h"
 #include "SamplePipeControllers.h"
+#include "TransitionView.h"
 
 SK_DEFINE_INST_COUNT(SampleWindow::DeviceManager)
 
@@ -80,7 +81,6 @@
 
 extern SkView* create_overview(int, const SkViewFactory*[]);
 extern bool is_overview(SkView* view);
-extern SkView* create_transition(SkView*, SkView*, int);
 extern bool is_transition(SkView* view);
 
 
diff --git a/samplecode/TransitionView.cpp b/samplecode/TransitionView.cpp
index 19cb24d..b2b1b9d 100644
--- a/samplecode/TransitionView.cpp
+++ b/samplecode/TransitionView.cpp
@@ -4,6 +4,8 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
+#include "TransitionView.h"
+
 #include "SampleCode.h"
 #include "SkView.h"
 #include "SkCanvas.h"
@@ -186,9 +188,6 @@
     typedef SampleView INHERITED;
 };
 
-// FIXME: this should go in a header
-SkView* create_transition(SkView* prev, SkView* next, int direction);
-
 SkView* create_transition(SkView* prev, SkView* next, int direction) {
     return SkNEW_ARGS(TransitionView, (prev, next, direction));
-};
+}