diff --git a/include/constructor.hpp b/include/constructor.hpp
index 2fbaf6c..bafc7ac 100644
--- a/include/constructor.hpp
+++ b/include/constructor.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <vector>
 #include "scope.hpp"
+#include <vector>
 
 namespace riddle
 {
diff --git a/include/core.hpp b/include/core.hpp
index 683c31b..f4cb946 100644
--- a/include/core.hpp
+++ b/include/core.hpp
@@ -1,12 +1,12 @@
 #pragma once
 
-#include <vector>
 #include "conjunction.hpp"
 #include "bool.hpp"
 #include "type.hpp"
 #include "inf_rational.hpp"
 #include "enum.hpp"
 #include "compilation_unit.hpp"
+#include <vector>
 
 #ifdef COMPUTE_NAMES
 #include <unordered_map>
diff --git a/include/declaration.hpp b/include/declaration.hpp
index b6ff133..93e42fb 100644
--- a/include/declaration.hpp
+++ b/include/declaration.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <vector>
 #include "statement.hpp"
+#include <vector>
 
 namespace riddle
 {
diff --git a/include/env.hpp b/include/env.hpp
index b73a60b..05c3b76 100644
--- a/include/env.hpp
+++ b/include/env.hpp
@@ -3,6 +3,7 @@
 #include <memory>
 #include <map>
 #include <string>
+#include <string_view>
 
 namespace riddle
 {
diff --git a/include/field.hpp b/include/field.hpp
index 995f83d..39a4508 100644
--- a/include/field.hpp
+++ b/include/field.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <string>
 #include "expression.hpp"
+#include <string>
 
 namespace riddle
 {
diff --git a/include/method.hpp b/include/method.hpp
index b366c4a..87594fd 100644
--- a/include/method.hpp
+++ b/include/method.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <vector>
 #include "scope.hpp"
+#include <vector>
 
 namespace riddle
 {
diff --git a/include/scope.hpp b/include/scope.hpp
index 88c181f..d15c940 100644
--- a/include/scope.hpp
+++ b/include/scope.hpp
@@ -1,10 +1,10 @@
 #pragma once
 
+#include "field.hpp"
 #include <memory>
 #include <vector>
 #include <map>
 #include <optional>
-#include "field.hpp"
 
 namespace riddle
 {
diff --git a/include/type.hpp b/include/type.hpp
index 768e8e3..be584d6 100644
--- a/include/type.hpp
+++ b/include/type.hpp
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <vector>
 #include "scope.hpp"
 #include "constructor.hpp"
 #include "method.hpp"
+#include <vector>
 
 namespace riddle
 {