diff --git a/externals/abseil/CMakeLists.txt b/externals/abseil/CMakeLists.txt
index fe914405..0891c2cd 100644
--- a/externals/abseil/CMakeLists.txt
+++ b/externals/abseil/CMakeLists.txt
@@ -1,4 +1,5 @@
 set(ABSL_PROPAGATE_CXX_STD ON)
+set(ABSL_USE_SYSTEM_INCLUDES ON CACHE BOOL "Use system includes for Abseil" FORCE)
 
 FetchContent_Declare(
   cpp-abseil
diff --git a/lib/mpi_interceptor/InterceptorFunctions.h b/lib/mpi_interceptor/InterceptorFunctions.h
index 4d2a47e5..4ddbe4cd 100644
--- a/lib/mpi_interceptor/InterceptorFunctions.h
+++ b/lib/mpi_interceptor/InterceptorFunctions.h
@@ -10,8 +10,8 @@
 // SPDX-License-Identifier: BSD-3-Clause
 //
 
-#ifndef TEST_MPI_INTERCEPTOR_INTERCEPTORFUNCTIONS_H_
-#define TEST_MPI_INTERCEPTOR_INTERCEPTORFUNCTIONS_H_
+#ifndef TYPEART_MPI_INTERCEPTOR_INTERCEPTORFUNCTIONS_H
+#define TYPEART_MPI_INTERCEPTOR_INTERCEPTORFUNCTIONS_H
 
 #include "RuntimeExport.h"
 #include "RuntimeInterface.h"
@@ -156,4 +156,4 @@ TYPEART_NO_EXPORT void ta_exit() {
          mcounter.null_count);
 }
 
-#endif /* TEST_MPI_INTERCEPTOR_INTERCEPTORFUNCTIONS_H_ */
+#endif  // TYPEART_MPI_INTERCEPTOR_INTERCEPTORFUNCTIONS_H
diff --git a/lib/passes/analysis/MemOpVisitor.h b/lib/passes/analysis/MemOpVisitor.h
index 88738e39..fc982549 100644
--- a/lib/passes/analysis/MemOpVisitor.h
+++ b/lib/passes/analysis/MemOpVisitor.h
@@ -10,8 +10,8 @@
 // SPDX-License-Identifier: BSD-3-Clause
 //
 
-#ifndef LIB_MEMOPVISITOR_H_
-#define LIB_MEMOPVISITOR_H_
+#ifndef TYPEART_MEMOPVISITOR_H
+#define TYPEART_MEMOPVISITOR_H
 
 #include "MemOpData.h"
 #include "configuration/Configuration.h"
@@ -57,4 +57,4 @@ struct MemOpVisitor : public llvm::InstVisitor<MemOpVisitor> {
 
 }  // namespace typeart::analysis
 
-#endif /* LIB_MEMOPVISITOR_H_ */
+#endif  // TYPEART_MEMOPVISITOR_H
diff --git a/lib/passes/compat/CallSite.h b/lib/passes/compat/CallSite.h
index 430ac868..d3f9ebd9 100644
--- a/lib/passes/compat/CallSite.h
+++ b/lib/passes/compat/CallSite.h
@@ -12,8 +12,8 @@
 
 // In Clang 11 CallSite.h was removed, this is a small wrapper reimplementation
 
-#ifndef COMPAT_LLVM_IR_CALLSITE_H
-#define COMPAT_LLVM_IR_CALLSITE_H
+#ifndef TYPEART_CALLSITE_H
+#define TYPEART_CALLSITE_H
 
 #include "llvm/IR/Instruction.h"
 
@@ -86,4 +86,4 @@ class CallSite {
 };
 }  // namespace llvm
 
-#endif
+#endif  // TYPEART_CALLSITE_H
diff --git a/lib/passes/configuration/OptionsUtil.h b/lib/passes/configuration/OptionsUtil.h
index 59cf5f2f..75a11c82 100644
--- a/lib/passes/configuration/OptionsUtil.h
+++ b/lib/passes/configuration/OptionsUtil.h
@@ -10,8 +10,8 @@
 // SPDX-License-Identifier: BSD-3-Clause
 //
 
