diff --git a/libqpdf/BitStream.cc b/libqpdf/BitStream.cc
index dc8dccf..3b8e702 100644
--- a/libqpdf/BitStream.cc
+++ b/libqpdf/BitStream.cc
@@ -2,9 +2,9 @@
 
 #include <qpdf/QIntC.hh>
 
-// See comments in bits.cc
+// See comments in bits_include.cc
 #define BITS_READ 1
-#include "bits.icc"
+#include "bits_include.cc"
 
 BitStream::BitStream(unsigned char const* p, size_t nbytes) :
     start(p),
diff --git a/libqpdf/BitWriter.cc b/libqpdf/BitWriter.cc
index 29445f8..81c47db 100644
--- a/libqpdf/BitWriter.cc
+++ b/libqpdf/BitWriter.cc
@@ -1,8 +1,8 @@
 #include <qpdf/BitWriter.hh>
 
-// See comments in bits.cc
+// See comments in bits_include.cc
 #define BITS_WRITE 1
-#include "bits.icc"
+#include "bits_include.cc"
 
 BitWriter::BitWriter(Pipeline* pl) :
     pl(pl),
diff --git a/libqpdf/bits.icc b/libqpdf/bits_include.cc
index 14c4640..14c4640 100644
--- a/libqpdf/bits.icc
+++ b/libqpdf/bits_include.cc
diff --git a/libtests/bits.cc b/libtests/bits.cc
index 55075f8..81b4456 100644
--- a/libtests/bits.cc
+++ b/libtests/bits.cc
@@ -7,11 +7,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-// See comments in bits.cc
+// See comments in bits_include.cc
 #define BITS_TESTING 1
 #define BITS_READ 1
 #define BITS_WRITE 1
-#include "../libqpdf/bits.icc"
+#include "../libqpdf/bits_include.cc"
 
 static void
 print_values(long long byte_offset, size_t bit_offset,
diff --git a/libtests/build.mk b/libtests/build.mk
index 40bd082..0b9f6fa 100644
--- a/libtests/build.mk
+++ b/libtests/build.mk
@@ -38,8 +38,7 @@ $(TARGETS_libtests): $(TARGETS_libqpdf) $(TARGETS_qpdf)
 
 INCLUDES_libtests = include libqpdf
 
-TC_SRCS_libtests = $(wildcard libqpdf/*.cc) $(wildcard libtests/*.cc) \
-	libqpdf/bits.icc
+TC_SRCS_libtests = $(wildcard libqpdf/*.cc) $(wildcard libtests/*.cc)
 
 # -----