diff --git a/src/c/error.h b/src/c/error.h
index fa5520a..a32197f 100644
--- a/src/c/error.h
+++ b/src/c/error.h
@@ -1,5 +1,5 @@
-#ifndef FOUG_C_DATAX_ERROR_H
-#define FOUG_C_DATAX_ERROR_H
+#ifndef FOUG_DATAX_C_ERROR_H
+#define FOUG_DATAX_C_ERROR_H
 
 #include "global.h"
 
@@ -13,4 +13,4 @@
 FOUG_LIB_EXPORT foug_bool_t foug_datax_no_error(int code);
 FOUG_LIB_EXPORT foug_bool_t foug_datax_error(int code);
 
-#endif /* FOUG_C_DATAX_ERROR_H */
+#endif /* FOUG_DATAX_C_ERROR_H */
diff --git a/src/c/global.h b/src/c/global.h
index e9f0650..64962c2 100644
--- a/src/c/global.h
+++ b/src/c/global.h
@@ -15,7 +15,7 @@
 #  define FOUG_LIB_EXPORT FOUG_DECL_EXPORT
 # else
 #  define FOUG_LIB_EXPORT FOUG_DECL_IMPORT
-# endif /* APP_LIBCORE_MAKE_DLL */
+# endif /* FOUG_LIB_MAKE_DLL */
 #else
 # define FOUG_LIB_EXPORT
 #endif /* FOUG_LIB_DLL */
diff --git a/src/c/libstl/stl_global.h b/src/c/libstl/stl_global.h
index 6838b4d..72b00b3 100644
--- a/src/c/libstl/stl_global.h
+++ b/src/c/libstl/stl_global.h
@@ -1,5 +1,5 @@
-#ifndef FOUG_C_LIBSTL_STLB_GLOBAL_H
-#define FOUG_C_LIBSTL_STLB_GLOBAL_H
+#ifndef FOUG_DATAX_C_LIBSTL_STLB_GLOBAL_H
+#define FOUG_DATAX_C_LIBSTL_STLB_GLOBAL_H
 
 #include "../global.h"
 
@@ -8,7 +8,7 @@
 #  define FOUG_DATAX_LIBSTL_EXPORT FOUG_DECL_EXPORT
 # else
 #  define FOUG_DATAX_LIBSTL_EXPORT FOUG_DECL_IMPORT
-# endif /* APP_LIBCORE_MAKE_DLL */
+# endif /* FOUG_DATAX_LIBSTL_MAKE_DLL */
 #else
 # define FOUG_DATAX_LIBSTL_EXPORT
 #endif /* FOUG_DATAX_LIBSTL_DLL */
@@ -18,4 +18,4 @@
 #define FOUG_STLB_MIN_CONTENTS_SIZE 284
 #define FOUG_STLB_TRIANGLE_SIZE 50 /* 12 * sizeof(foug_real32_t) + sizeof(uint16_t) */
 
-#endif /* FOUG_C_LIBSTL_STLB_GLOBAL_H */
+#endif /* FOUG_DATAX_C_LIBSTL_STLB_GLOBAL_H */
diff --git a/src/c/libstl/stl_triangle.h b/src/c/libstl/stl_triangle.h
index 6089c17..d8fb12b 100644
--- a/src/c/libstl/stl_triangle.h
+++ b/src/c/libstl/stl_triangle.h
@@ -1,5 +1,5 @@
-#ifndef FOUG_C_LIBSTL_TRIANGLE_H
-#define FOUG_C_LIBSTL_TRIANGLE_H
+#ifndef FOUG_DATAX_C_LIBSTL_TRIANGLE_H
+#define FOUG_DATAX_C_LIBSTL_TRIANGLE_H
 
 #include "stl_global.h"
 
@@ -18,4 +18,4 @@ typedef struct foug_stl_triangle
   foug_stl_coords_t v3;
 } foug_stl_triangle_t;
 
