diff --git a/src/Makefile.sources b/src/Makefile.sources
index b5a3c4cce..8eb235b3b 100644
--- a/src/Makefile.sources
+++ b/src/Makefile.sources
@@ -16,6 +16,7 @@ HB_BASE_sources = \
 	hb-aat-ltag-table.hh \
 	hb-aat-map.cc \
 	hb-aat-map.hh \
+	hb-algs.hh \
 	hb-array.hh \
 	hb-atomic.hh \
 	hb-blob.cc \
@@ -31,7 +32,6 @@ HB_BASE_sources = \
 	hb-cff2-interp-cs.hh \
 	hb-common.cc \
 	hb-debug.hh \
-	hb-dsalgs.hh \
 	hb-face.cc \
 	hb-face.hh \
 	hb-font.cc \
diff --git a/src/hb-dsalgs.hh b/src/hb-algs.hh
similarity index 99%
rename from src/hb-dsalgs.hh
rename to src/hb-algs.hh
index 62d979467..79db3eb96 100644
--- a/src/hb-dsalgs.hh
+++ b/src/hb-algs.hh
@@ -24,8 +24,8 @@
  * Google Author(s): Behdad Esfahbod
  */
 
-#ifndef HB_DSALGS_HH
-#define HB_DSALGS_HH
+#ifndef HB_ALGS_HH
+#define HB_ALGS_HH
 
 #include "hb.hh"
 #include "hb-null.hh"
@@ -638,4 +638,4 @@ struct hb_vector_size_t
 };
 
 
-#endif /* HB_DSALGS_HH */
+#endif /* HB_ALGS_HH */
diff --git a/src/hb-array.hh b/src/hb-array.hh
index d37d220bc..6fd362f5e 100644
--- a/src/hb-array.hh
+++ b/src/hb-array.hh
@@ -28,7 +28,7 @@
 #define HB_ARRAY_HH
 
 #include "hb.hh"
-#include "hb-dsalgs.hh"
+#include "hb-algs.hh"
 #include "hb-iter.hh"
 #include "hb-null.hh"
 
diff --git a/src/hb-debug.hh b/src/hb-debug.hh
index d7d0165a9..cf938b279 100644
--- a/src/hb-debug.hh
+++ b/src/hb-debug.hh
@@ -29,7 +29,7 @@
 
 #include "hb.hh"
 #include "hb-atomic.hh"
-#include "hb-dsalgs.hh"
+#include "hb-algs.hh"
 
 
 #ifndef HB_DEBUG
diff --git a/src/hb-iter.hh b/src/hb-iter.hh
index 5f2511baf..db033fc82 100644
--- a/src/hb-iter.hh
+++ b/src/hb-iter.hh
@@ -28,7 +28,7 @@
 #define HB_ITER_HH
 
 #include "hb.hh"
-#include "hb-dsalgs.hh" // for hb_addressof
+#include "hb-algs.hh" // for hb_addressof
 #include "hb-meta.hh"
 #include "hb-null.hh"
 
diff --git a/src/hb.hh b/src/hb.hh
index 3e75adb04..ffefa624a 100644
--- a/src/hb.hh
+++ b/src/hb.hh
@@ -619,10 +619,10 @@ _hb_memalign(void **memptr, size_t alignment, size_t size)
 #include "hb-mutex.hh"
 #include "hb-atomic.hh"	// Requires: hb-meta
 #include "hb-null.hh"	// Requires: hb-meta
-#include "hb-dsalgs.hh"	// Requires: hb-null
-#include "hb-iter.hh"	// Requires: hb-dsalgs hb-meta hb-null
-#include "hb-debug.hh"	// Requires: hb-atomic hb-dsalgs
-#include "hb-array.hh"	// Requires: hb-dsalgs hb-iter hb-null
+#include "hb-algs.hh"	// Requires: hb-null
+#include "hb-iter.hh"	// Requires: hb-algs hb-meta hb-null
+#include "hb-debug.hh"	// Requires: hb-algs hb-atomic
+#include "hb-array.hh"	// Requires: hb-algs hb-iter hb-null
 #include "hb-vector.hh"	// Requires: hb-array hb-null
 #include "hb-object.hh"	// Requires: hb-atomic hb-mutex hb-vector