-#ifndef LIB_PASSES_CONFIGURATION_OPTIONSUTIL
-#define LIB_PASSES_CONFIGURATION_OPTIONSUTIL
+#ifndef TYPEART_CONFIGURATION_OPTIONS_UTIL_H
+#define TYPEART_CONFIGURATION_OPTIONS_UTIL_H
 
 #include "analysis/MemInstFinder.h"
 #include "instrumentation/TypeIDProvider.h"
@@ -80,4 +80,4 @@ ClType make_opt(llvm::StringRef cl_value) {
 }
 
 }  // namespace typeart::config::util
-#endif /* LIB_PASSES_CONFIGURATION_OPTIONSUTIL */
+#endif  // TYPEART_CONFIGURATION_OPTIONS_UTIL_H
diff --git a/lib/passes/configuration/TypeARTOptions.h b/lib/passes/configuration/TypeARTOptions.h
index 3091701a..03e7884d 100644
--- a/lib/passes/configuration/TypeARTOptions.h
+++ b/lib/passes/configuration/TypeARTOptions.h
@@ -10,8 +10,8 @@
 // SPDX-License-Identifier: BSD-3-Clause
 //
 
-#ifndef LIB_PASSES_CONFIGURATION_TYPEARTOPTIONS
-#define LIB_PASSES_CONFIGURATION_TYPEARTOPTIONS
+#ifndef TYPEART_CONFIGURATION_OPTIONS_H
+#define TYPEART_CONFIGURATION_OPTIONS_H
 
 #include "analysis/MemInstFinder.h"
 #include "configuration/Configuration.h"
@@ -82,4 +82,4 @@ llvm::raw_ostream& operator<<(llvm::raw_ostream& out_s, const TypeARTConfigOptio
 
 }  // namespace typeart::config
 
-#endif /* LIB_PASSES_CONFIGURATION_TYPEARTOPTIONS */
+#endif  // TYPEART_CONFIGURATION_OPTIONS_H
diff --git a/lib/passes/filter/CGInterface.h b/lib/passes/filter/CGInterface.h
index 1450bb4b..fea57be8 100644
--- a/lib/passes/filter/CGInterface.h
+++ b/lib/passes/filter/CGInterface.h
@@ -10,8 +10,8 @@
 // SPDX-License-Identifier: BSD-3-Clause
 //
 
-#ifndef _LIB_TYPEART_CGINTERFACE_H
-#define _LIB_TYPEART_CGINTERFACE_H
+#ifndef TYPEART_CGINTERFACE_H
+#define TYPEART_CGINTERFACE_H
 
 #include "llvm/Support/JSON.h"
 
@@ -80,4 +80,4 @@ class JSONCG final : public CGInterface {
 };
 
 }  // namespace typeart::filter
-#endif
\ No newline at end of file
+#endif  // TYPEART_CGINTERFACE_H
\ No newline at end of file
diff --git a/lib/passes/instrumentation/CallBackFunctionInserter.h b/lib/passes/instrumentation/CallBackFunctionInserter.h
index 70e88737..7901fce4 100644
--- a/lib/passes/instrumentation/CallBackFunctionInserter.h
+++ b/lib/passes/instrumentation/CallBackFunctionInserter.h
@@ -1,5 +1,5 @@
-#ifndef LIB_PASSES_INSTRUMENTATION_CALLBACKFUNCTIONINSERTER
-#define LIB_PASSES_INSTRUMENTATION_CALLBACKFUNCTIONINSERTER
+#ifndef TYPEART_CALLBACKFUNCTIONINSERTER_H
+#define TYPEART_CALLBACKFUNCTIONINSERTER_H
 
 #include "instrumentation/TypeARTFunctions.h"
 
@@ -51,4 +51,4 @@ std::unique_ptr<InstrumentationInserter> make_callback_inserter(const config::Co
 
 }  // namespace typeart
 
-#endif /* LIB_PASSES_INSTRUMENTATION_CALLBACKFUNCTIONINSERTER */
+#endif  // TYPEART_CALLBACKFUNCTIONINSERTER_H
diff --git a/lib/passes/instrumentation/InstrumentationHelper.h b/lib/passes/instrumentation/InstrumentationHelper.h
index ba8e381f..be7211c8 100644
--- a/lib/passes/instrumentation/InstrumentationHelper.h
+++ b/lib/passes/instrumentation/InstrumentationHelper.h
@@ -10,8 +10,8 @@
 // SPDX-License-Identifier: BSD-3-Clause
 //
 
