diff --git a/CMakeLists.txt b/CMakeLists.txt
index e17a741..f443fd3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,6 +48,7 @@ add_subdirectory(faddeeva)
 
 add_subdirectory (qpms)
 
+add_subdirectory (tests/catch EXCLUDE_FROM_ALL)
 
 enable_testing()
 add_subdirectory (tests EXCLUDE_FROM_ALL)
diff --git a/tests/catch/CMakeLists.txt b/tests/catch/CMakeLists.txt
new file mode 100644
index 0000000..287c600
--- /dev/null
+++ b/tests/catch/CMakeLists.txt
@@ -0,0 +1,5 @@
+find_package(Catch2 REQUIRED)
+add_executable(catchtest all_includes.C)
+target_link_libraries(catchtest PRIVATE Catch2::Catch2WithMain qpms)
+
+
diff --git a/tests/catch/all_includes.C b/tests/catch/all_includes.C
new file mode 100644
index 0000000..10f3e9a
--- /dev/null
+++ b/tests/catch/all_includes.C
@@ -0,0 +1,31 @@
+// Just to test that all headers are C++ compatible
+#include <catch2/catch.hpp>
+extern "C" {
+#include <vswf.h>
+//#include <beyn.h> // C++ keyword as an identifier
+#include <gaunt.h>
+#include <groups.h>
+#include <kahansum.h>
+#include <materials.h>
+#include <optim.h>
+#include <oshacks.h>
+#include <parsing.h>
+#include <qpms_error.h>
+#include <qpms_specfunc.h>
+#include <qpms_types.h>
+#include <scatsystem.h>
+#include <symmetries.h>
+#include <tiny_inlines.h>
+#include <tmatrices.h>
+#include <tolerances.h>
+// C++ type conversion issues:
+//#include <lattices.h>
+//#include <normalisation.h>
+//#include <indexing.h>
+//#include <pointgroups.h>
+//#include <qpmsblas.h>
+//#include <quaternions.h>
+//#include <ewald.h>
+//#include <translations.h>
+//#include <vectors.h>
+}