gap-packages · fingolfin · Oct 6, 2022
diff --git a/src/debugger.cc b/src/debugger.cc
@@ -3,8 +3,8 @@
  */
 
 extern "C" {
-#include "src/compiled.h"          /* GAP headers                */
-#include "src/hookintrprtr.h"
+#include "gap_all.h"   // GAP headers
+#include "hookintrprtr.h"
 }
 
 #include "gap_cpp_headers/gap_cpp_mapping.hpp"

diff --git a/src/gap_cpp_headers/gap_cpp_mapping.hpp b/src/gap_cpp_headers/gap_cpp_mapping.hpp
@@ -10,9 +10,8 @@
 #include <utility>
 #include <stdlib.h>
 
-// We have to include this to get around problems with the 'extern C' wrapping of src/compiled.h,
-// which includes gmp, which in C++ mode has some C++ templates.
-#include "include_gap_headers.hpp"
+#include "gap_all.h"   // GAP headers
+
 #include "gap_prototypes.hpp"
 #include "gap_exception.hpp"
 #include "gap_function.hpp"

diff --git a/src/gap_cpp_headers/gap_prototypes.hpp b/src/gap_cpp_headers/gap_prototypes.hpp
@@ -1,7 +1,7 @@
 #ifndef PROTOTYPES_HPP_ZLALA
 #define PROTOTYPES_HPP_ZLALA
 
-#include "include_gap_headers.hpp"
+#include "gap_all.h"   // GAP headers
 
 namespace GAPdetail
 {

diff --git a/src/gap_cpp_headers/gap_wrapping.hpp b/src/gap_cpp_headers/gap_wrapping.hpp
@@ -1,7 +1,8 @@
 #ifndef _GAP_WRAP_HPP_AQD
 #define _GAP_WRAP_HPP_AQD
 
-#include "include_gap_headers.hpp"
+#include "gap_all.h"   // GAP headers
+
 #include "gap_prototypes.hpp"
 #include "gap_exception.hpp"
 

diff --git a/src/gap_cpp_headers/include_gap_headers.hpp b/src/gap_cpp_headers/include_gap_headers.hpp