diff --git a/src/core.h b/src/core.h
index ed185aa3..a0685ea9 100644
--- a/src/core.h
+++ b/src/core.h
@@ -96,15 +96,6 @@ struct GroupedValues {
     uint32_t flag;
 };
 
-/** Return the version string of QuadIron.
- *
- * The version string has the form MAJOR.MINOR.PATCH-REVISION, where '-REVISION'
- * is optional (only present for development version).
- *
- * @return the version string.
- */
-const char* get_version();
-
 /** Return a reference to the global PRNG. */
 static inline std::mt19937& prng()
 {
diff --git a/src/gf_ext.h b/src/gf_ext.h
index 8020c73c..ed5e026b 100644
--- a/src/gf_ext.h
+++ b/src/gf_ext.h
@@ -33,6 +33,7 @@
 
 #include "arith.h"
 #include "gf_base.h"
+#include "polynomial.h"
 
 namespace quadiron {
 
diff --git a/src/quadiron.h b/src/quadiron.h
index 223f40c7..a2d83816 100644
--- a/src/quadiron.h
+++ b/src/quadiron.h
@@ -36,8 +36,6 @@
  * The root namespace of the QuadIron library.
  */
 
-#include "arith.h"
-#include "core.h"
 #include "fec_base.h"
 #include "fec_rs_fnt.h"
 #include "fec_rs_gf2n.h"
@@ -45,33 +43,14 @@
 #include "fec_rs_gf2n_fft_add.h"
 #include "fec_rs_gfp_fft.h"
 #include "fec_rs_nf4.h"
-#include "fft_2.h"
-#include "fft_2n.h"
-#include "fft_add.h"
-#include "fft_base.h"
-#include "fft_ct.h"
-#include "fft_gt.h"
-#include "fft_large.h"
-#include "fft_naive.h"
-#include "fft_single.h"
-#include "gf_base.h"
-#include "gf_bin_ext.h"
-#include "gf_ext.h"
-#include "gf_nf4.h"
-#include "gf_prime.h"
-#include "gf_ring.h"
-#include "misc.h"
-#include "polynomial.h"
-#include "property.h"
-#include "vec_buf_doubled.h"
-#include "vec_buf_zero_ext.h"
-#include "vec_buffers.h"
-#include "vec_doubled.h"
-#include "vec_matrix.h"
-#include "vec_poly.h"
-#include "vec_slice.h"
-#include "vec_vector.h"
-#include "vec_view.h"
-#include "vec_zero_ext.h"
+
+/** Return the version string of QuadIron.
+ *
+ * The version string has the form MAJOR.MINOR.PATCH-REVISION, where '-REVISION'
+ * is optional (only present for development version).
+ *
+ * @return the version string.
+ */
+const char* get_version();
 
 #endif
diff --git a/test/fft_utest.cpp b/test/fft_utest.cpp
index 1e79e858..569f5fbd 100644
--- a/test/fft_utest.cpp
+++ b/test/fft_utest.cpp
@@ -27,7 +27,15 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-#include "quadiron.h"
+#include "fft_2n.h"
+#include "fft_add.h"
+#include "fft_ct.h"
+#include "fft_gt.h"
+#include "fft_naive.h"
+#include "fft_single.h"
+#include "gf_bin_ext.h"
+#include "gf_prime.h"
+#include "vec_buf_zero_ext.h"
 
 template <typename T>
 class FFTUtest {
diff --git a/test/gf_utest.cpp b/test/gf_utest.cpp
index 35a3f89a..f460fd93 100644
--- a/test/gf_utest.cpp
+++ b/test/gf_utest.cpp
@@ -27,7 +27,10 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-#include "quadiron.h"
+
+#include "gf_bin_ext.h"
+#include "gf_ext.h"
+#include "gf_nf4.h"
 
 template <typename T>
 class GFUtest {