-#endif /* FOUG_C_LIBSTL_TRIANGLE_H */
+#endif /* FOUG_DATAX_C_LIBSTL_TRIANGLE_H */
diff --git a/src/c/libstl/stla_read.h b/src/c/libstl/stla_read.h
index 8888114..9125cbd 100644
--- a/src/c/libstl/stla_read.h
+++ b/src/c/libstl/stla_read.h
@@ -1,5 +1,5 @@
-#ifndef FOUG_C_LIBSTL_STLA_READ_H
-#define FOUG_C_LIBSTL_STLA_READ_H
+#ifndef FOUG_DATAX_C_LIBSTL_STLA_READ_H
+#define FOUG_DATAX_C_LIBSTL_STLA_READ_H
 
 #include "stl_global.h"
 #include "stl_triangle.h"
@@ -37,4 +37,4 @@ struct foug_stla_read_args
   size_t data_size_hint;
 };
 
-#endif /* FOUG_C_LIBSTL_STLA_READ_H */
+#endif /* FOUG_DATAX_C_LIBSTL_STLA_READ_H */
diff --git a/src/c/libstl/stlb_read.h b/src/c/libstl/stlb_read.h
index 30e2258..88f8b9b 100644
--- a/src/c/libstl/stlb_read.h
+++ b/src/c/libstl/stlb_read.h
@@ -1,5 +1,5 @@
-#ifndef FOUG_C_LIBSTL_STLB_READ_H
-#define FOUG_C_LIBSTL_STLB_READ_H
+#ifndef FOUG_DATAX_C_LIBSTL_STLB_READ_H
+#define FOUG_DATAX_C_LIBSTL_STLB_READ_H
 
 #include "stl_global.h"
 #include "stlb_triangle.h"
@@ -37,4 +37,4 @@ struct foug_stlb_read_args
   uint32_t buffer_size;
 };
 
-#endif /* FOUG_C_LIBSTL_STLB_READ_H */
+#endif /* FOUG_DATAX_C_LIBSTL_STLB_READ_H */
diff --git a/src/c/libstl/stlb_triangle.h b/src/c/libstl/stlb_triangle.h
index 05478ad..a1a9d11 100644
--- a/src/c/libstl/stlb_triangle.h
+++ b/src/c/libstl/stlb_triangle.h
@@ -1,5 +1,5 @@
-#ifndef FOUG_C_LIBSTL_STLB_TRIANGLE_H
-#define FOUG_C_LIBSTL_STLB_TRIANGLE_H
+#ifndef FOUG_DATAX_C_LIBSTL_STLB_TRIANGLE_H
+#define FOUG_DATAX_C_LIBSTL_STLB_TRIANGLE_H
 
 #include "stl_triangle.h"
 
@@ -9,4 +9,4 @@ typedef struct foug_stlb_triangle
   uint16_t attribute_byte_count;
 } foug_stlb_triangle_t;
 
-#endif /* FOUG_C_LIBSTL_STLB_TRIANGLE_H */
+#endif /* FOUG_DATAX_C_LIBSTL_STLB_TRIANGLE_H */
diff --git a/src/c/libstl/stlb_write.h b/src/c/libstl/stlb_write.h
index 5aff966..66ec8f8 100644
--- a/src/c/libstl/stlb_write.h
+++ b/src/c/libstl/stlb_write.h
@@ -1,5 +1,5 @@
-#ifndef FOUG_C_LIBSTL_STLB_WRITE_H
-#define FOUG_C_LIBSTL_STLB_WRITE_H
+#ifndef FOUG_DATAX_C_LIBSTL_STLB_WRITE_H
+#define FOUG_DATAX_C_LIBSTL_STLB_WRITE_H
 
 #include "stl_global.h"
 #include "stlb_triangle.h"
@@ -36,4 +36,4 @@ struct foug_stlb_write_args
   uint32_t buffer_size;
 };
 
-#endif /* FOUG_C_LIBSTL_STLB_WRITE_H */
+#endif /* FOUG_DATAX_C_LIBSTL_STLB_WRITE_H */