-#ifndef LIB_INSTRUMENTATIONHELPER_H_
-#define LIB_INSTRUMENTATIONHELPER_H_
+#ifndef TYPEART_INSTRUMENTATIONHELPER_H
+#define TYPEART_INSTRUMENTATIONHELPER_H
 
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/SmallVector.h"
@@ -66,4 +66,4 @@ class InstrumentationHelper {
 
 }  // namespace typeart
 
-#endif /* LIB_INSTRUMENTATIONHELPER_H_ */
+#endif  // TYPEART_INSTRUMENTATIONHELPER_H
diff --git a/lib/passes/instrumentation/MemOpInstrumentation.h b/lib/passes/instrumentation/MemOpInstrumentation.h
index 824fd749..4db19f74 100644
--- a/lib/passes/instrumentation/MemOpInstrumentation.h
+++ b/lib/passes/instrumentation/MemOpInstrumentation.h
@@ -10,8 +10,8 @@
 // SPDX-License-Identifier: BSD-3-Clause
 //
 
-#ifndef LIB_PASSES_INSTRUMENTATION_MEMOPINSTRUMENTATION
-#define LIB_PASSES_INSTRUMENTATION_MEMOPINSTRUMENTATION
+#ifndef TYPEART_MEMOPINSTRUMENTATION_H
+#define TYPEART_MEMOPINSTRUMENTATION_H
 
 #include "Instrumentation.h"
 #include "configuration/Configuration.h"
@@ -45,4 +45,4 @@ class MemOpInstrumentation final : public MemoryInstrument {
 };
 
 }  // namespace typeart
-#endif /* LIB_PASSES_INSTRUMENTATION_MEMOPINSTRUMENTATION */
+#endif  // TYPEART_MEMOPINSTRUMENTATION_H
diff --git a/lib/passes/instrumentation/TypeIDProvider.h b/lib/passes/instrumentation/TypeIDProvider.h
index e0467edc..1271af4a 100644
--- a/lib/passes/instrumentation/TypeIDProvider.h
+++ b/lib/passes/instrumentation/TypeIDProvider.h
@@ -1,5 +1,5 @@
-#ifndef LIB_PASSES_INSTRUMENTATION_MODULETYPEREGISTRY
-#define LIB_PASSES_INSTRUMENTATION_MODULETYPEREGISTRY
+#ifndef TYPEART_TYPEIDPROVIDER_H
+#define TYPEART_TYPEIDPROVIDER_H
 
 // #include "TypeARTFunctions.h"
 // #include "instrumentation/TypeARTFunctions.h"
@@ -36,4 +36,4 @@ std::unique_ptr<TypeRegistry> get_type_id_handler(llvm::Module& m, const TypeDat
 
 }  // namespace typeart
 
-#endif /* LIB_PASSES_INSTRUMENTATION_MODULETYPEREGISTRY */
+#endif  // TYPEART_TYPEIDPROVIDER_H
diff --git a/lib/passes/support/ModuleDumper.h b/lib/passes/support/ModuleDumper.h
index 0ae30fb2..cacadf3f 100644
--- a/lib/passes/support/ModuleDumper.h
+++ b/lib/passes/support/ModuleDumper.h
@@ -10,8 +10,8 @@
 // SPDX-License-Identifier: BSD-3-Clause
 //
 
-#ifndef MODULE_DUMPER_UTIL_H
-#define MODULE_DUMPER_UTIL_H
+#ifndef TYPEART_MODULEDUMPER_H
+#define TYPEART_MODULEDUMPER_H
 
 #include "llvm/IR/Module.h"
 
@@ -23,4 +23,4 @@ void dump_module(const llvm::Module& module, ModulePhase phase);
 
 }  // namespace typeart::util::module
 
-#endif
+#endif  // TYPEART_MODULEDUMPER_H
diff --git a/lib/passes/support/TypeUtil.h b/lib/passes/support/TypeUtil.h
index 0dcee0bf..129f6d99 100644
--- a/lib/passes/support/TypeUtil.h
+++ b/lib/passes/support/TypeUtil.h
@@ -10,8 +10,8 @@
 // SPDX-License-Identifier: BSD-3-Clause
 //
 
