Removing unnecessary explicit paths from #include lines, since

#include "..."

always looks in the current directory of the file containing
the #include first.

This should make it easier to move the macros around.

Tom


git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinBase/ADMMacros/trunk@34 b1d164ef-f17a-46e7-89d4-021c7118ef4e

117 files changed, 248 insertions, 248 deletions

diff --git a/src/macro/CDCDA_declare.h b/src/macro/CDCDA_declare.h
index 58ced29..a677b31 100644
--- a/src/macro/CDCDA_declare.h
+++ b/src/macro/CDCDA_declare.h
@@ -12,9 +12,9 @@
 #ifndef CDCDA_DECLARE
 #define CDCDA_DECLARE
 
-#include "CactusEinstein/Einstein/src/macro/DA_declare.h"
-#include "CactusEinstein/Einstein/src/macro/DDA_declare.h"
-#include "CactusEinstein/Einstein/src/macro/CHR2_declare.h"
+#include "DA_declare.h"
+#include "DDA_declare.h"
+#include "CHR2_declare.h"
 
 /* Output variables */ 
 #undef  CDCDA_CDXXDA
diff --git a/src/macro/CDCDA_guts.h b/src/macro/CDCDA_guts.h
index c594773..194a0c9 100644
--- a/src/macro/CDCDA_guts.h
+++ b/src/macro/CDCDA_guts.h
@@ -13,9 +13,9 @@
 #ifndef CDCDA_GUTS
 #define CDCDA_GUTS
 
-#include "CactusEinstein/Einstein/src/macro/DA_guts.h"
-#include "CactusEinstein/Einstein/src/macro/DDA_guts.h"
-#include "CactusEinstein/Einstein/src/macro/CHR2_guts.h"
+#include "DA_guts.h"
+#include "DDA_guts.h"
+#include "CHR2_guts.h"
 
 #ifdef FCODE 
 
diff --git a/src/macro/CDCDA_undefine.h b/src/macro/CDCDA_undefine.h
index a060b67..5341847 100644
--- a/src/macro/CDCDA_undefine.h
+++ b/src/macro/CDCDA_undefine.h
@@ -8,8 +8,8 @@
 
 #undef CDCDA_GUTS
 
-#include "CactusEinstein/Einstein/src/macro/DA_undefine.h"
-#include "CactusEinstein/Einstein/src/macro/DDA_undefine.h"
-#include "CactusEinstein/Einstein/src/macro/CHR2_undefine.h"
+#include "DA_undefine.h"
+#include "DDA_undefine.h"
+#include "CHR2_undefine.h"
 
 
diff --git a/src/macro/CDK_declare.h b/src/macro/CDK_declare.h
index 3674b01..00a6c93 100644
--- a/src/macro/CDK_declare.h
+++ b/src/macro/CDK_declare.h
@@ -12,8 +12,8 @@
 #ifndef CDK_DECLARE
 #define CDK_DECLARE
 
-#include "CactusEinstein/Einstein/src/macro/CDXCDK_declare.h"
-#include "CactusEinstein/Einstein/src/macro/CDYCDK_declare.h"
-#include "CactusEinstein/Einstein/src/macro/CDZCDK_declare.h"
+#include "CDXCDK_declare.h"
+#include "CDYCDK_declare.h"
+#include "CDZCDK_declare.h"
 
 #endif
diff --git a/src/macro/CDK_guts.h b/src/macro/CDK_guts.h
index 742f3e5..873cdf6 100644
--- a/src/macro/CDK_guts.h
+++ b/src/macro/CDK_guts.h
@@ -11,8 +11,8 @@
 #ifndef CDK_GUTS
 #define CDK_GUTS
 
-#include "CactusEinstein/Einstein/src/macro/CDXCDK_guts.h"
-#include "CactusEinstein/Einstein/src/macro/CDYCDK_guts.h"
-#include "CactusEinstein/Einstein/src/macro/CDZCDK_guts.h"
+#include "CDXCDK_guts.h"
+#include "CDYCDK_guts.h"
+#include "CDZCDK_guts.h"
 
 #endif
diff --git a/src/macro/CDK_undefine.h b/src/macro/CDK_undefine.h
index 254cc59..74f2cc2 100644
--- a/src/macro/CDK_undefine.h
+++ b/src/macro/CDK_undefine.h
@@ -8,7 +8,7 @@
 
 #undef CDK_GUTS
 
-#include "CactusEinstein/Einstein/src/macro/CDXCDK_undefine.h"
-#include "CactusEinstein/Einstein/src/macro/CDYCDK_undefine.h"
-#include "CactusEinstein/Einstein/src/macro/CDZCDK_undefine.h"
+#include "CDXCDK_undefine.h"
+#include "CDYCDK_undefine.h"
+#include "CDZCDK_undefine.h"
 
diff --git a/src/macro/CDXCDK_declare.h b/src/macro/CDXCDK_declare.h
index 3d639af..82ef58e 100644
--- a/src/macro/CDXCDK_declare.h
+++ b/src/macro/CDXCDK_declare.h
@@ -11,8 +11,8 @@
 #ifndef CDXCDK_DECLARE
 #define CDXCDK_DECLARE
 
-#include "CactusEinstein/Einstein/src/macro/DXDK_declare.h"
-#include "CactusEinstein/Einstein/src/macro/CHR2_declare.h"
+#include "DXDK_declare.h"
+#include "CHR2_declare.h"
 
 #ifdef FCODE
 
diff --git a/src/macro/CDXCDK_guts.h b/src/macro/CDXCDK_guts.h
index a617da2..15ad9fc 100644
--- a/src/macro/CDXCDK_guts.h
+++ b/src/macro/CDXCDK_guts.h
@@ -11,8 +11,8 @@
 #ifndef CDXCDK_GUTS
 #define CDXCDK_GUTS
 
-#include "CactusEinstein/Einstein/src/macro/DXDK_guts.h"
-#include "CactusEinstein/Einstein/src/macro/CHR2_guts.h"
+#include "DXDK_guts.h"
+#include "CHR2_guts.h"
 
 #ifdef FCODE 
 
diff --git a/src/macro/CDXCDK_undefine.h b/src/macro/CDXCDK_undefine.h
index 960a8ab..1dc9521 100644
--- a/src/macro/CDXCDK_undefine.h
+++ b/src/macro/CDXCDK_undefine.h
@@ -8,5 +8,5 @@
 
 #undef CDXCDK_GUTS
 
-#include "CactusEinstein/Einstein/src/macro/DXDK_undefine.h"
-#include "CactusEinstein/Einstein/src/macro/CHR2_undefine.h"
+#include "DXDK_undefine.h"
+#include "CHR2_undefine.h"
diff --git a/src/macro/CDYCDK_declare.h b/src/macro/CDYCDK_declare.h
index 8c44163..46b0148 100644
--- a/src/macro/CDYCDK_declare.h
+++ b/src/macro/CDYCDK_declare.h
@@ -11,8 +11,8 @@
 #ifndef CDYCDK_DECLARE
 #define CDYCDK_DECLARE
 
-#include "CactusEinstein/Einstein/src/macro/DYDK_declare.h"
-#include "CactusEinstein/Einstein/src/macro/CHR2_declare.h"
+#include "DYDK_declare.h"
+#include "CHR2_declare.h"
 
 #ifdef FCODE
 
diff --git a/src/macro/CDYCDK_guts.h b/src/macro/CDYCDK_guts.h
index 293ffa3..36d617d 100644
--- a/src/macro/CDYCDK_guts.h
+++ b/src/macro/CDYCDK_guts.h
@@ -11,8 +11,8 @@
 #ifndef CDYCDK_GUTS
 #define CDYCDK_GUTS
 
-#include "CactusEinstein/Einstein/src/macro/DYDK_guts.h"
-#include "CactusEinstein/Einstein/src/macro/CHR2_guts.h"
+#include "DYDK_guts.h"
+#include "CHR2_guts.h"
 
 #ifdef FCODE 
 
diff --git a/src/macro/CDYCDK_undefine.h b/src/macro/CDYCDK_undefine.h
index 82eab35..4aeee15 100644
--- a/src/macro/CDYCDK_undefine.h
+++ b/src/macro/CDYCDK_undefine.h
@@ -8,6 +8,6 @@
 
 #undef CDYCDK_GUTS
 
-#include "CactusEinstein/Einstein/src/macro/DYDK_undefine.h"
-#include "CactusEinstein/Einstein/src/macro/CHR2_undefine.h"
+#include "DYDK_undefine.h"
+#include "CHR2_undefine.h"
 
diff --git a/src/macro/CDZCDK_declare.h b/src/macro/CDZCDK_declare.h
index a935f00..003c4b2 100644
--- a/src/macro/CDZCDK_declare.h
+++ b/src/macro/CDZCDK_declare.h
@@ -11,8 +11,8 @@
 #ifndef CDZCDK_DECLARE
 #define CDZCDK_DECLARE
 
-#include "CactusEinstein/Einstein/src/macro/DZDK_declare.h"
-#include "CactusEinstein/Einstein/src/macro/CHR2_declare.h"
+#include "DZDK_declare.h"
+#include "CHR2_declare.h"
 
 #ifdef FCODE
 
diff --git a/src/macro/CDZCDK_guts.h b/src/macro/CDZCDK_guts.h
index a95cd8b..df119b9 100644
--- a/src/macro/CDZCDK_guts.h
+++ b/src/macro/CDZCDK_guts.h
@@ -11,8 +11,8 @@
 #ifndef CDZCDK_GUTS
 #define CDZCDK_GUTS
 
