diff --git a/sefht.geany b/sefht.geany
index 387a93e0521cbf25679afc9308f3dee5ee486adb..4f9cbf8e4e8412fdce22ae688ed0cfa175a51571 100644
--- a/sefht.geany
+++ b/sefht.geany
@@ -28,32 +28,32 @@ long_line_behaviour=1
 long_line_column=72
 
 [files]
-current_page=19
+current_page=21
 FILE_NAME_0=923;Sh;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fconfigure.ac;0;8
 FILE_NAME_1=73;Make;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2FMakefile.am;0;8
 FILE_NAME_2=1143;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Fmain.c;0;8
-FILE_NAME_3=640;Make;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2FMakefile.am;0;8
+FILE_NAME_3=1260;Make;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2FMakefile.am;0;8
 FILE_NAME_4=1593;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Fcms.c;0;8
-FILE_NAME_5=839;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Fcms.h;0;8
+FILE_NAME_5=901;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Fcms.h;0;8
 FILE_NAME_6=2921;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Fdata.c;0;8
-FILE_NAME_7=841;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Fdata.h;0;8
+FILE_NAME_7=904;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Fdata.h;0;8
 FILE_NAME_8=1185;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Ffragment.c;0;8
-FILE_NAME_9=849;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Ffragment.h;0;8
-FILE_NAME_10=859;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Ffragment_data.c;0;8
-FILE_NAME_11=2220;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Ffragment_class.c;0;8
+FILE_NAME_9=916;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Ffragment.h;0;8
+FILE_NAME_10=1975;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Ffragment_data.c;0;8
+FILE_NAME_11=2173;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Ffragment_class.c;0;8
 FILE_NAME_12=8225;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Fnode_fragment.c;0;8
-FILE_NAME_13=829;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Fnode_fragment.h;0;8
+FILE_NAME_13=931;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Fnode_fragment.h;0;8
 FILE_NAME_14=25820;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Ftext.c;0;8
-FILE_NAME_15=841;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Ftext.h;0;8
+FILE_NAME_15=904;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Ftext.h;0;8
 FILE_NAME_16=1779;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Fvalidator.c;0;8
-FILE_NAME_17=851;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Fvalidator.h;0;8
+FILE_NAME_17=919;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Fvalidator.h;0;8
 FILE_NAME_18=14237;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Fvalidator_tag.c;0;8
 FILE_NAME_19=859;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Fvalidator_tag.h;0;8
-FILE_NAME_20=4600;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Fstatus.h;0;8
-FILE_NAME_21=839;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Flog.h;0;4
-FILE_NAME_22=1070;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Fmacro.h;0;8
-FILE_NAME_23=1106;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Fsefht.h;0;8
-FILE_NAME_24=499;Make;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Ftests%2FMakefile.am;0;8
+FILE_NAME_20=4608;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Fstatus.h;0;8
+FILE_NAME_21=901;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Flog.h;0;4
+FILE_NAME_22=907;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Fmacro.h;0;8
+FILE_NAME_23=1078;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Fsefht.h;0;8
+FILE_NAME_24=290;Make;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Ftests%2FMakefile.am;0;8
 FILE_NAME_25=1085;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Ftests%2Ftest_cms.c;0;8
 FILE_NAME_26=3283;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Ftests%2Ftest_data.c;0;8
 FILE_NAME_27=13617;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Ftests%2Ftest_node_fragment.c;0;8
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 9ce2c178182641663c7f5c5367d60a6ae2c9282c..38a43da3fcc74c31cb77038637ad7ba63fcdee93 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -34,5 +34,5 @@ nobase_include_HEADERS += sefht/text.h
 nobase_include_HEADERS += sefht/validator.h
 nobase_include_HEADERS += sefht/validator_tag.h
 
-libsefht_la_CPPFLAGS = -DLIB_SEFHT_COMPILATION
+libsefht_la_CPPFLAGS = -DSEFHT_COMPILATION
 libsefht_la_LDFLAGS = -version_info 0:0:0
