7 files changed, 5 insertions, 11 deletions
diff --git a/sample/chromium/chrome_subsetter.cc b/sample/chromium/chrome_subsetter.cc
index 6f5788e..df15c18 100644
--- a/sample/chromium/chrome_subsetter.cc
+++ b/sample/chromium/chrome_subsetter.cc
@@ -21,7 +21,7 @@
 #include <sstream>
 
 #include "sfntly/port/type.h"
-#include "test/font_subsetter.h"
+#include "font_subsetter.h"
 
 template <typename T>
 class HexTo {
diff --git a/test/font_subsetter.cc b/sample/chromium/font_subsetter.cc
index 401c9f5..14f5494 100644
--- a/test/font_subsetter.cc
+++ b/sample/chromium/font_subsetter.cc
@@ -13,12 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-// File is originally from Chromium third_party/sfntly/src/subsetter.
-// Use as test case in sfntly so that problems can be caught in upstream early.
 
-#include "test/font_subsetter.h"
+#include "font_subsetter.h"
 
-#include "test/subsetter_impl.h"
+#include "subsetter_impl.h"
 
 int SfntlyWrapper::SubsetFont(const char* font_name,
                               const unsigned char* original_font,
diff --git a/test/font_subsetter.h b/sample/chromium/font_subsetter.h
index 07b1b5b..07b1b5b 100644
--- a/test/font_subsetter.h
+++ b/sample/chromium/font_subsetter.h
diff --git a/test/subsetter_impl.cc b/sample/chromium/subsetter_impl.cc
index 4786f7f..7e7cf61 100644
--- a/test/subsetter_impl.cc
+++ b/sample/chromium/subsetter_impl.cc
@@ -13,10 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-// File is originally from Chromium third_party/sfntly/src/subsetter.
-// Use as test case in sfntly so that problems can be caught in upstream early.
 
-#include "test/subsetter_impl.h"
+#include "subsetter_impl.h"
 
 #include <string.h>
 
diff --git a/test/subsetter_impl.h b/sample/chromium/subsetter_impl.h
index ffbf408..ffbf408 100644
--- a/test/subsetter_impl.h
+++ b/sample/chromium/subsetter_impl.h
diff --git a/sfntly/font.h b/sfntly/font.h
index dd31c13..975e8cc 100644
--- a/sfntly/font.h
+++ b/sfntly/font.h
@@ -117,8 +117,6 @@ struct MacintoshEncodingId {
   };
 };
 
-extern const int32_t SFNTVERSION_1;
-
 class FontFactory;
 
 // An sfnt container font object. This object is immutable and thread safe. To
diff --git a/test/chrome_subsetter.cc b/test/chrome_subsetter.cc
index 0c5c9ca..9563ab1 100644
--- a/test/chrome_subsetter.cc
+++ b/test/chrome_subsetter.cc
@@ -15,7 +15,7 @@
  */
 
 #include "gtest/gtest.h"
-#include "test/font_subsetter.h"
+#include "sample/chromium/font_subsetter.h"
 #include "test/test_data.h"
 #include "test/test_font_utils.h"