-#include "CactusEinstein/Einstein/src/macro/DZDK_guts.h"
-#include "CactusEinstein/Einstein/src/macro/CHR2_guts.h"
+#include "DZDK_guts.h"
+#include "CHR2_guts.h"
 
 #ifdef FCODE 
 
diff --git a/src/macro/CDZCDK_undefine.h b/src/macro/CDZCDK_undefine.h
index eeb8102..b24a4a2 100644
--- a/src/macro/CDZCDK_undefine.h
+++ b/src/macro/CDZCDK_undefine.h
@@ -8,5 +8,5 @@
 
 #undef CDZCDK_GUTS
 
-#include "CactusEinstein/Einstein/src/macro/DZDK_undefine.h"
-#include "CactusEinstein/Einstein/src/macro/CHR2_undefine.h"
+#include "DZDK_undefine.h"
+#include "CHR2_undefine.h"
diff --git a/src/macro/CHR1_declare.h b/src/macro/CHR1_declare.h
index c25c90e..059905c 100644
--- a/src/macro/CHR1_declare.h
+++ b/src/macro/CHR1_declare.h
@@ -11,7 +11,7 @@
 #ifndef CHR1_DECLARE
 #define CHR1_DECLARE
 
-#include "CactusEinstein/Einstein/src/macro/DG_declare.h"
+#include "DG_declare.h"
 
 #ifdef FCODE
 
diff --git a/src/macro/CHR1_guts.h b/src/macro/CHR1_guts.h
index ffaa1fd..aa565d6 100644
--- a/src/macro/CHR1_guts.h
+++ b/src/macro/CHR1_guts.h
@@ -13,7 +13,7 @@
 #ifndef CHR1_GUTS
 #define CHR1_GUTS
 
-#include "CactusEinstein/Einstein/src/macro/DG_guts.h"
+#include "DG_guts.h"
 
 #ifdef FCODE 
 
diff --git a/src/macro/CHR1_undefine.h b/src/macro/CHR1_undefine.h
index dc0568a..7f02941 100644
--- a/src/macro/CHR1_undefine.h
+++ b/src/macro/CHR1_undefine.h
@@ -8,6 +8,6 @@
 
 #undef CHR1_GUTS
 
-#include "CactusEinstein/Einstein/src/macro/DG_undefine.h"
+#include "DG_undefine.h"
 
 
diff --git a/src/macro/CHR2_declare.h b/src/macro/CHR2_declare.h
index c27d1bc..1857d8c 100644
--- a/src/macro/CHR2_declare.h
+++ b/src/macro/CHR2_declare.h
@@ -21,8 +21,8 @@
 #ifndef CHR2_DECLARE
 #define CHR2_DECLARE
 
-#include "CactusEinstein/Einstein/src/macro/CHR1_declare.h"
-#include "CactusEinstein/Einstein/src/macro/UPPERMET_declare.h"
+#include "CHR1_declare.h"
+#include "UPPERMET_declare.h"
 
 #ifdef FCODE
 
diff --git a/src/macro/CHR2_guts.h b/src/macro/CHR2_guts.h
index e011bc6..a9839cc 100644
--- a/src/macro/CHR2_guts.h
+++ b/src/macro/CHR2_guts.h
@@ -20,8 +20,8 @@
 #ifndef CHR2_GUTS
 #define CHR2_GUTS
 
-#include "CactusEinstein/Einstein/src/macro/CHR1_guts.h"
-#include "CactusEinstein/Einstein/src/macro/UPPERMET_guts.h"
+#include "CHR1_guts.h"
+#include "UPPERMET_guts.h"
 
 #ifdef FCODE 
 
diff --git a/src/macro/CHR2_undefine.h b/src/macro/CHR2_undefine.h
index d873757..cbfdbf4 100644
--- a/src/macro/CHR2_undefine.h
+++ b/src/macro/CHR2_undefine.h
@@ -8,6 +8,6 @@
 
 #undef CHR2_GUTS
 
-#include "CactusEinstein/Einstein/src/macro/CHR1_undefine.h"
-#include "CactusEinstein/Einstein/src/macro/UPPERMET_undefine.h"
+#include "CHR1_undefine.h"
+#include "UPPERMET_undefine.h"
 
diff --git a/src/macro/DB_declare.h b/src/macro/DB_declare.h
index fabba8a..c1937ca 100644
--- a/src/macro/DB_declare.h
+++ b/src/macro/DB_declare.h
@@ -17,8 +17,8 @@
 #ifndef DB_DECLARE
 #define DB_DECLARE
 
-#include "CactusEinstein/Einstein/src/macro/DXDB_declare.h"
-#include "CactusEinstein/Einstein/src/macro/DYDB_declare.h"
-#include "CactusEinstein/Einstein/src/macro/DZDB_declare.h"
+#include "DXDB_declare.h"
+#include "DYDB_declare.h"
+#include "DZDB_declare.h"
 
 #endif
diff --git a/src/macro/DB_guts.h b/src/macro/DB_guts.h
index 87c265a..1488a49 100644
--- a/src/macro/DB_guts.h
+++ b/src/macro/DB_guts.h
@@ -18,8 +18,8 @@
 #ifndef DB_GUTS
 #define DB_GUTS
 
-#include "CactusEinstein/Einstein/src/macro/DXDB_guts.h"
-#include "CactusEinstein/Einstein/src/macro/DYDB_guts.h"
-#include "CactusEinstein/Einstein/src/macro/DZDB_guts.h"
+#include "DXDB_guts.h"
+#include "DYDB_guts.h"
+#include "DZDB_guts.h"
 
 #endif
diff --git a/src/macro/DB_undefine.h b/src/macro/DB_undefine.h
index 307489f..2766419 100644
--- a/src/macro/DB_undefine.h
+++ b/src/macro/DB_undefine.h
@@ -8,7 +8,7 @@
 
 #undef DB_GUTS
 
-#include "CactusEinstein/Einstein/src/macro/DXDB_undefine.h"
-#include "CactusEinstein/Einstein/src/macro/DYDB_undefine.h"
-#include "CactusEinstein/Einstein/src/macro/DZDB_undefine.h"
+#include "DXDB_undefine.h"
+#include "DYDB_undefine.h"
+#include "DZDB_undefine.h"
 
diff --git a/src/macro/DCGDT_declare.h b/src/macro/DCGDT_declare.h
index 230a543..c2ea1c3 100644
--- a/src/macro/DCGDT_declare.h
+++ b/src/macro/DCGDT_declare.h
@@ -15,7 +15,7 @@
 #ifndef DCGDT_DECLARE
 #define DCGDT_DECLARE
 
-#include "CactusEinstein/Einstein/src/macro/LIEG_declare.h"
+#include "LIEG_declare.h"
 
 #ifdef FCODE
 
diff --git a/src/macro/DCGDT_guts.h b/src/macro/DCGDT_guts.h
index 04417cf..84f57f5 100644
--- a/src/macro/DCGDT_guts.h
+++ b/src/macro/DCGDT_guts.h
@@ -40,7 +40,7 @@
 
       IF (shift_state .ne. 0) THEN
 
-#include "CactusEinstein/Einstein/src/macro/LIEG_guts.h"
+#include "LIEG_guts.h"
 
         DCGDT_DCGXXDT = DCGDT_DCGXXDT + LIEG_LGXX
         DCGDT_DCGXYDT = DCGDT_DCGXYDT + LIEG_LGXY