diff --git a/src/lib/sefht/cms.h b/src/lib/sefht/cms.h
index aa00772714a5ba00298a6ccc546ff6267539eb26..73030b1462756a0feac2dc49982e776040b77c7d 100644
--- a/src/lib/sefht/cms.h
+++ b/src/lib/sefht/cms.h
@@ -25,7 +25,7 @@
 #ifndef SEFHT_CMS_H
 #define SEFHT_CMS_H
 
-#if !defined (__SEFHT_H_INSIDE__) && !defined (LIB_SEFHT_COMPILATION)
+#if !defined (SEFHT_SEFHT_H_INSIDE) && !defined (SEFHT_COMPILATION)
 #error "Only <sefht/sefht.h> can be included directly."
 #endif
 
diff --git a/src/lib/sefht/data.h b/src/lib/sefht/data.h
index 35612e69102da45ab855b6b907afbb41224db098..8aa817b3e33e49b731fc3e8022124edbb6703147 100644
--- a/src/lib/sefht/data.h
+++ b/src/lib/sefht/data.h
@@ -25,7 +25,7 @@
 #ifndef SEFHT_DATA_H
 #define SEFHT_DATA_H
 
-#if !defined (__SEFHT_H_INSIDE__) && !defined (LIB_SEFHT_COMPILATION)
+#if !defined (SEFHT_SEFHT_H_INSIDE) && !defined (SEFHT_COMPILATION)
 #error "Only <sefht/sefht.h> can be included directly."
 #endif
 
diff --git a/src/lib/sefht/fragment.h b/src/lib/sefht/fragment.h
index b1cb6cfd7b868bebea43f04c7d258986e23f86ce..f2602e810ed359ed3ab32df60a59dab440952aa0 100644
--- a/src/lib/sefht/fragment.h
+++ b/src/lib/sefht/fragment.h
@@ -25,7 +25,7 @@
 #ifndef SEFHT_FRAGMENT_H
 #define SEFHT_FRAGMENT_H
 
-#if !defined (__SEFHT_H_INSIDE__) && !defined (LIB_SEFHT_COMPILATION)
+#if !defined (SEFHT_SEFHT_H_INSIDE) && !defined (SEFHT_COMPILATION)
 #error "Only <sefht/sefht.h> can be included directly."
 #endif
 
diff --git a/src/lib/sefht/fragment_class.c b/src/lib/sefht/fragment_class.c
index 55c98ea0bd9497da6159628d66901b2d4c962616..3a478d1f017f5d57b0554c92f921e7dc0b6eaeeb 100644
--- a/src/lib/sefht/fragment_class.c
+++ b/src/lib/sefht/fragment_class.c
@@ -25,7 +25,7 @@
 #ifndef SEFHT_FRAGMENT_CLASS_C
 #define SEFHT_FRAGMENT_CLASS_C
 
-#if !defined (__SEFHT_H_INSIDE__) && !defined (LIB_SEFHT_COMPILATION)
+#if !defined (SEFHT_SEFHT_H_INSIDE) && !defined (SEFHT_COMPILATION)
 #error "Only <sefht/sefht.h> can be included directly."
 #endif
 
@@ -35,7 +35,7 @@
 #include "text.h"
 
 
-#ifdef LIB_SEFHT_COMPILATION
+#ifdef SEFHT_COMPILATION
 #include "fragment_data.c"
 
 static inline
@@ -89,5 +89,5 @@ get_type (const struct SH_Fragment * fragment)
 	return fragment->type;
 }
 
-#endif /* LIB_SEFHT_COMPILATION */
+#endif /* SEFHT_COMPILATION */
 #endif /* SEFHT_FRAGMENT_CLASS_C */