-#ifndef LIB_UTIL_TYPE_H
-#define LIB_UTIL_TYPE_H
+#ifndef TYPEART_TYPE_UTIL_H
+#define TYPEART_TYPE_UTIL_H
 
 namespace llvm {
 class DataLayout;
@@ -46,4 +46,4 @@ unsigned getPointerSizeInBytes(llvm::Type* ptrT, const llvm::DataLayout& dl);
 
 }  // namespace typeart::util::type
 
-#endif
+#endif  // TYPEART_TYPE_UTIL_H
diff --git a/lib/passes/support/Util.h b/lib/passes/support/Util.h
index 9019d85e..b7e1c8b2 100644
--- a/lib/passes/support/Util.h
+++ b/lib/passes/support/Util.h
@@ -10,8 +10,8 @@
 // SPDX-License-Identifier: BSD-3-Clause
 //
 
-#ifndef LIB_UTIL_H_
-#define LIB_UTIL_H_
+#ifndef TYPEART_UTIL_H
+#define TYPEART_UTIL_H
 
 // #include "Logger.h"
 
@@ -228,4 +228,4 @@ void for_each_cdtor(llvm::StringRef name, llvm::Module& module, Matcher&& matchi
 
 }  // namespace typeart::util
 
-#endif /* LIB_UTIL_H_ */
+#endif  // TYPEART_UTIL_H
diff --git a/lib/passes/typegen/TypeGenerator.h b/lib/passes/typegen/TypeGenerator.h
index 3130afee..37c65d9e 100644
--- a/lib/passes/typegen/TypeGenerator.h
+++ b/lib/passes/typegen/TypeGenerator.h
@@ -10,8 +10,8 @@
 // SPDX-License-Identifier: BSD-3-Clause
 //
 
-#ifndef LIB_PASSES_TYPEGEN_TYPEGENERATOR
-#define LIB_PASSES_TYPEGEN_TYPEGENERATOR
+#ifndef TYPEART_TYPEGENERATOR_H
+#define TYPEART_TYPEGENERATOR_H
 
 #include "analysis/MemOpData.h"
 #include "typelib/TypeDatabase.h"
@@ -68,4 +68,4 @@ std::unique_ptr<TypeGenerator> make_typegen(std::string_view file, TypegenImplem
 
 }  // namespace typeart
 
-#endif /* LIB_PASSES_TYPEGEN_TYPEGENERATOR */
+#endif  // TYPEART_TYPEGENERATOR_H
diff --git a/lib/passes/typegen/ir/TypeManager.h b/lib/passes/typegen/ir/TypeManager.h
index 996a905a..6953d475 100644
--- a/lib/passes/typegen/ir/TypeManager.h
+++ b/lib/passes/typegen/ir/TypeManager.h
@@ -10,8 +10,8 @@
 // SPDX-License-Identifier: BSD-3-Clause
 //
 
-#ifndef LLVM_MUST_SUPPORT_TYPEMANAGER_H
-#define LLVM_MUST_SUPPORT_TYPEMANAGER_H
+#ifndef TYPEART_TYPEMANAGER_H
+#define TYPEART_TYPEMANAGER_H
 
 #include "typegen/TypeIDGenerator.h"
 
@@ -44,4 +44,4 @@ class TypeManager final : public types::TypeIDGenerator {
 
 }  // namespace typeart
 
-#endif  // LLVM_MUST_SUPPORT_TYPEMANAGER_H
+#endif  // TYPEART_TYPEMANAGER_H
diff --git a/lib/runtime/GlobalTypeDefCallbacks.h b/lib/runtime/GlobalTypeDefCallbacks.h
index b59d93d4..a836809b 100644
--- a/lib/runtime/GlobalTypeDefCallbacks.h
+++ b/lib/runtime/GlobalTypeDefCallbacks.h
@@ -1,5 +1,5 @@
-#ifndef LIB_RUNTIME_GLOBALTYPEDEFCALLBACKS
-#define LIB_RUNTIME_GLOBALTYPEDEFCALLBACKS
+#ifndef TYPEART_GLOBALTYPEDEFCALLBACKS_H
+#define TYPEART_GLOBALTYPEDEFCALLBACKS_H
 
 #include "RuntimeData.h"
 #include "TypeInterface.h"
@@ -41,4 +41,4 @@ class GlobalTypeTranslator final {
 
 }  // namespace typeart
 
