Cleanup

include/papilio/access.hpp

@@ -374,10 +374,10 @@ class accessor_traits : public detail::accessor_traits_base
 };
 } // namespace papilio
 
-#include "access/tuple.inl"
-#include "access/ranges.inl"
-#include "access/misc.inl"
-
 #include "detail/suffix.hpp"
 
+#include "accessor/tuple.hpp"
+#include "accessor/ranges.hpp"
+#include "accessor/misc.hpp"
+
 #endif

include/papilio/access/misc.inl → include/papilio/accessor/misc.hpp

@@ -1,6 +1,11 @@
-#include <string_view>
+#ifndef PAPILIO_ACCESSOR_MISC_HPP
+#define PAPILIO_ACCESSOR_MISC_HPP
+
+#pragma once
+
 #include <typeindex>
-#include "../utility.hpp"
+#include "../access.hpp"
+#include "../detail/prefix.hpp"
 
 namespace papilio
 {
@@ -34,3 +39,7 @@ struct accessor<std::type_index, Context>
     }
 };
 } // namespace papilio
+
+#include "../detail/suffix.hpp"
+
+#endif

include/papilio/access/ranges.inl → include/papilio/accessor/ranges.hpp

@@ -1,11 +1,15 @@
-#include <string_view>
+#ifndef PAPILIO_ACCESSOR_RANGES_HPP
+#define PAPILIO_ACCESSOR_RANGES_HPP
+
+#pragma once
+
 #include <span>
 #include <ranges>
 #include <vector>
 #include <map>
 #include <utility>
-#include "../utility.hpp"
-#include "../utf/string.hpp"
+#include "../access.hpp"
+#include "../detail/prefix.hpp"
 
 namespace papilio
 {
@@ -279,3 +283,7 @@ struct accessor<fixed_flat_map<Key, T, Capacity, Compare>, Context> :
     public map_accessor<fixed_flat_map<Key, T, Capacity, Compare>, Context>
 {};
 } // namespace papilio
+
+#include "../detail/suffix.hpp"
+
+#endif

include/papilio/access/tuple.inl → include/papilio/accessor/tuple.hpp

@@ -1,6 +1,11 @@
-#include <string_view>
+#ifndef PAPILIO_ACCESSOR_TUPLE_HPP
+#define PAPILIO_ACCESSOR_TUPLE_HPP
+
+#pragma once
+
 #include <tuple>
 #include "../utility.hpp"
+#include "../detail/prefix.hpp"
 
 namespace papilio
 {
@@ -91,3 +96,7 @@ struct accessor<compressed_pair<T1, T2>, Context> :
     public tuple_accessor<compressed_pair<T1, T2>, Context, true>
 {};
 } // namespace papilio
+
+#include "../detail/suffix.hpp"
+
+#endif