diff --git a/src/lib/sefht/fragment_data.c b/src/lib/sefht/fragment_data.c
index 5cbc21aa7999cbcbb6acef06e4caf2bc2ec047ed..f55a71c764e29281f9b748ea258d97aab6b7aa31 100644
--- a/src/lib/sefht/fragment_data.c
+++ b/src/lib/sefht/fragment_data.c
@@ -25,7 +25,7 @@
 #ifndef SEFHT_FRAGMENT_DATA_C
 #define SEFHT_FRAGMENT_DATA_C
 
-#if !defined (__SEFHT_H_INSIDE__) && !defined (LIB_SEFHT_COMPILATION)
+#if !defined (SEFHT_SEFHT_H_INSIDE) && !defined (SEFHT_COMPILATION)
 #error "Only <sefht/sefht.h> can be included directly."
 #endif
 
@@ -35,7 +35,7 @@
 #include "text.h"
 
 
-#ifdef LIB_SEFHT_COMPILATION
+#ifdef SEFHT_COMPILATION
 
 enum SH_FRAGMENT_TYPE
 {
@@ -82,5 +82,5 @@ struct SH_Fragment
 	/*@shared@*/ const struct fragment_methods * methods;
 };
 
-#endif /* LIB_SEFHT_COMPILATION */
+#endif /* SEFHT_COMPILATION */
 #endif /* SEFHT_FRAGMENT_DATA_C */
diff --git a/src/lib/sefht/log.h b/src/lib/sefht/log.h
index 27218567d66467b5909881389ddb501597e047c7..2f81d238db1c48be1d2fa8c09586b25a9148cb2f 100644
--- a/src/lib/sefht/log.h
+++ b/src/lib/sefht/log.h
@@ -25,7 +25,7 @@
 #ifndef SEFHT_LOG_H
 #define SEFHT_LOG_H
 
-#if !defined (__SEFHT_H_INSIDE__) && !defined (LIB_SEFHT_COMPILATION)
+#if !defined (SEFHT_SEFHT_H_INSIDE) && !defined (SEFHT_COMPILATION)
 #error "Only <sefht/sefht.h> can be included directly."
 #endif
 
diff --git a/src/lib/sefht/macro.h b/src/lib/sefht/macro.h
index 418706d61cc807ec17fdb0a0e44a8ee9d77ce498..71286e65492069c6dbd47885ed3bd43e53173830 100644
--- a/src/lib/sefht/macro.h
+++ b/src/lib/sefht/macro.h
@@ -25,7 +25,7 @@
 #ifndef SEFHT_MACRO_H
 #define SEFHT_MACRO_H
 
-#if !defined (__SEFHT_H_INSIDE__) && !defined (LIB_SEFHT_COMPILATION)
+#if !defined (SEFHT_SEFHT_H_INSIDE) && !defined (SEFHT_COMPILATION)
 #error "Only <sefht/sefht.h> can be included directly."
 #endif
 
diff --git a/src/lib/sefht/node_fragment.h b/src/lib/sefht/node_fragment.h
index 658181792931a0c38c2c0f4d6ab72d575091f92e..46be532032aa5df8eb7fd6b8d4db5b0648d5a442 100644
--- a/src/lib/sefht/node_fragment.h
+++ b/src/lib/sefht/node_fragment.h
@@ -25,7 +25,7 @@
 #ifndef SEFHT_NODE_FRAGMENT_H
 #define SEFHT_NODE_FRAGMENT_H
 
-#if !defined (__SEFHT_H_INSIDE__) && !defined (LIB_SEFHT_COMPILATION)
+#if !defined (SEFHT_SEFHT_H_INSIDE) && !defined (SEFHT_COMPILATION)
 #status "Only <sefht/sefht.h> can be included directly."
 #endif
 
diff --git a/src/lib/sefht/sefht.h b/src/lib/sefht/sefht.h
index 20e68ff52489155b250e2d9943d2e2ed21128435..b94c2672cbd221d297d60003e865547022eacb4a 100644
--- a/src/lib/sefht/sefht.h
+++ b/src/lib/sefht/sefht.h
@@ -25,7 +25,7 @@
 #ifndef SEFHT_SEFHT_H
 #define SEFHT_SEFHT_H
 
