1 files changed, 32 insertions, 16 deletions
diff --git a/src/CoordBase.h b/src/CoordBase.h
index 007d628..b67b07c 100644
--- a/src/CoordBase.h
+++ b/src/CoordBase.h
@@ -11,32 +11,48 @@
 #ifndef _COORDBASE_H_
 #define _COORDBASE_H_
 
+#ifndef COORD_IN_COORDBASE
+
+/* Since some people may still be including this header file 
+ * rather than using the function aliasing, we need to 
+ * allow them access to the internal functions.
+ */
+
+#define Coord_SystemRegister CoordBase_SystemRegister
+#define Coord_SystemHandle CoordBase_SystemHandle
+#define Coord_CoordRegister CoordBase_CoordRegister
+#define Coord_CoordHandle CoordBase_CoordHandle
+#define Coord_GroupSystem CoordBase_GroupSystem
+#define Coord_SetDefaultSystem CoordBase_SetDefaultSystem
+
+#endif /* COORD_IN_COORDBASE */
+
 #ifdef __cplusplus 
 extern "C" 
 {
 #endif
 
-CCTK_INT Coord_SystemRegister(CCTK_POINTER_TO_CONST GH,
-                              CCTK_INT dim,
-                              CCTK_STRING systemname);
+CCTK_INT CoordBase_SystemRegister(CCTK_POINTER_TO_CONST GH,
+                                  CCTK_INT dim,
+                                  CCTK_STRING systemname);
 
-CCTK_INT Coord_SystemHandle(CCTK_POINTER_TO_CONST GH,
-                            CCTK_STRING systemname);
+CCTK_INT CoordBase_SystemHandle(CCTK_POINTER_TO_CONST GH,
+                                CCTK_STRING systemname);
 
-CCTK_INT Coord_CoordRegister(CCTK_POINTER_TO_CONST GH,
-                             CCTK_INT systemhandle,
-                             CCTK_INT direction,
-                             CCTK_STRING coordname);
+CCTK_INT CoordBase_CoordRegister(CCTK_POINTER_TO_CONST GH,
+                                 CCTK_INT systemhandle,
+                                 CCTK_INT direction,
+                                 CCTK_STRING coordname);
 
-CCTK_INT Coord_CoordHandle(CCTK_POINTER_TO_CONST GH,
-                           CCTK_STRING coordname,
-                           CCTK_STRING systemname);
+CCTK_INT CoordBase_CoordHandle(CCTK_POINTER_TO_CONST GH,
+                               CCTK_STRING coordname,
+                               CCTK_STRING systemname);
 
-CCTK_INT Coord_GroupSystem(CCTK_POINTER_TO_CONST GH,
-                           CCTK_STRING groupname);
+CCTK_INT CoordBase_GroupSystem(CCTK_POINTER_TO_CONST GH,
+                               CCTK_STRING groupname);
 
-CCTK_INT Coord_SetDefaultSystem(CCTK_POINTER_TO_CONST GH,
-                                CCTK_STRING systemname);
+CCTK_INT CoordBase_SetDefaultSystem(CCTK_POINTER_TO_CONST GH,
+                                    CCTK_STRING systemname);
 
 #ifdef __cplusplus 
 }