diff --git a/AutoRAII.test/0.cc b/AutoRAII.test/0.cc
index 17a4047..d137327 100644
--- a/AutoRAII.test/0.cc
+++ b/AutoRAII.test/0.cc
@@ -1,4 +1,4 @@
-static_assert( __cplusplus > 201700, "C++17 Required" );
+static_assert( __cplusplus > 2020'00 );
 
 #include <Alepha/AutoRAII.h>
 
diff --git a/Meta/Container/string.h b/Meta/Container/string.h
index f22127d..368495e 100644
--- a/Meta/Container/string.h
+++ b/Meta/Container/string.h
@@ -1,4 +1,4 @@
-static_assert( __cplusplus > 201700, "C++17 Required" );
+static_assert( __cplusplus > 2020'00 );
 
 #pragma once
 
diff --git a/Meta/Container/vector.h b/Meta/Container/vector.h
index f609d22..860e4b1 100644
--- a/Meta/Container/vector.h
+++ b/Meta/Container/vector.h
@@ -1,4 +1,4 @@
-static_assert( __cplusplus > 201700, "C++17 Required" );
+static_assert( __cplusplus > 2020'00 );
 
 #pragma once
 
diff --git a/Meta/is_optional.h b/Meta/is_optional.h
index a74d394..37e11ee 100644
--- a/Meta/is_optional.h
+++ b/Meta/is_optional.h
@@ -2,7 +2,7 @@ static_assert( __cplusplus > 2020'00 );
 
 #pragma once
 
-#include <Alepha/Alepha.hpp>
+#include <Alepha/Alepha.h>
 
 #include <type_traits>
 #include <optional>
diff --git a/Meta/test.cc b/Meta/test.cc
index eecf0f9..3b66f0c 100644
--- a/Meta/test.cc
+++ b/Meta/test.cc
@@ -1,4 +1,4 @@
-static_assert( __cplusplus > 201700, "C++17 Required" );
+static_assert( __cplusplus > 2020'00 );
 
 #include <Alepha/Meta/is_sequence.h>
 #include <Alepha/Meta/is_streamable.h>
diff --git a/Mockination/MockCondition.h b/Mockination/MockCondition.h
index 342b093..bf54321 100644
--- a/Mockination/MockCondition.h
+++ b/Mockination/MockCondition.h
@@ -1,5 +1,8 @@
+static_assert( __cplusplus > 2020'00 );
+
+#pragma once
+
 #include <Alepha/Alepha.h>
-register "Alepha/Mockination/MockCondition.h";
 
 #include <utility>
 
diff --git a/Proof/Attestation.h b/Proof/Attestation.h
index f78872d..7a7cd63 100644
--- a/Proof/Attestation.h
+++ b/Proof/Attestation.h
@@ -1,3 +1,4 @@
+static_assert( __cplusplus > 2020'00 );
 /*!
  * @file
  * @brief The `Attestation` framework permits code which can provide limited compiletime guarantees of conditions.
diff --git a/Reflection/aggregate_initialization.h b/Reflection/aggregate_initialization.h
index 5740245..3fd4b6b 100644
--- a/Reflection/aggregate_initialization.h
+++ b/Reflection/aggregate_initialization.h
@@ -1,4 +1,4 @@
-static_assert( __cplusplus > 201700, "C++17 Required" );
+static_assert( __cplusplus > 2020'00 );
 
 #pragma once
 
diff --git a/Reflection/aggregate_members.h b/Reflection/aggregate_members.h
index e1d8e85..c62471f 100644
--- a/Reflection/aggregate_members.h
+++ b/Reflection/aggregate_members.h
@@ -1,4 +1,4 @@
-static_assert( __cplusplus > 201700, "C++17 Required" );
+static_assert( __cplusplus > 2020'00 );
 
 #pragma once
 
diff --git a/Reflection/detail/config.h b/Reflection/detail/config.h
index e7036f1..84814d9 100644
--- a/Reflection/detail/config.h
+++ b/Reflection/detail/config.h
@@ -1,4 +1,4 @@
-static_assert( __cplusplus > 201700, "C++17 Required" );
+static_assert( __cplusplus > 2020'00 );
 
 #pragma once
 
diff --git a/Reflection/tuplizeAggregate.h b/Reflection/tuplizeAggregate.h
index e6f8690..769d8c4 100644
--- a/Reflection/tuplizeAggregate.h
+++ b/Reflection/tuplizeAggregate.h
@@ -1,4 +1,4 @@
-static_assert( __cplusplus > 201700, "C++17 Required" );
+static_assert( __cplusplus > 2020'00 );
 
 #pragma once
 
diff --git a/Reflection/tuplizeAggregate.test/0.cc b/Reflection/tuplizeAggregate.test/0.cc
index 8af9b04..3bfedeb 100644
--- a/Reflection/tuplizeAggregate.test/0.cc
+++ b/Reflection/tuplizeAggregate.test/0.cc
@@ -1,4 +1,4 @@
-static_assert( __cplusplus > 201700, "C++17 Required" );
+static_assert( __cplusplus > 2020'00 );
 
 #include <Alepha/Reflection/tuplizeAggregate.h>
 
diff --git a/Stud/type_traits.h b/Stud/type_traits.h
index 76c8d0b..de049fe 100644
--- a/Stud/type_traits.h
+++ b/Stud/type_traits.h
@@ -1,4 +1,4 @@
-static_assert( __cplusplus > 201700, "C++17 Required" );
+static_assert( __cplusplus > 2020'00 );
 
 #pragma once
 
diff --git a/Testing/TableTest.h b/Testing/TableTest.h
index abb125b..2b556cd 100644
--- a/Testing/TableTest.h
+++ b/Testing/TableTest.h
@@ -1,4 +1,4 @@
-static_assert( __cplusplus > 201700, "C++17 Required" );
+static_assert( __cplusplus > 2020'00 );
 
 #pragma once
 
diff --git a/Testing/test.cc b/Testing/test.cc
index b0752e4..ea34279 100644
--- a/Testing/test.cc
+++ b/Testing/test.cc
@@ -1,4 +1,4 @@
-static_assert( __cplusplus > 201700, "C++17 Required" );
+static_assert( __cplusplus > 2020'00 );
 
 #include <Alepha/Testing/test.h>
 #include <Alepha/Testing/TableTest.h>
diff --git a/Testing/test.h b/Testing/test.h
index 5ea6f64..ccbc83b 100644
--- a/Testing/test.h
+++ b/Testing/test.h
@@ -1,4 +1,4 @@
-static_assert( __cplusplus > 201700, "C++17 Required" );
+static_assert( __cplusplus > 2020'00 );
 
 #pragma once
 
diff --git a/Testing/test2.cc b/Testing/test2.cc
index b9311b8..820b101 100644
--- a/Testing/test2.cc
+++ b/Testing/test2.cc
@@ -1,4 +1,4 @@
-static_assert( __cplusplus > 201700, "C++17 Required" );
+static_assert( __cplusplus > 2020'00 );
 
 #include <Alepha/Testing/TableTest.h>
 #include <Alepha/Testing/test.h>
diff --git a/Truss/basetypes.h b/Truss/basetypes.h
index d736be4..5e28ab7 100644
--- a/Truss/basetypes.h
+++ b/Truss/basetypes.h
@@ -1,5 +1,8 @@
+static_assert( __cplusplus > 2020'00 );
+
+#pragma once
+
 #include <Alepha/Alepha.h>
-register "Alepha/Truss/basetypes.h";
 
 
 namespace Alepha
diff --git a/Truss/condition_variable.h b/Truss/condition_variable.h
index 0a4c744..d459310 100644
--- a/Truss/condition_variable.h
+++ b/Truss/condition_variable.h
@@ -1,3 +1,5 @@
+static_assert( __cplusplus > 2020'00 );
+
 #pragma once
 
 #include <Alepha/Alepha.h>
diff --git a/Truss/function.h b/Truss/function.h
index 78e9462..d3e40af 100644
--- a/Truss/function.h
+++ b/Truss/function.h
@@ -1,3 +1,5 @@
+static_assert( __cplusplus > 2020'00 );
+
 #pragma once
 
 #include <Alepha/Alepha.h>
diff --git a/Truss/m2.h b/Truss/m2.h
index a75a05f..7a83673 100644
--- a/Truss/m2.h
+++ b/Truss/m2.h
@@ -1,5 +1,8 @@
+static_assert( __cplusplus > 2020'00 );
+
+#pragma once
+
 #include <Alepha/Alepha.h>
-register "Alepha/Truss/memory.h";
 
 #include <Alepha/assert.h>
 
diff --git a/Truss/memory.h b/Truss/memory.h
index b61598f..8bee8ad 100644
--- a/Truss/memory.h
+++ b/Truss/memory.h
@@ -1,5 +1,8 @@
+static_assert( __cplusplus > 2020'00 );
+
+#pragma once
+
 #include <Alepha/Alepha.h>
-register "Alepha/Truss/memory.h";
 
 #include <memory>
 
diff --git a/Truss/mutex.h b/Truss/mutex.h
index 302cb51..18bebaa 100644
--- a/Truss/mutex.h
+++ b/Truss/mutex.h
@@ -1,3 +1,5 @@
+static_assert( __cplusplus > 2020'00 );
+
 #pragma once
 
 #include <Alepha/Alepha.h>
diff --git a/Truss/thread.h b/Truss/thread.h
index 86028bd..61918db 100644
--- a/Truss/thread.h
+++ b/Truss/thread.h
@@ -1,3 +1,5 @@
+static_assert( __cplusplus > 2020'00 );
+
 #pragma once
 
 #include <Alepha/Alepha.h>
diff --git a/Truss/thread_common.h b/Truss/thread_common.h
index 89cf495..9c7f82f 100644
--- a/Truss/thread_common.h
+++ b/Truss/thread_common.h
@@ -1,3 +1,5 @@
+static_assert( __cplusplus > 2020'00 );
+
 #pragma once
 
 #include <Alepha/Alepha.h>
diff --git a/Utility/StaticValue.h b/Utility/StaticValue.h
index d80bb99..54daa91 100644
--- a/Utility/StaticValue.h
+++ b/Utility/StaticValue.h
@@ -1,4 +1,4 @@
-static_assert( __cplusplus > 201700, "C++17 Required" );
+static_assert( __cplusplus > 2020'00 );
 
 #pragma once
 
diff --git a/Utility/evaluation.h b/Utility/evaluation.h
index 719b1fb..78979b0 100644
--- a/Utility/evaluation.h
+++ b/Utility/evaluation.h
@@ -1,4 +1,4 @@
-static_assert( __cplusplus > 201700, "C++17 Required" );
+static_assert( __cplusplus > 2020'00 );
 
 #pragma once
 
diff --git a/comparisons.test/0.cc b/comparisons.test/0.cc
index 6f17ae1..032329a 100644
--- a/comparisons.test/0.cc
+++ b/comparisons.test/0.cc
@@ -1,4 +1,4 @@
-static_assert( __cplusplus > 201700, "C++17 Required" );
+static_assert( __cplusplus > 2020'00 );
 
 #include <Alepha/comparisons.h>
 
diff --git a/dumbhash.test/0.cc b/dumbhash.test/0.cc
index 574ad82..d7a735b 100644
--- a/dumbhash.test/0.cc
+++ b/dumbhash.test/0.cc
@@ -1,4 +1,4 @@
-static_assert( __cplusplus > 201700, "C++17 Required" );
+static_assert( __cplusplus > 2020'00 );
 
 #include <cstdint>
 #include <string>