-#define __SEFHT_H_INSIDE__
+#define SEFHT_SEFHT_H_INSIDE
 
 #include "log.h"
 #include "macro.h"
@@ -38,6 +38,6 @@
 #include "text.h"
 #include "validator.h"
 
-#undef __SEFHT_H_INSIDE__
+#undef SEFHT_SEFHT_H_INSIDE
 
 #endif /* SEFHT_SEFHT_H */
diff --git a/src/lib/sefht/status.h b/src/lib/sefht/status.h
index 00d828913a3ba20ff06db1b91daa6c1dce89bb43..4b4b479ee2b7fb623f650127ab686e3b939f49ae 100644
--- a/src/lib/sefht/status.h
+++ b/src/lib/sefht/status.h
@@ -30,12 +30,12 @@
 
 #include "macro.h"
 
-#if !defined (__SEFHT_H_INSIDE__) && !defined (LIB_SEFHT_COMPILATION)
+#if !defined (SEFHT_SEFHT_H_INSIDE) && !defined (SEFHT_COMPILATION)
 #error "Only <sefht/sefht.h> can be included directly."
 #endif
 
 
-#ifdef LIB_SEFHT_COMPILATION
+#ifdef SEFHT_COMPILATION
 
 #define succeed(STATUS)                                                \
 	(((STATUS) != NULL) && ((STATUS)->status == SUCCESS))
@@ -101,7 +101,7 @@ do {                                                                   \
 }                                                                      \
 while (FALSE)
 
-#endif /* LIB_SEFHT_COMPILATION */
+#endif /* SEFHT_COMPILATION */
 
 
 struct SH_Status
diff --git a/src/lib/sefht/text.h b/src/lib/sefht/text.h
index 9a8d916d5ae79bfd201bea57392f621e4fb974b9..b4bfa9632e63eb8adefa0773319a57c836c9dd4d 100644
--- a/src/lib/sefht/text.h
+++ b/src/lib/sefht/text.h
@@ -25,7 +25,7 @@
 #ifndef SEFHT_TEXT_H
 #define SEFHT_TEXT_H
 
-#if !defined (__SEFHT_H_INSIDE__) && !defined (LIB_SEFHT_COMPILATION)
+#if !defined (SEFHT_SEFHT_H_INSIDE) && !defined (SEFHT_COMPILATION)
 #error "Only <sefht/sefht.h> can be included directly."
 #endif
 
diff --git a/src/lib/sefht/validator.h b/src/lib/sefht/validator.h
index 71c3fdadab5db871f4806bab8a00116dffd03137..55de52ab711b8b9957d4d5e3d8ca326c2e9348d4 100644
--- a/src/lib/sefht/validator.h
+++ b/src/lib/sefht/validator.h
@@ -25,7 +25,7 @@
 #ifndef SEFHT_VALIDATOR_H
 #define SEFHT_VALIDATOR_H
 
-#if !defined (__SEFHT_H_INSIDE__) && !defined (LIB_SEFHT_COMPILATION)
+#if !defined (SEFHT_SEFHT_H_INSIDE) && !defined (SEFHT_COMPILATION)
 #error "Only <sefht/sefht.h> can be included directly."
 #endif
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index e75da677f5feca9d4c6b143a7a68f8a891c58b84..3053a22bd19ee3328a38ac7e9d429706061654b2 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -11,7 +11,7 @@ TESTS += sefht_text_test
 check_PROGRAMS = $(TESTS)
 
 AM_CPPFLAGS =
-AM_CPPFLAGS += -DLIB_SEFHT_COMPILATION
+AM_CPPFLAGS += -DSEFHT_COMPILATION
 AM_CPPFLAGS += -I$(top_srcdir)/src/lib/sefht
 
 LDADD = $(CHECK_LIBS)