@@ -79,7 +79,7 @@
       if (*shift_state != 0)
       {
 
-#include "CactusEinstein/Einstein/src/macro/LIEG_guts.h"
+#include "LIEG_guts.h"
 
         DCGDT_DCGXXDT = DCGDT_DCGXXDT + LIEG_LGXX;
         DCGDT_DCGXYDT = DCGDT_DCGXYDT + LIEG_LGXY;
diff --git a/src/macro/DCGDT_undefine.h b/src/macro/DCGDT_undefine.h
index 99d81fa..6e85191 100644
--- a/src/macro/DCGDT_undefine.h
+++ b/src/macro/DCGDT_undefine.h
@@ -8,6 +8,6 @@
 
 #undef DCGDT_GUTS
 
-#include "CactusEinstein/Einstein/src/macro/LIEG_undefine.h"
+#include "LIEG_undefine.h"
 
 
diff --git a/src/macro/DDG_declare.h b/src/macro/DDG_declare.h
index 5403065..873f900 100644
--- a/src/macro/DDG_declare.h
+++ b/src/macro/DDG_declare.h
@@ -17,12 +17,12 @@
 #ifndef DDG_DECLARE
 #define DDG_DECLARE
 
-#include "CactusEinstein/Einstein/src/macro/DXXDG_declare.h"
-#include "CactusEinstein/Einstein/src/macro/DXYDG_declare.h"
-#include "CactusEinstein/Einstein/src/macro/DXZDG_declare.h"
-#include "CactusEinstein/Einstein/src/macro/DYYDG_declare.h"
-#include "CactusEinstein/Einstein/src/macro/DYZDG_declare.h"
-#include "CactusEinstein/Einstein/src/macro/DZZDG_declare.h"
+#include "DXXDG_declare.h"
+#include "DXYDG_declare.h"
+#include "DXZDG_declare.h"
+#include "DYYDG_declare.h"
+#include "DYZDG_declare.h"
+#include "DZZDG_declare.h"
 
 #undef  DDG_DXXDGXX
 #define DDG_DXXDGXX DXXDG_DXXDGXX
diff --git a/src/macro/DDG_guts.h b/src/macro/DDG_guts.h
index 42e7f9f..cba2568 100644
--- a/src/macro/DDG_guts.h
+++ b/src/macro/DDG_guts.h
@@ -16,11 +16,11 @@
 #ifndef DDG_GUTS 
 #define DDG_GUTS
 
-#include "CactusEinstein/Einstein/src/macro/DXXDG_guts.h"
-#include "CactusEinstein/Einstein/src/macro/DXYDG_guts.h"
-#include "CactusEinstein/Einstein/src/macro/DXZDG_guts.h"
-#include "CactusEinstein/Einstein/src/macro/DYYDG_guts.h"
-#include "CactusEinstein/Einstein/src/macro/DYZDG_guts.h"
-#include "CactusEinstein/Einstein/src/macro/DZZDG_guts.h"
+#include "DXXDG_guts.h"
+#include "DXYDG_guts.h"
+#include "DXZDG_guts.h"
+#include "DYYDG_guts.h"
+#include "DYZDG_guts.h"
+#include "DZZDG_guts.h"
 
 #endif
diff --git a/src/macro/DDG_undefine.h b/src/macro/DDG_undefine.h
index 67785de..6166a1b 100644
--- a/src/macro/DDG_undefine.h
+++ b/src/macro/DDG_undefine.h
@@ -8,10 +8,10 @@
 
 #undef DDG_GUTS
 
-#include "CactusEinstein/Einstein/src/macro/DXXDG_undefine.h"
-#include "CactusEinstein/Einstein/src/macro/DXYDG_undefine.h"
-#include "CactusEinstein/Einstein/src/macro/DXZDG_undefine.h"
-#include "CactusEinstein/Einstein/src/macro/DYYDG_undefine.h"
-#include "CactusEinstein/Einstein/src/macro/DYZDG_undefine.h"
-#include "CactusEinstein/Einstein/src/macro/DZZDG_undefine.h"
+#include "DXXDG_undefine.h"
+#include "DXYDG_undefine.h"
+#include "DXZDG_undefine.h"
+#include "DYYDG_undefine.h"
+#include "DYZDG_undefine.h"
+#include "DZZDG_undefine.h"
 
diff --git a/src/macro/DG_declare.h b/src/macro/DG_declare.h
index a444284..185a7db 100644
--- a/src/macro/DG_declare.h
+++ b/src/macro/DG_declare.h
@@ -17,8 +17,8 @@
 #ifndef DG_DECLARE
 #define DG_DECLARE
 
-#include "CactusEinstein/Einstein/src/macro/DXDG_declare.h"
-#include "CactusEinstein/Einstein/src/macro/DYDG_declare.h"
-#include "CactusEinstein/Einstein/src/macro/DZDG_declare.h"
+#include "DXDG_declare.h"
+#include "DYDG_declare.h"
+#include "DZDG_declare.h"
 
 #endif
diff --git a/src/macro/DG_guts.h b/src/macro/DG_guts.h
index 4c1b211..a85c25f 100644
--- a/src/macro/DG_guts.h
+++ b/src/macro/DG_guts.h
@@ -18,8 +18,8 @@
 #ifndef DG_GUTS
 #define DG_GUTS
 
-#include "CactusEinstein/Einstein/src/macro/DXDG_guts.h"
-#include "CactusEinstein/Einstein/src/macro/DYDG_guts.h"
-#include "CactusEinstein/Einstein/src/macro/DZDG_guts.h"
+#include "DXDG_guts.h"
+#include "DYDG_guts.h"
+#include "DZDG_guts.h"
 
 #endif
diff --git a/src/macro/DG_undefine.h b/src/macro/DG_undefine.h
index 7943f8e..67e3dc0 100644
--- a/src/macro/DG_undefine.h
+++ b/src/macro/DG_undefine.h
@@ -8,7 +8,7 @@
 
 #undef DG_GUTS
 
-#include "CactusEinstein/Einstein/src/macro/DXDG_undefine.h"
-#include "CactusEinstein/Einstein/src/macro/DYDG_undefine.h"
-#include "CactusEinstein/Einstein/src/macro/DZDG_undefine.h"
+#include "DXDG_undefine.h"
+#include "DYDG_undefine.h"
+#include "DZDG_undefine.h"
 
diff --git a/src/macro/DKDT_declare.h b/src/macro/DKDT_declare.h
index 1364f3b..8caab41 100644
--- a/src/macro/DKDT_declare.h
+++ b/src/macro/DKDT_declare.h
@@ -16,11 +16,11 @@
 #ifndef DKDT_DECLARE
 #define DKDT_DECLARE
 
-#include "CactusEinstein/Einstein/src/macro/RICCI_declare.h"
-#include "CactusEinstein/Einstein/src/macro/KK_declare.h"
-#include "CactusEinstein/Einstein/src/macro/TRK_declare.h"
-#include "CactusEinstein/Einstein/src/macro/CDCDA_declare.h"
-#include "CactusEinstein/Einstein/src/macro/LIEK_declare.h"
+#include "RICCI_declare.h"
+#include "KK_declare.h"
+#include "TRK_declare.h"
+#include "CDCDA_declare.h"
+#include "LIEK_declare.h"
 
 
 #ifdef FCODE
diff --git a/src/macro/DKDT_guts.h b/src/macro/DKDT_guts.h
index 304205a..57872cf 100644
--- a/src/macro/DKDT_guts.h
+++ b/src/macro/DKDT_guts.h
@@ -16,10 +16,10 @@
 #ifndef DKDT_GUTS
 #define DKDT_GUTS
 
-#include "CactusEinstein/Einstein/src/macro/RICCI_guts.h"
-#include "CactusEinstein/Einstein/src/macro/KK_guts.h"
-#include "CactusEinstein/Einstein/src/macro/TRK_guts.h"
-#include "CactusEinstein/Einstein/src/macro/CDCDA_guts.h"
+#include "RICCI_guts.h"
+#include "KK_guts.h"
+#include "TRK_guts.h"
+#include "CDCDA_guts.h"
 
 #ifdef FCODE 
 
@@ -32,7 +32,7 @@
 
       IF (shift_state .ne. 0) THEN
 
-#include "CactusEinstein/Einstein/src/macro/LIEK_guts.h"
+#include "LIEK_guts.h"
 
         DKDT_DKXXDT = DKDT_DKXXDT + LIEK_LKXX
         DKDT_DKXYDT = DKDT_DKXYDT + LIEK_LKXY
@@ -58,7 +58,7 @@
       if (*shift_state != 0) 
       {
 
-#include "CactusEinstein/Einstein/src/macro/LIEK_guts.h"
+#include "LIEK_guts.h"
 
         DKDT_DKXXDT = DKDT_DKXXDT + LIEK_LKXX;
         DKDT_DKXYDT = DKDT_DKXYDT + LIEK_LKXY;
diff --git a/src/macro/DKDT_undefine.h b/src/macro/DKDT_undefine.h
index abc20bc..924151b 100644
--- a/src/macro/DKDT_undefine.h
+++ b/src/macro/DKDT_undefine.h
@@ -8,10 +8,10 @@
 
 #undef DKDT_GUTS
 
-#include "CactusEinstein/Einstein/src/macro/RICCI_undefine.h"
-#include "CactusEinstein/Einstein/src/macro/KK_undefine.h"
-#include "CactusEinstein/Einstein/src/macro/TRK_undefine.h"
-#include "CactusEinstein/Einstein/src/macro/CDCDA_undefine.h"
-#include "CactusEinstein/Einstein/src/macro/LIEK_undefine.h"
+#include "RICCI_undefine.h"
+#include "KK_undefine.h"
+#include "TRK_undefine.h"
+#include "CDCDA_undefine.h"
+#include "LIEK_undefine.h"
 
 
diff --git a/src/macro/DK_declare.h b/src/macro/DK_declare.h
index d699eba..e55c2f6 100644
--- a/src/macro/DK_declare.h
+++ b/src/macro/DK_declare.h
@@ -17,8 +17,8 @@
 #ifndef DK_DECLARE
 #define DK_DECLARE
 
-#include "CactusEinstein/Einstein/src/macro/DXDK_declare.h"
-#include "CactusEinstein/Einstein/src/macro/DYDK_declare.h"
-#include "CactusEinstein/Einstein/src/macro/DZDK_declare.h"
+#include "DXDK_declare.h"
+#include "DYDK_declare.h"
+#include "DZDK_declare.h"
 
 #endif
diff --git a/src/macro/DK_guts.h b/src/macro/DK_guts.h
index ec9be1e..23f0d59 100644
--- a/src/macro/DK_guts.h
+++ b/src/macro/DK_guts.h
@@ -18,8 +18,8 @@
 #ifndef DK_GUTS
 #define DK_GUTS
 
-#include "CactusEinstein/Einstein/src/macro/DXDK_guts.h"
-#include "CactusEinstein/Einstein/src/macro/DYDK_guts.h"
-#include "CactusEinstein/Einstein/src/macro/DZDK_guts.h"
+#include "DXDK_guts.h"
+#include "DYDK_guts.h"
+#include "DZDK_guts.h"
 
 #endif
diff --git a/src/macro/DK_undefine.h b/src/macro/DK_undefine.h
index a7e1e78..f355087 100644
--- a/src/macro/DK_undefine.h
+++ b/src/macro/DK_undefine.h
@@ -8,7 +8,7 @@
 
 #undef DK_GUTS
 
-#include "CactusEinstein/Einstein/src/macro/DXDK_undefine.h"
-#include "CactusEinstein/Einstein/src/macro/DYDK_undefine.h"
-#include "CactusEinstein/Einstein/src/macro/DZDK_undefine.h"
+#include "DXDK_undefine.h"
+#include "DYDK_undefine.h"
+#include "DZDK_undefine.h"
 
diff --git a/src/macro/DXDG_declare.h b/src/macro/DXDG_declare.h
index a148566..028806e 100644
--- a/src/macro/DXDG_declare.h
+++ b/src/macro/DXDG_declare.h
@@ -11,7 +11,7 @@
 #ifndef DXDG_DECLARE
 #define DXDG_DECLARE
 
-#include "CactusEinstein/Einstein/src/macro/DXDCG_declare.h"
+#include "DXDCG_declare.h"
 
 #ifdef FCODE
 
diff --git a/src/macro/DXDG_guts.h b/src/macro/DXDG_guts.h
index 1a36303..c95ffc9 100644
--- a/src/macro/DXDG_guts.h
+++ b/src/macro/DXDG_guts.h
@@ -14,7 +14,7 @@
 #ifndef DXDG_GUTS
 #define DXDG_GUTS
 
-#include "CactusEinstein/Einstein/src/macro/DXDCG_guts.h"
+#include "DXDCG_guts.h"
 
 #ifdef FCODE 
 
diff --git a/src/macro/DXDG_undefine.h b/src/macro/DXDG_undefine.h
index 56cbd49..97af3c8 100644
--- a/src/macro/DXDG_undefine.h
+++ b/src/macro/DXDG_undefine.h
@@ -8,5 +8,5 @@
 
 #undef DXDG_GUTS
 
-#include "CactusEinstein/Einstein/src/macro/DXDCG_undefine.h"
+#include "DXDCG_undefine.h"
 
diff --git a/src/macro/DXXDG_declare.h b/src/macro/DXXDG_declare.h
index 2a87c7f..87bf248 100644
--- a/src/macro/DXXDG_declare.h
+++ b/src/macro/DXXDG_declare.h
@@ -13,7 +13,7 @@
 #ifndef DXXDG_DECLARE
 #define DXXDG_DECLARE
 
-#include "CactusEinstein/Einstein/src/macro/DXDG_declare.h"
+#include "DXDG_declare.h"
 
 #ifdef FCODE
 
diff --git a/src/macro/DXXDG_guts.h b/src/macro/DXXDG_guts.h
index 09074ca..0aad331 100644
--- a/src/macro/DXXDG_guts.h
+++ b/src/macro/DXXDG_guts.h
@@ -16,7 +16,7 @@
 #ifndef DXXDG_GUTS
 #define DXXDG_GUTS
 
-#include "CactusEinstein/Einstein/src/macro/DXDG_guts.h"
+#include "DXDG_guts.h"
 
 #ifdef FCODE 
 
diff --git a/src/macro/DXXDG_undefine.h b/src/macro/DXXDG_undefine.h
index 88d2d00..616d27c 100644
--- a/src/macro/DXXDG_undefine.h
+++ b/src/macro/DXXDG_undefine.h
@@ -8,4 +8,4 @@
 
 #undef DXXDG_GUTS
 
-#include "CactusEinstein/Einstein/src/macro/DXDG_undefine.h"
+#include "DXDG_undefine.h"
diff --git a/src/macro/DXYDG_declare.h b/src/macro/DXYDG_declare.h
index 19e3178..c979e58 100644
--- a/src/macro/DXYDG_declare.h
+++ b/src/macro/DXYDG_declare.h
@@ -14,8 +14,8 @@
 #ifndef DXYDG_DECLARE
 #define DXYDG_DECLARE
 
-#include "CactusEinstein/Einstein/src/macro/DXDG_declare.h"
-#include "CactusEinstein/Einstein/src/macro/DYDG_declare.h"
+#include "DXDG_declare.h"
+#include "DYDG_declare.h"
 
 #ifdef FCODE
 
diff --git a/src/macro/DXYDG_guts.h b/src/macro/DXYDG_guts.h
index 5c5b7cb..fac19cf 100644
--- a/src/macro/DXYDG_guts.h
+++ b/src/macro/DXYDG_guts.h
@@ -17,8 +17,8 @@
 #ifndef DXYDG_GUTS
 #define DXYDG_DECLARE
 
-#include "CactusEinstein/Einstein/src/macro/DXDG_guts.h"
-#include "CactusEinstein/Einstein/src/macro/DYDG_guts.h"
+#include "DXDG_guts.h"
+#include "DYDG_guts.h"
 
 #ifdef FCODE 
 
diff --git a/src/macro/DXYDG_undefine.h b/src/macro/DXYDG_undefine.h
index 92e1328..0f1b551 100644
--- a/src/macro/DXYDG_undefine.h
+++ b/src/macro/DXYDG_undefine.h
@@ -8,6 +8,6 @@
 
 #undef DXYDG_DECLARE
 
-#include "CactusEinstein/Einstein/src/macro/DXDG_undefine.h"
-#include "CactusEinstein/Einstein/src/macro/DYDG_undefine.h"
+#include "DXDG_undefine.h"
+#include "DYDG_undefine.h"
 
diff --git a/src/macro/DXZDG_declare.h b/src/macro/DXZDG_declare.h
index 68874f7..fc8d169 100644
--- a/src/macro/DXZDG_declare.h
+++ b/src/macro/DXZDG_declare.h
@@ -14,8 +14,8 @@
 #ifndef DXZDG_DECLARE
 #define DXZDG_DECLARE
 
-#include "CactusEinstein/Einstein/src/macro/DXDG_declare.h"
-#include "CactusEinstein/Einstein/src/macro/DZDG_declare.h"
+#include "DXDG_declare.h"
+#include "DZDG_declare.h"
 
 #ifdef FCODE
 
diff --git a/src/macro/DXZDG_guts.h b/src/macro/DXZDG_guts.h
index 7515e96..d68e200 100644
--- a/src/macro/DXZDG_guts.h
+++ b/src/macro/DXZDG_guts.h
@@ -17,8 +17,8 @@
 #ifndef DXZDG_GUTS
 #define DXZDG_GUTS
 
-#include "CactusEinstein/Einstein/src/macro/DXDG_guts.h"
-#include "CactusEinstein/Einstein/src/macro/DZDG_guts.h"
+#include "DXDG_guts.h"
+#include "DZDG_guts.h"
 
 #ifdef FCODE 
 
diff --git a/src/macro/DXZDG_undefine.h b/src/macro/DXZDG_undefine.h
index c9cd16b..9aeeda5 100644
--- a/src/macro/DXZDG_undefine.h
+++ b/src/macro/DXZDG_undefine.h
@@ -8,5 +8,5 @@
 
 #undef DXZDG_GUTS
 
-#include "CactusEinstein/Einstein/src/macro/DXDG_undefine.h"
-#include "CactusEinstein/Einstein/src/macro/DZDG_undefine.h"
+#include "DXDG_undefine.h"
+#include "DZDG_undefine.h"
diff --git a/src/macro/DYDG_declare.h b/src/macro/DYDG_declare.h
index d635ed3..97eacf7 100644
--- a/src/macro/DYDG_declare.h
+++ b/src/macro/DYDG_declare.h
@@ -11,7 +11,7 @@
 #ifndef DYDG_DECLARE
 #define DYDG_DECLARE
 
-#include "CactusEinstein/Einstein/src/macro/DYDCG_declare.h"
+#include "DYDCG_declare.h"
 
 #ifdef FCODE
 
diff --git a/src/macro/DYDG_guts.h b/src/macro/DYDG_guts.h
index a95cd95..ff1e01e 100644
--- a/src/macro/DYDG_guts.h
+++ b/src/macro/DYDG_guts.h
@@ -14,7 +14,7 @@
 #ifndef DYDG_GUTS
 #define DYDG_GUTS
 
-#include "CactusEinstein/Einstein/src/macro/DYDCG_guts.h"
+#include "DYDCG_guts.h"
 
 #ifdef FCODE 
 
diff --git a/src/macro/DYDG_undefine.h b/src/macro/DYDG_undefine.h
index 11a0c7d..412f38f 100644
--- a/src/macro/DYDG_undefine.h
+++ b/src/macro/DYDG_undefine.h
@@ -8,5 +8,5 @@
 
 #undef DYDG_GUTS
 
-#include "CactusEinstein/Einstein/src/macro/DYDCG_undefine.h"
+#include "DYDCG_undefine.h"
 
diff --git a/src/macro/DYYDG_declare.h b/src/macro/DYYDG_declare.h
index e2421ed..ec88efa 100644
--- a/src/macro/DYYDG_declare.h
+++ b/src/macro/DYYDG_declare.h
@@ -13,7 +13,7 @@
 #ifndef DYYDG_DECLARE
 #define DYYDG_DECLARE
 
-#include "CactusEinstein/Einstein/src/macro/DYDG_declare.h"
+#include "DYDG_declare.h"
 
 #ifdef FCODE
 
diff --git a/src/macro/DYYDG_guts.h b/src/macro/DYYDG_guts.h
index 7f4895a..8599263 100644
--- a/src/macro/DYYDG_guts.h
+++ b/src/macro/DYYDG_guts.h
@@ -16,7 +16,7 @@
 #ifndef DYYDG_GUTS
 #define DYYDG_GUTS
 
-#include "CactusEinstein/Einstein/src/macro/DYDG_guts.h"
+#include "DYDG_guts.h"
 
 #ifdef FCODE 
 
diff --git a/src/macro/DYYDG_undefine.h b/src/macro/DYYDG_undefine.h
index abb3e82..9d983c3 100644
--- a/src/macro/DYYDG_undefine.h
+++ b/src/macro/DYYDG_undefine.h
@@ -8,6 +8,6 @@
 
 #undef DYYDG_GUTS
 
-#include "CactusEinstein/Einstein/src/macro/DYDG_undefine.h"
+#include "DYDG_undefine.h"
 
 
diff --git a/src/macro/DYZDG_declare.h b/src/macro/DYZDG_declare.h
index f599f22..6ef4702 100644
--- a/src/macro/DYZDG_declare.h
+++ b/src/macro/DYZDG_declare.h
@@ -14,8 +14,8 @@
 #ifndef DYZDG_DECLARE
 #define DYZDG_DECLARE
 
-#include "CactusEinstein/Einstein/src/macro/DYDG_declare.h"
-#include "CactusEinstein/Einstein/src/macro/DZDG_declare.h"
+#include "DYDG_declare.h"
+#include "DZDG_declare.h"
 
 #ifdef FCODE
 
diff --git a/src/macro/DYZDG_guts.h b/src/macro/DYZDG_guts.h
index 4cf3d45..41e0acd 100644
--- a/src/macro/DYZDG_guts.h
+++ b/src/macro/DYZDG_guts.h
@@ -17,8 +17,8 @@
 #ifndef DYZDG_GUTS
 #define DYZDG_GUTS
 
-#include "CactusEinstein/Einstein/src/macro/DYDG_guts.h"
-#include "CactusEinstein/Einstein/src/macro/DZDG_guts.h"
+#include "DYDG_guts.h"
+#include "DZDG_guts.h"
 
 #ifdef FCODE 
 
diff --git a/src/macro/DYZDG_undefine.h b/src/macro/DYZDG_undefine.h
index 1e4b30b..86209ba 100644
--- a/src/macro/DYZDG_undefine.h
+++ b/src/macro/DYZDG_undefine.h
@@ -8,7 +8,7 @@
 
 #undef DYZDG_GUTS
 
-#include "CactusEinstein/Einstein/src/macro/DYDG_undefine.h"
-#include "CactusEinstein/Einstein/src/macro/DZDG_undefine.h"
+#include "DYDG_undefine.h"
+#include "DZDG_undefine.h"
 
 
diff --git a/src/macro/DZDG_declare.h b/src/macro/DZDG_declare.h
index 07d638b..110fe73 100644
--- a/src/macro/DZDG_declare.h
+++ b/src/macro/DZDG_declare.h
@@ -11,7 +11,7 @@
 #ifndef DZDG_DECLARE
 #define DZDG_DECLARE
 
-#include "CactusEinstein/Einstein/src/macro/DZDCG_declare.h"
+#include "DZDCG_declare.h"
 
 #ifdef FCODE
 
diff --git a/src/macro/DZDG_guts.h b/src/macro/DZDG_guts.h
index d093d17..e5f385d 100644
--- a/src/macro/DZDG_guts.h
+++ b/src/macro/DZDG_guts.h
@@ -14,7 +14,7 @@
 #ifndef DZDG_GUTS
 #define DZDG_GUTS
 
-#include "CactusEinstein/Einstein/src/macro/DZDCG_guts.h"
+#include "DZDCG_guts.h"
 
 #ifdef FCODE 
 
diff --git a/src/macro/DZDG_undefine.h b/src/macro/DZDG_undefine.h
index 9aaa508..2095cc8 100644
--- a/src/macro/DZDG_undefine.h
+++ b/src/macro/DZDG_undefine.h
@@ -8,5 +8,5 @@
 
 #undef DZDG_GUTS
 
-#include "CactusEinstein/Einstein/src/macro/DZDCG_undefine.h"
+#include "DZDCG_undefine.h"
 
diff --git a/src/macro/DZZDG_declare.h b/src/macro/DZZDG_declare.h
index 8384a29..0c9b12e 100644
--- a/src/macro/DZZDG_declare.h
+++ b/src/macro/DZZDG_declare.h
@@ -13,7 +13,7 @@
 #ifndef DZZDG_DECLARE
 #define DZZDG_DECLARE
 
-#include "CactusEinstein/Einstein/src/macro/DZDG_declare.h"
+#include "DZDG_declare.h"
 
 #ifdef FCODE
 
diff --git a/src/macro/DZZDG_guts.h b/src/macro/DZZDG_guts.h
index b53da00..c25656a 100644
--- a/src/macro/DZZDG_guts.h
+++ b/src/macro/DZZDG_guts.h
@@ -16,7 +16,7 @@
 #ifndef DZZDG_GUTS
 #define DZZDG_GUTS
 
-#include "CactusEinstein/Einstein/src/macro/DZDG_guts.h"
+#include "DZDG_guts.h"
 
 #ifdef FCODE 
 
diff --git a/src/macro/DZZDG_undefine.h b/src/macro/DZZDG_undefine.h
index df1401f..aa70882 100644
--- a/src/macro/DZZDG_undefine.h
+++ b/src/macro/DZZDG_undefine.h
@@ -8,5 +8,5 @@
 
 #undef DZZDG_GUTS
 
-#include "CactusEinstein/Einstein/src/macro/DZDG_undefine.h"
+#include "DZDG_undefine.h"
 
diff --git a/src/macro/GAMMA_declare.h b/src/macro/GAMMA_declare.h
index 7d59d68..8d61f5d 100644
--- a/src/macro/GAMMA_declare.h
+++ b/src/macro/GAMMA_declare.h
@@ -13,8 +13,8 @@
 #ifndef GAMMA_DECLARE
 #define GAMMA_DECLARE
 
-#include "CactusEinstein/Einstein/src/macro/CHR2_declare.h"
-#include "CactusEinstein/Einstein/src/macro/UPPERMET_declare.h"
+#include "CHR2_declare.h"
+#include "UPPERMET_declare.h"
 
 #ifdef FCODE
 
diff --git a/src/macro/GAMMA_guts.h b/src/macro/GAMMA_guts.h
index eaa6908..bb642ab 100644
--- a/src/macro/GAMMA_guts.h
+++ b/src/macro/GAMMA_guts.h
@@ -13,8 +13,8 @@
 #ifndef GAMMA_GUTS
 #define GAMMA_GUTS
 
-#include "CactusEinstein/Einstein/src/macro/CHR2_guts.h"
-#include "CactusEinstein/Einstein/src/macro/UPPERMET_guts.h"
+#include "CHR2_guts.h"
+#include "UPPERMET_guts.h"
 
 #ifdef FCODE 
 
diff --git a/src/macro/GAMMA_undefine.h b/src/macro/GAMMA_undefine.h
index 5fc5d65..051e417 100644
--- a/src/macro/GAMMA_undefine.h
+++ b/src/macro/GAMMA_undefine.h
@@ -8,6 +8,6 @@
 
 #undef GAMMA_GUTS
 
-#include "CactusEinstein/Einstein/src/macro/CHR2_undefine.h"
-#include "CactusEinstein/Einstein/src/macro/UPPERMET_undefine.h"
+#include "CHR2_undefine.h"
+#include "UPPERMET_undefine.h"
 
diff --git a/src/macro/HAMADM_declare.h b/src/macro/HAMADM_declare.h
index 64bd5f7..5c4c01b 100644
--- a/src/macro/HAMADM_declare.h
+++ b/src/macro/HAMADM_declare.h
@@ -12,9 +12,9 @@
 #ifndef HAMADM_DECLARE
 #define HAMADM_DECLARE
 
-#include "CactusEinstein/Einstein/src/macro/TRRICCI_declare.h"
-#include "CactusEinstein/Einstein/src/macro/TRKK_declare.h"
-#include "CactusEinstein/Einstein/src/macro/TRK_declare.h"
+#include "TRRICCI_declare.h"
+#include "TRKK_declare.h"
+#include "TRK_declare.h"
 
 #ifdef FCODE
 
diff --git a/src/macro/HAMADM_guts.h b/src/macro/HAMADM_guts.h
index 68c4a5c..9c87ccb 100644
--- a/src/macro/HAMADM_guts.h
+++ b/src/macro/HAMADM_guts.h
@@ -14,9 +14,9 @@
 #ifndef HAMADM_GUTS
 #define HAMADM_GUTS
 
-#include "CactusEinstein/Einstein/src/macro/TRRICCI_guts.h"
-#include "CactusEinstein/Einstein/src/macro/TRKK_guts.h"
-#include "CactusEinstein/Einstein/src/macro/TRK_guts.h"
+#include "TRRICCI_guts.h"
+#include "TRKK_guts.h"
+#include "TRK_guts.h"
 
 #ifdef FCODE 
 
diff --git a/src/macro/HAMADM_undefine.h b/src/macro/HAMADM_undefine.h
index 58ca220..4be6e5a 100644
--- a/src/macro/HAMADM_undefine.h
+++ b/src/macro/HAMADM_undefine.h
@@ -8,9 +8,9 @@
 
 #undef HAMADM_GUTS
 
-#include "CactusEinstein/Einstein/src/macro/TRRICCI_undefine.h"
-#include "CactusEinstein/Einstein/src/macro/TRKK_undefine.h"
-#include "CactusEinstein/Einstein/src/macro/TRK_undefine.h"
+#include "TRRICCI_undefine.h"
+#include "TRKK_undefine.h"
+#include "TRK_undefine.h"
 
 
 
diff --git a/src/macro/KK_declare.h b/src/macro/KK_declare.h
index fa09fe0..f4ace5a 100644
--- a/src/macro/KK_declare.h
+++ b/src/macro/KK_declare.h
@@ -16,7 +16,7 @@
 
 #ifndef KK_DECLARE
 
-#include "CactusEinstein/Einstein/src/macro/UPPERMET_declare.h"
+#include "UPPERMET_declare.h"
 
 #ifdef FCODE
 
diff --git a/src/macro/KK_guts.h b/src/macro/KK_guts.h
index f587f49..fe4dae3 100644
--- a/src/macro/KK_guts.h
+++ b/src/macro/KK_guts.h
@@ -20,7 +20,7 @@
 #ifndef KK_GUTS
 #define KK_GUTS
 
-#include "CactusEinstein/Einstein/src/macro/UPPERMET_guts.h"
+#include "UPPERMET_guts.h"
 
 #ifdef FCODE
 
diff --git a/src/macro/KK_undefine.h b/src/macro/KK_undefine.h
index b00cddf..21c8127 100644
--- a/src/macro/KK_undefine.h
+++ b/src/macro/KK_undefine.h
@@ -8,6 +8,6 @@
 
 #undef KK_GUTS
 
-#include "CactusEinstein/Einstein/src/macro/UPPERMET_undefine.h"
+#include "UPPERMET_undefine.h"
 
   
diff --git a/src/macro/LIEG_declare.h b/src/macro/LIEG_declare.h
index 0f98c3b..b4765d9 100644
--- a/src/macro/LIEG_declare.h
+++ b/src/macro/LIEG_declare.h
@@ -12,8 +12,8 @@
 #ifndef LIEG_DECLARE
 #define LIEG_DECLARE
 
-#include "CactusEinstein/Einstein/src/macro/DB_declare.h"
-#include "CactusEinstein/Einstein/src/macro/DG_declare.h"
+#include "DB_declare.h"
+#include "DG_declare.h"
 
 #ifdef FCODE
 
diff --git a/src/macro/LIEG_guts.h b/src/macro/LIEG_guts.h
index 4bdafcb..eabe90f 100644
--- a/src/macro/LIEG_guts.h
+++ b/src/macro/LIEG_guts.h
@@ -16,8 +16,8 @@
 #ifndef LIEG_GUTS
 #define LIEG_GUTS
 
-#include "CactusEinstein/Einstein/src/macro/DB_guts.h"
-#include "CactusEinstein/Einstein/src/macro/DG_guts.h"
+#include "DB_guts.h"
+#include "DG_guts.h"
 
 #ifdef FCODE
 
diff --git a/src/macro/LIEG_undefine.h b/src/macro/LIEG_undefine.h
index 0e6639b..2da195a 100644
--- a/src/macro/LIEG_undefine.h
+++ b/src/macro/LIEG_undefine.h
@@ -8,7 +8,7 @@
 
 #undef LIEG_GUTS
 
-#include "CactusEinstein/Einstein/src/macro/DB_undefine.h"
-#include "CactusEinstein/Einstein/src/macro/DG_undefine.h"
+#include "DB_undefine.h"
+#include "DG_undefine.h"
 
 
diff --git a/src/macro/LIEK_declare.h b/src/macro/LIEK_declare.h
index 7efab65..1cfb349 100644
--- a/src/macro/LIEK_declare.h
+++ b/src/macro/LIEK_declare.h
@@ -12,8 +12,8 @@
 #ifndef LIEK_DECLARE
 #define LIEK_DECLARE
 
-#include "CactusEinstein/Einstein/src/macro/DB_declare.h"
-#include "CactusEinstein/Einstein/src/macro/DK_declare.h"
+#include "DB_declare.h"
+#include "DK_declare.h"
 
 #ifdef FCODE
 
diff --git a/src/macro/LIEK_guts.h b/src/macro/LIEK_guts.h
index ccfa980..3dea13b 100644
--- a/src/macro/LIEK_guts.h
+++ b/src/macro/LIEK_guts.h
@@ -17,8 +17,8 @@
 #ifndef LIEK_GUTS
 #define LIEK_GUTS
 
-#include "CactusEinstein/Einstein/src/macro/DB_guts.h"
-#include "CactusEinstein/Einstein/src/macro/DK_guts.h"
+#include "DB_guts.h"
+#include "DK_guts.h"
 
 #ifdef FCODE
 
diff --git a/src/macro/LIEK_undefine.h b/src/macro/LIEK_undefine.h
index 04d248d..51d5642 100644
--- a/src/macro/LIEK_undefine.h
+++ b/src/macro/LIEK_undefine.h
@@ -8,7 +8,7 @@
 
 #undef LIEK_GUTS
 
-#include "CactusEinstein/Einstein/src/macro/DB_undefine.h"
-#include "CactusEinstein/Einstein/src/macro/DK_undefine.h"
+#include "DB_undefine.h"
+#include "DK_undefine.h"
 
 
diff --git a/src/macro/MOMXADM_declare.h b/src/macro/MOMXADM_declare.h
index 15987c3..a43adf9 100644
--- a/src/macro/MOMXADM_declare.h
+++ b/src/macro/MOMXADM_declare.h
@@ -12,8 +12,8 @@
 #ifndef MOMXADM_DECLARE
 #define MOMXADM_DECLARE
 
-#include "CactusEinstein/Einstein/src/macro/UPPERMET_declare.h"
-#include "CactusEinstein/Einstein/src/macro/CDK_declare.h"
+#include "UPPERMET_declare.h"
+#include "CDK_declare.h"
 
 #ifdef FCODE
 
diff --git a/src/macro/MOMXADM_guts.h b/src/macro/MOMXADM_guts.h
index e826131..d8d79ef 100644
--- a/src/macro/MOMXADM_guts.h
+++ b/src/macro/MOMXADM_guts.h
@@ -14,8 +14,8 @@
 #ifndef MOMXADM_GUTS
 #define MOMXADM_GUTS
 
-#include "CactusEinstein/Einstein/src/macro/UPPERMET_guts.h"
-#include "CactusEinstein/Einstein/src/macro/CDK_guts.h"
+#include "UPPERMET_guts.h"
+#include "CDK_guts.h"
 
 #ifdef FCODE 
 
diff --git a/src/macro/MOMXADM_undefine.h b/src/macro/MOMXADM_undefine.h
index 90d5d2b..1cb0f7f 100644
--- a/src/macro/MOMXADM_undefine.h
+++ b/src/macro/MOMXADM_undefine.h
@@ -8,8 +8,8 @@
 
 #undef MOMXADM_GUTS
 
-#include "CactusEinstein/Einstein/src/macro/UPPERMET_undefine.h"
-#include "CactusEinstein/Einstein/src/macro/CDK_undefine.h"
+#include "UPPERMET_undefine.h"
+#include "CDK_undefine.h"
 
 
 
diff --git a/src/macro/MOMYADM_declare.h b/src/macro/MOMYADM_declare.h
index 4d7b72f..bc72b79 100644
--- a/src/macro/MOMYADM_declare.h
+++ b/src/macro/MOMYADM_declare.h
@@ -12,8 +12,8 @@
 #ifndef MOMYADM_DECLARE
 #define MOMYADM_DECLARE
 
-#include "CactusEinstein/Einstein/src/macro/UPPERMET_declare.h"
-#include "CactusEinstein/Einstein/src/macro/CDK_declare.h"
+#include "UPPERMET_declare.h"
+#include "CDK_declare.h"
 
 #ifdef FCODE
 
diff --git a/src/macro/MOMYADM_guts.h b/src/macro/MOMYADM_guts.h
index 6aa344f..c2040f3 100644
--- a/src/macro/MOMYADM_guts.h
+++ b/src/macro/MOMYADM_guts.h
@@ -14,8 +14,8 @@
 #ifndef MOMYADM_GUTS
 #define MOMYADM_GUTS
 
-#include "CactusEinstein/Einstein/src/macro/UPPERMET_guts.h"
-#include "CactusEinstein/Einstein/src/macro/CDK_guts.h"
+#include "UPPERMET_guts.h"
+#include "CDK_guts.h"
 
 #ifdef FCODE 
 
diff --git a/src/macro/MOMYADM_undefine.h b/src/macro/MOMYADM_undefine.h
index b969afd..9146271 100644
--- a/src/macro/MOMYADM_undefine.h
+++ b/src/macro/MOMYADM_undefine.h
@@ -8,8 +8,8 @@
 
 #undef MOMYADM_GUTS
 
-#include "CactusEinstein/Einstein/src/macro/UPPERMET_undefine.h"
-#include "CactusEinstein/Einstein/src/macro/CDK_undefine.h"
+#include "UPPERMET_undefine.h"
+#include "CDK_undefine.h"
 
 
 
diff --git a/src/macro/MOMZADM_declare.h b/src/macro/MOMZADM_declare.h
index 125fda9..306751f 100644
--- a/src/macro/MOMZADM_declare.h
+++ b/src/macro/MOMZADM_declare.h
@@ -12,8 +12,8 @@
 #ifndef MOMZADM_DECLARE
 #define MOMZADM_DECLARE
 
-#include "CactusEinstein/Einstein/src/macro/UPPERMET_declare.h"
-#include "CactusEinstein/Einstein/src/macro/CDK_declare.h"
+#include "UPPERMET_declare.h"
+#include "CDK_declare.h"
 
 #ifdef FCODE
 
diff --git a/src/macro/MOMZADM_guts.h b/src/macro/MOMZADM_guts.h
index 33ed313..0bb555b 100644
--- a/src/macro/MOMZADM_guts.h
+++ b/src/macro/MOMZADM_guts.h
@@ -14,8 +14,8 @@
 #ifndef MOMZADM_GUTS
 #define MOMZADM_GUTS
 
-#include "CactusEinstein/Einstein/src/macro/UPPERMET_guts.h"
-#include "CactusEinstein/Einstein/src/macro/CDK_guts.h"
+#include "UPPERMET_guts.h"
+#include "CDK_guts.h"
 
 #ifdef FCODE 
 
diff --git a/src/macro/MOMZADM_undefine.h b/src/macro/MOMZADM_undefine.h
index 11f179f..8d377aa 100644
--- a/src/macro/MOMZADM_undefine.h
+++ b/src/macro/MOMZADM_undefine.h
@@ -8,8 +8,8 @@
 
 #undef MOMZADM_GUTS
 
-#include "CactusEinstein/Einstein/src/macro/UPPERMET_undefine.h"
-#include "CactusEinstein/Einstein/src/macro/CDK_undefine.h"
+#include "UPPERMET_undefine.h"
+#include "CDK_undefine.h"
 
 
 
diff --git a/src/macro/NABA_declare.h b/src/macro/NABA_declare.h
index fad5126..18eb829 100644
--- a/src/macro/NABA_declare.h
+++ b/src/macro/NABA_declare.h
@@ -12,8 +12,8 @@
 #ifndef NABA_DECLARE
 #define NABA_DECLARE
 
-#include "CactusEinstein/Einstein/src/macro/UPPERMET_declare.h"
-#include "CactusEinstein/Einstein/src/macro/CDCDA_declare.h"
+#include "UPPERMET_declare.h"
+#include "CDCDA_declare.h"
 
 /* Output variables */ 
 #undef  NABA_NABA
diff --git a/src/macro/NABA_guts.h b/src/macro/NABA_guts.h
index 53897fe..82cacbb 100644
--- a/src/macro/NABA_guts.h
+++ b/src/macro/NABA_guts.h
@@ -13,8 +13,8 @@
 #ifndef NABA_GUTS
 #define NABA_GUTS
 
-#include "CactusEinstein/Einstein/src/macro/UPPERMET_guts.h"
-#include "CactusEinstein/Einstein/src/macro/CDCDA_guts.h"
+#include "UPPERMET_guts.h"
+#include "CDCDA_guts.h"
 
 #ifdef FCODE 
 
diff --git a/src/macro/NABA_undefine.h b/src/macro/NABA_undefine.h
index 6b98cf9..aa52e4e 100644
--- a/src/macro/NABA_undefine.h
+++ b/src/macro/NABA_undefine.h
@@ -8,7 +8,7 @@
 
 #undef NABA_GUTS
 
-#include "CactusEinstein/Einstein/src/macro/UPPERMET_undefine.h"
-#include "CactusEinstein/Einstein/src/macro/CDCDA_undefine.h"
+#include "UPPERMET_undefine.h"
+#include "CDCDA_undefine.h"
 
 
diff --git a/src/macro/RICCI_declare.h b/src/macro/RICCI_declare.h
index f70c149..f2642d9 100644
--- a/src/macro/RICCI_declare.h
+++ b/src/macro/RICCI_declare.h
@@ -18,10 +18,10 @@
 
 #ifndef RICCI_DECLARE 
 
-#include "CactusEinstein/Einstein/src/macro/UPPERMET_declare.h"
-#include "CactusEinstein/Einstein/src/macro/DDG_declare.h"
-#include "CactusEinstein/Einstein/src/macro/CHR1_declare.h"
-#include "CactusEinstein/Einstein/src/macro/CHR2_declare.h"
+#include "UPPERMET_declare.h"
+#include "DDG_declare.h"
+#include "CHR1_declare.h"
+#include "CHR2_declare.h"
 
 #ifdef FCODE
 
diff --git a/src/macro/RICCI_guts.h b/src/macro/RICCI_guts.h
index 7c54b36..11a4aa3 100644
--- a/src/macro/RICCI_guts.h
+++ b/src/macro/RICCI_guts.h
@@ -18,10 +18,10 @@
 #ifndef RICCI_GUTS
 #define RICCI_GUTS
 
-#include "CactusEinstein/Einstein/src/macro/UPPERMET_guts.h"
-#include "CactusEinstein/Einstein/src/macro/DDG_guts.h"
-#include "CactusEinstein/Einstein/src/macro/CHR1_guts.h"
-#include "CactusEinstein/Einstein/src/macro/CHR2_guts.h"
+#include "UPPERMET_guts.h"
+#include "DDG_guts.h"
+#include "CHR1_guts.h"
+#include "CHR2_guts.h"
 
 #ifdef FCODE
 
diff --git a/src/macro/RICCI_undefine.h b/src/macro/RICCI_undefine.h
index 31347fa..5546268 100644
--- a/src/macro/RICCI_undefine.h
+++ b/src/macro/RICCI_undefine.h
@@ -8,7 +8,7 @@
 
 #undef RICCI_GUTS
 
-#include "CactusEinstein/Einstein/src/macro/UPPERMET_undefine.h"
-#include "CactusEinstein/Einstein/src/macro/DDG_undefine.h"
-#include "CactusEinstein/Einstein/src/macro/CHR1_undefine.h"
-#include "CactusEinstein/Einstein/src/macro/CHR2_undefine.h"
+#include "UPPERMET_undefine.h"
+#include "DDG_undefine.h"
+#include "CHR1_undefine.h"
+#include "CHR2_undefine.h"
diff --git a/src/macro/STRESSENERGY_declare.h b/src/macro/STRESSENERGY_declare.h
index e04e4ea..48ad050 100644
--- a/src/macro/STRESSENERGY_declare.h
+++ b/src/macro/STRESSENERGY_declare.h
@@ -12,9 +12,9 @@
 #ifndef STRESSENERGY_DECLARE
 #define STRESSENERGY_DECLARE
 
-#include "CactusEinstein/Einstein/src/macro/DETG_declare.h"
-#include "CactusEinstein/Einstein/src/macro/UPPERMET_declare.h"
-#include "CactusEinstein/Einstein/src/macro/TRT_declare.h"
+#include "DETG_declare.h"
+#include "UPPERMET_declare.h"
+#include "TRT_declare.h"
 
 #undef  STRESSENERGY_TTT 
 #define STRESSENERGY_TTT Ttt
diff --git a/src/macro/STRESSENERGY_guts.h b/src/macro/STRESSENERGY_guts.h
index 0ee3cae..565cb90 100644
--- a/src/macro/STRESSENERGY_guts.h
+++ b/src/macro/STRESSENERGY_guts.h
@@ -13,8 +13,8 @@
 
 c    These geometrical quantities are supplied for CalcTmunu
 
-#include "CactusEinstein/Einstein/src/macro/DETG_guts.h"
-#include "CactusEinstein/Einstein/src/macro/UPPERMET_guts.h"
+#include "DETG_guts.h"
+#include "UPPERMET_guts.h"
 
       uxx = UPPERMET_UXX; uyy = UPPERMET_UYY; uzz = UPPERMET_UZZ
       uxy = UPPERMET_UXY; uxz = UPPERMET_UXZ; uyz = UPPERMET_UYZ
@@ -35,6 +35,6 @@ c    Calculate the stress-energy tensor
 
 
 c    Calculate the trace of the stress-energy tensor
-#include "CactusEinstein/Einstein/src/macro/TRT_guts.h"
+#include "TRT_guts.h"
 
 #endif
diff --git a/src/macro/STRESSENERGY_undefine.h b/src/macro/STRESSENERGY_undefine.h
index 3f93cd2..ef27031 100644
--- a/src/macro/STRESSENERGY_undefine.h
+++ b/src/macro/STRESSENERGY_undefine.h
@@ -11,7 +11,7 @@
 
 #undef STRESSENERGY_GUTS
 
-#include "CactusEinstein/Einstein/src/macro/DETG_undefine.h"
-#include "CactusEinstein/Einstein/src/macro/UPPERMET_undefine.h"
-#include "CactusEinstein/Einstein/src/macro/TRT_undefine.h"
+#include "DETG_undefine.h"
+#include "UPPERMET_undefine.h"
+#include "TRT_undefine.h"
 
diff --git a/src/macro/TRKK_declare.h b/src/macro/TRKK_declare.h
index a152d75..c2fd779 100644
--- a/src/macro/TRKK_declare.h
+++ b/src/macro/TRKK_declare.h
@@ -13,8 +13,8 @@
 #ifndef TRKK_DECLARE
 #define TRKK_DECLARE
 
-#include "CactusEinstein/Einstein/src/macro/UPPERMET_declare.h"
-#include "CactusEinstein/Einstein/src/macro/KK_declare.h"
+#include "UPPERMET_declare.h"
+#include "KK_declare.h"
 
 #ifdef FCODE
 
diff --git a/src/macro/TRKK_guts.h b/src/macro/TRKK_guts.h
index 05a8f1b..1db75c4 100644
--- a/src/macro/TRKK_guts.h
+++ b/src/macro/TRKK_guts.h
@@ -12,8 +12,8 @@
 #ifndef TRKK_GUTS
 #define TRKK_GUTS
 
-#include "CactusEinstein/Einstein/src/macro/UPPERMET_guts.h"
-#include "CactusEinstein/Einstein/src/macro/KK_guts.h"
+#include "UPPERMET_guts.h"
+#include "KK_guts.h"
 
 #ifdef FCODE
 
diff --git a/src/macro/TRKK_undefine.h b/src/macro/TRKK_undefine.h
index 248b65c..b33ed1e 100644
--- a/src/macro/TRKK_undefine.h
+++ b/src/macro/TRKK_undefine.h
@@ -8,8 +8,8 @@
 
 #undef TRKK_GUTS
 
-#include "CactusEinstein/Einstein/src/macro/UPPERMET_undefine.h"
-#include "CactusEinstein/Einstein/src/macro/KK_undefine.h"
+#include "UPPERMET_undefine.h"
+#include "KK_undefine.h"
 
 
   
diff --git a/src/macro/TRK_declare.h b/src/macro/TRK_declare.h
index ec0f5bf..b9be061 100644
--- a/src/macro/TRK_declare.h
+++ b/src/macro/TRK_declare.h
@@ -13,7 +13,7 @@
 #ifndef TRK_DECLARE
 #define TRK_DECLARE
 
-#include "CactusEinstein/Einstein/src/macro/UPPERMET_declare.h"
+#include "UPPERMET_declare.h"
 
 #ifdef FCODE
 
diff --git a/src/macro/TRK_guts.h b/src/macro/TRK_guts.h
index 9ec04f9..e384ce1 100644
--- a/src/macro/TRK_guts.h
+++ b/src/macro/TRK_guts.h
@@ -20,7 +20,7 @@
 #ifndef TRK_GUTS
 #define TRK_GUTS
 
-#include "CactusEinstein/Einstein/src/macro/UPPERMET_guts.h"
+#include "UPPERMET_guts.h"
 
 #ifdef FCODE
 
diff --git a/src/macro/TRK_undefine.h b/src/macro/TRK_undefine.h
index a01516a..875a0c6 100644
--- a/src/macro/TRK_undefine.h
+++ b/src/macro/TRK_undefine.h
@@ -8,7 +8,7 @@
 
 #undef TRK_GUTS
 
-#include "CactusEinstein/Einstein/src/macro/UPPERMET_undefine.h"
+#include "UPPERMET_undefine.h"
 
 
   
diff --git a/src/macro/TRRICCI_declare.h b/src/macro/TRRICCI_declare.h
index a3e4c37..9c837e0 100644
--- a/src/macro/TRRICCI_declare.h
+++ b/src/macro/TRRICCI_declare.h
@@ -12,8 +12,8 @@
 #ifndef TRRICCI_DECLARE
 #define TRRICCI_DECLARE
 
-#include "CactusEinstein/Einstein/src/macro/UPPERMET_declare.h"
-#include "CactusEinstein/Einstein/src/macro/RICCI_declare.h"
+#include "UPPERMET_declare.h"
+#include "RICCI_declare.h"
 
 #ifdef FCODE
 
diff --git a/src/macro/TRRICCI_guts.h b/src/macro/TRRICCI_guts.h
index 9448f85..f48fe74 100644
--- a/src/macro/TRRICCI_guts.h
+++ b/src/macro/TRRICCI_guts.h
@@ -12,8 +12,8 @@
 #ifndef TRRICCI_GUTS
 #define TRRICCI_GUTS
 
-#include "CactusEinstein/Einstein/src/macro/UPPERMET_guts.h"
-#include "CactusEinstein/Einstein/src/macro/RICCI_guts.h"
+#include "UPPERMET_guts.h"
+#include "RICCI_guts.h"
 
 #ifdef FCODE
 
diff --git a/src/macro/TRRICCI_undefine.h b/src/macro/TRRICCI_undefine.h
index de4928e..c72aef4 100644
--- a/src/macro/TRRICCI_undefine.h
+++ b/src/macro/TRRICCI_undefine.h
@@ -8,8 +8,8 @@
 
 #undef TRRICCI_GUTS
 
-#include "CactusEinstein/Einstein/src/macro/UPPERMET_undefine.h"
-#include "CactusEinstein/Einstein/src/macro/RICCI_undefine.h"
+#include "UPPERMET_undefine.h"
+#include "RICCI_undefine.h"
 
 
   
diff --git a/src/macro/TRT_declare.h b/src/macro/TRT_declare.h
index 293f945..00d5f35 100644
--- a/src/macro/TRT_declare.h
+++ b/src/macro/TRT_declare.h
@@ -13,7 +13,7 @@
 #ifndef TRT_DECLARE
 #define TRT_DECLARE
 
-#include "CactusEinstein/Einstein/src/macro/UPPERMET_declare.h"
+#include "UPPERMET_declare.h"
 
 #ifdef FCODE
 
diff --git a/src/macro/TRT_guts.h b/src/macro/TRT_guts.h
index 0a27f17..7c18ae9 100644
--- a/src/macro/TRT_guts.h
+++ b/src/macro/TRT_guts.h
@@ -12,7 +12,7 @@
 #ifndef TRT_GUTS
 #define TRT_GUTS
 
-#include "CactusEinstein/Einstein/src/macro/UPPERMET_guts.h"
+#include "UPPERMET_guts.h"
 
 #ifdef FCODE
 
diff --git a/src/macro/TRT_undefine.h b/src/macro/TRT_undefine.h
index cb794cc..6a9ab67 100644
--- a/src/macro/TRT_undefine.h
+++ b/src/macro/TRT_undefine.h
@@ -8,7 +8,7 @@
 
 #undef TRT_GUTS
 
-#include "CactusEinstein/Einstein/src/macro/UPPERMET_undefine.h"
+#include "UPPERMET_undefine.h"
 
 
   
diff --git a/src/macro/UPPERMET_declare.h b/src/macro/UPPERMET_declare.h
index 5253abf..18f7f8a 100644
--- a/src/macro/UPPERMET_declare.h
+++ b/src/macro/UPPERMET_declare.h
@@ -11,7 +11,7 @@
 #ifndef UPPERMET_DECLARE
 #define UPPERMET_DECLARE
 
-#include "CactusEinstein/Einstein/src/macro/DETG_declare.h"
+#include "DETG_declare.h"
 
 #ifdef FCODE
 
diff --git a/src/macro/UPPERMET_guts.h b/src/macro/UPPERMET_guts.h
index e4f2c17..238e919 100644
--- a/src/macro/UPPERMET_guts.h
+++ b/src/macro/UPPERMET_guts.h
@@ -11,7 +11,7 @@ Gabrielle Allen, 11th June 1998
 #ifndef UPPERMET_GUTS
 #define UPPERMET_GUTS
 
-#include "CactusEinstein/Einstein/src/macro/DETG_guts.h"
+#include "DETG_guts.h"
 
 #ifdef FCODE
 
diff --git a/src/macro/UPPERMET_undefine.h b/src/macro/UPPERMET_undefine.h
index 99fa947..7776b58 100644
--- a/src/macro/UPPERMET_undefine.h
+++ b/src/macro/UPPERMET_undefine.h
@@ -8,4 +8,4 @@
 
 #undef UPPERMET_GUTS
 
-#include "CactusEinstein/Einstein/src/macro/DETG_undefine.h"
+#include "DETG_undefine.h"
diff --git a/src/macro/WAVEG_declare.h b/src/macro/WAVEG_declare.h
index f83531d..7050722 100644
--- a/src/macro/WAVEG_declare.h
+++ b/src/macro/WAVEG_declare.h
@@ -13,8 +13,8 @@
 #ifndef WAVEG_DECLARE
 #define WAVEG_DECLARE
 
-#include "CactusEinstein/Einstein/src/macro/UPPERMET_declare.h"
-#include "CactusEinstein/Einstein/src/macro/DDG_declare.h"
+#include "UPPERMET_declare.h"
+#include "DDG_declare.h"
 
 /* Output variables */ 
 #undef  WAVEG_DDGXX
diff --git a/src/macro/WAVEG_guts.h b/src/macro/WAVEG_guts.h
index 6453679..2635ca9 100644
--- a/src/macro/WAVEG_guts.h
+++ b/src/macro/WAVEG_guts.h
@@ -13,8 +13,8 @@
 #ifndef WAVEG_GUTS
 #define WAVEG_GUTS
 
-#include "CactusEinstein/Einstein/src/macro/UPPERMET_guts.h"
-#include "CactusEinstein/Einstein/src/macro/DDG_guts.h"
+#include "UPPERMET_guts.h"
+#include "DDG_guts.h"
 
 #ifdef FCODE 
 
diff --git a/src/macro/WAVEG_undefine.h b/src/macro/WAVEG_undefine.h
index ac4f9e8..76e44fb 100644
--- a/src/macro/WAVEG_undefine.h
+++ b/src/macro/WAVEG_undefine.h
@@ -12,6 +12,6 @@
 
 #undef WAVEG_GUTS
 
-#include "CactusEinstein/Einstein/src/macro/UPPERMET_undefine.h"
-#include "CactusEinstein/Einstein/src/macro/DDG_undefine.h"
+#include "UPPERMET_undefine.h"
+#include "DDG_undefine.h"