diff --git a/Z4co/src/derivs.hxx b/Z4co/src/derivs.hxx
index b6f804d6..f90be6ca 100644
--- a/Z4co/src/derivs.hxx
+++ b/Z4co/src/derivs.hxx
@@ -1,5 +1,5 @@
-#ifndef DERIVS_HXX
-#define DERIVS_HXX
+#ifndef Z4CO_DERIVS_HXX
+#define Z4CO_DERIVS_HXX
 
 #include <div.hxx>
 #include <loop_device.hxx>
@@ -489,4 +489,4 @@ apply_upwind_diss(const cGH *restrict const cctkGH, const GF3D2<const T> &gf_,
 
 } // namespace Z4co
 
-#endif // #ifndef DERIVS_HXX
+#endif // #ifndef Z4CO_DERIVS_HXX
diff --git a/Z4co/wolfram/Z4co_set_ADM.hxx b/Z4co/wolfram/Z4co_set_ADM.hxx
index 5d1f411b..23124ef6 100644
--- a/Z4co/wolfram/Z4co_set_ADM.hxx
+++ b/Z4co/wolfram/Z4co_set_ADM.hxx
@@ -1,6 +1,9 @@
 /* Z4co_set_ADM.hxx */
 /* Produced with Mathematica */
 
+#ifndef Z4CO_SET_ADM_HXX
+#define Z4CO_SET_ADM_HXX
+
 const GF3D2<CCTK_REAL> &local_ADMgam11 = gf_ADMgam(0,0);
 const GF3D2<CCTK_REAL> &local_ADMgam12 = gf_ADMgam(0,1);
 const GF3D2<CCTK_REAL> &local_ADMgam13 = gf_ADMgam(0,2);
@@ -118,4 +121,6 @@ beta3
 
 });
 
+#endif // #ifndef Z4CO_SET_ADM_HXX
+
 /* Z4co_set_ADM.hxx */
diff --git a/Z4co/wolfram/Z4co_set_constraint.hxx b/Z4co/wolfram/Z4co_set_constraint.hxx
index 282a511f..a3f5f37b 100644
--- a/Z4co/wolfram/Z4co_set_constraint.hxx
+++ b/Z4co/wolfram/Z4co_set_constraint.hxx
@@ -1,6 +1,9 @@
 /* Z4co_set_constraint.hxx */
 /* Produced with Mathematica */
 
+#ifndef Z4CO_SET_CONSTRAINT_HXX
+#define Z4CO_SET_CONSTRAINT_HXX
+
 const GF3D2<CCTK_REAL> &local_ZtC1 = gf_ZtC(0);
 const GF3D2<CCTK_REAL> &local_ZtC2 = gf_ZtC(1);
 const GF3D2<CCTK_REAL> &local_ZtC3 = gf_ZtC(2);
@@ -1026,4 +1029,6 @@ local_MtC3.store(mask, index2,
   });
 });
 
+#endif // #ifndef Z4CO_SET_CONSTRAINT_HXX
+
 /* Z4co_set_constraint.hxx */
diff --git a/Z4co/wolfram/Z4co_set_rhs.hxx b/Z4co/wolfram/Z4co_set_rhs.hxx
index 0f4033c1..a54be34b 100644
--- a/Z4co/wolfram/Z4co_set_rhs.hxx
+++ b/Z4co/wolfram/Z4co_set_rhs.hxx
@@ -1,6 +1,9 @@
 /* Z4co_set_rhs.hxx */
 /* Produced with Mathematica */
 
+#ifndef Z4CO_SET_RHS_HXX
+#define Z4CO_SET_RHS_HXX
+
 const GF3D2<CCTK_REAL> &local_dtchi = gf_dtchi;
 const GF3D2<CCTK_REAL> &local_dtgamt11 = gf_dtgamt(0,0);
 const GF3D2<CCTK_REAL> &local_dtgamt12 = gf_dtgamt(0,1);
@@ -1515,4 +1518,6 @@ local_dtbeta3.store(mask, index2,
   });
 });
 
+#endif // #ifndef Z4CO_SET_RHS_HXX
+
 /* Z4co_set_rhs.hxx */
diff --git a/Z4co/wolfram/type_rhs.nb b/Z4co/wolfram/type_in_rhs.nb
similarity index 100%
rename from Z4co/wolfram/type_rhs.nb
rename to Z4co/wolfram/type_in_rhs.nb