Clean up include guards

11 files changed, 18 insertions, 17 deletions

diff --git a/.clang-tidy b/.clang-tidy
index bdc03d3..a6f9e1a 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -20,7 +20,6 @@ Checks: >
   -google-runtime-int,
   -google-runtime-references,
   -hicpp-explicit-conversions,
-  -llvm-header-guard,
   -llvmlibc-*,
   -modernize-use-trailing-return-type,
   -readability-avoid-const-params-in-decls,
diff --git a/benchmark/.clang-tidy b/benchmark/.clang-tidy
index ac890bd..879423b 100644
--- a/benchmark/.clang-tidy
+++ b/benchmark/.clang-tidy
@@ -1,3 +1,4 @@
 Checks: >
+  -llvm-header-guard,
   -readability-static-accessed-through-instance,
 InheritParentConfig: true
diff --git a/include/chilbert/chilbert.ipp b/include/chilbert/chilbert.ipp
index db75a62..5c18570 100644
--- a/include/chilbert/chilbert.ipp
+++ b/include/chilbert/chilbert.ipp
@@ -16,8 +16,8 @@
   this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-#ifndef CHILBERT_ALGORITHM_HPP
-#define CHILBERT_ALGORITHM_HPP
+#ifndef CHILBERT_CHILBERT_HPP
+#define CHILBERT_CHILBERT_HPP
 
 #include "chilbert/BoundedBitVec.hpp"
 #include "chilbert/DynamicBitVec.hpp"
diff --git a/include/chilbert/detail/BitVecIndex.hpp b/include/chilbert/detail/BitVecIndex.hpp
index e7b385e..0998968 100644
--- a/include/chilbert/detail/BitVecIndex.hpp
+++ b/include/chilbert/detail/BitVecIndex.hpp
@@ -16,8 +16,8 @@
   this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-#ifndef CHILBERT_BITVECINDEX_HPP
-#define CHILBERT_BITVECINDEX_HPP
+#ifndef CHILBERT_DETAIL_BITVECINDEX_HPP
+#define CHILBERT_DETAIL_BITVECINDEX_HPP
 
 #include <cassert>
 #include <climits>
diff --git a/include/chilbert/detail/BitVecIterator.hpp b/include/chilbert/detail/BitVecIterator.hpp
index 8902747..2458da9 100644
--- a/include/chilbert/detail/BitVecIterator.hpp
+++ b/include/chilbert/detail/BitVecIterator.hpp
@@ -16,8 +16,8 @@
   this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-#ifndef CHILBERT_BITVECITERATOR_HPP
-#define CHILBERT_BITVECITERATOR_HPP
+#ifndef CHILBERT_DETAIL_BITVECITERATOR_HPP
+#define CHILBERT_DETAIL_BITVECITERATOR_HPP
 
 #include "chilbert/detail/BitVecMask.hpp"
 
diff --git a/include/chilbert/detail/BitVecMask.hpp b/include/chilbert/detail/BitVecMask.hpp
index 2d3466a..f015d63 100644
--- a/include/chilbert/detail/BitVecMask.hpp
+++ b/include/chilbert/detail/BitVecMask.hpp
@@ -16,8 +16,8 @@
   this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-#ifndef CHILBERT_BITVECMASK_HPP
-#define CHILBERT_BITVECMASK_HPP
+#ifndef CHILBERT_DETAIL_BITVECMASK_HPP
+#define CHILBERT_DETAIL_BITVECMASK_HPP
 
 #include <climits>
 #include <cstddef>
diff --git a/include/chilbert/detail/MultiBitVec.hpp b/include/chilbert/detail/MultiBitVec.hpp
index 269fb85..6db1065 100644
--- a/include/chilbert/detail/MultiBitVec.hpp
+++ b/include/chilbert/detail/MultiBitVec.hpp
@@ -16,8 +16,8 @@
   this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-#ifndef CHILBERT_MULTIBITVEC_HPP
-#define CHILBERT_MULTIBITVEC_HPP
+#ifndef CHILBERT_DETAIL_MULTIBITVEC_HPP
+#define CHILBERT_DETAIL_MULTIBITVEC_HPP
 
 #include "chilbert/detail/BitVecIndex.hpp"
 #include "chilbert/detail/BitVecIterator.hpp"
diff --git a/include/chilbert/detail/gray_code_rank.hpp b/include/chilbert/detail/gray_code_rank.hpp
index 03c1169..b6811ff 100644
--- a/include/chilbert/detail/gray_code_rank.hpp
+++ b/include/chilbert/detail/gray_code_rank.hpp
@@ -16,8 +16,8 @@
   this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-#ifndef CHILBERT_GRAYCODERANK_HPP
-#define CHILBERT_GRAYCODERANK_HPP
+#ifndef CHILBERT_DETAIL_GRAY_CODE_RANK_HPP
+#define CHILBERT_DETAIL_GRAY_CODE_RANK_HPP
 
 #include <cassert>
 #include <cstddef>
diff --git a/include/chilbert/detail/operations.hpp b/include/chilbert/detail/operations.hpp
index 398944f..a196ba4 100644
--- a/include/chilbert/detail/operations.hpp
+++ b/include/chilbert/detail/operations.hpp
@@ -16,8 +16,8 @@
   this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-#ifndef CHILBERT_OPERATIONS_HPP
-#define CHILBERT_OPERATIONS_HPP
+#ifndef CHILBERT_DETAIL_OPERATIONS_HPP
+#define CHILBERT_DETAIL_OPERATIONS_HPP
 
 #include "chilbert/detail/traits.hpp"
 #include "chilbert/operators.hpp"
diff --git a/include/chilbert/detail/traits.hpp b/include/chilbert/detail/traits.hpp
index 0cb0f03..3e3f4d2 100644
--- a/include/chilbert/detail/traits.hpp
+++ b/include/chilbert/detail/traits.hpp
@@ -16,8 +16,8 @@
   this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-#ifndef CHILBERT_TRAITS_HPP
-#define CHILBERT_TRAITS_HPP
+#ifndef CHILBERT_DETAIL_TRAITS_HPP
+#define CHILBERT_DETAIL_TRAITS_HPP
 
 namespace chilbert {
 namespace detail {
diff --git a/test/.clang-tidy b/test/.clang-tidy
index b789602..77149fb 100644
--- a/test/.clang-tidy
+++ b/test/.clang-tidy
@@ -6,6 +6,7 @@ Checks: >
   -concurrency-mt-unsafe,
   -cppcoreguidelines-pro-bounds-array-to-pointer-decay,
   -hicpp-no-array-decay,
+  -llvm-header-guard,
   -performance-no-automatic-move,
   -readability-identifier-length,
 InheritParentConfig: true