diff --git a/CMakeLists.txt b/CMakeLists.txt
index 50f1efab..bc381dce 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -155,51 +155,51 @@ set(CODON_HPPFILES
     codon/parser/visitors/typecheck/typecheck.h
     codon/parser/visitors/typecheck/ctx.hpp
     codon/parser/visitors/visitor.h
-    codon/cir/analyze/analysis.h
-    codon/cir/analyze/dataflow/capture.h
-    codon/cir/analyze/dataflow/cfg.h
-    codon/cir/analyze/dataflow/dominator.h
-    codon/cir/analyze/dataflow/reaching.h
-    codon/cir/analyze/module/global_vars.h
-    codon/cir/analyze/module/side_effect.h
+    codon/cir/analyze/analysis.hpp
+    codon/cir/analyze/dataflow/capture.hpp
+    codon/cir/analyze/dataflow/cfg.hpp
+    codon/cir/analyze/dataflow/dominator.hpp
+    codon/cir/analyze/dataflow/reaching.hpp
+    codon/cir/analyze/module/global_vars.hpp
+    codon/cir/analyze/module/side_effect.hpp
     codon/cir/attribute.h
     codon/cir/base.h
     codon/cir/const.h
-    codon/cir/dsl/codegen.h
-    codon/cir/dsl/nodes.h
+    codon/cir/dsl/codegen.hpp
+    codon/cir/dsl/nodes.hpp
     codon/cir/flow.h
     codon/cir/func.h
     codon/cir/instr.h
-    codon/cir/llvm/gpu.h
-    codon/cir/llvm/llvisitor.h
-    codon/cir/llvm/llvm.h
-    codon/cir/llvm/optimize.h
+    codon/cir/llvm/gpu.hpp
+    codon/cir/llvm/llvisitor.hpp
+    codon/cir/llvm/llvm.hpp
+    codon/cir/llvm/optimize.hpp
     codon/cir/module.h
     codon/cir/pyextension.h
     codon/cir/cir.h
-    codon/cir/transform/cleanup/canonical.h
-    codon/cir/transform/cleanup/dead_code.h
-    codon/cir/transform/cleanup/global_demote.h
-    codon/cir/transform/cleanup/replacer.h
-    codon/cir/transform/folding/const_fold.h
-    codon/cir/transform/folding/const_prop.h
-    codon/cir/transform/folding/folding.h
-    codon/cir/transform/folding/rule.h
-    codon/cir/transform/lowering/imperative.h
-    codon/cir/transform/lowering/pipeline.h
+    codon/cir/transform/cleanup/canonical.hpp
+    codon/cir/transform/cleanup/dead_code.hpp
+    codon/cir/transform/cleanup/global_demote.hpp
+    codon/cir/transform/cleanup/replacer.hpp
+    codon/cir/transform/folding/const_fold.hpp
+    codon/cir/transform/folding/const_prop.hpp
+    codon/cir/transform/folding/folding.hpp
+    codon/cir/transform/folding/rule.hpp
+    codon/cir/transform/lowering/imperative.hpp
+    codon/cir/transform/lowering/pipeline.hpp
     codon/cir/transform/manager.h
-    codon/cir/transform/parallel/openmp.h
-    codon/cir/transform/parallel/schedule.h
-    codon/cir/transform/pass.h
-    codon/cir/transform/pythonic/dict.h
-    codon/cir/transform/pythonic/generator.h
-    codon/cir/transform/pythonic/io.h
-    codon/cir/transform/pythonic/list.h
-    codon/cir/transform/pythonic/str.h
-    codon/cir/transform/rewrite.h
-    codon/cir/types/types.h
-    codon/cir/util/cloning.h
-    codon/cir/util/context.h
+    codon/cir/transform/parallel/openmp.hpp
+    codon/cir/transform/parallel/schedule.hpp
+    codon/cir/transform/pass.hpp
+    codon/cir/transform/pythonic/dict.hpp
+    codon/cir/transform/pythonic/generator.hpp
+    codon/cir/transform/pythonic/io.hpp
+    codon/cir/transform/pythonic/list.hpp
+    codon/cir/transform/pythonic/str.hpp
+    codon/cir/transform/rewrite.hpp
+    codon/cir/types/types.hpp
+    codon/cir/util/cloning.hpp
+    codon/cir/util/context.hpp
     codon/cir/util/format.h
     codon/cir/util/inlining.h
     codon/cir/util/irtools.h
@@ -208,7 +208,7 @@ set(CODON_HPPFILES
     codon/cir/util/operator.h
     codon/cir/util/outlining.h
     codon/cir/util/packs.h
-    codon/cir/util/side_effect.h
+    codon/cir/util/side_effect.hpp
     codon/cir/util/visitor.h
     codon/cir/value.h
     codon/cir/var.h
diff --git a/codon/cir/analyze/analysis.cpp b/codon/cir/analyze/analysis.cpp
index f62f2807..98db7df3 100644
--- a/codon/cir/analyze/analysis.cpp
+++ b/codon/cir/analyze/analysis.cpp
@@ -1,6 +1,6 @@
 // Copyright (C) 2022-2024 Exaloop Inc. <https://exaloop.io>
 
-#include "analysis.h"
+#include "analysis.hpp"
 
 #include "codon/cir/transform/manager.h"
 
diff --git a/codon/cir/analyze/analysis.h b/codon/cir/analyze/analysis.hpp
similarity index 96%
rename from codon/cir/analyze/analysis.h
rename to codon/cir/analyze/analysis.hpp
index e51114ee..6f5df550 100644
--- a/codon/cir/analyze/analysis.h
+++ b/codon/cir/analyze/analysis.hpp
@@ -5,7 +5,7 @@
 #include <memory>
 
 #include "codon/cir/module.h"
-#include "codon/cir/transform/pass.h"
+#include "codon/cir/transform/pass.hpp"
 
 namespace codon {
 namespace ir {
diff --git a/codon/cir/analyze/dataflow/capture.cpp b/codon/cir/analyze/dataflow/capture.cpp
index 3f8ed2a8..acd474e5 100644
--- a/codon/cir/analyze/dataflow/capture.cpp
+++ b/codon/cir/analyze/dataflow/capture.cpp
@@ -1,14 +1,14 @@
 // Copyright (C) 2022-2024 Exaloop Inc. <https://exaloop.io>
 
-#include "capture.h"
+#include "capture.hpp"
 
 #include <algorithm>
 #include <iterator>
 #include <utility>
 
-#include "codon/cir/analyze/dataflow/reaching.h"
+#include "codon/cir/analyze/dataflow/reaching.hpp"
 #include "codon/cir/util/irtools.h"
-#include "codon/cir/util/side_effect.h"
+#include "codon/cir/util/side_effect.hpp"
 
 namespace codon {
 namespace ir {
diff --git a/codon/cir/analyze/dataflow/capture.h b/codon/cir/analyze/dataflow/capture.hpp
similarity index 94%
rename from codon/cir/analyze/dataflow/capture.h
rename to codon/cir/analyze/dataflow/capture.hpp
index e08ed2fd..3dccf851 100644
--- a/codon/cir/analyze/dataflow/capture.h
+++ b/codon/cir/analyze/dataflow/capture.hpp
@@ -6,9 +6,9 @@
 #include <unordered_map>
 #include <vector>
 
-#include "codon/cir/analyze/analysis.h"
-#include "codon/cir/analyze/dataflow/dominator.h"
-#include "codon/cir/analyze/dataflow/reaching.h"
+#include "codon/cir/analyze/analysis.hpp"
+#include "codon/cir/analyze/dataflow/dominator.hpp"
+#include "codon/cir/analyze/dataflow/reaching.hpp"
 #include "codon/cir/cir.h"
 
 namespace codon {
diff --git a/codon/cir/analyze/dataflow/cfg.cpp b/codon/cir/analyze/dataflow/cfg.cpp
index b3345038..1dfb0b8f 100644
--- a/codon/cir/analyze/dataflow/cfg.cpp
+++ b/codon/cir/analyze/dataflow/cfg.cpp
@@ -1,11 +1,11 @@
 // Copyright (C) 2022-2024 Exaloop Inc. <https://exaloop.io>
 
-#include "cfg.h"
+#include "cfg.hpp"
 
 #include <vector>
 
-#include "codon/cir/dsl/codegen.h"
-#include "codon/cir/dsl/nodes.h"
+#include "codon/cir/dsl/codegen.hpp"
+#include "codon/cir/dsl/nodes.hpp"
 
 namespace codon {
 namespace ir {
diff --git a/codon/cir/analyze/dataflow/cfg.h b/codon/cir/analyze/dataflow/cfg.hpp
similarity index 99%
rename from codon/cir/analyze/dataflow/cfg.h
rename to codon/cir/analyze/dataflow/cfg.hpp
index 9f30c30b..3a82d1eb 100644
--- a/codon/cir/analyze/dataflow/cfg.h
+++ b/codon/cir/analyze/dataflow/cfg.hpp
@@ -8,7 +8,7 @@
 #include <unordered_map>
 #include <unordered_set>
 
-#include "codon/cir/analyze/analysis.h"
+#include "codon/cir/analyze/analysis.hpp"
 #include "codon/cir/cir.h"
 #include "codon/cir/util/iterators.h"
 
diff --git a/codon/cir/analyze/dataflow/dominator.cpp b/codon/cir/analyze/dataflow/dominator.cpp
index ee874b0e..9773709c 100644
--- a/codon/cir/analyze/dataflow/dominator.cpp
+++ b/codon/cir/analyze/dataflow/dominator.cpp
@@ -1,6 +1,6 @@
 // Copyright (C) 2022-2024 Exaloop Inc. <https://exaloop.io>
 
-#include "dominator.h"
+#include "dominator.hpp"
 
 namespace codon {
 namespace ir {
diff --git a/codon/cir/analyze/dataflow/dominator.h b/codon/cir/analyze/dataflow/dominator.hpp
similarity index 94%
rename from codon/cir/analyze/dataflow/dominator.h
rename to codon/cir/analyze/dataflow/dominator.hpp
index 39b407d3..4c1b1e1e 100644
--- a/codon/cir/analyze/dataflow/dominator.h
+++ b/codon/cir/analyze/dataflow/dominator.hpp
@@ -6,8 +6,8 @@
 #include <unordered_map>
 #include <utility>
 
-#include "codon/cir/analyze/analysis.h"
-#include "codon/cir/analyze/dataflow/cfg.h"
+#include "codon/cir/analyze/analysis.hpp"
+#include "codon/cir/analyze/dataflow/cfg.hpp"
 
 namespace codon {
 namespace ir {
diff --git a/codon/cir/analyze/dataflow/reaching.cpp b/codon/cir/analyze/dataflow/reaching.cpp
index c21821ed..d6a6ea8e 100644
--- a/codon/cir/analyze/dataflow/reaching.cpp
+++ b/codon/cir/analyze/dataflow/reaching.cpp
@@ -1,6 +1,6 @@
 // Copyright (C) 2022-2024 Exaloop Inc. <https://exaloop.io>
 
-#include "reaching.h"
+#include "reaching.hpp"
 
 #include <deque>
 #include <tuple>
diff --git a/codon/cir/analyze/dataflow/reaching.h b/codon/cir/analyze/dataflow/reaching.hpp
similarity index 95%
rename from codon/cir/analyze/dataflow/reaching.h
rename to codon/cir/analyze/dataflow/reaching.hpp
index efb5b713..dbfc3039 100644
--- a/codon/cir/analyze/dataflow/reaching.h
+++ b/codon/cir/analyze/dataflow/reaching.hpp
@@ -4,8 +4,8 @@
 
 #include <utility>
 
-#include "codon/cir/analyze/analysis.h"
-#include "codon/cir/analyze/dataflow/cfg.h"
+#include "codon/cir/analyze/analysis.hpp"
+#include "codon/cir/analyze/dataflow/cfg.hpp"
 
 namespace codon {
 namespace ir {
diff --git a/codon/cir/analyze/module/global_vars.cpp b/codon/cir/analyze/module/global_vars.cpp
index cb94e783..b6b73fd3 100644
--- a/codon/cir/analyze/module/global_vars.cpp
+++ b/codon/cir/analyze/module/global_vars.cpp
@@ -1,6 +1,6 @@
 // Copyright (C) 2022-2024 Exaloop Inc. <https://exaloop.io>
 
-#include "global_vars.h"
+#include "global_vars.hpp"
 
 #include "codon/cir/util/operator.h"
 
diff --git a/codon/cir/analyze/module/global_vars.h b/codon/cir/analyze/module/global_vars.hpp
similarity index 94%
rename from codon/cir/analyze/module/global_vars.h
rename to codon/cir/analyze/module/global_vars.hpp
index 917e6743..6cbf87e5 100644
--- a/codon/cir/analyze/module/global_vars.h
+++ b/codon/cir/analyze/module/global_vars.hpp
@@ -4,7 +4,7 @@
 
 #include <unordered_map>
 
-#include "codon/cir/analyze/analysis.h"
+#include "codon/cir/analyze/analysis.hpp"
 
 namespace codon {
 namespace ir {
diff --git a/codon/cir/analyze/module/side_effect.cpp b/codon/cir/analyze/module/side_effect.cpp
index 5688de5b..49193d02 100644
--- a/codon/cir/analyze/module/side_effect.cpp
+++ b/codon/cir/analyze/module/side_effect.cpp
@@ -1,11 +1,11 @@
 // Copyright (C) 2022-2024 Exaloop Inc. <https://exaloop.io>
 
-#include "side_effect.h"
+#include "side_effect.hpp"
 
 #include <type_traits>
 #include <utility>
 
-#include "codon/cir/analyze/dataflow/capture.h"
+#include "codon/cir/analyze/dataflow/capture.hpp"
 #include "codon/cir/util/irtools.h"
 #include "codon/cir/util/operator.h"
 
diff --git a/codon/cir/analyze/module/side_effect.h b/codon/cir/analyze/module/side_effect.hpp
similarity index 94%
rename from codon/cir/analyze/module/side_effect.h
rename to codon/cir/analyze/module/side_effect.hpp
index aba9f134..99b9e750 100644
--- a/codon/cir/analyze/module/side_effect.h
+++ b/codon/cir/analyze/module/side_effect.hpp
@@ -4,8 +4,8 @@
 
 #include <unordered_map>
 
-#include "codon/cir/analyze/analysis.h"
-#include "codon/cir/util/side_effect.h"
+#include "codon/cir/analyze/analysis.hpp"
+#include "codon/cir/util/side_effect.hpp"
 
 namespace codon {
 namespace ir {
diff --git a/codon/cir/attribute.cpp b/codon/cir/attribute.cpp
index 64e7ba87..f1da3d97 100644
--- a/codon/cir/attribute.cpp
+++ b/codon/cir/attribute.cpp
@@ -3,7 +3,7 @@
 #include "attribute.h"
 
 #include "codon/cir/func.h"
-#include "codon/cir/util/cloning.h"
+#include "codon/cir/util/cloning.hpp"
 #include "codon/cir/value.h"
 #include <fmt/ostream.h>
 
diff --git a/codon/cir/base.cpp b/codon/cir/base.cpp
index e61a0676..31b3bc4e 100644
--- a/codon/cir/base.cpp
+++ b/codon/cir/base.cpp
@@ -2,7 +2,7 @@
 
 #include "base.h"
 
-#include "codon/cir/types/types.h"
+#include "codon/cir/types/types.hpp"
 #include "codon/cir/util/format.h"
 #include "codon/cir/value.h"
 #include "codon/cir/var.h"
diff --git a/codon/cir/cir.h b/codon/cir/cir.h
index 8f8d22cb..69932e40 100644
--- a/codon/cir/cir.h
+++ b/codon/cir/cir.h
@@ -3,11 +3,11 @@
 #pragma once
 
 #include "codon/cir/const.h"
-#include "codon/cir/dsl/nodes.h"
+#include "codon/cir/dsl/nodes.hpp"
 #include "codon/cir/flow.h"
 #include "codon/cir/func.h"
 #include "codon/cir/instr.h"
 #include "codon/cir/module.h"
-#include "codon/cir/types/types.h"
+#include "codon/cir/types/types.hpp"
 #include "codon/cir/value.h"
 #include "codon/cir/var.h"
diff --git a/codon/cir/dsl/codegen.h b/codon/cir/dsl/codegen.hpp
similarity index 94%
rename from codon/cir/dsl/codegen.h
rename to codon/cir/dsl/codegen.hpp
index 2aeb7c25..a1dd090c 100644
--- a/codon/cir/dsl/codegen.h
+++ b/codon/cir/dsl/codegen.hpp
@@ -4,8 +4,8 @@
 
 #include <unordered_map>
 
-#include "codon/cir/llvm/llvm.h"
-#include "codon/cir/types/types.h"
+#include "codon/cir/llvm/llvm.hpp"
+#include "codon/cir/types/types.hpp"
 
 namespace codon {
 namespace ir {
diff --git a/codon/cir/dsl/nodes.cpp b/codon/cir/dsl/nodes.cpp
index 7f36fd62..36319d16 100644
--- a/codon/cir/dsl/nodes.cpp
+++ b/codon/cir/dsl/nodes.cpp
@@ -1,6 +1,6 @@
 // Copyright (C) 2022-2024 Exaloop Inc. <https://exaloop.io>
 
-#include "nodes.h"
+#include "nodes.hpp"
 
 namespace codon {
 namespace ir {
diff --git a/codon/cir/dsl/nodes.h b/codon/cir/dsl/nodes.hpp
similarity index 99%
rename from codon/cir/dsl/nodes.h
rename to codon/cir/dsl/nodes.hpp
index e0bb1c09..29a81f9d 100644
--- a/codon/cir/dsl/nodes.h
+++ b/codon/cir/dsl/nodes.hpp
@@ -7,7 +7,7 @@
 #include "codon/cir/base.h"
 #include "codon/cir/const.h"
 #include "codon/cir/instr.h"
-#include "codon/cir/util/side_effect.h"
+#include "codon/cir/util/side_effect.hpp"
 
 namespace codon {
 namespace ir {
diff --git a/codon/cir/flow.h b/codon/cir/flow.h
index 75621d9a..80a03abe 100644
--- a/codon/cir/flow.h
+++ b/codon/cir/flow.h
@@ -6,7 +6,7 @@
 #include <vector>
 
 #include "codon/cir/base.h"
-#include "codon/cir/transform/parallel/schedule.h"
+#include "codon/cir/transform/parallel/schedule.hpp"
 #include "codon/cir/value.h"
 #include "codon/cir/var.h"
 
diff --git a/codon/cir/instr.h b/codon/cir/instr.h
index dcc97559..ab64d63f 100644
--- a/codon/cir/instr.h
+++ b/codon/cir/instr.h
@@ -6,7 +6,7 @@
 #include <string>
 
 #include "codon/cir/flow.h"
-#include "codon/cir/types/types.h"
+#include "codon/cir/types/types.hpp"
 #include "codon/cir/util/iterators.h"
 #include "codon/cir/value.h"
 #include "codon/cir/var.h"
diff --git a/codon/cir/llvm/gpu.cpp b/codon/cir/llvm/gpu.cpp
index 464b6da0..1bad7f3e 100644
--- a/codon/cir/llvm/gpu.cpp
+++ b/codon/cir/llvm/gpu.cpp
@@ -1,6 +1,6 @@
 // Copyright (C) 2022-2024 Exaloop Inc. <https://exaloop.io>
 
-#include "gpu.h"
+#include "gpu.hpp"
 
 #include <algorithm>
 #include <memory>
diff --git a/codon/cir/llvm/gpu.h b/codon/cir/llvm/gpu.hpp
similarity index 94%
rename from codon/cir/llvm/gpu.h
rename to codon/cir/llvm/gpu.hpp
index 889accc9..b9916195 100644
--- a/codon/cir/llvm/gpu.h
+++ b/codon/cir/llvm/gpu.hpp
@@ -4,7 +4,7 @@
 
 #include <string>
 
-#include "codon/cir/llvm/llvm.h"
+#include "codon/cir/llvm/llvm.hpp"
 
 namespace codon {
 namespace ir {
diff --git a/codon/cir/llvm/llvisitor.cpp b/codon/cir/llvm/llvisitor.cpp
index 27bedb0e..e5f10fef 100644
--- a/codon/cir/llvm/llvisitor.cpp
+++ b/codon/cir/llvm/llvisitor.cpp
@@ -1,6 +1,6 @@
 // Copyright (C) 2022-2024 Exaloop Inc. <https://exaloop.io>
 
-#include "llvisitor.h"
+#include "llvisitor.hpp"
 
 #include <algorithm>
 #include <cctype>
@@ -10,8 +10,8 @@
 #include <unistd.h>
 #include <utility>
 
-#include "codon/cir/dsl/codegen.h"
-#include "codon/cir/llvm/optimize.h"
+#include "codon/cir/dsl/codegen.hpp"
+#include "codon/cir/llvm/optimize.hpp"
 #include "codon/cir/util/irtools.h"
 #include "codon/compiler/debug_listener.h"
 #include "codon/compiler/memory_manager.h"
diff --git a/codon/cir/llvm/llvisitor.h b/codon/cir/llvm/llvisitor.hpp
similarity index 99%
rename from codon/cir/llvm/llvisitor.h
rename to codon/cir/llvm/llvisitor.hpp
index 772b13b1..44c2068a 100644
--- a/codon/cir/llvm/llvisitor.h
+++ b/codon/cir/llvm/llvisitor.hpp
@@ -3,7 +3,7 @@
 #pragma once
 
 #include "codon/cir/cir.h"
-#include "codon/cir/llvm/llvm.h"
+#include "codon/cir/llvm/llvm.hpp"
 #include "codon/cir/pyextension.h"
 #include "codon/dsl/plugins.h"
 #include "codon/util/common.hpp"
diff --git a/codon/cir/llvm/llvm.h b/codon/cir/llvm/llvm.hpp
similarity index 100%
rename from codon/cir/llvm/llvm.h
rename to codon/cir/llvm/llvm.hpp
diff --git a/codon/cir/llvm/optimize.cpp b/codon/cir/llvm/optimize.cpp
index 61aa71a4..1a1d01ae 100644
--- a/codon/cir/llvm/optimize.cpp
+++ b/codon/cir/llvm/optimize.cpp
@@ -1,11 +1,11 @@
 // Copyright (C) 2022-2024 Exaloop Inc. <https://exaloop.io>
 
-#include "optimize.h"
+#include "optimize.hpp"
 
 #include <algorithm>
 #include <deque>
 
-#include "codon/cir/llvm/gpu.h"
+#include "codon/cir/llvm/gpu.hpp"
 #include "codon/util/common.hpp"
 
 static llvm::codegen::RegisterCodeGenFlags CFG;
diff --git a/codon/cir/llvm/optimize.h b/codon/cir/llvm/optimize.hpp
similarity index 95%
rename from codon/cir/llvm/optimize.h
rename to codon/cir/llvm/optimize.hpp
index 093e11dc..43649c5f 100644
--- a/codon/cir/llvm/optimize.h
+++ b/codon/cir/llvm/optimize.hpp
@@ -4,7 +4,7 @@
 
 #include <memory>
 
-#include "codon/cir/llvm/llvm.h"
+#include "codon/cir/llvm/llvm.hpp"
 #include "codon/dsl/plugins.h"
 
 namespace codon {
diff --git a/codon/cir/pyextension.h b/codon/cir/pyextension.h
index e075c822..1a39a8a2 100644
--- a/codon/cir/pyextension.h
+++ b/codon/cir/pyextension.h
@@ -6,7 +6,7 @@
 #include <vector>
 
 #include "codon/cir/func.h"
-#include "codon/cir/types/types.h"
+#include "codon/cir/types/types.hpp"
 
 namespace codon {
 namespace ir {
diff --git a/codon/cir/transform/cleanup/canonical.cpp b/codon/cir/transform/cleanup/canonical.cpp
index 2a9aadaa..ee9f513a 100644
--- a/codon/cir/transform/cleanup/canonical.cpp
+++ b/codon/cir/transform/cleanup/canonical.cpp
@@ -1,6 +1,6 @@
 // Copyright (C) 2022-2024 Exaloop Inc. <https://exaloop.io>
 
-#include "canonical.h"
+#include "canonical.hpp"
 
 #include <algorithm>
 #include <functional>
@@ -8,8 +8,8 @@
 #include <unordered_set>
 #include <utility>
 
-#include "codon/cir/analyze/module/side_effect.h"
-#include "codon/cir/transform/rewrite.h"
+#include "codon/cir/analyze/module/side_effect.hpp"
+#include "codon/cir/transform/rewrite.hpp"
 #include "codon/cir/util/irtools.h"
 #include "codon/cir/util/matching.h"
 
diff --git a/codon/cir/transform/cleanup/canonical.h b/codon/cir/transform/cleanup/canonical.hpp
similarity index 91%
rename from codon/cir/transform/cleanup/canonical.h
rename to codon/cir/transform/cleanup/canonical.hpp
index c3d5ca22..dd2c5f94 100644
--- a/codon/cir/transform/cleanup/canonical.h
+++ b/codon/cir/transform/cleanup/canonical.hpp
@@ -2,8 +2,8 @@
 
 #pragma once
 
-#include "codon/cir/transform/pass.h"
-#include "codon/cir/transform/rewrite.h"
+#include "codon/cir/transform/pass.hpp"
+#include "codon/cir/transform/rewrite.hpp"
 
 namespace codon {
 namespace ir {
diff --git a/codon/cir/transform/cleanup/dead_code.cpp b/codon/cir/transform/cleanup/dead_code.cpp
index 6d7c2818..1acab0bc 100644
--- a/codon/cir/transform/cleanup/dead_code.cpp
+++ b/codon/cir/transform/cleanup/dead_code.cpp
@@ -1,9 +1,9 @@
 // Copyright (C) 2022-2024 Exaloop Inc. <https://exaloop.io>
 
-#include "dead_code.h"
+#include "dead_code.hpp"
 
-#include "codon/cir/analyze/module/side_effect.h"
-#include "codon/cir/util/cloning.h"
+#include "codon/cir/analyze/module/side_effect.hpp"
+#include "codon/cir/util/cloning.hpp"
 
 namespace codon {
 namespace ir {
diff --git a/codon/cir/transform/cleanup/dead_code.h b/codon/cir/transform/cleanup/dead_code.hpp
similarity index 96%
rename from codon/cir/transform/cleanup/dead_code.h
rename to codon/cir/transform/cleanup/dead_code.hpp
index 1da42798..95d871a7 100644
--- a/codon/cir/transform/cleanup/dead_code.h
+++ b/codon/cir/transform/cleanup/dead_code.hpp
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "codon/cir/transform/pass.h"
+#include "codon/cir/transform/pass.hpp"
 
 namespace codon {
 namespace ir {
diff --git a/codon/cir/transform/cleanup/global_demote.cpp b/codon/cir/transform/cleanup/global_demote.cpp
index 280b5581..302bb6df 100644
--- a/codon/cir/transform/cleanup/global_demote.cpp
+++ b/codon/cir/transform/cleanup/global_demote.cpp
@@ -1,6 +1,6 @@
 // Copyright (C) 2022-2024 Exaloop Inc. <https://exaloop.io>
 
-#include "global_demote.h"
+#include "global_demote.hpp"
 
 namespace codon {
 namespace ir {
diff --git a/codon/cir/transform/cleanup/global_demote.h b/codon/cir/transform/cleanup/global_demote.hpp
similarity index 95%
rename from codon/cir/transform/cleanup/global_demote.h
rename to codon/cir/transform/cleanup/global_demote.hpp
index 73725270..0d86b205 100644
--- a/codon/cir/transform/cleanup/global_demote.h
+++ b/codon/cir/transform/cleanup/global_demote.hpp
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "codon/cir/transform/pass.h"
+#include "codon/cir/transform/pass.hpp"
 
 namespace codon {
 namespace ir {
diff --git a/codon/cir/transform/cleanup/replacer.cpp b/codon/cir/transform/cleanup/replacer.cpp
index d210645a..e2922c8f 100644
--- a/codon/cir/transform/cleanup/replacer.cpp
+++ b/codon/cir/transform/cleanup/replacer.cpp
@@ -1,10 +1,10 @@
 // Copyright (C) 2022-2024 Exaloop Inc. <https://exaloop.io>
 
-#include "replacer.h"
+#include "replacer.hpp"
 
 #include <unordered_set>
 
-#include "codon/cir/types/types.h"
+#include "codon/cir/types/types.hpp"
 #include "codon/cir/value.h"
 #include "codon/cir/var.h"
 
diff --git a/codon/cir/transform/cleanup/replacer.h b/codon/cir/transform/cleanup/replacer.hpp
similarity index 92%
rename from codon/cir/transform/cleanup/replacer.h
rename to codon/cir/transform/cleanup/replacer.hpp
index 999b7f74..4cadec68 100644
--- a/codon/cir/transform/cleanup/replacer.h
+++ b/codon/cir/transform/cleanup/replacer.hpp
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "codon/cir/transform/pass.h"
+#include "codon/cir/transform/pass.hpp"
 
 namespace codon {
 namespace ir {
diff --git a/codon/cir/transform/folding/const_fold.cpp b/codon/cir/transform/folding/const_fold.cpp
index d2aeb3ac..59469cde 100644
--- a/codon/cir/transform/folding/const_fold.cpp
+++ b/codon/cir/transform/folding/const_fold.cpp
@@ -1,11 +1,11 @@
 // Copyright (C) 2022-2024 Exaloop Inc. <https://exaloop.io>
 
-#include "const_fold.h"
+#include "const_fold.hpp"
 
 #include <cmath>
 #include <utility>
 
-#include "codon/cir/util/cloning.h"
+#include "codon/cir/util/cloning.hpp"
 #include "codon/cir/util/irtools.h"
 
 #define BINOP(o) [](auto x, auto y) -> auto { return x o y; }
diff --git a/codon/cir/transform/folding/const_fold.h b/codon/cir/transform/folding/const_fold.hpp
similarity index 89%
rename from codon/cir/transform/folding/const_fold.h
rename to codon/cir/transform/folding/const_fold.hpp
index 3c27d06d..4331e945 100644
--- a/codon/cir/transform/folding/const_fold.h
+++ b/codon/cir/transform/folding/const_fold.hpp
@@ -5,8 +5,8 @@
 #include <memory>
 #include <unordered_map>
 
-#include "codon/cir/transform/folding/rule.h"
-#include "codon/cir/transform/pass.h"
+#include "codon/cir/transform/folding/rule.hpp"
+#include "codon/cir/transform/pass.hpp"
 
 namespace codon {
 namespace ir {
diff --git a/codon/cir/transform/folding/const_prop.cpp b/codon/cir/transform/folding/const_prop.cpp
index 085f9a90..e8e6ef3f 100644
--- a/codon/cir/transform/folding/const_prop.cpp
+++ b/codon/cir/transform/folding/const_prop.cpp
@@ -1,10 +1,10 @@
 // Copyright (C) 2022-2024 Exaloop Inc. <https://exaloop.io>
 
-#include "const_prop.h"
+#include "const_prop.hpp"
 
-#include "codon/cir/analyze/dataflow/reaching.h"
-#include "codon/cir/analyze/module/global_vars.h"
-#include "codon/cir/util/cloning.h"
+#include "codon/cir/analyze/dataflow/reaching.hpp"
+#include "codon/cir/analyze/module/global_vars.hpp"
+#include "codon/cir/util/cloning.hpp"
 
 namespace codon {
 namespace ir {
diff --git a/codon/cir/transform/folding/const_prop.h b/codon/cir/transform/folding/const_prop.hpp
similarity index 95%
rename from codon/cir/transform/folding/const_prop.h
rename to codon/cir/transform/folding/const_prop.hpp
index 3cd624d4..e2a6429e 100644
--- a/codon/cir/transform/folding/const_prop.h
+++ b/codon/cir/transform/folding/const_prop.hpp
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "codon/cir/transform/pass.h"
+#include "codon/cir/transform/pass.hpp"
 
 namespace codon {
 namespace ir {
diff --git a/codon/cir/transform/folding/folding.cpp b/codon/cir/transform/folding/folding.cpp
index d65d089a..e86a30e2 100644
--- a/codon/cir/transform/folding/folding.cpp
+++ b/codon/cir/transform/folding/folding.cpp
@@ -1,9 +1,9 @@
 // Copyright (C) 2022-2024 Exaloop Inc. <https://exaloop.io>
 
-#include "folding.h"
+#include "folding.hpp"
 
-#include "codon/cir/transform/folding/const_fold.h"
-#include "codon/cir/transform/folding/const_prop.h"
+#include "codon/cir/transform/folding/const_fold.hpp"
+#include "codon/cir/transform/folding/const_prop.hpp"
 
 namespace codon {
 namespace ir {
diff --git a/codon/cir/transform/folding/folding.h b/codon/cir/transform/folding/folding.hpp
similarity index 86%
rename from codon/cir/transform/folding/folding.h
rename to codon/cir/transform/folding/folding.hpp
index d68feafb..2b6a15cd 100644
--- a/codon/cir/transform/folding/folding.h
+++ b/codon/cir/transform/folding/folding.hpp
@@ -2,10 +2,10 @@
 
 #pragma once
 
-#include "codon/cir/transform/cleanup/canonical.h"
-#include "codon/cir/transform/cleanup/dead_code.h"
-#include "codon/cir/transform/cleanup/global_demote.h"
-#include "codon/cir/transform/pass.h"
+#include "codon/cir/transform/cleanup/canonical.hpp"
+#include "codon/cir/transform/cleanup/dead_code.hpp"
+#include "codon/cir/transform/cleanup/global_demote.hpp"
+#include "codon/cir/transform/pass.hpp"
 
 namespace codon {
 namespace ir {
diff --git a/codon/cir/transform/folding/rule.h b/codon/cir/transform/folding/rule.hpp
similarity index 98%
rename from codon/cir/transform/folding/rule.h
rename to codon/cir/transform/folding/rule.hpp
index 9305594f..628e4747 100644
--- a/codon/cir/transform/folding/rule.h
+++ b/codon/cir/transform/folding/rule.hpp
@@ -5,8 +5,8 @@
 #include <algorithm>
 #include <utility>
 
-#include "codon/cir/transform/pass.h"
-#include "codon/cir/transform/rewrite.h"
+#include "codon/cir/transform/pass.hpp"
+#include "codon/cir/transform/rewrite.hpp"
 #include "codon/cir/util/irtools.h"
 
 namespace codon {
diff --git a/codon/cir/transform/lowering/imperative.cpp b/codon/cir/transform/lowering/imperative.cpp
index 8b34f1d4..aefb1280 100644
--- a/codon/cir/transform/lowering/imperative.cpp
+++ b/codon/cir/transform/lowering/imperative.cpp
@@ -1,10 +1,10 @@
 // Copyright (C) 2022-2024 Exaloop Inc. <https://exaloop.io>
 
-#include "imperative.h"
+#include "imperative.hpp"
 
 #include <algorithm>
 
-#include "codon/cir/util/cloning.h"
+#include "codon/cir/util/cloning.hpp"
 #include "codon/cir/util/irtools.h"
 #include "codon/cir/util/matching.h"
 
diff --git a/codon/cir/transform/lowering/imperative.h b/codon/cir/transform/lowering/imperative.hpp
similarity index 91%
rename from codon/cir/transform/lowering/imperative.h
rename to codon/cir/transform/lowering/imperative.hpp
index 25a7b613..1ecb0239 100644
--- a/codon/cir/transform/lowering/imperative.h
+++ b/codon/cir/transform/lowering/imperative.hpp
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "codon/cir/transform/pass.h"
+#include "codon/cir/transform/pass.hpp"
 
 namespace codon {
 namespace ir {
diff --git a/codon/cir/transform/lowering/pipeline.cpp b/codon/cir/transform/lowering/pipeline.cpp
index 6a7a6002..191ec615 100644
--- a/codon/cir/transform/lowering/pipeline.cpp
+++ b/codon/cir/transform/lowering/pipeline.cpp
@@ -1,10 +1,10 @@
 // Copyright (C) 2022-2024 Exaloop Inc. <https://exaloop.io>
 
-#include "pipeline.h"
+#include "pipeline.hpp"
 
 #include <algorithm>
 
-#include "codon/cir/util/cloning.h"
+#include "codon/cir/util/cloning.hpp"
 #include "codon/cir/util/irtools.h"
 #include "codon/cir/util/matching.h"
 
diff --git a/codon/cir/transform/lowering/pipeline.h b/codon/cir/transform/lowering/pipeline.hpp
similarity index 92%
rename from codon/cir/transform/lowering/pipeline.h
rename to codon/cir/transform/lowering/pipeline.hpp
index 9d0d6abc..4caf1b04 100644
--- a/codon/cir/transform/lowering/pipeline.h
+++ b/codon/cir/transform/lowering/pipeline.hpp
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "codon/cir/transform/pass.h"
+#include "codon/cir/transform/pass.hpp"
 
 namespace codon {
 namespace ir {
diff --git a/codon/cir/transform/manager.cpp b/codon/cir/transform/manager.cpp
index 2e9a395f..993364e5 100644
--- a/codon/cir/transform/manager.cpp
+++ b/codon/cir/transform/manager.cpp
@@ -4,24 +4,24 @@
 
 #include <unordered_set>
 
-#include "codon/cir/analyze/analysis.h"
-#include "codon/cir/analyze/dataflow/capture.h"
-#include "codon/cir/analyze/dataflow/cfg.h"
-#include "codon/cir/analyze/dataflow/dominator.h"
-#include "codon/cir/analyze/dataflow/reaching.h"
-#include "codon/cir/analyze/module/global_vars.h"
-#include "codon/cir/analyze/module/side_effect.h"
-#include "codon/cir/transform/folding/folding.h"
-#include "codon/cir/transform/lowering/imperative.h"
-#include "codon/cir/transform/lowering/pipeline.h"
+#include "codon/cir/analyze/analysis.hpp"
+#include "codon/cir/analyze/dataflow/capture.hpp"
+#include "codon/cir/analyze/dataflow/cfg.hpp"
+#include "codon/cir/analyze/dataflow/dominator.hpp"
+#include "codon/cir/analyze/dataflow/reaching.hpp"
+#include "codon/cir/analyze/module/global_vars.hpp"
+#include "codon/cir/analyze/module/side_effect.hpp"
+#include "codon/cir/transform/folding/folding.hpp"
+#include "codon/cir/transform/lowering/imperative.hpp"
+#include "codon/cir/transform/lowering/pipeline.hpp"
 #include "codon/cir/transform/manager.h"
-#include "codon/cir/transform/parallel/openmp.h"
-#include "codon/cir/transform/pass.h"
-#include "codon/cir/transform/pythonic/dict.h"
-#include "codon/cir/transform/pythonic/generator.h"
-#include "codon/cir/transform/pythonic/io.h"
-#include "codon/cir/transform/pythonic/list.h"
-#include "codon/cir/transform/pythonic/str.h"
+#include "codon/cir/transform/parallel/openmp.hpp"
+#include "codon/cir/transform/pass.hpp"
+#include "codon/cir/transform/pythonic/dict.hpp"
+#include "codon/cir/transform/pythonic/generator.hpp"
+#include "codon/cir/transform/pythonic/io.hpp"
+#include "codon/cir/transform/pythonic/list.hpp"
+#include "codon/cir/transform/pythonic/str.hpp"
 #include "codon/util/common.hpp"
 
 namespace codon {
diff --git a/codon/cir/transform/manager.h b/codon/cir/transform/manager.h
index c0306837..ba0e9cdc 100644
--- a/codon/cir/transform/manager.h
+++ b/codon/cir/transform/manager.h
@@ -9,9 +9,9 @@
 #include <utility>
 #include <vector>
 
-#include "codon/cir/analyze/analysis.h"
+#include "codon/cir/analyze/analysis.hpp"
 #include "codon/cir/module.h"
-#include "codon/cir/transform/pass.h"
+#include "codon/cir/transform/pass.hpp"
 
 namespace codon {
 namespace ir {
diff --git a/codon/cir/transform/parallel/openmp.cpp b/codon/cir/transform/parallel/openmp.cpp
index 77b7373d..0e9395ac 100644
--- a/codon/cir/transform/parallel/openmp.cpp
+++ b/codon/cir/transform/parallel/openmp.cpp
@@ -1,14 +1,14 @@
 // Copyright (C) 2022-2024 Exaloop Inc. <https://exaloop.io>
 
-#include "openmp.h"
+#include "openmp.hpp"
 
 #include <algorithm>
 #include <iterator>
 #include <limits>
 #include <unordered_set>
 
-#include "codon/cir/transform/parallel/schedule.h"
-#include "codon/cir/util/cloning.h"
+#include "codon/cir/transform/parallel/schedule.hpp"
+#include "codon/cir/util/cloning.hpp"
 #include "codon/cir/util/irtools.h"
 #include "codon/cir/util/outlining.h"
 
diff --git a/codon/cir/transform/parallel/openmp.h b/codon/cir/transform/parallel/openmp.hpp
similarity index 93%
rename from codon/cir/transform/parallel/openmp.h
rename to codon/cir/transform/parallel/openmp.hpp
index 610afa01..c5f5be0f 100644
--- a/codon/cir/transform/parallel/openmp.h
+++ b/codon/cir/transform/parallel/openmp.hpp
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "codon/cir/transform/pass.h"
+#include "codon/cir/transform/pass.hpp"
 
 namespace codon {
 namespace ir {
diff --git a/codon/cir/transform/parallel/schedule.cpp b/codon/cir/transform/parallel/schedule.cpp
index fb0ba28b..7bf6886a 100644
--- a/codon/cir/transform/parallel/schedule.cpp
+++ b/codon/cir/transform/parallel/schedule.cpp
@@ -1,6 +1,6 @@
 // Copyright (C) 2022-2024 Exaloop Inc. <https://exaloop.io>
 
-#include "schedule.h"
+#include "schedule.hpp"
 
 #include "codon/cir/cir.h"
 #include "codon/cir/util/irtools.h"
diff --git a/codon/cir/transform/parallel/schedule.h b/codon/cir/transform/parallel/schedule.hpp
similarity index 100%
rename from codon/cir/transform/parallel/schedule.h
rename to codon/cir/transform/parallel/schedule.hpp
diff --git a/codon/cir/transform/pass.cpp b/codon/cir/transform/pass.cpp
index e9e1d20e..66a7a356 100644
--- a/codon/cir/transform/pass.cpp
+++ b/codon/cir/transform/pass.cpp
@@ -1,6 +1,6 @@
 // Copyright (C) 2022-2024 Exaloop Inc. <https://exaloop.io>
 
-#include "pass.h"
+#include "pass.hpp"
 
 #include "codon/cir/transform/manager.h"
 
diff --git a/codon/cir/transform/pass.h b/codon/cir/transform/pass.hpp
similarity index 100%
rename from codon/cir/transform/pass.h
rename to codon/cir/transform/pass.hpp
diff --git a/codon/cir/transform/pythonic/dict.cpp b/codon/cir/transform/pythonic/dict.cpp
index 8767d789..66e24c4c 100644
--- a/codon/cir/transform/pythonic/dict.cpp
+++ b/codon/cir/transform/pythonic/dict.cpp
@@ -1,10 +1,10 @@
 // Copyright (C) 2022-2024 Exaloop Inc. <https://exaloop.io>
 
-#include "dict.h"
+#include "dict.hpp"
 
 #include <algorithm>
 
-#include "codon/cir/util/cloning.h"
+#include "codon/cir/util/cloning.hpp"
 #include "codon/cir/util/irtools.h"
 #include "codon/cir/util/matching.h"
 
diff --git a/codon/cir/transform/pythonic/dict.h b/codon/cir/transform/pythonic/dict.hpp
similarity index 93%
rename from codon/cir/transform/pythonic/dict.h
rename to codon/cir/transform/pythonic/dict.hpp
index 95725c20..38f1e1e6 100644
--- a/codon/cir/transform/pythonic/dict.h
+++ b/codon/cir/transform/pythonic/dict.hpp
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "codon/cir/transform/pass.h"
+#include "codon/cir/transform/pass.hpp"
 
 namespace codon {
 namespace ir {
diff --git a/codon/cir/transform/pythonic/generator.cpp b/codon/cir/transform/pythonic/generator.cpp
index a37a4662..8be58873 100644
--- a/codon/cir/transform/pythonic/generator.cpp
+++ b/codon/cir/transform/pythonic/generator.cpp
@@ -1,10 +1,10 @@
 // Copyright (C) 2022-2024 Exaloop Inc. <https://exaloop.io>
 
-#include "generator.h"
+#include "generator.hpp"
 
 #include <algorithm>
 
-#include "codon/cir/util/cloning.h"
+#include "codon/cir/util/cloning.hpp"
 #include "codon/cir/util/irtools.h"
 #include "codon/cir/util/matching.h"
 
diff --git a/codon/cir/transform/pythonic/generator.h b/codon/cir/transform/pythonic/generator.hpp
similarity index 93%
rename from codon/cir/transform/pythonic/generator.h
rename to codon/cir/transform/pythonic/generator.hpp
index 9e416bbe..5d042238 100644
--- a/codon/cir/transform/pythonic/generator.h
+++ b/codon/cir/transform/pythonic/generator.hpp
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "codon/cir/transform/pass.h"
+#include "codon/cir/transform/pass.hpp"
 
 namespace codon {
 namespace ir {
diff --git a/codon/cir/transform/pythonic/io.cpp b/codon/cir/transform/pythonic/io.cpp
index a9195064..ec88acc8 100644
--- a/codon/cir/transform/pythonic/io.cpp
+++ b/codon/cir/transform/pythonic/io.cpp
@@ -1,10 +1,10 @@
 // Copyright (C) 2022-2024 Exaloop Inc. <https://exaloop.io>
 
-#include "io.h"
+#include "io.hpp"
 
 #include <algorithm>
 
-#include "codon/cir/util/cloning.h"
+#include "codon/cir/util/cloning.hpp"
 #include "codon/cir/util/irtools.h"
 
 namespace codon {
diff --git a/codon/cir/transform/pythonic/io.h b/codon/cir/transform/pythonic/io.hpp
similarity index 92%
rename from codon/cir/transform/pythonic/io.h
rename to codon/cir/transform/pythonic/io.hpp
index ae7ffe26..7a41cce7 100644
--- a/codon/cir/transform/pythonic/io.h
+++ b/codon/cir/transform/pythonic/io.hpp
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "codon/cir/transform/pass.h"
+#include "codon/cir/transform/pass.hpp"
 
 namespace codon {
 namespace ir {
diff --git a/codon/cir/transform/pythonic/list.cpp b/codon/cir/transform/pythonic/list.cpp
index dcf462c6..39e9a307 100644
--- a/codon/cir/transform/pythonic/list.cpp
+++ b/codon/cir/transform/pythonic/list.cpp
@@ -1,10 +1,10 @@
 // Copyright (C) 2022-2024 Exaloop Inc. <https://exaloop.io>
 
-#include "list.h"
+#include "list.hpp"
 
 #include <algorithm>
 
-#include "codon/cir/util/cloning.h"
+#include "codon/cir/util/cloning.hpp"
 #include "codon/cir/util/irtools.h"
 
 namespace codon {
diff --git a/codon/cir/transform/pythonic/list.h b/codon/cir/transform/pythonic/list.hpp
similarity index 93%
rename from codon/cir/transform/pythonic/list.h
rename to codon/cir/transform/pythonic/list.hpp
index 16cd8770..ff48375e 100644
--- a/codon/cir/transform/pythonic/list.h
+++ b/codon/cir/transform/pythonic/list.hpp
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "codon/cir/transform/pass.h"
+#include "codon/cir/transform/pass.hpp"
 
 namespace codon {
 namespace ir {
diff --git a/codon/cir/transform/pythonic/str.cpp b/codon/cir/transform/pythonic/str.cpp
index ead700db..8f4f3326 100644
--- a/codon/cir/transform/pythonic/str.cpp
+++ b/codon/cir/transform/pythonic/str.cpp
@@ -1,10 +1,10 @@
 // Copyright (C) 2022-2024 Exaloop Inc. <https://exaloop.io>
 
-#include "str.h"
+#include "str.hpp"
 
 #include <algorithm>
 
-#include "codon/cir/util/cloning.h"
+#include "codon/cir/util/cloning.hpp"
 #include "codon/cir/util/irtools.h"
 
 namespace codon {
diff --git a/codon/cir/transform/pythonic/str.h b/codon/cir/transform/pythonic/str.hpp
similarity index 92%
rename from codon/cir/transform/pythonic/str.h
rename to codon/cir/transform/pythonic/str.hpp
index af4c368b..5a7fa13f 100644
--- a/codon/cir/transform/pythonic/str.h
+++ b/codon/cir/transform/pythonic/str.hpp
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "codon/cir/transform/pass.h"
+#include "codon/cir/transform/pass.hpp"
 
 namespace codon {
 namespace ir {
diff --git a/codon/cir/transform/rewrite.h b/codon/cir/transform/rewrite.hpp
similarity index 97%
rename from codon/cir/transform/rewrite.h
rename to codon/cir/transform/rewrite.hpp
index 055c549b..e75bc897 100644
--- a/codon/cir/transform/rewrite.h
+++ b/codon/cir/transform/rewrite.hpp
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "codon/cir/transform/pass.h"
+#include "codon/cir/transform/pass.hpp"
 #include "codon/cir/util/visitor.h"
 
 namespace codon {
diff --git a/codon/cir/types/types.cpp b/codon/cir/types/types.cpp
index a96cf746..2c2ea74d 100644
--- a/codon/cir/types/types.cpp
+++ b/codon/cir/types/types.cpp
@@ -1,6 +1,6 @@
 // Copyright (C) 2022-2024 Exaloop Inc. <https://exaloop.io>
 
-#include "types.h"
+#include "types.hpp"
 
 #include <algorithm>
 #include <memory>
diff --git a/codon/cir/types/types.h b/codon/cir/types/types.hpp
similarity index 100%
rename from codon/cir/types/types.h
rename to codon/cir/types/types.hpp
diff --git a/codon/cir/util/cloning.cpp b/codon/cir/util/cloning.cpp
index e44fef38..a837f21f 100644
--- a/codon/cir/util/cloning.cpp
+++ b/codon/cir/util/cloning.cpp
@@ -1,6 +1,6 @@
 // Copyright (C) 2022-2024 Exaloop Inc. <https://exaloop.io>
 
-#include "cloning.h"
+#include "cloning.hpp"
 
 #include "codon/cir/util/operator.h"
 
diff --git a/codon/cir/util/cloning.h b/codon/cir/util/cloning.hpp
similarity index 100%
rename from codon/cir/util/cloning.h
rename to codon/cir/util/cloning.hpp
diff --git a/codon/cir/util/context.h b/codon/cir/util/context.hpp
similarity index 85%
rename from codon/cir/util/context.h
rename to codon/cir/util/context.hpp
index b3461049..96d45342 100644
--- a/codon/cir/util/context.h
+++ b/codon/cir/util/context.hpp
@@ -1,5 +1,5 @@
 // Copyright (C) 2022-2024 Exaloop Inc. <https://exaloop.io>
-
+#if false // seemly unused file so comment out for testing then delete if passed
 #pragma once
 
 #include <vector>
@@ -9,7 +9,7 @@ namespace ir {
 namespace util {
 
 /// Base for CIR visitor contexts.
-template <typename Frame> class CIRContext {
+template <typename Frame> class  {
 private:
   std::vector<Frame> frames;
 
@@ -36,3 +36,4 @@ template <typename Frame> class CIRContext {
 } // namespace util
 } // namespace ir
 } // namespace codon
+#endif // false (testing)
\ No newline at end of file
diff --git a/codon/cir/util/inlining.cpp b/codon/cir/util/inlining.cpp
index 1e507551..8bb761ba 100644
--- a/codon/cir/util/inlining.cpp
+++ b/codon/cir/util/inlining.cpp
@@ -4,7 +4,7 @@
 
 #include <algorithm>
 
-#include "codon/cir/util/cloning.h"
+#include "codon/cir/util/cloning.hpp"
 #include "codon/cir/util/irtools.h"
 #include "codon/cir/util/operator.h"
 
diff --git a/codon/cir/util/outlining.cpp b/codon/cir/util/outlining.cpp
index 69fa4525..e1863b63 100644
--- a/codon/cir/util/outlining.cpp
+++ b/codon/cir/util/outlining.cpp
@@ -6,7 +6,7 @@
 #include <unordered_set>
 #include <utility>
 
-#include "codon/cir/util/cloning.h"
+#include "codon/cir/util/cloning.hpp"
 #include "codon/cir/util/irtools.h"
 #include "codon/cir/util/operator.h"
 
diff --git a/codon/cir/util/side_effect.cpp b/codon/cir/util/side_effect.cpp
index 6248a3a3..80f2dfe7 100644
--- a/codon/cir/util/side_effect.cpp
+++ b/codon/cir/util/side_effect.cpp
@@ -1,6 +1,6 @@
 // Copyright (C) 2022-2024 Exaloop Inc. <https://exaloop.io>
 
-#include "side_effect.h"
+#include "side_effect.hpp"
 
 namespace codon {
 namespace ir {
diff --git a/codon/cir/util/side_effect.h b/codon/cir/util/side_effect.hpp
similarity index 100%
rename from codon/cir/util/side_effect.h
rename to codon/cir/util/side_effect.hpp
diff --git a/codon/cir/value.h b/codon/cir/value.h
index 0bb0e9ae..7c0e3ffb 100644
--- a/codon/cir/value.h
+++ b/codon/cir/value.h
@@ -3,7 +3,7 @@
 #pragma once
 
 #include "codon/cir/base.h"
-#include "codon/cir/types/types.h"
+#include "codon/cir/types/types.hpp"
 #include "codon/cir/util/packs.h"
 
 namespace codon {
diff --git a/codon/cir/var.h b/codon/cir/var.h
index fff7fc2e..48cec466 100644
--- a/codon/cir/var.h
+++ b/codon/cir/var.h
@@ -7,7 +7,7 @@
 #include <utility>
 #include <vector>
 
-#include "codon/cir/types/types.h"
+#include "codon/cir/types/types.hpp"
 #include "codon/cir/value.h"
 #include "codon/util/common.hpp"
 #include <fmt/format.h>
diff --git a/codon/compiler/compiler.h b/codon/compiler/compiler.h
index 468f7c83..6a5fef15 100644
--- a/codon/compiler/compiler.h
+++ b/codon/compiler/compiler.h
@@ -7,7 +7,7 @@
 #include <unordered_map>
 #include <vector>
 
-#include "codon/cir/llvm/llvisitor.h"
+#include "codon/cir/llvm/llvisitor.hpp"
 #include "codon/cir/module.h"
 #include "codon/cir/transform/manager.h"
 #include "codon/compiler/error.hpp"
diff --git a/codon/compiler/debug_listener.h b/codon/compiler/debug_listener.h
index bb558aee..60412343 100644
--- a/codon/compiler/debug_listener.h
+++ b/codon/compiler/debug_listener.h
@@ -7,7 +7,7 @@
 #include <mutex>
 #include <vector>
 
-#include "codon/cir/llvm/llvm.h"
+#include "codon/cir/llvm/llvm.hpp"
 
 namespace codon {
 
diff --git a/codon/compiler/engine.cpp b/codon/compiler/engine.cpp
index fefc0572..556ed435 100644
--- a/codon/compiler/engine.cpp
+++ b/codon/compiler/engine.cpp
@@ -2,7 +2,7 @@
 
 #include "engine.h"
 
-#include "codon/cir/llvm/optimize.h"
+#include "codon/cir/llvm/optimize.hpp"
 #include "codon/compiler/memory_manager.h"
 
 namespace codon {
diff --git a/codon/compiler/engine.h b/codon/compiler/engine.h
index 6b3c3217..72e29b3b 100644
--- a/codon/compiler/engine.h
+++ b/codon/compiler/engine.h
@@ -5,7 +5,7 @@
 #include <memory>
 #include <vector>
 
-#include "codon/cir/llvm/llvm.h"
+#include "codon/cir/llvm/llvm.hpp"
 #include "codon/compiler/debug_listener.h"
 
 namespace codon {
diff --git a/codon/compiler/jit.h b/codon/compiler/jit.h
index 9f93b10d..17452517 100644
--- a/codon/compiler/jit.h
+++ b/codon/compiler/jit.h
@@ -7,7 +7,7 @@
 #include <unordered_map>
 #include <vector>
 
-#include "codon/cir/llvm/llvisitor.h"
+#include "codon/cir/llvm/llvisitor.hpp"
 #include "codon/cir/transform/manager.h"
 #include "codon/cir/var.h"
 #include "codon/compiler/compiler.h"
diff --git a/codon/compiler/memory_manager.h b/codon/compiler/memory_manager.h
index c54f04d4..6791a8f8 100644
--- a/codon/compiler/memory_manager.h
+++ b/codon/compiler/memory_manager.h
@@ -6,7 +6,7 @@
 #include <utility>
 #include <vector>
 
-#include "codon/cir/llvm/llvm.h"
+#include "codon/cir/llvm/llvm.hpp"
 
 namespace codon {
 
diff --git a/codon/dsl/dsl.h b/codon/dsl/dsl.h
index b22e752c..17f78847 100644
--- a/codon/dsl/dsl.h
+++ b/codon/dsl/dsl.h
@@ -4,7 +4,7 @@
 
 #include "codon/cir/cir.h"
 #include "codon/cir/transform/manager.h"
-#include "codon/cir/transform/pass.h"
+#include "codon/cir/transform/pass.hpp"
 #include "codon/parser/cache.hpp"
 #include "llvm/Passes/PassBuilder.h"
 #include <functional>
diff --git a/codon/parser/visitors/translate/translate.cpp b/codon/parser/visitors/translate/translate.cpp
index 5951dd60..e6c23a06 100644
--- a/codon/parser/visitors/translate/translate.cpp
+++ b/codon/parser/visitors/translate/translate.cpp
@@ -7,8 +7,8 @@
 #include <string>
 #include <vector>
 
-#include "codon/cir/transform/parallel/schedule.h"
-#include "codon/cir/util/cloning.h"
+#include "codon/cir/transform/parallel/schedule.hpp"
+#include "codon/cir/util/cloning.hpp"
 #include "codon/parser/ast.hpp"
 #include "codon/parser/common.hpp"
 #include "codon/parser/visitors/translate/translate_ctx.hpp"
diff --git a/codon/parser/visitors/translate/translate_ctx.hpp b/codon/parser/visitors/translate/translate_ctx.hpp
index a85f030a..c8286b51 100644
--- a/codon/parser/visitors/translate/translate_ctx.hpp
+++ b/codon/parser/visitors/translate/translate_ctx.hpp
@@ -8,7 +8,7 @@
 #include <vector>
 
 #include "codon/cir/cir.h"
-#include "codon/cir/types/types.h"
+#include "codon/cir/types/types.hpp"
 #include "codon/parser/cache.hpp"
 #include "codon/parser/common.hpp"
 #include "codon/parser/ctx.hpp"
diff --git a/codon/parser/visitors/typecheck/infer.cpp b/codon/parser/visitors/typecheck/infer.cpp
index f1521243..7558163f 100644
--- a/codon/parser/visitors/typecheck/infer.cpp
+++ b/codon/parser/visitors/typecheck/infer.cpp
@@ -7,7 +7,7 @@
 #include <tuple>
 #include <vector>
 
-#include "codon/cir/types/types.h"
+#include "codon/cir/types/types.hpp"
 #include "codon/parser/ast.hpp"
 #include "codon/parser/common.hpp"
 #include "codon/parser/visitors/simplify/simplify.h"
diff --git a/docs/advanced/ir.md b/docs/advanced/ir.md
index 6eb07659..53081259 100644
--- a/docs/advanced/ir.md
+++ b/docs/advanced/ir.md
@@ -100,7 +100,7 @@ In other words, a simple form of constant folding that only looks at addition on
 The resulting pass would like this:
 
 ``` cpp
-#include "codon/cir/transform/pass.h"
+#include "codon/cir/transform/pass.hpp"
 
 using namespace codon::ir;
 
@@ -206,7 +206,7 @@ Assume we want our pass to insert a call to `validate()` after each assignment t
 and the argument passed to `foo()`. We would do something like the following:
 
 ``` cpp
-#include "codon/cir/transform/pass.h"
+#include "codon/cir/transform/pass.hpp"
 
 using namespace codon::ir;
 
@@ -267,8 +267,8 @@ would subclass `CustomType`. Let's look at an example where we extend CIR to add
 ``` cpp
 using namespace codon::ir;
 
-#include "codon/cir/dsl/nodes.h"
-#include "codon/cir/llvm/llvisitor.h"
+#include "codon/cir/dsl/nodes.hpp"
+#include "codon/cir/llvm/llvisitor.hpp"
 
 class Builder : public dsl::codegen::TypeBuilder {
 public:
diff --git a/test/cir/analyze/dominator.cpp b/test/cir/analyze/dominator.cpp
index 7f62163f..0853471e 100644
--- a/test/cir/analyze/dominator.cpp
+++ b/test/cir/analyze/dominator.cpp
@@ -1,7 +1,7 @@
 #include "test.h"
 
-#include "codon/cir/analyze/dataflow/cfg.h"
-#include "codon/cir/analyze/dataflow/dominator.h"
+#include "codon/cir/analyze/dataflow/cfg.hpp"
+#include "codon/cir/analyze/dataflow/dominator.hpp"
 
 using namespace codon::ir;
 
diff --git a/test/cir/analyze/reaching.cpp b/test/cir/analyze/reaching.cpp
index e02df0d0..a6be7685 100644
--- a/test/cir/analyze/reaching.cpp
+++ b/test/cir/analyze/reaching.cpp
@@ -1,7 +1,7 @@
 #include "test.h"
 
-#include "codon/cir/analyze/dataflow/cfg.h"
-#include "codon/cir/analyze/dataflow/reaching.h"
+#include "codon/cir/analyze/dataflow/cfg.hpp"
+#include "codon/cir/analyze/dataflow/reaching.hpp"
 
 using namespace codon::ir;
 
diff --git a/test/cir/test.h b/test/cir/test.h
index 9bb66433..e3cae2b4 100644
--- a/test/cir/test.h
+++ b/test/cir/test.h
@@ -1,7 +1,7 @@
 #include <algorithm>
 
 #include "codon/cir/cir.h"
-#include "codon/cir/util/cloning.h"
+#include "codon/cir/util/cloning.hpp"
 #include "gtest/gtest.h"
 
 class CIRCoreTest : public testing::Test {
diff --git a/test/cir/transform/manager.cpp b/test/cir/transform/manager.cpp
index 34276098..9ee1bccd 100644
--- a/test/cir/transform/manager.cpp
+++ b/test/cir/transform/manager.cpp
@@ -1,7 +1,7 @@
 #include "test.h"
 
 #include "codon/cir/transform/manager.h"
-#include "codon/cir/transform/pass.h"
+#include "codon/cir/transform/pass.hpp"
 
 using namespace codon::ir;
 
diff --git a/test/main.cpp b/test/main.cpp
index 83095e03..0051b7c7 100644
--- a/test/main.cpp
+++ b/test/main.cpp
@@ -15,8 +15,8 @@
 #include <unistd.h>
 #include <vector>
 
-#include "codon/cir/analyze/dataflow/capture.h"
-#include "codon/cir/analyze/dataflow/reaching.h"
+#include "codon/cir/analyze/dataflow/capture.hpp"
+#include "codon/cir/analyze/dataflow/reaching.hpp"
 #include "codon/cir/util/inlining.h"
 #include "codon/cir/util/irtools.h"
 #include "codon/cir/util/operator.h"