diff --git a/src/Makefile.am b/src/Makefile.am
index 3618d03a2c751161913eb3f386602deffc19c6b3..84fed30e4efe4625ec3fbaa7b1a5cde6bd737c8f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -384,8 +384,11 @@ dump_use_data_SOURCES = dump-use-data.cc hb-ot-shape-complex-use-table.cc
 dump_use_data_CPPFLAGS = $(HBCFLAGS)
 dump_use_data_LDADD = libharfbuzz.la $(HBLIBS)
 
-check_PROGRAMS += test-ot-tag test-unicode-ranges
-TESTS += test-ot-tag test-unicode-ranges
+compiled_tests = test-iter test-ot-tag test-unicode-ranges
+check_PROGRAMS += $(compiled_tests)
+TESTS += $(compiled_tests)
+
+test_iter_SOURCES = test-iter.cc
 
 test_ot_tag_SOURCES = hb-ot-tag.cc
 test_ot_tag_CPPFLAGS = $(HBCFLAGS) -DMAIN
diff --git a/src/hb-machinery.hh b/src/hb-machinery.hh
index bfe751bfec1632f1227d16e472e8eef467e4322f..fdb7b0a0d734c13382a96343a2b202934a461483 100644
--- a/src/hb-machinery.hh
+++ b/src/hb-machinery.hh
@@ -32,7 +32,6 @@
 #include "hb.hh"
 #include "hb-blob.hh"
 
-#include "hb-iter.hh"
 #include "hb-array.hh"
 #include "hb-vector.hh"
 
diff --git a/src/test-iter.cc b/src/test-iter.cc
new file mode 100644
index 0000000000000000000000000000000000000000..2d673289975abf267ec3271144b3a3cc1df0cd1b
--- /dev/null
+++ b/src/test-iter.cc
@@ -0,0 +1,33 @@
+/*
+ * Copyright © 2018  Google, Inc.
+ *
+ *  This is part of HarfBuzz, a text shaping library.
+ *
+ * Permission is hereby granted, without written agreement and without
+ * license or royalty fees, to use, copy, modify, and distribute this
+ * software and its documentation for any purpose, provided that the
+ * above copyright notice and the following two paragraphs appear in
+ * all copies of this software.
+ *
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+ * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ *
+ * Google Author(s): Behdad Esfahbod
+ */
+
+#include "hb-iter.hh"
+
+int
+main (int argc, char **argv)
+{
+  return 0;
+}
diff --git a/src/test-unicode-ranges.cc b/src/test-unicode-ranges.cc
index ec9d17acd23a6cd12c45a2fd63e509910ee82e6d..d5d39b95716edc66273ea80263f4695d4a9e590e 100644
--- a/src/test-unicode-ranges.cc
+++ b/src/test-unicode-ranges.cc
@@ -24,8 +24,6 @@
  * Google Author(s): Garret Rieger
  */
 
-#include "hb.hh"
-
 #include "hb-ot-os2-unicode-ranges.hh"
 
 static void