diff --git a/libwccl/ops/and.h b/libwccl/ops/and.h
index b6e44c607ececf04a85f373f7fd27789d63ad33d..9e3b50efc5a2716b8bddbbe4fa257724a6f5538a 100644
--- a/libwccl/ops/and.h
+++ b/libwccl/ops/and.h
@@ -1,5 +1,5 @@
-#ifndef AND_H
-#define AND_H
+#ifndef LIBWCCL_OPS_AND_H
+#define LIBWCCL_OPS_AND_H
 
 #include <boost/foreach.hpp>
 #define foreach         BOOST_FOREACH
@@ -33,4 +33,4 @@ protected :
 };
 
 } /* end ns Wccl */
-#endif // AND_H
+#endif // LIBWCCL_OPS_AND_H
diff --git a/libwccl/ops/constant.h b/libwccl/ops/constant.h
index abb08e9b505fd0c0ef47e4c7916fad9a21d2943a..32d8a950ccfc03d677e9ae82c180827128053456 100644
--- a/libwccl/ops/constant.h
+++ b/libwccl/ops/constant.h
@@ -1,5 +1,5 @@
-#ifndef CONSTANT_H
-#define CONSTANT_H
+#ifndef LIBWCCL_OPS_CONSTANT_H
+#define LIBWCCL_OPS_CONSTANT_H
 
 #include <boost/scoped_ptr.hpp>
 #include <boost/concept_check.hpp>
@@ -57,4 +57,4 @@ private:
 
 } /* end ns Wccl */
 
-#endif // CONSTANT_H
+#endif // LIBWCCL_OPS_CONSTANT_H
diff --git a/libwccl/ops/functions.h b/libwccl/ops/functions.h
index 0c56fb65282c8cd6a87ad5daf3dd735dd514b302..9db64d7ee197d9df44a1912ff1ed8bef585e40ef 100644
--- a/libwccl/ops/functions.h
+++ b/libwccl/ops/functions.h
@@ -1,5 +1,5 @@
-#ifndef FUNCTIONS_H
-#define FUNCTIONS_H
+#ifndef LIBWCCL_OPS_FUNCTIONS_H
+#define LIBWCCL_OPS_FUNCTIONS_H
 
 #include <boost/shared_ptr.hpp>
 #include <boost/assert.hpp>
@@ -53,4 +53,4 @@ public:
 
 } /* end ns Wccl */
 
-#endif // FUNCTIONS_H
+#endif // LIBWCCL_OPS_FUNCTIONS_H
diff --git a/libwccl/ops/logicalpredicate.h b/libwccl/ops/logicalpredicate.h
index 60427e32f816066326b3fcdfe8de550fcfc0650b..384c962a39973ba6a519bf754f09be6023e02354 100644
--- a/libwccl/ops/logicalpredicate.h
+++ b/libwccl/ops/logicalpredicate.h
@@ -1,5 +1,5 @@
-#ifndef LOGICALPREDICATE_H
-#define LOGICALPREDICATE_H
+#ifndef LIBWCCL_OPS_LOGICALPREDICATE_H
+#define LIBWCCL_OPS_LOGICALPREDICATE_H
 
 #include <vector>
 #include <boost/shared_array.hpp>
@@ -45,4 +45,4 @@ protected:
 
 } /* end ns Wccl */
 
-#endif // LOGICALPREDICATE_H
+#endif // LIBWCCL_OPS_LOGICALPREDICATE_H
diff --git a/libwccl/ops/nor.h b/libwccl/ops/nor.h
index 368c3c7a05aba521dede936525ce7e822c9da066..e826365d15ad622e067322eba8eb514e456d9989 100644
--- a/libwccl/ops/nor.h
+++ b/libwccl/ops/nor.h
@@ -1,5 +1,5 @@
-#ifndef NOR_H
-#define NOR_H
+#ifndef LIBWCCL_OPS_NOR_H
+#define LIBWCCL_OPS_NOR_H
 
 #include <boost/foreach.hpp>
 #define foreach         BOOST_FOREACH
@@ -35,4 +35,4 @@ protected :
 };
 
 } /* end ns Wccl */
-#endif // NOR_H
+#endif // LIBWCCL_OPS_NOR_H
diff --git a/libwccl/ops/operator.h b/libwccl/ops/operator.h
index 46ae2ecd9093c98b1ed4a99a9f0529812d9659d6..5997c5ab8c67d04806fbf712f83601fcd5252b15 100644
--- a/libwccl/ops/operator.h
+++ b/libwccl/ops/operator.h
@@ -1,5 +1,5 @@
-#ifndef OPERATOR_H
-#define OPERATOR_H
+#ifndef LIBWCCL_OPS_OPERATOR_H
+#define LIBWCCL_OPS_OPERATOR_H
 
 #include <libcorpus2/tagset.h>
 #include <unicode/unistr.h>
@@ -47,4 +47,4 @@ public:
 
 } /* end ns Wccl */
 
-#endif // OPERATOR_H
+#endif // LIBWCCL_OPS_OPERATOR_H
diff --git a/libwccl/ops/or.h b/libwccl/ops/or.h
index f33716627c98f60e112e4406f6bdcc7953cd61c9..574f9bd80b0bee2abd0b808bbfc3d77ea30b1b23 100644
--- a/libwccl/ops/or.h
+++ b/libwccl/ops/or.h
@@ -1,5 +1,5 @@
-#ifndef OR_H
-#define OR_H
+#ifndef LIBWCCL_OPS_OR_H
+#define LIBWCCL_OPS_OR_H
 
 #include <boost/foreach.hpp>
 #define foreach         BOOST_FOREACH
@@ -33,4 +33,4 @@ protected :
 };
 
 } /* end ns Wccl */
-#endif // OR_H
+#endif // LIBWCCL_OPS_OR_H
diff --git a/libwccl/ops/predicate.h b/libwccl/ops/predicate.h
index 3c34e6be60bfc0e8a25c0aad3c836f5e8b6ed167..d4d84ec44057c17b6671c3b5c7e4e6180cb343bc 100644
--- a/libwccl/ops/predicate.h
+++ b/libwccl/ops/predicate.h
@@ -1,5 +1,5 @@
-#ifndef PREDICATE_H
-#define PREDICATE_H
+#ifndef LIBWCCL_OPS_PREDICATE_H
+#define LIBWCCL_OPS_PREDICATE_H
 
 #include <boost/shared_ptr.hpp>
 #include <boost/scoped_ptr.hpp>
@@ -27,4 +27,4 @@ public:
 
 } /* end ns Wccl */
 
-#endif // PREDICATE_H
+#endif // LIBWCCL_OPS_PREDICATE_H