-#endif /* LIB_RUNTIME_GLOBALTYPEDEFCALLBACKS */
+#endif  // TYPEART_GLOBALTYPEDEFCALLBACKS_H
diff --git a/lib/runtime/Runtime.h b/lib/runtime/Runtime.h
index c5539e2d..97aaa819 100644
--- a/lib/runtime/Runtime.h
+++ b/lib/runtime/Runtime.h
@@ -10,8 +10,8 @@
 // SPDX-License-Identifier: BSD-3-Clause
 //
 
-#ifndef LIB_RUNTIME_RUNTIME
-#define LIB_RUNTIME_RUNTIME
+#ifndef TYPEART_RUNTIME_H
+#define TYPEART_RUNTIME_H
 
 #include "AccessCounter.h"
 #include "AllocationTracking.h"
@@ -126,4 +126,4 @@ struct RTGuard final {
 
 }  // namespace typeart
 
-#endif /* LIB_RUNTIME_RUNTIME */
+#endif  // TYPEART_RUNTIME_H
diff --git a/lib/runtime/RuntimeData.h b/lib/runtime/RuntimeData.h
index 5e334b58..cf179f58 100644
--- a/lib/runtime/RuntimeData.h
+++ b/lib/runtime/RuntimeData.h
@@ -21,13 +21,8 @@
 #ifdef TYPEART_PHMAP
 #error TypeART-RT: Set ABSL and PHMAP, mutually exclusive.
 #endif
-
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wpedantic"
-#pragma GCC diagnostic ignored "-Wshadow"
 #include "absl/container/btree_map.h"
 #include "absl/container/flat_hash_map.h"
-#pragma GCC diagnostic pop
 #endif
 
 #ifdef TYPEART_PHMAP
diff --git a/lib/support/Logger.h b/lib/support/Logger.h
index 2cf064e7..e055d565 100644
--- a/lib/support/Logger.h
+++ b/lib/support/Logger.h
@@ -10,8 +10,8 @@
 // SPDX-License-Identifier: BSD-3-Clause
 //
 
-#ifndef LIB_LOGGER_H_
-#define LIB_LOGGER_H_
+#ifndef TYPEART_LOGGER_H
+#define TYPEART_LOGGER_H
 
 #include "llvm/Support/raw_ostream.h"
 
@@ -67,4 +67,4 @@ inline void typeart_log(const std::string& msg) {
 #define LOG_FATAL(MSG)   OO_LOG_LEVEL_MSG(0, "[Fatal]", MSG)
 #define LOG_MSG(MSG)     llvm::errs() << MSG << "\n"; /* NOLINT */
 
-#endif /* LIB_LOGGER_H_ */
+#endif  // TYPEART_LOGGER_H
diff --git a/lib/typelib/TypeDB.h b/lib/typelib/TypeDB.h
index 54e7b611..bcac9d4f 100644
--- a/lib/typelib/TypeDB.h
+++ b/lib/typelib/TypeDB.h
@@ -10,8 +10,8 @@
 // SPDX-License-Identifier: BSD-3-Clause
 //
 
-#ifndef LLVM_MUST_SUPPORT_TYPECONFIG_H
-#define LLVM_MUST_SUPPORT_TYPECONFIG_H
+#ifndef TYPEART_TYPEDB_H
+#define TYPEART_TYPEDB_H
 
 #include "TypeDatabase.h"
 #include "TypeInterface.h"
@@ -110,4 +110,4 @@ class TypeDB final : public TypeDatabase {
 
 }  // namespace typeart
 
-#endif  // LLVM_MUST_SUPPORT_TYPECONFIG_H
+#endif  // TYPEART_TYPEDB_H
diff --git a/lib/typelib/TypeIO.h b/lib/typelib/TypeIO.h
index 85d40d88..25b4e011 100644
--- a/lib/typelib/TypeIO.h
+++ b/lib/typelib/TypeIO.h
@@ -10,8 +10,8 @@
 // SPDX-License-Identifier: BSD-3-Clause
 //
 
-#ifndef LLVM_MUST_SUPPORT_CONFIGIO_H
-#define LLVM_MUST_SUPPORT_CONFIGIO_H
+#ifndef TYPEART_TYPEIO_H
+#define TYPEART_TYPEIO_H
 
 #include "typelib/TypeDatabase.h"
 
@@ -30,4 +30,4 @@ namespace io {
 
 }  // namespace typeart
 
-#endif  // LLVM_MUST_SUPPORT_CONFIGIO_H
+#endif  // TYPEART_TYPEIO_H