diff --git a/src/catalog/catalog.cpp b/src/catalog/catalog.cpp
index 337243b45f8..e196105d891 100644
--- a/src/catalog/catalog.cpp
+++ b/src/catalog/catalog.cpp
@@ -1,20 +1,20 @@
-#include "catalog/catalog.hpp"
-
-#include "catalog/catalog_entry/list.hpp"
-#include "common/exception.hpp"
-#include "main/client_context.hpp"
-#include "parser/expression/function_expression.hpp"
-#include "parser/parsed_data/alter_table_info.hpp"
-#include "parser/parsed_data/create_index_info.hpp"
-#include "parser/parsed_data/create_aggregate_function_info.hpp"
-#include "parser/parsed_data/create_scalar_function_info.hpp"
-#include "parser/parsed_data/create_schema_info.hpp"
-#include "parser/parsed_data/create_sequence_info.hpp"
-#include "parser/parsed_data/create_table_function_info.hpp"
-#include "parser/parsed_data/create_view_info.hpp"
-#include "parser/parsed_data/drop_info.hpp"
-#include "planner/parsed_data/bound_create_table_info.hpp"
-#include "storage/storage_manager.hpp"
+#include "duckdb/catalog/catalog.hpp"
+
+#include "duckdb/catalog/catalog_entry/list.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/main/client_context.hpp"
+#include "duckdb/parser/expression/function_expression.hpp"
+#include "duckdb/parser/parsed_data/alter_table_info.hpp"
+#include "duckdb/parser/parsed_data/create_index_info.hpp"
+#include "duckdb/parser/parsed_data/create_aggregate_function_info.hpp"
+#include "duckdb/parser/parsed_data/create_scalar_function_info.hpp"
+#include "duckdb/parser/parsed_data/create_schema_info.hpp"
+#include "duckdb/parser/parsed_data/create_sequence_info.hpp"
+#include "duckdb/parser/parsed_data/create_table_function_info.hpp"
+#include "duckdb/parser/parsed_data/create_view_info.hpp"
+#include "duckdb/parser/parsed_data/drop_info.hpp"
+#include "duckdb/planner/parsed_data/bound_create_table_info.hpp"
+#include "duckdb/storage/storage_manager.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/catalog/catalog_entry.cpp b/src/catalog/catalog_entry.cpp
index 1a08222e83c..379b747d886 100644
--- a/src/catalog/catalog_entry.cpp
+++ b/src/catalog/catalog_entry.cpp
@@ -1,6 +1,6 @@
-#include "catalog/catalog_entry.hpp"
+#include "duckdb/catalog/catalog_entry.hpp"
 
-#include "catalog/catalog.hpp"
+#include "duckdb/catalog/catalog.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/catalog/catalog_entry/schema_catalog_entry.cpp b/src/catalog/catalog_entry/schema_catalog_entry.cpp
index c55dafb8835..8bb480f0ff0 100644
--- a/src/catalog/catalog_entry/schema_catalog_entry.cpp
+++ b/src/catalog/catalog_entry/schema_catalog_entry.cpp
@@ -1,24 +1,24 @@
-#include "catalog/catalog_entry/schema_catalog_entry.hpp"
-
-#include "catalog/catalog.hpp"
-#include "catalog/catalog_entry/index_catalog_entry.hpp"
-#include "catalog/catalog_entry/aggregate_function_catalog_entry.hpp"
-#include "catalog/catalog_entry/scalar_function_catalog_entry.hpp"
-#include "catalog/catalog_entry/sequence_catalog_entry.hpp"
-#include "catalog/catalog_entry/table_catalog_entry.hpp"
-#include "catalog/catalog_entry/table_function_catalog_entry.hpp"
-#include "catalog/catalog_entry/view_catalog_entry.hpp"
-#include "common/exception.hpp"
-#include "parser/expression/function_expression.hpp"
-#include "parser/parsed_data/alter_table_info.hpp"
-#include "parser/parsed_data/create_index_info.hpp"
-#include "parser/parsed_data/create_scalar_function_info.hpp"
-#include "parser/parsed_data/create_schema_info.hpp"
-#include "parser/parsed_data/create_sequence_info.hpp"
-#include "parser/parsed_data/create_table_function_info.hpp"
-#include "parser/parsed_data/create_view_info.hpp"
-#include "parser/parsed_data/drop_info.hpp"
-#include "planner/parsed_data/bound_create_table_info.hpp"
+#include "duckdb/catalog/catalog_entry/schema_catalog_entry.hpp"
+
+#include "duckdb/catalog/catalog.hpp"
+#include "duckdb/catalog/catalog_entry/index_catalog_entry.hpp"
+#include "duckdb/catalog/catalog_entry/aggregate_function_catalog_entry.hpp"
+#include "duckdb/catalog/catalog_entry/scalar_function_catalog_entry.hpp"
+#include "duckdb/catalog/catalog_entry/sequence_catalog_entry.hpp"
+#include "duckdb/catalog/catalog_entry/table_catalog_entry.hpp"
+#include "duckdb/catalog/catalog_entry/table_function_catalog_entry.hpp"
+#include "duckdb/catalog/catalog_entry/view_catalog_entry.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/parser/expression/function_expression.hpp"
+#include "duckdb/parser/parsed_data/alter_table_info.hpp"
+#include "duckdb/parser/parsed_data/create_index_info.hpp"
+#include "duckdb/parser/parsed_data/create_scalar_function_info.hpp"
+#include "duckdb/parser/parsed_data/create_schema_info.hpp"
+#include "duckdb/parser/parsed_data/create_sequence_info.hpp"
+#include "duckdb/parser/parsed_data/create_table_function_info.hpp"
+#include "duckdb/parser/parsed_data/create_view_info.hpp"
+#include "duckdb/parser/parsed_data/drop_info.hpp"
+#include "duckdb/planner/parsed_data/bound_create_table_info.hpp"
 
 #include <algorithm>
 
diff --git a/src/catalog/catalog_entry/sequence_catalog_entry.cpp b/src/catalog/catalog_entry/sequence_catalog_entry.cpp
index a6c0f268817..97074439f08 100644
--- a/src/catalog/catalog_entry/sequence_catalog_entry.cpp
+++ b/src/catalog/catalog_entry/sequence_catalog_entry.cpp
@@ -1,9 +1,9 @@
-#include "catalog/catalog_entry/sequence_catalog_entry.hpp"
+#include "duckdb/catalog/catalog_entry/sequence_catalog_entry.hpp"
 
-#include "catalog/catalog_entry/schema_catalog_entry.hpp"
-#include "common/exception.hpp"
-#include "common/serializer.hpp"
-#include "parser/parsed_data/create_sequence_info.hpp"
+#include "duckdb/catalog/catalog_entry/schema_catalog_entry.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/common/serializer.hpp"
+#include "duckdb/parser/parsed_data/create_sequence_info.hpp"
 
 #include <algorithm>
 
diff --git a/src/catalog/catalog_entry/table_catalog_entry.cpp b/src/catalog/catalog_entry/table_catalog_entry.cpp
index 78ffffa0679..a051113d08e 100644
--- a/src/catalog/catalog_entry/table_catalog_entry.cpp
+++ b/src/catalog/catalog_entry/table_catalog_entry.cpp
@@ -1,23 +1,23 @@
-#include "catalog/catalog_entry/table_catalog_entry.hpp"
-
-#include "catalog/catalog.hpp"
-#include "catalog/catalog_entry/prepared_statement_catalog_entry.hpp"
-#include "catalog/catalog_entry/schema_catalog_entry.hpp"
-#include "common/exception.hpp"
-#include "common/serializer.hpp"
-#include "main/connection.hpp"
-#include "main/database.hpp"
-#include "parser/constraints/list.hpp"
-#include "parser/parsed_data/alter_table_info.hpp"
-#include "planner/constraints/bound_not_null_constraint.hpp"
-#include "planner/constraints/bound_unique_constraint.hpp"
-#include "planner/expression/bound_constant_expression.hpp"
-#include "planner/parsed_data/bound_create_table_info.hpp"
-#include "storage/storage_manager.hpp"
-#include "planner/binder.hpp"
-
-#include "execution/index/art/art.hpp"
-#include "planner/expression/bound_reference_expression.hpp"
+#include "duckdb/catalog/catalog_entry/table_catalog_entry.hpp"
+
+#include "duckdb/catalog/catalog.hpp"
+#include "duckdb/catalog/catalog_entry/prepared_statement_catalog_entry.hpp"
+#include "duckdb/catalog/catalog_entry/schema_catalog_entry.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/common/serializer.hpp"
+#include "duckdb/main/connection.hpp"
+#include "duckdb/main/database.hpp"
+#include "duckdb/parser/constraints/list.hpp"
+#include "duckdb/parser/parsed_data/alter_table_info.hpp"
+#include "duckdb/planner/constraints/bound_not_null_constraint.hpp"
+#include "duckdb/planner/constraints/bound_unique_constraint.hpp"
+#include "duckdb/planner/expression/bound_constant_expression.hpp"
+#include "duckdb/planner/parsed_data/bound_create_table_info.hpp"
+#include "duckdb/storage/storage_manager.hpp"
+#include "duckdb/planner/binder.hpp"
+
+#include "duckdb/execution/index/art/art.hpp"
+#include "duckdb/planner/expression/bound_reference_expression.hpp"
 
 #include <algorithm>
 
diff --git a/src/catalog/catalog_entry/table_function_catalog_entry.cpp b/src/catalog/catalog_entry/table_function_catalog_entry.cpp
index 51e3d7321c7..9098f4d24fe 100644
--- a/src/catalog/catalog_entry/table_function_catalog_entry.cpp
+++ b/src/catalog/catalog_entry/table_function_catalog_entry.cpp
@@ -1,9 +1,9 @@
-#include "catalog/catalog_entry/table_function_catalog_entry.hpp"
+#include "duckdb/catalog/catalog_entry/table_function_catalog_entry.hpp"
 
-#include "common/exception.hpp"
-#include "parser/constraints/list.hpp"
-#include "parser/parsed_data/create_table_function_info.hpp"
-#include "storage/storage_manager.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/parser/constraints/list.hpp"
+#include "duckdb/parser/parsed_data/create_table_function_info.hpp"
+#include "duckdb/storage/storage_manager.hpp"
 
 #include <algorithm>
 
diff --git a/src/catalog/catalog_entry/view_catalog_entry.cpp b/src/catalog/catalog_entry/view_catalog_entry.cpp
index 6e1907d94f4..1f61ae5f440 100644
--- a/src/catalog/catalog_entry/view_catalog_entry.cpp
+++ b/src/catalog/catalog_entry/view_catalog_entry.cpp
@@ -1,9 +1,9 @@
-#include "catalog/catalog_entry/view_catalog_entry.hpp"
+#include "duckdb/catalog/catalog_entry/view_catalog_entry.hpp"
 
-#include "catalog/catalog_entry/schema_catalog_entry.hpp"
-#include "common/exception.hpp"
-#include "common/serializer.hpp"
-#include "parser/parsed_data/create_view_info.hpp"
+#include "duckdb/catalog/catalog_entry/schema_catalog_entry.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/common/serializer.hpp"
+#include "duckdb/parser/parsed_data/create_view_info.hpp"
 
 #include <algorithm>
 
diff --git a/src/catalog/catalog_set.cpp b/src/catalog/catalog_set.cpp
index dc8b8625105..eb491b628ff 100644
--- a/src/catalog/catalog_set.cpp
+++ b/src/catalog/catalog_set.cpp
@@ -1,10 +1,10 @@
-#include "catalog/catalog_set.hpp"
+#include "duckdb/catalog/catalog_set.hpp"
 
-#include "catalog/catalog.hpp"
-#include "common/exception.hpp"
-#include "transaction/transaction_manager.hpp"
-#include "transaction/transaction.hpp"
-#include "main/client_context.hpp"
+#include "duckdb/catalog/catalog.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/transaction/transaction_manager.hpp"
+#include "duckdb/transaction/transaction.hpp"
+#include "duckdb/main/client_context.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/catalog/dependency_manager.cpp b/src/catalog/dependency_manager.cpp
index 0dcbc2f7ba9..d727692e367 100644
--- a/src/catalog/dependency_manager.cpp
+++ b/src/catalog/dependency_manager.cpp
@@ -1,6 +1,6 @@
-#include "catalog/dependency_manager.hpp"
+#include "duckdb/catalog/dependency_manager.hpp"
 
-#include "catalog/catalog.hpp"
+#include "duckdb/catalog/catalog.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/common/checksum.cpp b/src/common/checksum.cpp
index 78964b8fb29..0cf078c3e86 100644
--- a/src/common/checksum.cpp
+++ b/src/common/checksum.cpp
@@ -1,5 +1,5 @@
-#include "common/checksum.hpp"
-#include "common/types/hash.hpp"
+#include "duckdb/common/checksum.hpp"
+#include "duckdb/common/types/hash.hpp"
 
 using namespace std;
 
diff --git a/src/common/constants.cpp b/src/common/constants.cpp
index a46b9bc7a53..061da1ac7b7 100644
--- a/src/common/constants.cpp
+++ b/src/common/constants.cpp
@@ -1,4 +1,4 @@
-#include "common/constants.hpp"
+#include "duckdb/common/constants.hpp"
 
 #include <limits>
 
diff --git a/src/common/enums/expression_type.cpp b/src/common/enums/expression_type.cpp
index a2eeae7204e..23049e7771d 100644
--- a/src/common/enums/expression_type.cpp
+++ b/src/common/enums/expression_type.cpp
@@ -1,6 +1,6 @@
-#include "common/enums/expression_type.hpp"
+#include "duckdb/common/enums/expression_type.hpp"
 
-#include "common/exception.hpp"
+#include "duckdb/common/exception.hpp"
 
 using namespace std;
 
diff --git a/src/common/enums/join_type.cpp b/src/common/enums/join_type.cpp
index 0486cbe01c7..1b3aff6e623 100644
--- a/src/common/enums/join_type.cpp
+++ b/src/common/enums/join_type.cpp
@@ -1,4 +1,4 @@
-#include "common/enums/join_type.hpp"
+#include "duckdb/common/enums/join_type.hpp"
 
 using namespace std;
 
diff --git a/src/common/enums/logical_operator_type.cpp b/src/common/enums/logical_operator_type.cpp
index 0cffb462530..ab43a61640b 100644
--- a/src/common/enums/logical_operator_type.cpp
+++ b/src/common/enums/logical_operator_type.cpp
@@ -1,4 +1,4 @@
-#include "common/enums/logical_operator_type.hpp"
+#include "duckdb/common/enums/logical_operator_type.hpp"
 
 using namespace std;
 
diff --git a/src/common/enums/physical_operator_type.cpp b/src/common/enums/physical_operator_type.cpp
index 8e451e4a98f..f5f43131077 100644
--- a/src/common/enums/physical_operator_type.cpp
+++ b/src/common/enums/physical_operator_type.cpp
@@ -1,4 +1,4 @@
-#include "common/enums/physical_operator_type.hpp"
+#include "duckdb/common/enums/physical_operator_type.hpp"
 
 using namespace std;
 
diff --git a/src/common/enums/statement_type.cpp b/src/common/enums/statement_type.cpp
index 51897444533..57acecd2cb1 100644
--- a/src/common/enums/statement_type.cpp
+++ b/src/common/enums/statement_type.cpp
@@ -1,4 +1,4 @@
-#include "common/enums/statement_type.hpp"
+#include "duckdb/common/enums/statement_type.hpp"
 
 using namespace std;
 
diff --git a/src/common/exception.cpp b/src/common/exception.cpp
index e25b4b6e0ba..a1748f9455c 100644
--- a/src/common/exception.cpp
+++ b/src/common/exception.cpp
@@ -1,5 +1,5 @@
-#include "common/exception.hpp"
-#include "common/string_util.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/common/string_util.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/common/file_buffer.cpp b/src/common/file_buffer.cpp
index c35da0cff34..4ebee25d3c4 100644
--- a/src/common/file_buffer.cpp
+++ b/src/common/file_buffer.cpp
@@ -1,8 +1,8 @@
-#include "common/file_buffer.hpp"
-#include "common/file_system.hpp"
-#include "common/helper.hpp"
-#include "common/checksum.hpp"
-#include "common/exception.hpp"
+#include "duckdb/common/file_buffer.hpp"
+#include "duckdb/common/file_system.hpp"
+#include "duckdb/common/helper.hpp"
+#include "duckdb/common/checksum.hpp"
+#include "duckdb/common/exception.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/common/file_system.cpp b/src/common/file_system.cpp
index c49f9c4d4d0..af38f7b0bfb 100644
--- a/src/common/file_system.cpp
+++ b/src/common/file_system.cpp
@@ -1,9 +1,9 @@
-#include "common/file_system.hpp"
+#include "duckdb/common/file_system.hpp"
 
-#include "common/exception.hpp"
-#include "common/helper.hpp"
-#include "common/string_util.hpp"
-#include "common/checksum.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/common/helper.hpp"
+#include "duckdb/common/string_util.hpp"
+#include "duckdb/common/checksum.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/common/fstream_util.cpp b/src/common/fstream_util.cpp
index 36c6a31553f..5e60accce15 100644
--- a/src/common/fstream_util.cpp
+++ b/src/common/fstream_util.cpp
@@ -1,4 +1,4 @@
-#include "common/fstream_util.hpp"
+#include "duckdb/common/fstream_util.hpp"
 
 using namespace std;
 using namespace duckdb;
diff --git a/src/common/gzip_stream.cpp b/src/common/gzip_stream.cpp
index 0f5d048f8f7..63f99f89e94 100644
--- a/src/common/gzip_stream.cpp
+++ b/src/common/gzip_stream.cpp
@@ -1,8 +1,8 @@
-#include "common/gzip_stream.hpp"
+#include "duckdb/common/gzip_stream.hpp"
 
-#include "common/exception.hpp"
-#include "common/file_system.hpp"
-#include "common/fstream_util.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/common/file_system.hpp"
+#include "duckdb/common/fstream_util.hpp"
 
 #define MINIZ_NO_ARCHIVE_APIS
 #define MINIZ_NO_STDIO
diff --git a/src/common/limits.cpp b/src/common/limits.cpp
index 6f8b57e76e7..38161764ac5 100644
--- a/src/common/limits.cpp
+++ b/src/common/limits.cpp
@@ -1,6 +1,6 @@
-#include "common/limits.hpp"
+#include "duckdb/common/limits.hpp"
 
-#include "common/exception.hpp"
+#include "duckdb/common/exception.hpp"
 
 using namespace std;
 
diff --git a/src/common/operator/cast_operators.cpp b/src/common/operator/cast_operators.cpp
index fbce1a12605..c3c958e2750 100644
--- a/src/common/operator/cast_operators.cpp
+++ b/src/common/operator/cast_operators.cpp
@@ -1,10 +1,10 @@
-#include "common/operator/cast_operators.hpp"
+#include "duckdb/common/operator/cast_operators.hpp"
 
-#include "common/exception.hpp"
-#include "common/limits.hpp"
-#include "common/types/date.hpp"
-#include "common/types/time.hpp"
-#include "common/types/timestamp.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/common/limits.hpp"
+#include "duckdb/common/types/date.hpp"
+#include "duckdb/common/types/time.hpp"
+#include "duckdb/common/types/timestamp.hpp"
 
 #include <cstdlib>
 #include <cctype>
diff --git a/src/common/operator/like_operators.cpp b/src/common/operator/like_operators.cpp
index 0cf4dcab33b..38f71d40b53 100644
--- a/src/common/operator/like_operators.cpp
+++ b/src/common/operator/like_operators.cpp
@@ -1,4 +1,4 @@
-#include "common/operator/like_operators.hpp"
+#include "duckdb/common/operator/like_operators.hpp"
 
 namespace duckdb {
 
diff --git a/src/common/printer.cpp b/src/common/printer.cpp
index c7cf39028ef..be399d6e00a 100644
--- a/src/common/printer.cpp
+++ b/src/common/printer.cpp
@@ -1,4 +1,4 @@
-#include "common/printer.hpp"
+#include "duckdb/common/printer.hpp"
 
 #include <stdio.h>
 
diff --git a/src/common/serializer.cpp b/src/common/serializer.cpp
index ccf6cd551d5..939e0bf986d 100644
--- a/src/common/serializer.cpp
+++ b/src/common/serializer.cpp
@@ -1,4 +1,4 @@
-#include "common/serializer.hpp"
+#include "duckdb/common/serializer.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/common/serializer/buffered_deserializer.cpp b/src/common/serializer/buffered_deserializer.cpp
index c40513458f6..b0ba88acc4c 100644
--- a/src/common/serializer/buffered_deserializer.cpp
+++ b/src/common/serializer/buffered_deserializer.cpp
@@ -1,4 +1,4 @@
-#include "common/serializer/buffered_deserializer.hpp"
+#include "duckdb/common/serializer/buffered_deserializer.hpp"
 
 #include <cstring>
 
diff --git a/src/common/serializer/buffered_file_reader.cpp b/src/common/serializer/buffered_file_reader.cpp
index 1e6d5259be9..39ccd6eae5f 100644
--- a/src/common/serializer/buffered_file_reader.cpp
+++ b/src/common/serializer/buffered_file_reader.cpp
@@ -1,6 +1,6 @@
-#include "common/serializer/buffered_file_reader.hpp"
-#include "common/serializer/buffered_file_writer.hpp"
-#include "common/exception.hpp"
+#include "duckdb/common/serializer/buffered_file_reader.hpp"
+#include "duckdb/common/serializer/buffered_file_writer.hpp"
+#include "duckdb/common/exception.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/common/serializer/buffered_file_writer.cpp b/src/common/serializer/buffered_file_writer.cpp
index 2e18d1a94ae..e7f11cb68cc 100644
--- a/src/common/serializer/buffered_file_writer.cpp
+++ b/src/common/serializer/buffered_file_writer.cpp
@@ -1,5 +1,5 @@
-#include "common/serializer/buffered_file_writer.hpp"
-#include "common/exception.hpp"
+#include "duckdb/common/serializer/buffered_file_writer.hpp"
+#include "duckdb/common/exception.hpp"
 
 #include <cstring>
 
diff --git a/src/common/serializer/buffered_serializer.cpp b/src/common/serializer/buffered_serializer.cpp
index 1784bf4df81..936582d6c02 100644
--- a/src/common/serializer/buffered_serializer.cpp
+++ b/src/common/serializer/buffered_serializer.cpp
@@ -1,4 +1,4 @@
-#include "common/serializer/buffered_serializer.hpp"
+#include "duckdb/common/serializer/buffered_serializer.hpp"
 
 #include <cstring>
 
diff --git a/src/common/string_util.cpp b/src/common/string_util.cpp
index 15ce7255d30..8e273d69c2a 100644
--- a/src/common/string_util.cpp
+++ b/src/common/string_util.cpp
@@ -1,4 +1,4 @@
-#include "common/string_util.hpp"
+#include "duckdb/common/string_util.hpp"
 
 #include <algorithm>
 #include <cctype>
diff --git a/src/common/symbols.cpp b/src/common/symbols.cpp
index df8c3bb2709..d1560e2f1dd 100644
--- a/src/common/symbols.cpp
+++ b/src/common/symbols.cpp
@@ -3,37 +3,37 @@
 
 #ifdef DEBUG
 
-#include "catalog/catalog.hpp"
-#include "common/types/chunk_collection.hpp"
-#include "execution/aggregate_hashtable.hpp"
-#include "execution/column_binding_resolver.hpp"
-#include "execution/join_hashtable.hpp"
-#include "execution/physical_operator.hpp"
-#include "main/materialized_query_result.hpp"
-#include "main/query_profiler.hpp"
-#include "main/query_result.hpp"
-#include "main/stream_query_result.hpp"
-#include "optimizer/join_order_optimizer.hpp"
-#include "optimizer/rule.hpp"
-#include "parser/constraint.hpp"
-#include "parser/constraints/list.hpp"
-#include "parser/expression/list.hpp"
-#include "parser/query_node.hpp"
-#include "parser/query_node/select_node.hpp"
-#include "parser/query_node/set_operation_node.hpp"
-#include "parser/statement/list.hpp"
-#include "parser/tableref/list.hpp"
-#include "planner/expression/list.hpp"
-#include "planner/logical_operator.hpp"
-#include "planner/operator/list.hpp"
-#include "planner/operator/logical_join.hpp"
-#include "planner/query_node/bound_select_node.hpp"
-#include "planner/query_node/bound_set_operation_node.hpp"
-#include "planner/statement/list.hpp"
-#include "planner/tableref/list.hpp"
-#include "storage/data_table.hpp"
-#include "storage/write_ahead_log.hpp"
-#include "transaction/transaction.hpp"
+#include "duckdb/catalog/catalog.hpp"
+#include "duckdb/common/types/chunk_collection.hpp"
+#include "duckdb/execution/aggregate_hashtable.hpp"
+#include "duckdb/execution/column_binding_resolver.hpp"
+#include "duckdb/execution/join_hashtable.hpp"
+#include "duckdb/execution/physical_operator.hpp"
+#include "duckdb/main/materialized_query_result.hpp"
+#include "duckdb/main/query_profiler.hpp"
+#include "duckdb/main/query_result.hpp"
+#include "duckdb/main/stream_query_result.hpp"
+#include "duckdb/optimizer/join_order_optimizer.hpp"
+#include "duckdb/optimizer/rule.hpp"
+#include "duckdb/parser/constraint.hpp"
+#include "duckdb/parser/constraints/list.hpp"
+#include "duckdb/parser/expression/list.hpp"
+#include "duckdb/parser/query_node.hpp"
+#include "duckdb/parser/query_node/select_node.hpp"
+#include "duckdb/parser/query_node/set_operation_node.hpp"
+#include "duckdb/parser/statement/list.hpp"
+#include "duckdb/parser/tableref/list.hpp"
+#include "duckdb/planner/expression/list.hpp"
+#include "duckdb/planner/logical_operator.hpp"
+#include "duckdb/planner/operator/list.hpp"
+#include "duckdb/planner/operator/logical_join.hpp"
+#include "duckdb/planner/query_node/bound_select_node.hpp"
+#include "duckdb/planner/query_node/bound_set_operation_node.hpp"
+#include "duckdb/planner/statement/list.hpp"
+#include "duckdb/planner/tableref/list.hpp"
+#include "duckdb/storage/data_table.hpp"
+#include "duckdb/storage/write_ahead_log.hpp"
+#include "duckdb/transaction/transaction.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/common/types.cpp b/src/common/types.cpp
index bda9ebbe016..d6c9ebfad4a 100644
--- a/src/common/types.cpp
+++ b/src/common/types.cpp
@@ -1,7 +1,7 @@
-#include "common/types.hpp"
+#include "duckdb/common/types.hpp"
 
-#include "common/exception.hpp"
-#include "common/serializer.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/common/serializer.hpp"
 
 #include <cmath>
 
diff --git a/src/common/types/chunk_collection.cpp b/src/common/types/chunk_collection.cpp
index fd015f091df..ecd49849ba4 100644
--- a/src/common/types/chunk_collection.cpp
+++ b/src/common/types/chunk_collection.cpp
@@ -1,8 +1,8 @@
-#include "common/types/chunk_collection.hpp"
+#include "duckdb/common/types/chunk_collection.hpp"
 
-#include "common/exception.hpp"
-#include "common/printer.hpp"
-#include "common/value_operations/value_operations.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/common/printer.hpp"
+#include "duckdb/common/value_operations/value_operations.hpp"
 
 #include <algorithm>
 #include <cstring>
diff --git a/src/common/types/data_chunk.cpp b/src/common/types/data_chunk.cpp
index afb790db86d..4d669e60b55 100644
--- a/src/common/types/data_chunk.cpp
+++ b/src/common/types/data_chunk.cpp
@@ -1,11 +1,11 @@
-#include "common/types/data_chunk.hpp"
+#include "duckdb/common/types/data_chunk.hpp"
 
-#include "common/exception.hpp"
-#include "common/helper.hpp"
-#include "common/printer.hpp"
-#include "common/serializer.hpp"
-#include "common/types/null_value.hpp"
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/common/helper.hpp"
+#include "duckdb/common/printer.hpp"
+#include "duckdb/common/serializer.hpp"
+#include "duckdb/common/types/null_value.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/common/types/date.cpp b/src/common/types/date.cpp
index bbc8488dbd2..3761d17f9b3 100644
--- a/src/common/types/date.cpp
+++ b/src/common/types/date.cpp
@@ -1,7 +1,7 @@
-#include "common/types/date.hpp"
+#include "duckdb/common/types/date.hpp"
 
-#include "common/exception.hpp"
-#include "common/string_util.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/common/string_util.hpp"
 
 #include <cctype>
 #include <iomanip>
diff --git a/src/common/types/hash.cpp b/src/common/types/hash.cpp
index a1893b127ed..5e50ab723ea 100644
--- a/src/common/types/hash.cpp
+++ b/src/common/types/hash.cpp
@@ -1,6 +1,6 @@
-#include "common/types/hash.hpp"
+#include "duckdb/common/types/hash.hpp"
 
-#include "common/exception.hpp"
+#include "duckdb/common/exception.hpp"
 
 #include <functional>
 
diff --git a/src/common/types/hyperloglog.cpp b/src/common/types/hyperloglog.cpp
index 78c51dc618b..57c97f93889 100644
--- a/src/common/types/hyperloglog.cpp
+++ b/src/common/types/hyperloglog.cpp
@@ -1,6 +1,6 @@
-#include "common/types/hyperloglog.hpp"
+#include "duckdb/common/types/hyperloglog.hpp"
 
-#include "common/exception.hpp"
+#include "duckdb/common/exception.hpp"
 #include "hyperloglog.h"
 
 using namespace duckdb;
diff --git a/src/common/types/null_value.cpp b/src/common/types/null_value.cpp
index 1d491b7a5ce..6a297940df0 100644
--- a/src/common/types/null_value.cpp
+++ b/src/common/types/null_value.cpp
@@ -1,6 +1,6 @@
-#include "common/types/null_value.hpp"
+#include "duckdb/common/types/null_value.hpp"
 
-#include "common/exception.hpp"
+#include "duckdb/common/exception.hpp"
 
 #include <cstring>
 
diff --git a/src/common/types/string_heap.cpp b/src/common/types/string_heap.cpp
index 98584207301..8d7ac8fb08d 100644
--- a/src/common/types/string_heap.cpp
+++ b/src/common/types/string_heap.cpp
@@ -1,6 +1,6 @@
-#include "common/types/string_heap.hpp"
+#include "duckdb/common/types/string_heap.hpp"
 
-#include "common/exception.hpp"
+#include "duckdb/common/exception.hpp"
 #include <cstring>
 
 using namespace duckdb;
diff --git a/src/common/types/time.cpp b/src/common/types/time.cpp
index 36f797a9a58..8795339e70f 100644
--- a/src/common/types/time.cpp
+++ b/src/common/types/time.cpp
@@ -1,8 +1,8 @@
-#include "common/types/time.hpp"
-#include "common/types/timestamp.hpp"
+#include "duckdb/common/types/time.hpp"
+#include "duckdb/common/types/timestamp.hpp"
 
-#include "common/string_util.hpp"
-#include "common/exception.hpp"
+#include "duckdb/common/string_util.hpp"
+#include "duckdb/common/exception.hpp"
 
 #include <iomanip>
 #include <cstring>
diff --git a/src/common/types/timestamp.cpp b/src/common/types/timestamp.cpp
index a8e7879d60d..22c88f758a8 100644
--- a/src/common/types/timestamp.cpp
+++ b/src/common/types/timestamp.cpp
@@ -1,8 +1,8 @@
-#include "common/types/timestamp.hpp"
+#include "duckdb/common/types/timestamp.hpp"
 
-#include "common/exception.hpp"
-#include "common/types/date.hpp"
-#include "common/types/time.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/common/types/date.hpp"
+#include "duckdb/common/types/time.hpp"
 
 #include <iomanip>
 #include <iostream>
diff --git a/src/common/types/value.cpp b/src/common/types/value.cpp
index 1603de0989d..ffac9e6cd07 100644
--- a/src/common/types/value.cpp
+++ b/src/common/types/value.cpp
@@ -1,20 +1,20 @@
-#include "common/types/value.hpp"
-
-#include "common/exception.hpp"
-#include "common/limits.hpp"
-#include "common/operator/aggregate_operators.hpp"
-#include "common/operator/cast_operators.hpp"
-#include "common/operator/comparison_operators.hpp"
-#include "common/operator/numeric_binary_operators.hpp"
-#include "common/printer.hpp"
-#include "common/serializer.hpp"
-#include "common/types/date.hpp"
-#include "common/types/time.hpp"
-#include "common/types/timestamp.hpp"
-#include "common/types/vector.hpp"
-#include "common/value_operations/value_operations.hpp"
-#include "common/vector_operations/vector_operations.hpp"
-#include "common/string_util.hpp"
+#include "duckdb/common/types/value.hpp"
+
+#include "duckdb/common/exception.hpp"
+#include "duckdb/common/limits.hpp"
+#include "duckdb/common/operator/aggregate_operators.hpp"
+#include "duckdb/common/operator/cast_operators.hpp"
+#include "duckdb/common/operator/comparison_operators.hpp"
+#include "duckdb/common/operator/numeric_binary_operators.hpp"
+#include "duckdb/common/printer.hpp"
+#include "duckdb/common/serializer.hpp"
+#include "duckdb/common/types/date.hpp"
+#include "duckdb/common/types/time.hpp"
+#include "duckdb/common/types/timestamp.hpp"
+#include "duckdb/common/types/vector.hpp"
+#include "duckdb/common/value_operations/value_operations.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
+#include "duckdb/common/string_util.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/common/types/vector.cpp b/src/common/types/vector.cpp
index 2e5fc6a3d1f..e0a68a537ec 100644
--- a/src/common/types/vector.cpp
+++ b/src/common/types/vector.cpp
@@ -1,9 +1,9 @@
-#include "common/types/vector.hpp"
+#include "duckdb/common/types/vector.hpp"
 
-#include "common/assert.hpp"
-#include "common/exception.hpp"
-#include "common/printer.hpp"
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/common/assert.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/common/printer.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/common/value_operations/comparison_operations.cpp b/src/common/value_operations/comparison_operations.cpp
index 4a1f8d227a2..2937723cf0d 100644
--- a/src/common/value_operations/comparison_operations.cpp
+++ b/src/common/value_operations/comparison_operations.cpp
@@ -1,6 +1,6 @@
-#include "common/exception.hpp"
-#include "common/operator/comparison_operators.hpp"
-#include "common/value_operations/value_operations.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/common/operator/comparison_operators.hpp"
+#include "duckdb/common/value_operations/value_operations.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/common/value_operations/hash.cpp b/src/common/value_operations/hash.cpp
index 62a6922994e..41fa495d3bf 100644
--- a/src/common/value_operations/hash.cpp
+++ b/src/common/value_operations/hash.cpp
@@ -1,8 +1,8 @@
-#include "common/types/hash.hpp"
+#include "duckdb/common/types/hash.hpp"
 
-#include "common/exception.hpp"
-#include "common/operator/numeric_functions.hpp"
-#include "common/value_operations/value_operations.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/common/operator/numeric_functions.hpp"
+#include "duckdb/common/value_operations/value_operations.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/common/value_operations/numeric_functions.cpp b/src/common/value_operations/numeric_functions.cpp
index d4f3e996de3..4509f436ba4 100644
--- a/src/common/value_operations/numeric_functions.cpp
+++ b/src/common/value_operations/numeric_functions.cpp
@@ -1,7 +1,7 @@
-#include "common/operator/numeric_functions.hpp"
+#include "duckdb/common/operator/numeric_functions.hpp"
 
-#include "common/exception.hpp"
-#include "common/value_operations/value_operations.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/common/value_operations/value_operations.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/common/value_operations/numeric_operations.cpp b/src/common/value_operations/numeric_operations.cpp
index 1d09261dbde..b0661976a92 100644
--- a/src/common/value_operations/numeric_operations.cpp
+++ b/src/common/value_operations/numeric_operations.cpp
@@ -1,8 +1,8 @@
-#include "common/exception.hpp"
-#include "common/limits.hpp"
-#include "common/operator/aggregate_operators.hpp"
-#include "common/operator/numeric_binary_operators.hpp"
-#include "common/value_operations/value_operations.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/common/limits.hpp"
+#include "duckdb/common/operator/aggregate_operators.hpp"
+#include "duckdb/common/operator/numeric_binary_operators.hpp"
+#include "duckdb/common/value_operations/value_operations.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/common/vector_operations/aggregate_operators.cpp b/src/common/vector_operations/aggregate_operators.cpp
index fefca0ab05c..63da6251528 100644
--- a/src/common/vector_operations/aggregate_operators.cpp
+++ b/src/common/vector_operations/aggregate_operators.cpp
@@ -4,16 +4,16 @@
 // aggregates
 //===--------------------------------------------------------------------===//
 
-#include "common/operator/aggregate_operators.hpp"
+#include "duckdb/common/operator/aggregate_operators.hpp"
 
-#include "common/operator/constant_operators.hpp"
-#include "common/operator/numeric_binary_operators.hpp"
-#include "common/types/constant_vector.hpp"
-#include "common/types/static_vector.hpp"
-#include "common/value_operations/value_operations.hpp"
-#include "common/vector_operations/fold_loops.hpp"
-#include "common/vector_operations/vector_operations.hpp"
-#include "common/operator/comparison_operators.hpp"
+#include "duckdb/common/operator/constant_operators.hpp"
+#include "duckdb/common/operator/numeric_binary_operators.hpp"
+#include "duckdb/common/types/constant_vector.hpp"
+#include "duckdb/common/types/static_vector.hpp"
+#include "duckdb/common/value_operations/value_operations.hpp"
+#include "duckdb/common/vector_operations/fold_loops.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
+#include "duckdb/common/operator/comparison_operators.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/common/vector_operations/append.cpp b/src/common/vector_operations/append.cpp
index a53b3d98534..3b17981cc71 100644
--- a/src/common/vector_operations/append.cpp
+++ b/src/common/vector_operations/append.cpp
@@ -3,9 +3,9 @@
 // Description: This file contains the implementation of the append function
 //===--------------------------------------------------------------------===//
 
-#include "common/exception.hpp"
-#include "common/types/null_value.hpp"
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/common/types/null_value.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/common/vector_operations/boolean_operators.cpp b/src/common/vector_operations/boolean_operators.cpp
index 6e33292ca29..8c56aca76f1 100644
--- a/src/common/vector_operations/boolean_operators.cpp
+++ b/src/common/vector_operations/boolean_operators.cpp
@@ -4,11 +4,11 @@
 // operations AND OR !
 //===--------------------------------------------------------------------===//
 
-#include "common/operator/boolean_operators.hpp"
+#include "duckdb/common/operator/boolean_operators.hpp"
 
-#include "common/vector_operations/binary_loops.hpp"
-#include "common/vector_operations/unary_loops.hpp"
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/common/vector_operations/binary_loops.hpp"
+#include "duckdb/common/vector_operations/unary_loops.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/common/vector_operations/cast_operators.cpp b/src/common/vector_operations/cast_operators.cpp
index 2c10b524525..993db782b39 100644
--- a/src/common/vector_operations/cast_operators.cpp
+++ b/src/common/vector_operations/cast_operators.cpp
@@ -2,9 +2,9 @@
 // cast_operators.cpp
 // Description: This file contains the implementation of the different casts
 //===--------------------------------------------------------------------===//
-#include "common/operator/cast_operators.hpp"
+#include "duckdb/common/operator/cast_operators.hpp"
 
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/common/vector_operations/comparison_operators.cpp b/src/common/vector_operations/comparison_operators.cpp
index fe079540e64..7c0dc5182ec 100644
--- a/src/common/vector_operations/comparison_operators.cpp
+++ b/src/common/vector_operations/comparison_operators.cpp
@@ -4,10 +4,10 @@
 // operations == != >= <= > <
 //===--------------------------------------------------------------------===//
 
-#include "common/operator/comparison_operators.hpp"
+#include "duckdb/common/operator/comparison_operators.hpp"
 
-#include "common/vector_operations/binary_loops.hpp"
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/common/vector_operations/binary_loops.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/common/vector_operations/copy.cpp b/src/common/vector_operations/copy.cpp
index f924d941290..c210acb1d75 100644
--- a/src/common/vector_operations/copy.cpp
+++ b/src/common/vector_operations/copy.cpp
@@ -4,9 +4,9 @@
 // functions
 //===--------------------------------------------------------------------===//
 
-#include "common/exception.hpp"
-#include "common/types/null_value.hpp"
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/common/types/null_value.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/common/vector_operations/gather.cpp b/src/common/vector_operations/gather.cpp
index fc62183fb34..0d6c531047e 100644
--- a/src/common/vector_operations/gather.cpp
+++ b/src/common/vector_operations/gather.cpp
@@ -3,10 +3,10 @@
 // Description: This file contains the implementation of the gather operators
 //===--------------------------------------------------------------------===//
 
-#include "common/exception.hpp"
-#include "common/operator/constant_operators.hpp"
-#include "common/types/null_value.hpp"
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/common/operator/constant_operators.hpp"
+#include "duckdb/common/types/null_value.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/common/vector_operations/generators.cpp b/src/common/vector_operations/generators.cpp
index cc78b913c07..3d120a128b3 100644
--- a/src/common/vector_operations/generators.cpp
+++ b/src/common/vector_operations/generators.cpp
@@ -3,8 +3,8 @@
 // Description: This file contains the implementation of different generators
 //===--------------------------------------------------------------------===//
 
-#include "common/exception.hpp"
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/common/vector_operations/hash.cpp b/src/common/vector_operations/hash.cpp
index c328eafda3b..cb17baf938b 100644
--- a/src/common/vector_operations/hash.cpp
+++ b/src/common/vector_operations/hash.cpp
@@ -3,9 +3,9 @@
 // Description: This file contains the vectorized hash implementations
 //===--------------------------------------------------------------------===//
 
-#include "common/operator/hash_operators.hpp"
-#include "common/vector_operations/binary_loops.hpp"
-#include "common/vector_operations/unary_loops.hpp"
+#include "duckdb/common/operator/hash_operators.hpp"
+#include "duckdb/common/vector_operations/binary_loops.hpp"
+#include "duckdb/common/vector_operations/unary_loops.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/common/vector_operations/like.cpp b/src/common/vector_operations/like.cpp
index 5ad9f2e0edd..4443af4c8d9 100644
--- a/src/common/vector_operations/like.cpp
+++ b/src/common/vector_operations/like.cpp
@@ -3,9 +3,9 @@
 // Description: This file contains the implementation of (NOT) LIKE
 //===--------------------------------------------------------------------===//
 
-#include "common/operator/like_operators.hpp"
-#include "common/vector_operations/binary_loops.hpp"
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/common/operator/like_operators.hpp"
+#include "duckdb/common/vector_operations/binary_loops.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/common/vector_operations/null_operations.cpp b/src/common/vector_operations/null_operations.cpp
index a9760a40902..55a3120100b 100644
--- a/src/common/vector_operations/null_operations.cpp
+++ b/src/common/vector_operations/null_operations.cpp
@@ -4,8 +4,8 @@
 // IS NULL/NOT IS NULL operators
 //===--------------------------------------------------------------------===//
 
-#include "common/exception.hpp"
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/common/vector_operations/numeric_binary_operators.cpp b/src/common/vector_operations/numeric_binary_operators.cpp
index 2010bf9988c..3e51df28e14 100644
--- a/src/common/vector_operations/numeric_binary_operators.cpp
+++ b/src/common/vector_operations/numeric_binary_operators.cpp
@@ -4,10 +4,10 @@
 // operations (+ - / * %)
 //===--------------------------------------------------------------------===//
 
-#include "common/operator/numeric_binary_operators.hpp"
+#include "duckdb/common/operator/numeric_binary_operators.hpp"
 
-#include "common/vector_operations/binary_loops.hpp"
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/common/vector_operations/binary_loops.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/common/vector_operations/numeric_bitwise_operators.cpp b/src/common/vector_operations/numeric_bitwise_operators.cpp
index cb828cbee4d..0a0c428ab5c 100644
--- a/src/common/vector_operations/numeric_bitwise_operators.cpp
+++ b/src/common/vector_operations/numeric_bitwise_operators.cpp
@@ -4,10 +4,10 @@
 // operations (^ | & >> << ~)
 //===--------------------------------------------------------------------===//
 
-#include "common/operator/numeric_bitwise_operators.hpp"
+#include "duckdb/common/operator/numeric_bitwise_operators.hpp"
 
-#include "common/vector_operations/binary_loops.hpp"
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/common/vector_operations/binary_loops.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/common/vector_operations/numeric_functions.cpp b/src/common/vector_operations/numeric_functions.cpp
index d49992c8fa0..149512c7820 100644
--- a/src/common/vector_operations/numeric_functions.cpp
+++ b/src/common/vector_operations/numeric_functions.cpp
@@ -4,13 +4,13 @@
 // += *= /= -= %=
 //===--------------------------------------------------------------------===//
 
-#include "common/operator/numeric_functions.hpp"
+#include "duckdb/common/operator/numeric_functions.hpp"
 
-#include "common/vector_operations/binary_loops.hpp"
-#include "common/vector_operations/unary_loops.hpp"
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/common/vector_operations/binary_loops.hpp"
+#include "duckdb/common/vector_operations/unary_loops.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 
-#include "common/vector_operations/unary_numeric.hpp"
+#include "duckdb/common/vector_operations/unary_numeric.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/common/vector_operations/numeric_inplace_bitwise_operators.cpp b/src/common/vector_operations/numeric_inplace_bitwise_operators.cpp
index a29afa526a9..82dcef52015 100644
--- a/src/common/vector_operations/numeric_inplace_bitwise_operators.cpp
+++ b/src/common/vector_operations/numeric_inplace_bitwise_operators.cpp
@@ -4,10 +4,10 @@
 // bitwise ops: ^= &= |= >>= <<=
 //===--------------------------------------------------------------------===//
 
-#include "common/operator/numeric_inplace_bitwise_operators.hpp"
+#include "duckdb/common/operator/numeric_inplace_bitwise_operators.hpp"
 
-#include "common/vector_operations/inplace_loops.hpp"
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/common/vector_operations/inplace_loops.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/common/vector_operations/numeric_inplace_operators.cpp b/src/common/vector_operations/numeric_inplace_operators.cpp
index f5a88e3f4d1..fe766c999de 100644
--- a/src/common/vector_operations/numeric_inplace_operators.cpp
+++ b/src/common/vector_operations/numeric_inplace_operators.cpp
@@ -4,11 +4,11 @@
 // += *= /= -= %=
 //===--------------------------------------------------------------------===//
 
-#include "common/operator/numeric_inplace_operators.hpp"
+#include "duckdb/common/operator/numeric_inplace_operators.hpp"
 
-#include "common/types/constant_vector.hpp"
-#include "common/vector_operations/inplace_loops.hpp"
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/common/types/constant_vector.hpp"
+#include "duckdb/common/vector_operations/inplace_loops.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/common/vector_operations/scatter.cpp b/src/common/vector_operations/scatter.cpp
index 8c8ba5ffcf1..c9c7813d4e3 100644
--- a/src/common/vector_operations/scatter.cpp
+++ b/src/common/vector_operations/scatter.cpp
@@ -3,11 +3,11 @@
 // Description: This file contains the implementation of the scatter operations
 //===--------------------------------------------------------------------===//
 
-#include "common/operator/aggregate_operators.hpp"
-#include "common/operator/constant_operators.hpp"
-#include "common/operator/numeric_binary_operators.hpp"
-#include "common/vector_operations/scatter_loops.hpp"
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/common/operator/aggregate_operators.hpp"
+#include "duckdb/common/operator/constant_operators.hpp"
+#include "duckdb/common/operator/numeric_binary_operators.hpp"
+#include "duckdb/common/vector_operations/scatter_loops.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/common/vector_operations/set.cpp b/src/common/vector_operations/set.cpp
index 7100cebfd77..0b18281e268 100644
--- a/src/common/vector_operations/set.cpp
+++ b/src/common/vector_operations/set.cpp
@@ -3,10 +3,10 @@
 // Description: This file contains the implementation of VectorOperations::Set
 //===--------------------------------------------------------------------===//
 
-#include "common/exception.hpp"
-#include "common/operator/constant_operators.hpp"
-#include "common/vector_operations/unary_loops.hpp"
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/common/operator/constant_operators.hpp"
+#include "duckdb/common/vector_operations/unary_loops.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/common/vector_operations/sort.cpp b/src/common/vector_operations/sort.cpp
index ab10073477d..810da9ae538 100644
--- a/src/common/vector_operations/sort.cpp
+++ b/src/common/vector_operations/sort.cpp
@@ -3,9 +3,9 @@
 // Description: This file contains the implementation of the sort operator
 //===--------------------------------------------------------------------===//
 
-#include "common/exception.hpp"
-#include "common/operator/comparison_operators.hpp"
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/common/operator/comparison_operators.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 
 using namespace duckdb;
 using namespace std;
@@ -148,7 +148,7 @@ void VectorOperations::Sort(Vector &vector, sel_t result[]) {
 	}
 }
 
-#include "common/operator/comparison_operators.hpp"
+#include "duckdb/common/operator/comparison_operators.hpp"
 
 template <class T> bool is_unique(Vector &vector, sel_t sel_vector[]) {
 	auto data = (T *)vector.data;
diff --git a/src/execution/aggregate_hashtable.cpp b/src/execution/aggregate_hashtable.cpp
index 3609c998a96..211702519b6 100644
--- a/src/execution/aggregate_hashtable.cpp
+++ b/src/execution/aggregate_hashtable.cpp
@@ -1,11 +1,11 @@
-#include "execution/aggregate_hashtable.hpp"
-
-#include "common/exception.hpp"
-#include "common/types/null_value.hpp"
-#include "common/types/static_vector.hpp"
-#include "common/vector_operations/vector_operations.hpp"
-#include "planner/expression/bound_aggregate_expression.hpp"
-#include "catalog/catalog_entry/aggregate_function_catalog_entry.hpp"
+#include "duckdb/execution/aggregate_hashtable.hpp"
+
+#include "duckdb/common/exception.hpp"
+#include "duckdb/common/types/null_value.hpp"
+#include "duckdb/common/types/static_vector.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
+#include "duckdb/planner/expression/bound_aggregate_expression.hpp"
+#include "duckdb/catalog/catalog_entry/aggregate_function_catalog_entry.hpp"
 
 #include <cmath>
 #include <map>
diff --git a/src/execution/column_binding_resolver.cpp b/src/execution/column_binding_resolver.cpp
index 2a679c01ce3..5b9540edeac 100644
--- a/src/execution/column_binding_resolver.cpp
+++ b/src/execution/column_binding_resolver.cpp
@@ -1,7 +1,7 @@
-#include "execution/column_binding_resolver.hpp"
+#include "duckdb/execution/column_binding_resolver.hpp"
 
-#include "planner/expression/bound_columnref_expression.hpp"
-#include "planner/expression/bound_reference_expression.hpp"
+#include "duckdb/planner/expression/bound_columnref_expression.hpp"
+#include "duckdb/planner/expression/bound_reference_expression.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/expression_executor.cpp b/src/execution/expression_executor.cpp
index 084502b0a4c..e04f3fb02e6 100644
--- a/src/execution/expression_executor.cpp
+++ b/src/execution/expression_executor.cpp
@@ -1,7 +1,7 @@
-#include "execution/expression_executor.hpp"
+#include "duckdb/execution/expression_executor.hpp"
 
-#include "common/types/static_vector.hpp"
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/common/types/static_vector.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/expression_executor/execute_bound.cpp b/src/execution/expression_executor/execute_bound.cpp
index b8e1910f523..c64c047e065 100644
--- a/src/execution/expression_executor/execute_bound.cpp
+++ b/src/execution/expression_executor/execute_bound.cpp
@@ -1,5 +1,5 @@
-#include "execution/expression_executor.hpp"
-#include "planner/expression/bound_reference_expression.hpp"
+#include "duckdb/execution/expression_executor.hpp"
+#include "duckdb/planner/expression/bound_reference_expression.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/expression_executor/execute_case.cpp b/src/execution/expression_executor/execute_case.cpp
index 53d9a6d8ff8..85c3feb93f4 100644
--- a/src/execution/expression_executor/execute_case.cpp
+++ b/src/execution/expression_executor/execute_case.cpp
@@ -1,6 +1,6 @@
-#include "common/vector_operations/vector_operations.hpp"
-#include "execution/expression_executor.hpp"
-#include "planner/expression/bound_case_expression.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
+#include "duckdb/execution/expression_executor.hpp"
+#include "duckdb/planner/expression/bound_case_expression.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/expression_executor/execute_cast.cpp b/src/execution/expression_executor/execute_cast.cpp
index 6fffe91855d..f08cc9ddeea 100644
--- a/src/execution/expression_executor/execute_cast.cpp
+++ b/src/execution/expression_executor/execute_cast.cpp
@@ -1,6 +1,6 @@
-#include "common/vector_operations/vector_operations.hpp"
-#include "execution/expression_executor.hpp"
-#include "planner/expression/bound_cast_expression.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
+#include "duckdb/execution/expression_executor.hpp"
+#include "duckdb/planner/expression/bound_cast_expression.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/expression_executor/execute_comparison.cpp b/src/execution/expression_executor/execute_comparison.cpp
index ee251d7a697..66de3550298 100644
--- a/src/execution/expression_executor/execute_comparison.cpp
+++ b/src/execution/expression_executor/execute_comparison.cpp
@@ -1,6 +1,6 @@
-#include "common/vector_operations/vector_operations.hpp"
-#include "execution/expression_executor.hpp"
-#include "planner/expression/bound_comparison_expression.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
+#include "duckdb/execution/expression_executor.hpp"
+#include "duckdb/planner/expression/bound_comparison_expression.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/expression_executor/execute_conjunction.cpp b/src/execution/expression_executor/execute_conjunction.cpp
index 9aeece6d972..9e149e98a7e 100644
--- a/src/execution/expression_executor/execute_conjunction.cpp
+++ b/src/execution/expression_executor/execute_conjunction.cpp
@@ -1,6 +1,6 @@
-#include "common/vector_operations/vector_operations.hpp"
-#include "execution/expression_executor.hpp"
-#include "planner/expression/bound_conjunction_expression.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
+#include "duckdb/execution/expression_executor.hpp"
+#include "duckdb/planner/expression/bound_conjunction_expression.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/expression_executor/execute_constant.cpp b/src/execution/expression_executor/execute_constant.cpp
index 2621ffda111..e65073edf0f 100644
--- a/src/execution/expression_executor/execute_constant.cpp
+++ b/src/execution/expression_executor/execute_constant.cpp
@@ -1,6 +1,6 @@
-#include "common/vector_operations/vector_operations.hpp"
-#include "execution/expression_executor.hpp"
-#include "planner/expression/bound_constant_expression.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
+#include "duckdb/execution/expression_executor.hpp"
+#include "duckdb/planner/expression/bound_constant_expression.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/expression_executor/execute_cse.cpp b/src/execution/expression_executor/execute_cse.cpp
index 863ff9786cb..0eb41b3858b 100644
--- a/src/execution/expression_executor/execute_cse.cpp
+++ b/src/execution/expression_executor/execute_cse.cpp
@@ -1,6 +1,6 @@
-#include "common/vector_operations/vector_operations.hpp"
-#include "execution/expression_executor.hpp"
-#include "planner/expression/common_subexpression.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
+#include "duckdb/execution/expression_executor.hpp"
+#include "duckdb/planner/expression/common_subexpression.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/expression_executor/execute_function.cpp b/src/execution/expression_executor/execute_function.cpp
index 9435e12eca2..b0f664b330e 100644
--- a/src/execution/expression_executor/execute_function.cpp
+++ b/src/execution/expression_executor/execute_function.cpp
@@ -1,7 +1,7 @@
-#include "catalog/catalog_entry/scalar_function_catalog_entry.hpp"
-#include "common/vector_operations/vector_operations.hpp"
-#include "execution/expression_executor.hpp"
-#include "planner/expression/bound_function_expression.hpp"
+#include "duckdb/catalog/catalog_entry/scalar_function_catalog_entry.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
+#include "duckdb/execution/expression_executor.hpp"
+#include "duckdb/planner/expression/bound_function_expression.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/expression_executor/execute_operator.cpp b/src/execution/expression_executor/execute_operator.cpp
index d8ee5736f48..7a7dcfbc5b3 100644
--- a/src/execution/expression_executor/execute_operator.cpp
+++ b/src/execution/expression_executor/execute_operator.cpp
@@ -1,6 +1,6 @@
-#include "common/vector_operations/vector_operations.hpp"
-#include "execution/expression_executor.hpp"
-#include "planner/expression/bound_operator_expression.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
+#include "duckdb/execution/expression_executor.hpp"
+#include "duckdb/planner/expression/bound_operator_expression.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/expression_executor/execute_parameter.cpp b/src/execution/expression_executor/execute_parameter.cpp
index c007407400a..31c07cd2552 100644
--- a/src/execution/expression_executor/execute_parameter.cpp
+++ b/src/execution/expression_executor/execute_parameter.cpp
@@ -1,6 +1,6 @@
-#include "common/vector_operations/vector_operations.hpp"
-#include "execution/expression_executor.hpp"
-#include "planner/expression/bound_parameter_expression.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
+#include "duckdb/execution/expression_executor.hpp"
+#include "duckdb/planner/expression/bound_parameter_expression.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/index/art/art.cpp b/src/execution/index/art/art.cpp
index bc764eca1d2..45567bdd015 100644
--- a/src/execution/index/art/art.cpp
+++ b/src/execution/index/art/art.cpp
@@ -1,7 +1,7 @@
-#include "execution/index/art/art.hpp"
-#include "execution/expression_executor.hpp"
-#include "common/vector_operations/vector_operations.hpp"
-#include "main/client_context.hpp"
+#include "duckdb/execution/index/art/art.hpp"
+#include "duckdb/execution/expression_executor.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
+#include "duckdb/main/client_context.hpp"
 #include <algorithm>
 
 using namespace duckdb;
diff --git a/src/execution/index/art/art_key.cpp b/src/execution/index/art/art_key.cpp
index 329fcbef38f..4080620c3e7 100644
--- a/src/execution/index/art/art_key.cpp
+++ b/src/execution/index/art/art_key.cpp
@@ -1,5 +1,5 @@
-#include "execution/index/art/art_key.hpp"
-#include "execution/index/art/art.hpp"
+#include "duckdb/execution/index/art/art_key.hpp"
+#include "duckdb/execution/index/art/art.hpp"
 
 using namespace duckdb;
 
diff --git a/src/execution/index/art/leaf.cpp b/src/execution/index/art/leaf.cpp
index b226d476858..b0964b2c411 100644
--- a/src/execution/index/art/leaf.cpp
+++ b/src/execution/index/art/leaf.cpp
@@ -1,5 +1,5 @@
-#include "execution/index/art/node.hpp"
-#include "execution/index/art/leaf.hpp"
+#include "duckdb/execution/index/art/node.hpp"
+#include "duckdb/execution/index/art/leaf.hpp"
 
 Leaf::Leaf(ART &art, unique_ptr<Key> value, row_t row_id) : Node(art, NodeType::NLeaf) {
 	this->value = move(value);
diff --git a/src/execution/index/art/node.cpp b/src/execution/index/art/node.cpp
index 67dcfb6c020..d343080766e 100644
--- a/src/execution/index/art/node.cpp
+++ b/src/execution/index/art/node.cpp
@@ -1,6 +1,6 @@
-#include "execution/index/art/node.hpp"
-#include "execution/index/art/art.hpp"
-#include "common/exception.hpp"
+#include "duckdb/execution/index/art/node.hpp"
+#include "duckdb/execution/index/art/art.hpp"
+#include "duckdb/common/exception.hpp"
 
 using namespace duckdb;
 
diff --git a/src/execution/index/art/node16.cpp b/src/execution/index/art/node16.cpp
index 3f3dc5262cc..146ed67fa99 100644
--- a/src/execution/index/art/node16.cpp
+++ b/src/execution/index/art/node16.cpp
@@ -1,6 +1,6 @@
-#include "execution/index/art/node4.hpp"
-#include "execution/index/art/node16.hpp"
-#include "execution/index/art/node48.hpp"
+#include "duckdb/execution/index/art/node4.hpp"
+#include "duckdb/execution/index/art/node16.hpp"
+#include "duckdb/execution/index/art/node48.hpp"
 
 using namespace duckdb;
 
diff --git a/src/execution/index/art/node256.cpp b/src/execution/index/art/node256.cpp
index 6a53b8e1b2a..a17ae837eee 100644
--- a/src/execution/index/art/node256.cpp
+++ b/src/execution/index/art/node256.cpp
@@ -1,5 +1,5 @@
-#include "execution/index/art/node48.hpp"
-#include "execution/index/art/node256.hpp"
+#include "duckdb/execution/index/art/node48.hpp"
+#include "duckdb/execution/index/art/node256.hpp"
 
 using namespace duckdb;
 
diff --git a/src/execution/index/art/node4.cpp b/src/execution/index/art/node4.cpp
index d0978e1a11b..47ad08cb091 100644
--- a/src/execution/index/art/node4.cpp
+++ b/src/execution/index/art/node4.cpp
@@ -1,6 +1,6 @@
-#include "execution/index/art/node4.hpp"
-#include "execution/index/art/node16.hpp"
-#include "execution/index/art/art.hpp"
+#include "duckdb/execution/index/art/node4.hpp"
+#include "duckdb/execution/index/art/node16.hpp"
+#include "duckdb/execution/index/art/art.hpp"
 
 using namespace duckdb;
 
diff --git a/src/execution/index/art/node48.cpp b/src/execution/index/art/node48.cpp
index c613585fe98..b07cafbea36 100644
--- a/src/execution/index/art/node48.cpp
+++ b/src/execution/index/art/node48.cpp
@@ -1,6 +1,6 @@
-#include "execution/index/art/node16.hpp"
-#include "execution/index/art/node48.hpp"
-#include "execution/index/art/node256.hpp"
+#include "duckdb/execution/index/art/node16.hpp"
+#include "duckdb/execution/index/art/node48.hpp"
+#include "duckdb/execution/index/art/node256.hpp"
 
 using namespace duckdb;
 
diff --git a/src/execution/join_hashtable.cpp b/src/execution/join_hashtable.cpp
index 31e8cfb214b..e2459442895 100644
--- a/src/execution/join_hashtable.cpp
+++ b/src/execution/join_hashtable.cpp
@@ -1,9 +1,9 @@
-#include "execution/join_hashtable.hpp"
+#include "duckdb/execution/join_hashtable.hpp"
 
-#include "common/exception.hpp"
-#include "common/types/null_value.hpp"
-#include "common/types/static_vector.hpp"
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/common/types/null_value.hpp"
+#include "duckdb/common/types/static_vector.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/merge_join/merge_join.cpp b/src/execution/merge_join/merge_join.cpp
index ce96a78607e..a2a220aebc6 100644
--- a/src/execution/merge_join/merge_join.cpp
+++ b/src/execution/merge_join/merge_join.cpp
@@ -1,6 +1,6 @@
-#include "execution/merge_join.hpp"
+#include "duckdb/execution/merge_join.hpp"
 
-#include "parser/expression/comparison_expression.hpp"
+#include "duckdb/parser/expression/comparison_expression.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/merge_join/merge_join_inner.cpp b/src/execution/merge_join/merge_join_inner.cpp
index a9193091ded..6a5ae6aca6b 100644
--- a/src/execution/merge_join/merge_join_inner.cpp
+++ b/src/execution/merge_join/merge_join_inner.cpp
@@ -1,7 +1,7 @@
-#include "common/operator/comparison_operators.hpp"
-#include "common/vector_operations/vector_operations.hpp"
-#include "execution/merge_join.hpp"
-#include "parser/expression/comparison_expression.hpp"
+#include "duckdb/common/operator/comparison_operators.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
+#include "duckdb/execution/merge_join.hpp"
+#include "duckdb/parser/expression/comparison_expression.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/merge_join/merge_join_mark.cpp b/src/execution/merge_join/merge_join_mark.cpp
index c0edb9ee7b5..a9af9adcc3a 100644
--- a/src/execution/merge_join/merge_join_mark.cpp
+++ b/src/execution/merge_join/merge_join_mark.cpp
@@ -1,7 +1,7 @@
-#include "common/operator/comparison_operators.hpp"
-#include "common/vector_operations/vector_operations.hpp"
-#include "execution/merge_join.hpp"
-#include "parser/expression/comparison_expression.hpp"
+#include "duckdb/common/operator/comparison_operators.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
+#include "duckdb/execution/merge_join.hpp"
+#include "duckdb/parser/expression/comparison_expression.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/nested_loop_join/nested_loop_join_inner.cpp b/src/execution/nested_loop_join/nested_loop_join_inner.cpp
index 5be4a53d0a9..39e0d8879a2 100644
--- a/src/execution/nested_loop_join/nested_loop_join_inner.cpp
+++ b/src/execution/nested_loop_join/nested_loop_join_inner.cpp
@@ -1,5 +1,5 @@
-#include "common/operator/comparison_operators.hpp"
-#include "execution/nested_loop_join.hpp"
+#include "duckdb/common/operator/comparison_operators.hpp"
+#include "duckdb/execution/nested_loop_join.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/nested_loop_join/nested_loop_join_mark.cpp b/src/execution/nested_loop_join/nested_loop_join_mark.cpp
index e5f4599c236..653d198d749 100644
--- a/src/execution/nested_loop_join/nested_loop_join_mark.cpp
+++ b/src/execution/nested_loop_join/nested_loop_join_mark.cpp
@@ -1,6 +1,6 @@
-#include "common/operator/comparison_operators.hpp"
-#include "common/vector_operations/vector_operations.hpp"
-#include "execution/nested_loop_join.hpp"
+#include "duckdb/common/operator/comparison_operators.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
+#include "duckdb/execution/nested_loop_join.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/operator/aggregate/physical_hash_aggregate.cpp b/src/execution/operator/aggregate/physical_hash_aggregate.cpp
index 9d6f33e3a0b..f25bb0f792b 100644
--- a/src/execution/operator/aggregate/physical_hash_aggregate.cpp
+++ b/src/execution/operator/aggregate/physical_hash_aggregate.cpp
@@ -1,10 +1,10 @@
-#include "execution/operator/aggregate/physical_hash_aggregate.hpp"
+#include "duckdb/execution/operator/aggregate/physical_hash_aggregate.hpp"
 
-#include "common/vector_operations/vector_operations.hpp"
-#include "execution/expression_executor.hpp"
-#include "planner/expression/bound_aggregate_expression.hpp"
-#include "planner/expression/bound_constant_expression.hpp"
-#include "catalog/catalog_entry/aggregate_function_catalog_entry.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
+#include "duckdb/execution/expression_executor.hpp"
+#include "duckdb/planner/expression/bound_aggregate_expression.hpp"
+#include "duckdb/planner/expression/bound_constant_expression.hpp"
+#include "duckdb/catalog/catalog_entry/aggregate_function_catalog_entry.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/operator/aggregate/physical_simple_aggregate.cpp b/src/execution/operator/aggregate/physical_simple_aggregate.cpp
index 61dfa946910..fda12417e5d 100644
--- a/src/execution/operator/aggregate/physical_simple_aggregate.cpp
+++ b/src/execution/operator/aggregate/physical_simple_aggregate.cpp
@@ -1,9 +1,9 @@
-#include "execution/operator/aggregate/physical_simple_aggregate.hpp"
+#include "duckdb/execution/operator/aggregate/physical_simple_aggregate.hpp"
 
-#include "common/vector_operations/vector_operations.hpp"
-#include "execution/expression_executor.hpp"
-#include "planner/expression/bound_aggregate_expression.hpp"
-#include "catalog/catalog_entry/aggregate_function_catalog_entry.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
+#include "duckdb/execution/expression_executor.hpp"
+#include "duckdb/planner/expression/bound_aggregate_expression.hpp"
+#include "duckdb/catalog/catalog_entry/aggregate_function_catalog_entry.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/operator/aggregate/physical_window.cpp b/src/execution/operator/aggregate/physical_window.cpp
index d4e96c7ed74..3afd2eceeb8 100644
--- a/src/execution/operator/aggregate/physical_window.cpp
+++ b/src/execution/operator/aggregate/physical_window.cpp
@@ -1,12 +1,12 @@
-#include "execution/operator/aggregate/physical_window.hpp"
-
-#include "common/types/chunk_collection.hpp"
-#include "common/types/constant_vector.hpp"
-#include "common/vector_operations/vector_operations.hpp"
-#include "execution/expression_executor.hpp"
-#include "execution/window_segment_tree.hpp"
-#include "planner/expression/bound_reference_expression.hpp"
-#include "planner/expression/bound_window_expression.hpp"
+#include "duckdb/execution/operator/aggregate/physical_window.hpp"
+
+#include "duckdb/common/types/chunk_collection.hpp"
+#include "duckdb/common/types/constant_vector.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
+#include "duckdb/execution/expression_executor.hpp"
+#include "duckdb/execution/window_segment_tree.hpp"
+#include "duckdb/planner/expression/bound_reference_expression.hpp"
+#include "duckdb/planner/expression/bound_window_expression.hpp"
 
 #include <cmath>
 
diff --git a/src/execution/operator/filter/physical_filter.cpp b/src/execution/operator/filter/physical_filter.cpp
index e91f284b65e..816b3570f9e 100644
--- a/src/execution/operator/filter/physical_filter.cpp
+++ b/src/execution/operator/filter/physical_filter.cpp
@@ -1,6 +1,6 @@
-#include "execution/operator/filter/physical_filter.hpp"
+#include "duckdb/execution/operator/filter/physical_filter.hpp"
 
-#include "execution/expression_executor.hpp"
+#include "duckdb/execution/expression_executor.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/operator/helper/physical_execute.cpp b/src/execution/operator/helper/physical_execute.cpp
index 47665ddce92..64211d045b7 100644
--- a/src/execution/operator/helper/physical_execute.cpp
+++ b/src/execution/operator/helper/physical_execute.cpp
@@ -1,4 +1,4 @@
-#include "execution/operator/helper/physical_execute.hpp"
+#include "duckdb/execution/operator/helper/physical_execute.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/operator/helper/physical_limit.cpp b/src/execution/operator/helper/physical_limit.cpp
index 082a433fe34..7307ce518e3 100644
--- a/src/execution/operator/helper/physical_limit.cpp
+++ b/src/execution/operator/helper/physical_limit.cpp
@@ -1,4 +1,4 @@
-#include "execution/operator/helper/physical_limit.hpp"
+#include "duckdb/execution/operator/helper/physical_limit.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/operator/helper/physical_prune_columns.cpp b/src/execution/operator/helper/physical_prune_columns.cpp
index 223a25a35bf..b48ddc4a376 100644
--- a/src/execution/operator/helper/physical_prune_columns.cpp
+++ b/src/execution/operator/helper/physical_prune_columns.cpp
@@ -1,6 +1,6 @@
-#include "execution/operator/helper/physical_prune_columns.hpp"
+#include "duckdb/execution/operator/helper/physical_prune_columns.hpp"
 
-#include "execution/expression_executor.hpp"
+#include "duckdb/execution/expression_executor.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/operator/join/physical_blockwise_nl_join.cpp b/src/execution/operator/join/physical_blockwise_nl_join.cpp
index 310e467908c..928074bc355 100644
--- a/src/execution/operator/join/physical_blockwise_nl_join.cpp
+++ b/src/execution/operator/join/physical_blockwise_nl_join.cpp
@@ -1,8 +1,8 @@
-#include "execution/operator/join/physical_blockwise_nl_join.hpp"
+#include "duckdb/execution/operator/join/physical_blockwise_nl_join.hpp"
 
-#include "common/types/static_vector.hpp"
-#include "common/vector_operations/vector_operations.hpp"
-#include "execution/expression_executor.hpp"
+#include "duckdb/common/types/static_vector.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
+#include "duckdb/execution/expression_executor.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/operator/join/physical_comparison_join.cpp b/src/execution/operator/join/physical_comparison_join.cpp
index be4a93d55d3..e56a6a4e71d 100644
--- a/src/execution/operator/join/physical_comparison_join.cpp
+++ b/src/execution/operator/join/physical_comparison_join.cpp
@@ -1,4 +1,4 @@
-#include "execution/operator/join/physical_comparison_join.hpp"
+#include "duckdb/execution/operator/join/physical_comparison_join.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/operator/join/physical_cross_product.cpp b/src/execution/operator/join/physical_cross_product.cpp
index de13301b336..897eb84b9b5 100644
--- a/src/execution/operator/join/physical_cross_product.cpp
+++ b/src/execution/operator/join/physical_cross_product.cpp
@@ -1,6 +1,6 @@
-#include "execution/operator/join/physical_cross_product.hpp"
+#include "duckdb/execution/operator/join/physical_cross_product.hpp"
 
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/operator/join/physical_delim_join.cpp b/src/execution/operator/join/physical_delim_join.cpp
index ffabce4f56d..2b3f67ffe4f 100644
--- a/src/execution/operator/join/physical_delim_join.cpp
+++ b/src/execution/operator/join/physical_delim_join.cpp
@@ -1,7 +1,7 @@
-#include "execution/operator/join/physical_delim_join.hpp"
+#include "duckdb/execution/operator/join/physical_delim_join.hpp"
 
-#include "common/vector_operations/vector_operations.hpp"
-#include "execution/operator/scan/physical_chunk_scan.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
+#include "duckdb/execution/operator/scan/physical_chunk_scan.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/operator/join/physical_hash_join.cpp b/src/execution/operator/join/physical_hash_join.cpp
index b19793b9a3c..2cd9b9b9edc 100644
--- a/src/execution/operator/join/physical_hash_join.cpp
+++ b/src/execution/operator/join/physical_hash_join.cpp
@@ -1,7 +1,7 @@
-#include "execution/operator/join/physical_hash_join.hpp"
+#include "duckdb/execution/operator/join/physical_hash_join.hpp"
 
-#include "common/vector_operations/vector_operations.hpp"
-#include "execution/expression_executor.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
+#include "duckdb/execution/expression_executor.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/operator/join/physical_join.cpp b/src/execution/operator/join/physical_join.cpp
index b72245621aa..d4a4dc6c56d 100644
--- a/src/execution/operator/join/physical_join.cpp
+++ b/src/execution/operator/join/physical_join.cpp
@@ -1,4 +1,4 @@
-#include "execution/operator/join/physical_join.hpp"
+#include "duckdb/execution/operator/join/physical_join.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/operator/join/physical_nested_loop_join.cpp b/src/execution/operator/join/physical_nested_loop_join.cpp
index 3b06283bb1a..b080eca7e63 100644
--- a/src/execution/operator/join/physical_nested_loop_join.cpp
+++ b/src/execution/operator/join/physical_nested_loop_join.cpp
@@ -1,11 +1,11 @@
-#include "execution/operator/join/physical_nested_loop_join.hpp"
+#include "duckdb/execution/operator/join/physical_nested_loop_join.hpp"
 
-#include "common/operator/comparison_operators.hpp"
-#include "common/types/constant_vector.hpp"
-#include "common/types/static_vector.hpp"
-#include "common/vector_operations/vector_operations.hpp"
-#include "execution/expression_executor.hpp"
-#include "execution/nested_loop_join.hpp"
+#include "duckdb/common/operator/comparison_operators.hpp"
+#include "duckdb/common/types/constant_vector.hpp"
+#include "duckdb/common/types/static_vector.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
+#include "duckdb/execution/expression_executor.hpp"
+#include "duckdb/execution/nested_loop_join.hpp"
 
 using namespace std;
 
diff --git a/src/execution/operator/join/physical_piecewise_merge_join.cpp b/src/execution/operator/join/physical_piecewise_merge_join.cpp
index ae9eccaf845..f32fd93cd1a 100644
--- a/src/execution/operator/join/physical_piecewise_merge_join.cpp
+++ b/src/execution/operator/join/physical_piecewise_merge_join.cpp
@@ -1,8 +1,8 @@
-#include "execution/operator/join/physical_piecewise_merge_join.hpp"
+#include "duckdb/execution/operator/join/physical_piecewise_merge_join.hpp"
 
-#include "common/vector_operations/vector_operations.hpp"
-#include "execution/expression_executor.hpp"
-#include "execution/merge_join.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
+#include "duckdb/execution/expression_executor.hpp"
+#include "duckdb/execution/merge_join.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/operator/order/physical_order.cpp b/src/execution/operator/order/physical_order.cpp
index 827ac6714e9..87d40facc09 100644
--- a/src/execution/operator/order/physical_order.cpp
+++ b/src/execution/operator/order/physical_order.cpp
@@ -1,10 +1,10 @@
-#include "execution/operator/order/physical_order.hpp"
+#include "duckdb/execution/operator/order/physical_order.hpp"
 
-#include "common/assert.hpp"
-#include "common/value_operations/value_operations.hpp"
-#include "common/vector_operations/vector_operations.hpp"
-#include "execution/expression_executor.hpp"
-#include "storage/data_table.hpp"
+#include "duckdb/common/assert.hpp"
+#include "duckdb/common/value_operations/value_operations.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
+#include "duckdb/execution/expression_executor.hpp"
+#include "duckdb/storage/data_table.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/operator/order/physical_top_n.cpp b/src/execution/operator/order/physical_top_n.cpp
index 0b8f3ea1847..6f8e29a8391 100644
--- a/src/execution/operator/order/physical_top_n.cpp
+++ b/src/execution/operator/order/physical_top_n.cpp
@@ -1,10 +1,10 @@
-#include "execution/operator/order/physical_top_n.hpp"
+#include "duckdb/execution/operator/order/physical_top_n.hpp"
 
-#include "common/assert.hpp"
-#include "common/value_operations/value_operations.hpp"
-#include "common/vector_operations/vector_operations.hpp"
-#include "execution/expression_executor.hpp"
-#include "storage/data_table.hpp"
+#include "duckdb/common/assert.hpp"
+#include "duckdb/common/value_operations/value_operations.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
+#include "duckdb/execution/expression_executor.hpp"
+#include "duckdb/storage/data_table.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/operator/persistent/buffered_csv_reader.cpp b/src/execution/operator/persistent/buffered_csv_reader.cpp
index e99ad31fe18..621652a6630 100644
--- a/src/execution/operator/persistent/buffered_csv_reader.cpp
+++ b/src/execution/operator/persistent/buffered_csv_reader.cpp
@@ -1,11 +1,11 @@
-#include "execution/operator/persistent/buffered_csv_reader.hpp"
-#include "execution/operator/persistent/physical_copy_from_file.hpp"
-
-#include "catalog/catalog_entry/table_catalog_entry.hpp"
-#include "common/vector_operations/vector_operations.hpp"
-#include "main/database.hpp"
-#include "storage/data_table.hpp"
-#include "parser/column_definition.hpp"
+#include "duckdb/execution/operator/persistent/buffered_csv_reader.hpp"
+#include "duckdb/execution/operator/persistent/physical_copy_from_file.hpp"
+
+#include "duckdb/catalog/catalog_entry/table_catalog_entry.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
+#include "duckdb/main/database.hpp"
+#include "duckdb/storage/data_table.hpp"
+#include "duckdb/parser/column_definition.hpp"
 
 #include <algorithm>
 #include <fstream>
diff --git a/src/execution/operator/persistent/physical_copy_from_file.cpp b/src/execution/operator/persistent/physical_copy_from_file.cpp
index 7f606f48618..4616d8139a3 100644
--- a/src/execution/operator/persistent/physical_copy_from_file.cpp
+++ b/src/execution/operator/persistent/physical_copy_from_file.cpp
@@ -1,10 +1,10 @@
-#include "execution/operator/persistent/physical_copy_from_file.hpp"
+#include "duckdb/execution/operator/persistent/physical_copy_from_file.hpp"
 
-#include "catalog/catalog_entry/table_catalog_entry.hpp"
-#include "common/file_system.hpp"
-#include "common/gzip_stream.hpp"
-#include "main/client_context.hpp"
-#include "main/database.hpp"
+#include "duckdb/catalog/catalog_entry/table_catalog_entry.hpp"
+#include "duckdb/common/file_system.hpp"
+#include "duckdb/common/gzip_stream.hpp"
+#include "duckdb/main/client_context.hpp"
+#include "duckdb/main/database.hpp"
 
 #include <algorithm>
 #include <fstream>
diff --git a/src/execution/operator/persistent/physical_copy_to_file.cpp b/src/execution/operator/persistent/physical_copy_to_file.cpp
index 4df37a93b46..634b099c5d8 100644
--- a/src/execution/operator/persistent/physical_copy_to_file.cpp
+++ b/src/execution/operator/persistent/physical_copy_to_file.cpp
@@ -1,5 +1,5 @@
-#include "execution/operator/persistent/physical_copy_to_file.hpp"
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/execution/operator/persistent/physical_copy_to_file.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 
 #include <algorithm>
 #include <fstream>
diff --git a/src/execution/operator/persistent/physical_delete.cpp b/src/execution/operator/persistent/physical_delete.cpp
index 84cf02acc24..126550fb1e4 100644
--- a/src/execution/operator/persistent/physical_delete.cpp
+++ b/src/execution/operator/persistent/physical_delete.cpp
@@ -1,8 +1,8 @@
-#include "execution/operator/persistent/physical_delete.hpp"
+#include "duckdb/execution/operator/persistent/physical_delete.hpp"
 
-#include "execution/expression_executor.hpp"
-#include "main/client_context.hpp"
-#include "storage/data_table.hpp"
+#include "duckdb/execution/expression_executor.hpp"
+#include "duckdb/main/client_context.hpp"
+#include "duckdb/storage/data_table.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/operator/persistent/physical_insert.cpp b/src/execution/operator/persistent/physical_insert.cpp
index 95b3f3d8a50..3cd65fc2cca 100644
--- a/src/execution/operator/persistent/physical_insert.cpp
+++ b/src/execution/operator/persistent/physical_insert.cpp
@@ -1,11 +1,11 @@
-#include "execution/operator/persistent/physical_insert.hpp"
+#include "duckdb/execution/operator/persistent/physical_insert.hpp"
 
-#include "catalog/catalog_entry/table_catalog_entry.hpp"
-#include "common/types/chunk_collection.hpp"
-#include "common/vector_operations/vector_operations.hpp"
-#include "execution/expression_executor.hpp"
-#include "main/client_context.hpp"
-#include "storage/data_table.hpp"
+#include "duckdb/catalog/catalog_entry/table_catalog_entry.hpp"
+#include "duckdb/common/types/chunk_collection.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
+#include "duckdb/execution/expression_executor.hpp"
+#include "duckdb/main/client_context.hpp"
+#include "duckdb/storage/data_table.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/operator/persistent/physical_update.cpp b/src/execution/operator/persistent/physical_update.cpp
index 2fd1dff9977..f3f6b598c87 100644
--- a/src/execution/operator/persistent/physical_update.cpp
+++ b/src/execution/operator/persistent/physical_update.cpp
@@ -1,11 +1,11 @@
-#include "execution/operator/persistent/physical_update.hpp"
+#include "duckdb/execution/operator/persistent/physical_update.hpp"
 
-#include "catalog/catalog_entry/table_catalog_entry.hpp"
-#include "common/vector_operations/vector_operations.hpp"
-#include "execution/expression_executor.hpp"
-#include "main/client_context.hpp"
-#include "planner/expression/bound_reference_expression.hpp"
-#include "storage/data_table.hpp"
+#include "duckdb/catalog/catalog_entry/table_catalog_entry.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
+#include "duckdb/execution/expression_executor.hpp"
+#include "duckdb/main/client_context.hpp"
+#include "duckdb/planner/expression/bound_reference_expression.hpp"
+#include "duckdb/storage/data_table.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/operator/projection/physical_projection.cpp b/src/execution/operator/projection/physical_projection.cpp
index d47a7386739..b2e116e497a 100644
--- a/src/execution/operator/projection/physical_projection.cpp
+++ b/src/execution/operator/projection/physical_projection.cpp
@@ -1,6 +1,6 @@
-#include "execution/operator/projection/physical_projection.hpp"
+#include "duckdb/execution/operator/projection/physical_projection.hpp"
 
-#include "execution/expression_executor.hpp"
+#include "duckdb/execution/expression_executor.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/operator/scan/physical_chunk_scan.cpp b/src/execution/operator/scan/physical_chunk_scan.cpp
index 37b5d2556ac..fedb2b57f91 100644
--- a/src/execution/operator/scan/physical_chunk_scan.cpp
+++ b/src/execution/operator/scan/physical_chunk_scan.cpp
@@ -1,4 +1,4 @@
-#include "execution/operator/scan/physical_chunk_scan.hpp"
+#include "duckdb/execution/operator/scan/physical_chunk_scan.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/operator/scan/physical_dummy_scan.cpp b/src/execution/operator/scan/physical_dummy_scan.cpp
index cb3a0b99d5a..c81260a7be5 100644
--- a/src/execution/operator/scan/physical_dummy_scan.cpp
+++ b/src/execution/operator/scan/physical_dummy_scan.cpp
@@ -1,4 +1,4 @@
-#include "execution/operator/scan/physical_dummy_scan.hpp"
+#include "duckdb/execution/operator/scan/physical_dummy_scan.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/operator/scan/physical_empty_result.cpp b/src/execution/operator/scan/physical_empty_result.cpp
index 0d67092b73a..b8baf2bd398 100644
--- a/src/execution/operator/scan/physical_empty_result.cpp
+++ b/src/execution/operator/scan/physical_empty_result.cpp
@@ -1,4 +1,4 @@
-#include "execution/operator/scan/physical_empty_result.hpp"
+#include "duckdb/execution/operator/scan/physical_empty_result.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/operator/scan/physical_expression_scan.cpp b/src/execution/operator/scan/physical_expression_scan.cpp
index a04f34c7d9b..298c37ca613 100644
--- a/src/execution/operator/scan/physical_expression_scan.cpp
+++ b/src/execution/operator/scan/physical_expression_scan.cpp
@@ -1,6 +1,6 @@
-#include "execution/operator/scan/physical_expression_scan.hpp"
+#include "duckdb/execution/operator/scan/physical_expression_scan.hpp"
 
-#include "execution/expression_executor.hpp"
+#include "duckdb/execution/expression_executor.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/operator/scan/physical_index_scan.cpp b/src/execution/operator/scan/physical_index_scan.cpp
index f4d3a6178f7..5d0d669de0c 100644
--- a/src/execution/operator/scan/physical_index_scan.cpp
+++ b/src/execution/operator/scan/physical_index_scan.cpp
@@ -1,7 +1,7 @@
-#include "execution/operator/scan/physical_index_scan.hpp"
+#include "duckdb/execution/operator/scan/physical_index_scan.hpp"
 
-#include "catalog/catalog_entry/table_catalog_entry.hpp"
-#include "main/client_context.hpp"
+#include "duckdb/catalog/catalog_entry/table_catalog_entry.hpp"
+#include "duckdb/main/client_context.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/operator/scan/physical_table_function.cpp b/src/execution/operator/scan/physical_table_function.cpp
index 2be89a3d57c..141b79d5a27 100644
--- a/src/execution/operator/scan/physical_table_function.cpp
+++ b/src/execution/operator/scan/physical_table_function.cpp
@@ -1,10 +1,10 @@
-#include "execution/operator/scan/physical_table_function.hpp"
+#include "duckdb/execution/operator/scan/physical_table_function.hpp"
 
-#include "catalog/catalog_entry/schema_catalog_entry.hpp"
-#include "catalog/catalog_entry/table_function_catalog_entry.hpp"
-#include "execution/expression_executor.hpp"
-#include "main/client_context.hpp"
-#include "planner/expression/bound_function_expression.hpp"
+#include "duckdb/catalog/catalog_entry/schema_catalog_entry.hpp"
+#include "duckdb/catalog/catalog_entry/table_function_catalog_entry.hpp"
+#include "duckdb/execution/expression_executor.hpp"
+#include "duckdb/main/client_context.hpp"
+#include "duckdb/planner/expression/bound_function_expression.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/operator/scan/physical_table_scan.cpp b/src/execution/operator/scan/physical_table_scan.cpp
index 594365a2e89..ebe5fa00868 100644
--- a/src/execution/operator/scan/physical_table_scan.cpp
+++ b/src/execution/operator/scan/physical_table_scan.cpp
@@ -1,7 +1,7 @@
-#include "execution/operator/scan/physical_table_scan.hpp"
+#include "duckdb/execution/operator/scan/physical_table_scan.hpp"
 
-#include "catalog/catalog_entry/table_catalog_entry.hpp"
-#include "main/client_context.hpp"
+#include "duckdb/catalog/catalog_entry/table_catalog_entry.hpp"
+#include "duckdb/main/client_context.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/operator/schema/physical_create_index.cpp b/src/execution/operator/schema/physical_create_index.cpp
index 35fbe0c7557..17a89389058 100644
--- a/src/execution/operator/schema/physical_create_index.cpp
+++ b/src/execution/operator/schema/physical_create_index.cpp
@@ -1,9 +1,9 @@
-#include "execution/operator/schema/physical_create_index.hpp"
+#include "duckdb/execution/operator/schema/physical_create_index.hpp"
 
-#include "catalog/catalog_entry/schema_catalog_entry.hpp"
-#include "catalog/catalog_entry/table_catalog_entry.hpp"
-#include "execution/expression_executor.hpp"
-#include "main/client_context.hpp"
+#include "duckdb/catalog/catalog_entry/schema_catalog_entry.hpp"
+#include "duckdb/catalog/catalog_entry/table_catalog_entry.hpp"
+#include "duckdb/execution/expression_executor.hpp"
+#include "duckdb/main/client_context.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/operator/schema/physical_create_table.cpp b/src/execution/operator/schema/physical_create_table.cpp
index 7939aefdec6..f531355fdab 100644
--- a/src/execution/operator/schema/physical_create_table.cpp
+++ b/src/execution/operator/schema/physical_create_table.cpp
@@ -1,10 +1,10 @@
-#include "execution/operator/schema/physical_create_table.hpp"
+#include "duckdb/execution/operator/schema/physical_create_table.hpp"
 
-#include "catalog/catalog_entry/schema_catalog_entry.hpp"
-#include "catalog/catalog_entry/table_catalog_entry.hpp"
-#include "execution/expression_executor.hpp"
-#include "main/client_context.hpp"
-#include "storage/data_table.hpp"
+#include "duckdb/catalog/catalog_entry/schema_catalog_entry.hpp"
+#include "duckdb/catalog/catalog_entry/table_catalog_entry.hpp"
+#include "duckdb/execution/expression_executor.hpp"
+#include "duckdb/main/client_context.hpp"
+#include "duckdb/storage/data_table.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/operator/set/physical_union.cpp b/src/execution/operator/set/physical_union.cpp
index b7dcfd4d29a..5c71c196350 100644
--- a/src/execution/operator/set/physical_union.cpp
+++ b/src/execution/operator/set/physical_union.cpp
@@ -1,6 +1,6 @@
-#include "execution/operator/set/physical_union.hpp"
+#include "duckdb/execution/operator/set/physical_union.hpp"
 
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/physical_operator.cpp b/src/execution/physical_operator.cpp
index ce2c9a98d53..3b6bddfb1bd 100644
--- a/src/execution/physical_operator.cpp
+++ b/src/execution/physical_operator.cpp
@@ -1,7 +1,7 @@
-#include "execution/physical_operator.hpp"
+#include "duckdb/execution/physical_operator.hpp"
 
-#include "common/string_util.hpp"
-#include "main/client_context.hpp"
+#include "duckdb/common/string_util.hpp"
+#include "duckdb/main/client_context.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/physical_plan/plan_aggregate.cpp b/src/execution/physical_plan/plan_aggregate.cpp
index 1e350cd2394..beec2b11b4d 100644
--- a/src/execution/physical_plan/plan_aggregate.cpp
+++ b/src/execution/physical_plan/plan_aggregate.cpp
@@ -1,9 +1,9 @@
-#include "execution/operator/aggregate/physical_hash_aggregate.hpp"
-#include "execution/operator/aggregate/physical_simple_aggregate.hpp"
-#include "execution/physical_plan_generator.hpp"
-#include "catalog/catalog_entry/aggregate_function_catalog_entry.hpp"
-#include "planner/expression/bound_aggregate_expression.hpp"
-#include "planner/operator/logical_aggregate.hpp"
+#include "duckdb/execution/operator/aggregate/physical_hash_aggregate.hpp"
+#include "duckdb/execution/operator/aggregate/physical_simple_aggregate.hpp"
+#include "duckdb/execution/physical_plan_generator.hpp"
+#include "duckdb/catalog/catalog_entry/aggregate_function_catalog_entry.hpp"
+#include "duckdb/planner/expression/bound_aggregate_expression.hpp"
+#include "duckdb/planner/operator/logical_aggregate.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/physical_plan/plan_any_join.cpp b/src/execution/physical_plan/plan_any_join.cpp
index e0396edd532..8f18b336234 100644
--- a/src/execution/physical_plan/plan_any_join.cpp
+++ b/src/execution/physical_plan/plan_any_join.cpp
@@ -1,6 +1,6 @@
-#include "execution/operator/join/physical_blockwise_nl_join.hpp"
-#include "execution/physical_plan_generator.hpp"
-#include "planner/operator/logical_any_join.hpp"
+#include "duckdb/execution/operator/join/physical_blockwise_nl_join.hpp"
+#include "duckdb/execution/physical_plan_generator.hpp"
+#include "duckdb/planner/operator/logical_any_join.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/physical_plan/plan_chunk_get.cpp b/src/execution/physical_plan/plan_chunk_get.cpp
index 0a1c30e41b7..b1fe5fe1144 100644
--- a/src/execution/physical_plan/plan_chunk_get.cpp
+++ b/src/execution/physical_plan/plan_chunk_get.cpp
@@ -1,6 +1,6 @@
-#include "execution/operator/scan/physical_chunk_scan.hpp"
-#include "execution/physical_plan_generator.hpp"
-#include "planner/operator/logical_chunk_get.hpp"
+#include "duckdb/execution/operator/scan/physical_chunk_scan.hpp"
+#include "duckdb/execution/physical_plan_generator.hpp"
+#include "duckdb/planner/operator/logical_chunk_get.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/physical_plan/plan_comparison_join.cpp b/src/execution/physical_plan/plan_comparison_join.cpp
index a228a36a146..94271a509f5 100644
--- a/src/execution/physical_plan/plan_comparison_join.cpp
+++ b/src/execution/physical_plan/plan_comparison_join.cpp
@@ -1,9 +1,9 @@
-#include "execution/operator/join/physical_cross_product.hpp"
-#include "execution/operator/join/physical_hash_join.hpp"
-#include "execution/operator/join/physical_nested_loop_join.hpp"
-#include "execution/operator/join/physical_piecewise_merge_join.hpp"
-#include "execution/physical_plan_generator.hpp"
-#include "planner/operator/logical_comparison_join.hpp"
+#include "duckdb/execution/operator/join/physical_cross_product.hpp"
+#include "duckdb/execution/operator/join/physical_hash_join.hpp"
+#include "duckdb/execution/operator/join/physical_nested_loop_join.hpp"
+#include "duckdb/execution/operator/join/physical_piecewise_merge_join.hpp"
+#include "duckdb/execution/physical_plan_generator.hpp"
+#include "duckdb/planner/operator/logical_comparison_join.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/physical_plan/plan_copy_from_file.cpp b/src/execution/physical_plan/plan_copy_from_file.cpp
index cf8611d5f9a..8d0c3600c0c 100644
--- a/src/execution/physical_plan/plan_copy_from_file.cpp
+++ b/src/execution/physical_plan/plan_copy_from_file.cpp
@@ -1,6 +1,6 @@
-#include "execution/physical_plan_generator.hpp"
-#include "execution/operator/persistent/physical_copy_from_file.hpp"
-#include "planner/operator/logical_copy_from_file.hpp"
+#include "duckdb/execution/physical_plan_generator.hpp"
+#include "duckdb/execution/operator/persistent/physical_copy_from_file.hpp"
+#include "duckdb/planner/operator/logical_copy_from_file.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/physical_plan/plan_copy_to_file.cpp b/src/execution/physical_plan/plan_copy_to_file.cpp
index 4b88a0b46fe..b1b28cf0bd8 100644
--- a/src/execution/physical_plan/plan_copy_to_file.cpp
+++ b/src/execution/physical_plan/plan_copy_to_file.cpp
@@ -1,6 +1,6 @@
-#include "execution/physical_plan_generator.hpp"
-#include "execution/operator/persistent/physical_copy_to_file.hpp"
-#include "planner/operator/logical_copy_to_file.hpp"
+#include "duckdb/execution/physical_plan_generator.hpp"
+#include "duckdb/execution/operator/persistent/physical_copy_to_file.hpp"
+#include "duckdb/planner/operator/logical_copy_to_file.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/physical_plan/plan_create_index.cpp b/src/execution/physical_plan/plan_create_index.cpp
index 1ddda28a42b..701b7ed2f96 100644
--- a/src/execution/physical_plan/plan_create_index.cpp
+++ b/src/execution/physical_plan/plan_create_index.cpp
@@ -1,7 +1,7 @@
-#include "catalog/catalog_entry/table_catalog_entry.hpp"
-#include "execution/operator/schema/physical_create_index.hpp"
-#include "execution/physical_plan_generator.hpp"
-#include "planner/operator/logical_create_index.hpp"
+#include "duckdb/catalog/catalog_entry/table_catalog_entry.hpp"
+#include "duckdb/execution/operator/schema/physical_create_index.hpp"
+#include "duckdb/execution/physical_plan_generator.hpp"
+#include "duckdb/planner/operator/logical_create_index.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/physical_plan/plan_create_table.cpp b/src/execution/physical_plan/plan_create_table.cpp
index fa443121f45..451109ceca3 100644
--- a/src/execution/physical_plan/plan_create_table.cpp
+++ b/src/execution/physical_plan/plan_create_table.cpp
@@ -1,9 +1,9 @@
-#include "catalog/catalog_entry/scalar_function_catalog_entry.hpp"
-#include "execution/operator/schema/physical_create_table.hpp"
-#include "execution/physical_plan_generator.hpp"
-#include "planner/expression/bound_function_expression.hpp"
-#include "planner/expression_iterator.hpp"
-#include "planner/operator/logical_create_table.hpp"
+#include "duckdb/catalog/catalog_entry/scalar_function_catalog_entry.hpp"
+#include "duckdb/execution/operator/schema/physical_create_table.hpp"
+#include "duckdb/execution/physical_plan_generator.hpp"
+#include "duckdb/planner/expression/bound_function_expression.hpp"
+#include "duckdb/planner/expression_iterator.hpp"
+#include "duckdb/planner/operator/logical_create_table.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/physical_plan/plan_cross_product.cpp b/src/execution/physical_plan/plan_cross_product.cpp
index 1a295dfa063..2e837e51c25 100644
--- a/src/execution/physical_plan/plan_cross_product.cpp
+++ b/src/execution/physical_plan/plan_cross_product.cpp
@@ -1,6 +1,6 @@
-#include "execution/operator/join/physical_cross_product.hpp"
-#include "execution/physical_plan_generator.hpp"
-#include "planner/operator/logical_cross_product.hpp"
+#include "duckdb/execution/operator/join/physical_cross_product.hpp"
+#include "duckdb/execution/physical_plan_generator.hpp"
+#include "duckdb/planner/operator/logical_cross_product.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/physical_plan/plan_delete.cpp b/src/execution/physical_plan/plan_delete.cpp
index 90996f22f26..115f659b4da 100644
--- a/src/execution/physical_plan/plan_delete.cpp
+++ b/src/execution/physical_plan/plan_delete.cpp
@@ -1,8 +1,8 @@
-#include "catalog/catalog_entry/table_catalog_entry.hpp"
-#include "execution/operator/persistent/physical_delete.hpp"
-#include "execution/physical_plan_generator.hpp"
-#include "planner/expression/bound_reference_expression.hpp"
-#include "planner/operator/logical_delete.hpp"
+#include "duckdb/catalog/catalog_entry/table_catalog_entry.hpp"
+#include "duckdb/execution/operator/persistent/physical_delete.hpp"
+#include "duckdb/execution/physical_plan_generator.hpp"
+#include "duckdb/planner/expression/bound_reference_expression.hpp"
+#include "duckdb/planner/operator/logical_delete.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/physical_plan/plan_delim_get.cpp b/src/execution/physical_plan/plan_delim_get.cpp
index feff3f5595f..6803ea25746 100644
--- a/src/execution/physical_plan/plan_delim_get.cpp
+++ b/src/execution/physical_plan/plan_delim_get.cpp
@@ -1,6 +1,6 @@
-#include "execution/operator/scan/physical_chunk_scan.hpp"
-#include "execution/physical_plan_generator.hpp"
-#include "planner/operator/logical_delim_get.hpp"
+#include "duckdb/execution/operator/scan/physical_chunk_scan.hpp"
+#include "duckdb/execution/physical_plan_generator.hpp"
+#include "duckdb/planner/operator/logical_delim_get.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/physical_plan/plan_delim_join.cpp b/src/execution/physical_plan/plan_delim_join.cpp
index 42be66bbe52..9843197d93a 100644
--- a/src/execution/physical_plan/plan_delim_join.cpp
+++ b/src/execution/physical_plan/plan_delim_join.cpp
@@ -1,13 +1,13 @@
-#include "execution/aggregate_hashtable.hpp"
-#include "execution/operator/join/physical_delim_join.hpp"
-#include "execution/operator/join/physical_hash_join.hpp"
-#include "execution/operator/projection/physical_projection.hpp"
-#include "execution/operator/scan/physical_chunk_scan.hpp"
-#include "execution/physical_plan_generator.hpp"
-#include "function/aggregate/distributive_functions.hpp"
-#include "planner/operator/logical_delim_join.hpp"
-#include "planner/expression/bound_aggregate_expression.hpp"
-#include "main/client_context.hpp"
+#include "duckdb/execution/aggregate_hashtable.hpp"
+#include "duckdb/execution/operator/join/physical_delim_join.hpp"
+#include "duckdb/execution/operator/join/physical_hash_join.hpp"
+#include "duckdb/execution/operator/projection/physical_projection.hpp"
+#include "duckdb/execution/operator/scan/physical_chunk_scan.hpp"
+#include "duckdb/execution/physical_plan_generator.hpp"
+#include "duckdb/function/aggregate/distributive_functions.hpp"
+#include "duckdb/planner/operator/logical_delim_join.hpp"
+#include "duckdb/planner/expression/bound_aggregate_expression.hpp"
+#include "duckdb/main/client_context.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/physical_plan/plan_distinct.cpp b/src/execution/physical_plan/plan_distinct.cpp
index d47273f0501..0c0554aaddd 100644
--- a/src/execution/physical_plan/plan_distinct.cpp
+++ b/src/execution/physical_plan/plan_distinct.cpp
@@ -1,12 +1,12 @@
-#include "execution/operator/aggregate/physical_hash_aggregate.hpp"
-#include "execution/operator/projection/physical_projection.hpp"
-#include "execution/physical_plan_generator.hpp"
-#include "function/aggregate/distributive_functions.hpp"
-#include "planner/expression/bound_aggregate_expression.hpp"
-#include "planner/expression/bound_columnref_expression.hpp"
-#include "planner/expression/bound_reference_expression.hpp"
-#include "planner/operator/logical_distinct.hpp"
-#include "main/client_context.hpp"
+#include "duckdb/execution/operator/aggregate/physical_hash_aggregate.hpp"
+#include "duckdb/execution/operator/projection/physical_projection.hpp"
+#include "duckdb/execution/physical_plan_generator.hpp"
+#include "duckdb/function/aggregate/distributive_functions.hpp"
+#include "duckdb/planner/expression/bound_aggregate_expression.hpp"
+#include "duckdb/planner/expression/bound_columnref_expression.hpp"
+#include "duckdb/planner/expression/bound_reference_expression.hpp"
+#include "duckdb/planner/operator/logical_distinct.hpp"
+#include "duckdb/main/client_context.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/physical_plan/plan_empty_result.cpp b/src/execution/physical_plan/plan_empty_result.cpp
index a9838945065..8409cc266fa 100644
--- a/src/execution/physical_plan/plan_empty_result.cpp
+++ b/src/execution/physical_plan/plan_empty_result.cpp
@@ -1,6 +1,6 @@
-#include "execution/operator/scan/physical_empty_result.hpp"
-#include "execution/physical_plan_generator.hpp"
-#include "planner/operator/logical_empty_result.hpp"
+#include "duckdb/execution/operator/scan/physical_empty_result.hpp"
+#include "duckdb/execution/physical_plan_generator.hpp"
+#include "duckdb/planner/operator/logical_empty_result.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/physical_plan/plan_execute.cpp b/src/execution/physical_plan/plan_execute.cpp
index 1e581aa9ba3..fc95cf3dd80 100644
--- a/src/execution/physical_plan/plan_execute.cpp
+++ b/src/execution/physical_plan/plan_execute.cpp
@@ -1,6 +1,6 @@
-#include "execution/operator/helper/physical_execute.hpp"
-#include "execution/physical_plan_generator.hpp"
-#include "planner/operator/logical_execute.hpp"
+#include "duckdb/execution/operator/helper/physical_execute.hpp"
+#include "duckdb/execution/physical_plan_generator.hpp"
+#include "duckdb/planner/operator/logical_execute.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/physical_plan/plan_explain.cpp b/src/execution/physical_plan/plan_explain.cpp
index 705a447e31d..55834d77403 100644
--- a/src/execution/physical_plan/plan_explain.cpp
+++ b/src/execution/physical_plan/plan_explain.cpp
@@ -1,6 +1,6 @@
-#include "execution/operator/scan/physical_chunk_scan.hpp"
-#include "execution/physical_plan_generator.hpp"
-#include "planner/operator/logical_explain.hpp"
+#include "duckdb/execution/operator/scan/physical_chunk_scan.hpp"
+#include "duckdb/execution/physical_plan_generator.hpp"
+#include "duckdb/planner/operator/logical_explain.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/physical_plan/plan_expression_get.cpp b/src/execution/physical_plan/plan_expression_get.cpp
index 83794ddafcc..13363be501d 100644
--- a/src/execution/physical_plan/plan_expression_get.cpp
+++ b/src/execution/physical_plan/plan_expression_get.cpp
@@ -1,6 +1,6 @@
-#include "execution/operator/scan/physical_expression_scan.hpp"
-#include "execution/physical_plan_generator.hpp"
-#include "planner/operator/logical_expression_get.hpp"
+#include "duckdb/execution/operator/scan/physical_expression_scan.hpp"
+#include "duckdb/execution/physical_plan_generator.hpp"
+#include "duckdb/planner/operator/logical_expression_get.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/physical_plan/plan_filter.cpp b/src/execution/physical_plan/plan_filter.cpp
index b4f76fb28a0..df7118bc67c 100644
--- a/src/execution/physical_plan/plan_filter.cpp
+++ b/src/execution/physical_plan/plan_filter.cpp
@@ -1,10 +1,10 @@
-#include "execution/operator/filter/physical_filter.hpp"
-#include "execution/physical_plan_generator.hpp"
-#include "optimizer/matcher/expression_matcher.hpp"
-#include "planner/expression/bound_comparison_expression.hpp"
-#include "planner/expression/bound_constant_expression.hpp"
-#include "planner/operator/logical_filter.hpp"
-#include "planner/operator/logical_get.hpp"
+#include "duckdb/execution/operator/filter/physical_filter.hpp"
+#include "duckdb/execution/physical_plan_generator.hpp"
+#include "duckdb/optimizer/matcher/expression_matcher.hpp"
+#include "duckdb/planner/expression/bound_comparison_expression.hpp"
+#include "duckdb/planner/expression/bound_constant_expression.hpp"
+#include "duckdb/planner/operator/logical_filter.hpp"
+#include "duckdb/planner/operator/logical_get.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/physical_plan/plan_get.cpp b/src/execution/physical_plan/plan_get.cpp
index 0efcc1c3708..c6bf5789a71 100644
--- a/src/execution/physical_plan/plan_get.cpp
+++ b/src/execution/physical_plan/plan_get.cpp
@@ -1,7 +1,7 @@
-#include "execution/operator/scan/physical_dummy_scan.hpp"
-#include "execution/operator/scan/physical_table_scan.hpp"
-#include "execution/physical_plan_generator.hpp"
-#include "planner/operator/logical_get.hpp"
+#include "duckdb/execution/operator/scan/physical_dummy_scan.hpp"
+#include "duckdb/execution/operator/scan/physical_table_scan.hpp"
+#include "duckdb/execution/physical_plan_generator.hpp"
+#include "duckdb/planner/operator/logical_get.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/physical_plan/plan_index_scan.cpp b/src/execution/physical_plan/plan_index_scan.cpp
index 16ba984a522..eaff28ca943 100644
--- a/src/execution/physical_plan/plan_index_scan.cpp
+++ b/src/execution/physical_plan/plan_index_scan.cpp
@@ -1,15 +1,7 @@
-#include "execution/operator/filter/physical_filter.hpp"
-#include "execution/operator/scan/physical_index_scan.hpp"
-#include "execution/physical_plan_generator.hpp"
-#include "optimizer/matcher/expression_matcher.hpp"
-#include "parser/expression/comparison_expression.hpp"
-#include "planner/expression/bound_comparison_expression.hpp"
-#include "planner/expression/bound_constant_expression.hpp"
-#include "planner/operator/logical_filter.hpp"
-#include "planner/operator/logical_get.hpp"
-#include "storage/data_table.hpp"
+#include "duckdb/execution/operator/scan/physical_index_scan.hpp"
+#include "duckdb/execution/physical_plan_generator.hpp"
 
-#include <planner/operator/list.hpp>
+#include "duckdb/planner/operator/logical_index_scan.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/physical_plan/plan_insert.cpp b/src/execution/physical_plan/plan_insert.cpp
index b0f5b9bb261..b41c5eb8992 100644
--- a/src/execution/physical_plan/plan_insert.cpp
+++ b/src/execution/physical_plan/plan_insert.cpp
@@ -1,7 +1,7 @@
-#include "catalog/catalog_entry/table_catalog_entry.hpp"
-#include "execution/operator/persistent/physical_insert.hpp"
-#include "execution/physical_plan_generator.hpp"
-#include "planner/operator/logical_insert.hpp"
+#include "duckdb/catalog/catalog_entry/table_catalog_entry.hpp"
+#include "duckdb/execution/operator/persistent/physical_insert.hpp"
+#include "duckdb/execution/physical_plan_generator.hpp"
+#include "duckdb/planner/operator/logical_insert.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/physical_plan/plan_limit.cpp b/src/execution/physical_plan/plan_limit.cpp
index 53a56e5ef6b..fc13b47116b 100644
--- a/src/execution/physical_plan/plan_limit.cpp
+++ b/src/execution/physical_plan/plan_limit.cpp
@@ -1,6 +1,6 @@
-#include "execution/operator/helper/physical_limit.hpp"
-#include "execution/physical_plan_generator.hpp"
-#include "planner/operator/logical_limit.hpp"
+#include "duckdb/execution/operator/helper/physical_limit.hpp"
+#include "duckdb/execution/physical_plan_generator.hpp"
+#include "duckdb/planner/operator/logical_limit.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/physical_plan/plan_order.cpp b/src/execution/physical_plan/plan_order.cpp
index 22472111d8f..ba732460d43 100644
--- a/src/execution/physical_plan/plan_order.cpp
+++ b/src/execution/physical_plan/plan_order.cpp
@@ -1,6 +1,6 @@
-#include "execution/operator/order/physical_order.hpp"
-#include "execution/physical_plan_generator.hpp"
-#include "planner/operator/logical_order.hpp"
+#include "duckdb/execution/operator/order/physical_order.hpp"
+#include "duckdb/execution/physical_plan_generator.hpp"
+#include "duckdb/planner/operator/logical_order.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/physical_plan/plan_prepare.cpp b/src/execution/physical_plan/plan_prepare.cpp
index ee8177b6d7b..7b3f8d3a1a5 100644
--- a/src/execution/physical_plan/plan_prepare.cpp
+++ b/src/execution/physical_plan/plan_prepare.cpp
@@ -1,8 +1,8 @@
-#include "execution/operator/scan/physical_dummy_scan.hpp"
-#include "execution/physical_plan_generator.hpp"
-#include "main/client_context.hpp"
-#include "main/database.hpp"
-#include "planner/operator/logical_prepare.hpp"
+#include "duckdb/execution/operator/scan/physical_dummy_scan.hpp"
+#include "duckdb/execution/physical_plan_generator.hpp"
+#include "duckdb/main/client_context.hpp"
+#include "duckdb/main/database.hpp"
+#include "duckdb/planner/operator/logical_prepare.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/physical_plan/plan_projection.cpp b/src/execution/physical_plan/plan_projection.cpp
index 10b136d6164..5a12faf1cff 100644
--- a/src/execution/physical_plan/plan_projection.cpp
+++ b/src/execution/physical_plan/plan_projection.cpp
@@ -1,6 +1,6 @@
-#include "execution/operator/projection/physical_projection.hpp"
-#include "execution/physical_plan_generator.hpp"
-#include "planner/operator/logical_projection.hpp"
+#include "duckdb/execution/operator/projection/physical_projection.hpp"
+#include "duckdb/execution/physical_plan_generator.hpp"
+#include "duckdb/planner/operator/logical_projection.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/physical_plan/plan_prune_columns.cpp b/src/execution/physical_plan/plan_prune_columns.cpp
index 4e1b5f017c1..b7f4d702c18 100644
--- a/src/execution/physical_plan/plan_prune_columns.cpp
+++ b/src/execution/physical_plan/plan_prune_columns.cpp
@@ -1,6 +1,6 @@
-#include "execution/operator/helper/physical_prune_columns.hpp"
-#include "execution/physical_plan_generator.hpp"
-#include "planner/operator/logical_prune_columns.hpp"
+#include "duckdb/execution/operator/helper/physical_prune_columns.hpp"
+#include "duckdb/execution/physical_plan_generator.hpp"
+#include "duckdb/planner/operator/logical_prune_columns.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/physical_plan/plan_set_operation.cpp b/src/execution/physical_plan/plan_set_operation.cpp
index c3b1ca1bc23..93c3777019e 100644
--- a/src/execution/physical_plan/plan_set_operation.cpp
+++ b/src/execution/physical_plan/plan_set_operation.cpp
@@ -1,8 +1,8 @@
-#include "execution/operator/join/physical_hash_join.hpp"
-#include "execution/operator/set/physical_union.hpp"
-#include "execution/physical_plan_generator.hpp"
-#include "planner/expression/bound_reference_expression.hpp"
-#include "planner/operator/logical_set_operation.hpp"
+#include "duckdb/execution/operator/join/physical_hash_join.hpp"
+#include "duckdb/execution/operator/set/physical_union.hpp"
+#include "duckdb/execution/physical_plan_generator.hpp"
+#include "duckdb/planner/expression/bound_reference_expression.hpp"
+#include "duckdb/planner/operator/logical_set_operation.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/physical_plan/plan_table_function.cpp b/src/execution/physical_plan/plan_table_function.cpp
index 0b24dc75a55..7f281d12c9f 100644
--- a/src/execution/physical_plan/plan_table_function.cpp
+++ b/src/execution/physical_plan/plan_table_function.cpp
@@ -1,6 +1,6 @@
-#include "execution/operator/scan/physical_table_function.hpp"
-#include "execution/physical_plan_generator.hpp"
-#include "planner/operator/logical_table_function.hpp"
+#include "duckdb/execution/operator/scan/physical_table_function.hpp"
+#include "duckdb/execution/physical_plan_generator.hpp"
+#include "duckdb/planner/operator/logical_table_function.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/physical_plan/plan_top_n.cpp b/src/execution/physical_plan/plan_top_n.cpp
index 2033263a961..0b5b804efe9 100644
--- a/src/execution/physical_plan/plan_top_n.cpp
+++ b/src/execution/physical_plan/plan_top_n.cpp
@@ -1,6 +1,6 @@
-#include "execution/operator/order/physical_top_n.hpp"
-#include "execution/physical_plan_generator.hpp"
-#include "planner/operator/logical_top_n.hpp"
+#include "duckdb/execution/operator/order/physical_top_n.hpp"
+#include "duckdb/execution/physical_plan_generator.hpp"
+#include "duckdb/planner/operator/logical_top_n.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/physical_plan/plan_update.cpp b/src/execution/physical_plan/plan_update.cpp
index 015f6c60f3c..c432a950891 100644
--- a/src/execution/physical_plan/plan_update.cpp
+++ b/src/execution/physical_plan/plan_update.cpp
@@ -1,7 +1,7 @@
-#include "catalog/catalog_entry/table_catalog_entry.hpp"
-#include "execution/operator/persistent/physical_update.hpp"
-#include "execution/physical_plan_generator.hpp"
-#include "planner/operator/logical_update.hpp"
+#include "duckdb/catalog/catalog_entry/table_catalog_entry.hpp"
+#include "duckdb/execution/operator/persistent/physical_update.hpp"
+#include "duckdb/execution/physical_plan_generator.hpp"
+#include "duckdb/planner/operator/logical_update.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/physical_plan/plan_window.cpp b/src/execution/physical_plan/plan_window.cpp
index 031923db255..53406ac1aef 100644
--- a/src/execution/physical_plan/plan_window.cpp
+++ b/src/execution/physical_plan/plan_window.cpp
@@ -1,6 +1,6 @@
-#include "execution/operator/aggregate/physical_window.hpp"
-#include "execution/physical_plan_generator.hpp"
-#include "planner/operator/logical_window.hpp"
+#include "duckdb/execution/operator/aggregate/physical_window.hpp"
+#include "duckdb/execution/physical_plan_generator.hpp"
+#include "duckdb/planner/operator/logical_window.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/physical_plan_generator.cpp b/src/execution/physical_plan_generator.cpp
index eebe1a128d0..2e40c9ac97f 100644
--- a/src/execution/physical_plan_generator.cpp
+++ b/src/execution/physical_plan_generator.cpp
@@ -1,9 +1,9 @@
-#include "execution/physical_plan_generator.hpp"
+#include "duckdb/execution/physical_plan_generator.hpp"
 
-#include "catalog/catalog_entry/scalar_function_catalog_entry.hpp"
-#include "execution/column_binding_resolver.hpp"
-#include "main/client_context.hpp"
-#include "planner/expression/bound_function_expression.hpp"
+#include "duckdb/catalog/catalog_entry/scalar_function_catalog_entry.hpp"
+#include "duckdb/execution/column_binding_resolver.hpp"
+#include "duckdb/main/client_context.hpp"
+#include "duckdb/planner/expression/bound_function_expression.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/execution/window_segment_tree.cpp b/src/execution/window_segment_tree.cpp
index aba80afea92..0a1433542b2 100644
--- a/src/execution/window_segment_tree.cpp
+++ b/src/execution/window_segment_tree.cpp
@@ -1,7 +1,7 @@
-#include "execution/window_segment_tree.hpp"
+#include "duckdb/execution/window_segment_tree.hpp"
 
-#include "common/types/constant_vector.hpp"
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/common/types/constant_vector.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 
 #include <cmath>
 
diff --git a/src/function/aggregate/algebraic/avg.cpp b/src/function/aggregate/algebraic/avg.cpp
index 75b8912719e..b70d5779333 100644
--- a/src/function/aggregate/algebraic/avg.cpp
+++ b/src/function/aggregate/algebraic/avg.cpp
@@ -1,7 +1,7 @@
-#include "function/aggregate/algebraic_functions.hpp"
-#include "common/exception.hpp"
-#include "common/types/null_value.hpp"
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/function/aggregate/algebraic_functions.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/common/types/null_value.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/function/aggregate/algebraic/covar.cpp b/src/function/aggregate/algebraic/covar.cpp
index a78a780f671..e3b6420e344 100644
--- a/src/function/aggregate/algebraic/covar.cpp
+++ b/src/function/aggregate/algebraic/covar.cpp
@@ -1,7 +1,7 @@
-#include "function/aggregate/algebraic_functions.hpp"
-#include "common/exception.hpp"
-#include "common/types/null_value.hpp"
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/function/aggregate/algebraic_functions.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/common/types/null_value.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 #include <cmath>
 
 using namespace duckdb;
diff --git a/src/function/aggregate/algebraic/stddev.cpp b/src/function/aggregate/algebraic/stddev.cpp
index b49dc2dd17d..4e55a468662 100644
--- a/src/function/aggregate/algebraic/stddev.cpp
+++ b/src/function/aggregate/algebraic/stddev.cpp
@@ -1,7 +1,7 @@
-#include "function/aggregate/algebraic_functions.hpp"
-#include "common/exception.hpp"
-#include "common/types/null_value.hpp"
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/function/aggregate/algebraic_functions.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/common/types/null_value.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 #include <cmath>
 
 using namespace duckdb;
diff --git a/src/function/aggregate/algebraic_functions.cpp b/src/function/aggregate/algebraic_functions.cpp
index d19b9649311..22711335e50 100644
--- a/src/function/aggregate/algebraic_functions.cpp
+++ b/src/function/aggregate/algebraic_functions.cpp
@@ -1,5 +1,5 @@
-#include "function/aggregate/algebraic_functions.hpp"
-#include "function/aggregate_function.hpp"
+#include "duckdb/function/aggregate/algebraic_functions.hpp"
+#include "duckdb/function/aggregate_function.hpp"
 
 using namespace std;
 
diff --git a/src/function/aggregate/distributive/count.cpp b/src/function/aggregate/distributive/count.cpp
index 751bebff74b..82380314e48 100644
--- a/src/function/aggregate/distributive/count.cpp
+++ b/src/function/aggregate/distributive/count.cpp
@@ -1,7 +1,7 @@
-#include "function/aggregate/distributive_functions.hpp"
-#include "common/exception.hpp"
-#include "common/types/null_value.hpp"
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/function/aggregate/distributive_functions.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/common/types/null_value.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 
 using namespace std;
 using namespace duckdb;
diff --git a/src/function/aggregate/distributive/first.cpp b/src/function/aggregate/distributive/first.cpp
index 648a6997259..850ff81008c 100644
--- a/src/function/aggregate/distributive/first.cpp
+++ b/src/function/aggregate/distributive/first.cpp
@@ -1,7 +1,7 @@
-#include "function/aggregate/distributive_functions.hpp"
-#include "common/exception.hpp"
-#include "common/types/null_value.hpp"
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/function/aggregate/distributive_functions.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/common/types/null_value.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 
 using namespace std;
 using namespace duckdb;
diff --git a/src/function/aggregate/distributive/max.cpp b/src/function/aggregate/distributive/max.cpp
index 30c6ac9188e..4adf687afd4 100644
--- a/src/function/aggregate/distributive/max.cpp
+++ b/src/function/aggregate/distributive/max.cpp
@@ -1,7 +1,7 @@
-#include "function/aggregate/distributive_functions.hpp"
-#include "common/exception.hpp"
-#include "common/types/null_value.hpp"
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/function/aggregate/distributive_functions.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/common/types/null_value.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 
 using namespace std;
 using namespace duckdb;
diff --git a/src/function/aggregate/distributive/min.cpp b/src/function/aggregate/distributive/min.cpp
index 8136c754ad3..e17d5741c97 100644
--- a/src/function/aggregate/distributive/min.cpp
+++ b/src/function/aggregate/distributive/min.cpp
@@ -1,7 +1,7 @@
-#include "function/aggregate/distributive_functions.hpp"
-#include "common/exception.hpp"
-#include "common/types/null_value.hpp"
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/function/aggregate/distributive_functions.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/common/types/null_value.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 
 using namespace std;
 using namespace duckdb;
diff --git a/src/function/aggregate/distributive/string_agg.cpp b/src/function/aggregate/distributive/string_agg.cpp
index 1bf88ef6f28..9f6ea75642f 100644
--- a/src/function/aggregate/distributive/string_agg.cpp
+++ b/src/function/aggregate/distributive/string_agg.cpp
@@ -1,7 +1,7 @@
-#include "function/aggregate/distributive_functions.hpp"
-#include "common/exception.hpp"
-#include "common/types/null_value.hpp"
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/function/aggregate/distributive_functions.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/common/types/null_value.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 #include <string>
 
 using namespace std;
diff --git a/src/function/aggregate/distributive/sum.cpp b/src/function/aggregate/distributive/sum.cpp
index 67332066ac3..b38c5e9ed69 100644
--- a/src/function/aggregate/distributive/sum.cpp
+++ b/src/function/aggregate/distributive/sum.cpp
@@ -1,7 +1,7 @@
-#include "function/aggregate/distributive_functions.hpp"
-#include "common/exception.hpp"
-#include "common/types/null_value.hpp"
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/function/aggregate/distributive_functions.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/common/types/null_value.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 
 using namespace std;
 using namespace duckdb;
diff --git a/src/function/aggregate/distributive_functions.cpp b/src/function/aggregate/distributive_functions.cpp
index 0f46e67e2e3..5770d9f3bb7 100644
--- a/src/function/aggregate/distributive_functions.cpp
+++ b/src/function/aggregate/distributive_functions.cpp
@@ -1,8 +1,8 @@
-#include "function/aggregate/distributive_functions.hpp"
-#include "common/exception.hpp"
-#include "common/types/null_value.hpp"
-#include "common/vector_operations/vector_operations.hpp"
-#include "function/aggregate_function.hpp"
+#include "duckdb/function/aggregate/distributive_functions.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/common/types/null_value.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
+#include "duckdb/function/aggregate_function.hpp"
 
 using namespace std;
 
diff --git a/src/function/cast_rules.cpp b/src/function/cast_rules.cpp
index 59e01da04a9..e84d8c7d452 100644
--- a/src/function/cast_rules.cpp
+++ b/src/function/cast_rules.cpp
@@ -1,4 +1,4 @@
-#include "function/cast_rules.hpp"
+#include "duckdb/function/cast_rules.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/function/function.cpp b/src/function/function.cpp
index a4c6e379cf7..ad07ed5fb6a 100644
--- a/src/function/function.cpp
+++ b/src/function/function.cpp
@@ -1,15 +1,15 @@
-#include "function/function.hpp"
-#include "function/aggregate_function.hpp"
-#include "function/scalar_function.hpp"
-#include "function/cast_rules.hpp"
-
-#include "catalog/catalog.hpp"
-// #include "function/aggregate/list.hpp"
-// #include "function/scalar/list.hpp"
-// #include "function/table/list.hpp"
-#include "parser/parsed_data/create_aggregate_function_info.hpp"
-#include "parser/parsed_data/create_scalar_function_info.hpp"
-#include "parser/parsed_data/create_table_function_info.hpp"
+#include "duckdb/function/function.hpp"
+#include "duckdb/function/aggregate_function.hpp"
+#include "duckdb/function/scalar_function.hpp"
+#include "duckdb/function/cast_rules.hpp"
+
+#include "duckdb/catalog/catalog.hpp"
+// #include "duckdb/function/aggregate/list.hpp"
+// #include "duckdb/function/scalar/list.hpp"
+// #include "duckdb/function/table/list.hpp"
+#include "duckdb/parser/parsed_data/create_aggregate_function_info.hpp"
+#include "duckdb/parser/parsed_data/create_scalar_function_info.hpp"
+#include "duckdb/parser/parsed_data/create_table_function_info.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/function/scalar/date/age.cpp b/src/function/scalar/date/age.cpp
index fc72e776fa5..f1f980e3bde 100644
--- a/src/function/scalar/date/age.cpp
+++ b/src/function/scalar/date/age.cpp
@@ -1,7 +1,7 @@
-#include "function/scalar/date_functions.hpp"
-#include "common/types/time.hpp"
-#include "common/types/timestamp.hpp"
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/function/scalar/date_functions.hpp"
+#include "duckdb/common/types/time.hpp"
+#include "duckdb/common/types/timestamp.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 
 using namespace std;
 
diff --git a/src/function/scalar/date/current.cpp b/src/function/scalar/date/current.cpp
index e3408fb4593..020ec690fc0 100644
--- a/src/function/scalar/date/current.cpp
+++ b/src/function/scalar/date/current.cpp
@@ -1,9 +1,9 @@
-#include "function/scalar/date_functions.hpp"
+#include "duckdb/function/scalar/date_functions.hpp"
 
-#include "common/exception.hpp"
-#include "common/types/date.hpp"
-#include "common/types/timestamp.hpp"
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/common/types/date.hpp"
+#include "duckdb/common/types/timestamp.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 
 using namespace std;
 
diff --git a/src/function/scalar/date/date_part.cpp b/src/function/scalar/date/date_part.cpp
index 78f43dcec59..1ebf1974772 100644
--- a/src/function/scalar/date/date_part.cpp
+++ b/src/function/scalar/date/date_part.cpp
@@ -1,8 +1,8 @@
-#include "function/scalar/date_functions.hpp"
-#include "common/exception.hpp"
-#include "common/types/date.hpp"
-#include "common/vector_operations/vector_operations.hpp"
-#include "common/string_util.hpp"
+#include "duckdb/function/scalar/date_functions.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/common/types/date.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
+#include "duckdb/common/string_util.hpp"
 
 using namespace std;
 
diff --git a/src/function/scalar/date/year.cpp b/src/function/scalar/date/year.cpp
index c4756c873a9..4efbbd8b27d 100644
--- a/src/function/scalar/date/year.cpp
+++ b/src/function/scalar/date/year.cpp
@@ -1,9 +1,9 @@
-#include "function/scalar/date_functions.hpp"
+#include "duckdb/function/scalar/date_functions.hpp"
 
-#include "common/exception.hpp"
-#include "common/types/date.hpp"
-#include "common/types/timestamp.hpp"
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/common/types/date.hpp"
+#include "duckdb/common/types/timestamp.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 
 using namespace std;
 
diff --git a/src/function/scalar/date_functions.cpp b/src/function/scalar/date_functions.cpp
index 31a8134e262..07052dbbf95 100644
--- a/src/function/scalar/date_functions.cpp
+++ b/src/function/scalar/date_functions.cpp
@@ -1,4 +1,4 @@
-#include "function/scalar/date_functions.hpp"
+#include "duckdb/function/scalar/date_functions.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/function/scalar/math/abs.cpp b/src/function/scalar/math/abs.cpp
index f1aa2d7197e..139b5d3a0e5 100644
--- a/src/function/scalar/math/abs.cpp
+++ b/src/function/scalar/math/abs.cpp
@@ -1,5 +1,5 @@
-#include "function/scalar/math_functions.hpp"
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/function/scalar/math_functions.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/function/scalar/math/cbrt.cpp b/src/function/scalar/math/cbrt.cpp
index ea359a4a2f9..6279df6f7f1 100644
--- a/src/function/scalar/math/cbrt.cpp
+++ b/src/function/scalar/math/cbrt.cpp
@@ -1,5 +1,5 @@
-#include "function/scalar/math_functions.hpp"
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/function/scalar/math_functions.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 
 using namespace std;
 
diff --git a/src/function/scalar/math/ceil.cpp b/src/function/scalar/math/ceil.cpp
index 22166942d41..80a16844dd8 100644
--- a/src/function/scalar/math/ceil.cpp
+++ b/src/function/scalar/math/ceil.cpp
@@ -1,5 +1,5 @@
-#include "function/scalar/math_functions.hpp"
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/function/scalar/math_functions.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 
 using namespace std;
 
diff --git a/src/function/scalar/math/degrees.cpp b/src/function/scalar/math/degrees.cpp
index 4dec7598c10..e8e08a6888a 100644
--- a/src/function/scalar/math/degrees.cpp
+++ b/src/function/scalar/math/degrees.cpp
@@ -1,5 +1,5 @@
-#include "function/scalar/math_functions.hpp"
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/function/scalar/math_functions.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 
 using namespace std;
 
diff --git a/src/function/scalar/math/exp.cpp b/src/function/scalar/math/exp.cpp
index 7ffad954501..7909572b5bb 100644
--- a/src/function/scalar/math/exp.cpp
+++ b/src/function/scalar/math/exp.cpp
@@ -1,5 +1,5 @@
-#include "function/scalar/math_functions.hpp"
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/function/scalar/math_functions.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 
 using namespace std;
 
diff --git a/src/function/scalar/math/floor.cpp b/src/function/scalar/math/floor.cpp
index 4a6e264a6fe..a39a0f850a1 100644
--- a/src/function/scalar/math/floor.cpp
+++ b/src/function/scalar/math/floor.cpp
@@ -1,5 +1,5 @@
-#include "function/scalar/math_functions.hpp"
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/function/scalar/math_functions.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 
 using namespace std;
 
diff --git a/src/function/scalar/math/ln.cpp b/src/function/scalar/math/ln.cpp
index 65cf4b089a7..db4847e0dbc 100644
--- a/src/function/scalar/math/ln.cpp
+++ b/src/function/scalar/math/ln.cpp
@@ -1,5 +1,5 @@
-#include "function/scalar/math_functions.hpp"
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/function/scalar/math_functions.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 
 using namespace std;
 
diff --git a/src/function/scalar/math/log10.cpp b/src/function/scalar/math/log10.cpp
index c5496e4eec8..a0205ac6b8f 100644
--- a/src/function/scalar/math/log10.cpp
+++ b/src/function/scalar/math/log10.cpp
@@ -1,5 +1,5 @@
-#include "function/scalar/math_functions.hpp"
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/function/scalar/math_functions.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 
 using namespace std;
 
diff --git a/src/function/scalar/math/log2.cpp b/src/function/scalar/math/log2.cpp
index 8df08bdf98b..ca7225434de 100644
--- a/src/function/scalar/math/log2.cpp
+++ b/src/function/scalar/math/log2.cpp
@@ -1,5 +1,5 @@
-#include "function/scalar/math_functions.hpp"
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/function/scalar/math_functions.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 
 using namespace std;
 
diff --git a/src/function/scalar/math/pi.cpp b/src/function/scalar/math/pi.cpp
index cb03a74511f..6e4e1124c95 100644
--- a/src/function/scalar/math/pi.cpp
+++ b/src/function/scalar/math/pi.cpp
@@ -1,5 +1,5 @@
-#include "function/scalar/math_functions.hpp"
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/function/scalar/math_functions.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 
 using namespace std;
 
diff --git a/src/function/scalar/math/pow.cpp b/src/function/scalar/math/pow.cpp
index 6c9f1aa4521..51131eac4a3 100644
--- a/src/function/scalar/math/pow.cpp
+++ b/src/function/scalar/math/pow.cpp
@@ -1,6 +1,6 @@
-#include "function/scalar/math_functions.hpp"
-#include "common/vector_operations/vector_operations.hpp"
-#include "planner/expression/bound_function_expression.hpp"
+#include "duckdb/function/scalar/math_functions.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
+#include "duckdb/planner/expression/bound_function_expression.hpp"
 
 using namespace std;
 
diff --git a/src/function/scalar/math/radians.cpp b/src/function/scalar/math/radians.cpp
index 59d747ad357..d3d0e21145e 100644
--- a/src/function/scalar/math/radians.cpp
+++ b/src/function/scalar/math/radians.cpp
@@ -1,5 +1,5 @@
-#include "function/scalar/math_functions.hpp"
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/function/scalar/math_functions.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 
 using namespace std;
 
diff --git a/src/function/scalar/math/random.cpp b/src/function/scalar/math/random.cpp
index 2e58e1f6c9d..f28ffe96def 100644
--- a/src/function/scalar/math/random.cpp
+++ b/src/function/scalar/math/random.cpp
@@ -1,8 +1,8 @@
-#include "function/scalar/math_functions.hpp"
-#include "common/vector_operations/vector_operations.hpp"
-#include "execution/expression_executor.hpp"
-#include "main/client_context.hpp"
-#include "planner/expression/bound_function_expression.hpp"
+#include "duckdb/function/scalar/math_functions.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
+#include "duckdb/execution/expression_executor.hpp"
+#include "duckdb/main/client_context.hpp"
+#include "duckdb/planner/expression/bound_function_expression.hpp"
 #include <random>
 
 using namespace duckdb;
diff --git a/src/function/scalar/math/round.cpp b/src/function/scalar/math/round.cpp
index 3d56bbe0f58..01bd8fdce1a 100644
--- a/src/function/scalar/math/round.cpp
+++ b/src/function/scalar/math/round.cpp
@@ -1,5 +1,5 @@
-#include "function/scalar/math_functions.hpp"
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/function/scalar/math_functions.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 
 using namespace std;
 
diff --git a/src/function/scalar/math/setseed.cpp b/src/function/scalar/math/setseed.cpp
index ec2aed39e9d..2d66c6ae8f6 100644
--- a/src/function/scalar/math/setseed.cpp
+++ b/src/function/scalar/math/setseed.cpp
@@ -1,9 +1,9 @@
-#include "function/scalar/math_functions.hpp"
-#include "common/exception.hpp"
-#include "common/vector_operations/vector_operations.hpp"
-#include "execution/expression_executor.hpp"
-#include "main/client_context.hpp"
-#include "planner/expression/bound_function_expression.hpp"
+#include "duckdb/function/scalar/math_functions.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
+#include "duckdb/execution/expression_executor.hpp"
+#include "duckdb/main/client_context.hpp"
+#include "duckdb/planner/expression/bound_function_expression.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/function/scalar/math/sign.cpp b/src/function/scalar/math/sign.cpp
index 8b59785f0eb..b260f0c394a 100644
--- a/src/function/scalar/math/sign.cpp
+++ b/src/function/scalar/math/sign.cpp
@@ -1,5 +1,5 @@
-#include "function/scalar/math_functions.hpp"
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/function/scalar/math_functions.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 
 using namespace std;
 
diff --git a/src/function/scalar/math/sqrt.cpp b/src/function/scalar/math/sqrt.cpp
index 1e847530389..e16576cba36 100644
--- a/src/function/scalar/math/sqrt.cpp
+++ b/src/function/scalar/math/sqrt.cpp
@@ -1,5 +1,5 @@
-#include "function/scalar/math_functions.hpp"
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/function/scalar/math_functions.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 
 using namespace std;
 
diff --git a/src/function/scalar/math_functions.cpp b/src/function/scalar/math_functions.cpp
index 1b50749a19b..19caffd3ce9 100644
--- a/src/function/scalar/math_functions.cpp
+++ b/src/function/scalar/math_functions.cpp
@@ -1,5 +1,5 @@
-#include "function/scalar/math_functions.hpp"
-#include "common/exception.hpp"
+#include "duckdb/function/scalar/math_functions.hpp"
+#include "duckdb/common/exception.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/function/scalar/operators.cpp b/src/function/scalar/operators.cpp
index a8d36dc07c4..49522a6aee7 100644
--- a/src/function/scalar/operators.cpp
+++ b/src/function/scalar/operators.cpp
@@ -1,5 +1,5 @@
-#include "function/scalar/operators.hpp"
-#include "common/exception.hpp"
+#include "duckdb/function/scalar/operators.hpp"
+#include "duckdb/common/exception.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/function/scalar/operators/add.cpp b/src/function/scalar/operators/add.cpp
index 3ba8dc74783..669457bd36d 100644
--- a/src/function/scalar/operators/add.cpp
+++ b/src/function/scalar/operators/add.cpp
@@ -1,5 +1,5 @@
-#include "function/scalar/operators.hpp"
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/function/scalar/operators.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/function/scalar/operators/bitwise_and.cpp b/src/function/scalar/operators/bitwise_and.cpp
index 7e75083bf7f..ba618c0baf5 100644
--- a/src/function/scalar/operators/bitwise_and.cpp
+++ b/src/function/scalar/operators/bitwise_and.cpp
@@ -1,5 +1,5 @@
-#include "function/scalar/operators.hpp"
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/function/scalar/operators.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/function/scalar/operators/bitwise_or.cpp b/src/function/scalar/operators/bitwise_or.cpp
index 51ef2562f00..56c99796c3b 100644
--- a/src/function/scalar/operators/bitwise_or.cpp
+++ b/src/function/scalar/operators/bitwise_or.cpp
@@ -1,5 +1,5 @@
-#include "function/scalar/operators.hpp"
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/function/scalar/operators.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/function/scalar/operators/bitwise_xor.cpp b/src/function/scalar/operators/bitwise_xor.cpp
index ec9ea177c78..ca89855d391 100644
--- a/src/function/scalar/operators/bitwise_xor.cpp
+++ b/src/function/scalar/operators/bitwise_xor.cpp
@@ -1,5 +1,5 @@
-#include "function/scalar/operators.hpp"
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/function/scalar/operators.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/function/scalar/operators/divide.cpp b/src/function/scalar/operators/divide.cpp
index 4c00f21c75f..280d8273292 100644
--- a/src/function/scalar/operators/divide.cpp
+++ b/src/function/scalar/operators/divide.cpp
@@ -1,5 +1,5 @@
-#include "function/scalar/operators.hpp"
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/function/scalar/operators.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/function/scalar/operators/left_shift.cpp b/src/function/scalar/operators/left_shift.cpp
index b7f69fe7a51..2584b5fc780 100644
--- a/src/function/scalar/operators/left_shift.cpp
+++ b/src/function/scalar/operators/left_shift.cpp
@@ -1,5 +1,5 @@
-#include "function/scalar/operators.hpp"
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/function/scalar/operators.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/function/scalar/operators/mod.cpp b/src/function/scalar/operators/mod.cpp
index 29cf8ef1167..f06cf7a11f6 100644
--- a/src/function/scalar/operators/mod.cpp
+++ b/src/function/scalar/operators/mod.cpp
@@ -1,5 +1,5 @@
-#include "function/scalar/operators.hpp"
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/function/scalar/operators.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/function/scalar/operators/multiply.cpp b/src/function/scalar/operators/multiply.cpp
index 9b9b0573302..efc39fc592c 100644
--- a/src/function/scalar/operators/multiply.cpp
+++ b/src/function/scalar/operators/multiply.cpp
@@ -1,5 +1,5 @@
-#include "function/scalar/operators.hpp"
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/function/scalar/operators.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/function/scalar/operators/right_shift.cpp b/src/function/scalar/operators/right_shift.cpp
index cf71576a6b3..2bab433701d 100644
--- a/src/function/scalar/operators/right_shift.cpp
+++ b/src/function/scalar/operators/right_shift.cpp
@@ -1,5 +1,5 @@
-#include "function/scalar/operators.hpp"
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/function/scalar/operators.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/function/scalar/operators/subtract.cpp b/src/function/scalar/operators/subtract.cpp
index fea02710265..e8498262ed9 100644
--- a/src/function/scalar/operators/subtract.cpp
+++ b/src/function/scalar/operators/subtract.cpp
@@ -1,5 +1,5 @@
-#include "function/scalar/operators.hpp"
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/function/scalar/operators.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/function/scalar/sequence/nextval.cpp b/src/function/scalar/sequence/nextval.cpp
index c58aedaf123..8a905f3e6db 100644
--- a/src/function/scalar/sequence/nextval.cpp
+++ b/src/function/scalar/sequence/nextval.cpp
@@ -1,14 +1,14 @@
-#include "function/scalar/sequence_functions.hpp"
+#include "duckdb/function/scalar/sequence_functions.hpp"
 
-#include "catalog/catalog.hpp"
-#include "catalog/catalog_entry/sequence_catalog_entry.hpp"
-#include "common/exception.hpp"
-#include "common/vector_operations/vector_operations.hpp"
-#include "execution/expression_executor.hpp"
-#include "main/client_context.hpp"
-#include "main/database.hpp"
-#include "planner/expression/bound_function_expression.hpp"
-#include "transaction/transaction.hpp"
+#include "duckdb/catalog/catalog.hpp"
+#include "duckdb/catalog/catalog_entry/sequence_catalog_entry.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
+#include "duckdb/execution/expression_executor.hpp"
+#include "duckdb/main/client_context.hpp"
+#include "duckdb/main/database.hpp"
+#include "duckdb/planner/expression/bound_function_expression.hpp"
+#include "duckdb/transaction/transaction.hpp"
 
 using namespace std;
 
diff --git a/src/function/scalar/sequence_functions.cpp b/src/function/scalar/sequence_functions.cpp
index c6e07bc708e..3c27aaec789 100644
--- a/src/function/scalar/sequence_functions.cpp
+++ b/src/function/scalar/sequence_functions.cpp
@@ -1,4 +1,4 @@
-#include "function/scalar/sequence_functions.hpp"
+#include "duckdb/function/scalar/sequence_functions.hpp"
 
 using namespace std;
 
diff --git a/src/function/scalar/string/caseconvert.cpp b/src/function/scalar/string/caseconvert.cpp
index a0986f5c006..f3a42bc9028 100644
--- a/src/function/scalar/string/caseconvert.cpp
+++ b/src/function/scalar/string/caseconvert.cpp
@@ -1,7 +1,7 @@
-#include "function/scalar/string_functions.hpp"
+#include "duckdb/function/scalar/string_functions.hpp"
 
-#include "common/exception.hpp"
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 
 #include <string.h>
 
diff --git a/src/function/scalar/string/concat.cpp b/src/function/scalar/string/concat.cpp
index 90910268c7b..403ca574f89 100644
--- a/src/function/scalar/string/concat.cpp
+++ b/src/function/scalar/string/concat.cpp
@@ -1,8 +1,8 @@
-#include "function/scalar/string_functions.hpp"
+#include "duckdb/function/scalar/string_functions.hpp"
 
-#include "common/exception.hpp"
-#include "common/types/date.hpp"
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/common/types/date.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 
 #include <string.h>
 
diff --git a/src/function/scalar/string/concat_ws.cpp b/src/function/scalar/string/concat_ws.cpp
index b5423dfba99..ca24ab45422 100644
--- a/src/function/scalar/string/concat_ws.cpp
+++ b/src/function/scalar/string/concat_ws.cpp
@@ -1,8 +1,8 @@
-#include "function/scalar/string_functions.hpp"
+#include "duckdb/function/scalar/string_functions.hpp"
 
-#include "common/exception.hpp"
-#include "common/types/date.hpp"
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/common/types/date.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 
 #include <string.h>
 
diff --git a/src/function/scalar/string/length.cpp b/src/function/scalar/string/length.cpp
index bf2e6c4d101..46e551e925c 100644
--- a/src/function/scalar/string/length.cpp
+++ b/src/function/scalar/string/length.cpp
@@ -1,7 +1,7 @@
-#include "function/scalar/string_functions.hpp"
+#include "duckdb/function/scalar/string_functions.hpp"
 
-#include "common/exception.hpp"
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 
 using namespace std;
 
diff --git a/src/function/scalar/string/like.cpp b/src/function/scalar/string/like.cpp
index 130c0cda0e9..9e2576c9fbd 100644
--- a/src/function/scalar/string/like.cpp
+++ b/src/function/scalar/string/like.cpp
@@ -1,7 +1,7 @@
-#include "function/scalar/string_functions.hpp"
+#include "duckdb/function/scalar/string_functions.hpp"
 
-#include "common/exception.hpp"
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 
 using namespace std;
 
diff --git a/src/function/scalar/string/regexp.cpp b/src/function/scalar/string/regexp.cpp
index e4e7c90fbda..266926af4b8 100644
--- a/src/function/scalar/string/regexp.cpp
+++ b/src/function/scalar/string/regexp.cpp
@@ -1,8 +1,8 @@
-#include "function/scalar/string_functions.hpp"
-#include "common/exception.hpp"
-#include "common/vector_operations/vector_operations.hpp"
-#include "execution/expression_executor.hpp"
-#include "planner/expression/bound_function_expression.hpp"
+#include "duckdb/function/scalar/string_functions.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
+#include "duckdb/execution/expression_executor.hpp"
+#include "duckdb/planner/expression/bound_function_expression.hpp"
 
 #include "re2/re2.h"
 
diff --git a/src/function/scalar/string/substring.cpp b/src/function/scalar/string/substring.cpp
index 5b3a7121790..9e22e20b0f7 100644
--- a/src/function/scalar/string/substring.cpp
+++ b/src/function/scalar/string/substring.cpp
@@ -1,7 +1,7 @@
-#include "function/scalar/string_functions.hpp"
+#include "duckdb/function/scalar/string_functions.hpp"
 
-#include "common/exception.hpp"
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 
 using namespace std;
 
diff --git a/src/function/scalar/string_functions.cpp b/src/function/scalar/string_functions.cpp
index 17a2ac589ab..17c7ad7727b 100644
--- a/src/function/scalar/string_functions.cpp
+++ b/src/function/scalar/string_functions.cpp
@@ -1,4 +1,4 @@
-#include "function/scalar/string_functions.hpp"
+#include "duckdb/function/scalar/string_functions.hpp"
 
 using namespace std;
 
diff --git a/src/function/scalar/trigonometrics/acos.cpp b/src/function/scalar/trigonometrics/acos.cpp
index 580589c3875..0333b815f94 100644
--- a/src/function/scalar/trigonometrics/acos.cpp
+++ b/src/function/scalar/trigonometrics/acos.cpp
@@ -1,6 +1,6 @@
-#include "function/scalar/trigonometric_functions.hpp"
-#include "common/vector_operations/vector_operations.hpp"
-#include "common/exception.hpp"
+#include "duckdb/function/scalar/trigonometric_functions.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
+#include "duckdb/common/exception.hpp"
 
 using namespace std;
 
diff --git a/src/function/scalar/trigonometrics/asin.cpp b/src/function/scalar/trigonometrics/asin.cpp
index d226e16b3e9..3d655952acb 100644
--- a/src/function/scalar/trigonometrics/asin.cpp
+++ b/src/function/scalar/trigonometrics/asin.cpp
@@ -1,6 +1,6 @@
-#include "function/scalar/trigonometric_functions.hpp"
-#include "common/vector_operations/vector_operations.hpp"
-#include "common/exception.hpp"
+#include "duckdb/function/scalar/trigonometric_functions.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
+#include "duckdb/common/exception.hpp"
 
 using namespace std;
 
diff --git a/src/function/scalar/trigonometrics/atan.cpp b/src/function/scalar/trigonometrics/atan.cpp
index cd23ae440b5..e532687459c 100644
--- a/src/function/scalar/trigonometrics/atan.cpp
+++ b/src/function/scalar/trigonometrics/atan.cpp
@@ -1,6 +1,6 @@
-#include "function/scalar/trigonometric_functions.hpp"
-#include "common/vector_operations/vector_operations.hpp"
-#include "common/exception.hpp"
+#include "duckdb/function/scalar/trigonometric_functions.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
+#include "duckdb/common/exception.hpp"
 
 using namespace std;
 
diff --git a/src/function/scalar/trigonometrics/atan2.cpp b/src/function/scalar/trigonometrics/atan2.cpp
index 9ac1f3787f2..846409fd4bf 100644
--- a/src/function/scalar/trigonometrics/atan2.cpp
+++ b/src/function/scalar/trigonometrics/atan2.cpp
@@ -1,6 +1,6 @@
-#include "function/scalar/trigonometric_functions.hpp"
-#include "common/vector_operations/vector_operations.hpp"
-#include "common/exception.hpp"
+#include "duckdb/function/scalar/trigonometric_functions.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
+#include "duckdb/common/exception.hpp"
 
 using namespace std;
 
diff --git a/src/function/scalar/trigonometrics/cos.cpp b/src/function/scalar/trigonometrics/cos.cpp
index 846cef7774c..0e3a495ae86 100644
--- a/src/function/scalar/trigonometrics/cos.cpp
+++ b/src/function/scalar/trigonometrics/cos.cpp
@@ -1,6 +1,6 @@
-#include "function/scalar/trigonometric_functions.hpp"
-#include "common/vector_operations/vector_operations.hpp"
-#include "common/exception.hpp"
+#include "duckdb/function/scalar/trigonometric_functions.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
+#include "duckdb/common/exception.hpp"
 
 using namespace std;
 
diff --git a/src/function/scalar/trigonometrics/cot.cpp b/src/function/scalar/trigonometrics/cot.cpp
index 1e71f518fd3..a808e1cd7a5 100644
--- a/src/function/scalar/trigonometrics/cot.cpp
+++ b/src/function/scalar/trigonometrics/cot.cpp
@@ -1,8 +1,8 @@
-#include "function/scalar/trigonometric_functions.hpp"
-#include "common/vector_operations/vector_operations.hpp"
-#include "common/types/constant_vector.hpp"
-#include "common/types/static_vector.hpp"
-#include "common/exception.hpp"
+#include "duckdb/function/scalar/trigonometric_functions.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
+#include "duckdb/common/types/constant_vector.hpp"
+#include "duckdb/common/types/static_vector.hpp"
+#include "duckdb/common/exception.hpp"
 
 using namespace std;
 
diff --git a/src/function/scalar/trigonometrics/sin.cpp b/src/function/scalar/trigonometrics/sin.cpp
index ad37fe57fa2..a779e3d0e1e 100644
--- a/src/function/scalar/trigonometrics/sin.cpp
+++ b/src/function/scalar/trigonometrics/sin.cpp
@@ -1,6 +1,6 @@
-#include "function/scalar/trigonometric_functions.hpp"
-#include "common/vector_operations/vector_operations.hpp"
-#include "common/exception.hpp"
+#include "duckdb/function/scalar/trigonometric_functions.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
+#include "duckdb/common/exception.hpp"
 
 using namespace std;
 
diff --git a/src/function/scalar/trigonometrics/tan.cpp b/src/function/scalar/trigonometrics/tan.cpp
index 4a174b1a16c..b32eb3e6f68 100644
--- a/src/function/scalar/trigonometrics/tan.cpp
+++ b/src/function/scalar/trigonometrics/tan.cpp
@@ -1,6 +1,6 @@
-#include "function/scalar/trigonometric_functions.hpp"
-#include "common/vector_operations/vector_operations.hpp"
-#include "common/exception.hpp"
+#include "duckdb/function/scalar/trigonometric_functions.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
+#include "duckdb/common/exception.hpp"
 
 using namespace std;
 
diff --git a/src/function/scalar/trigonometrics_functions.cpp b/src/function/scalar/trigonometrics_functions.cpp
index 422ca3a38ac..b2ed49b1cb7 100644
--- a/src/function/scalar/trigonometrics_functions.cpp
+++ b/src/function/scalar/trigonometrics_functions.cpp
@@ -1,6 +1,6 @@
-#include "function/scalar/trigonometric_functions.hpp"
-#include "common/vector_operations/vector_operations.hpp"
-#include "common/exception.hpp"
+#include "duckdb/function/scalar/trigonometric_functions.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
+#include "duckdb/common/exception.hpp"
 
 using namespace std;
 
diff --git a/src/function/table/sqlite/pragma_table_info.cpp b/src/function/table/sqlite/pragma_table_info.cpp
index f65e173f4fa..15edaaf4297 100644
--- a/src/function/table/sqlite/pragma_table_info.cpp
+++ b/src/function/table/sqlite/pragma_table_info.cpp
@@ -1,10 +1,10 @@
-#include "function/table/sqlite_functions.hpp"
+#include "duckdb/function/table/sqlite_functions.hpp"
 
-#include "catalog/catalog.hpp"
-#include "catalog/catalog_entry/table_catalog_entry.hpp"
-#include "common/exception.hpp"
-#include "main/client_context.hpp"
-#include "main/database.hpp"
+#include "duckdb/catalog/catalog.hpp"
+#include "duckdb/catalog/catalog_entry/table_catalog_entry.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/main/client_context.hpp"
+#include "duckdb/main/database.hpp"
 
 #include <algorithm>
 
diff --git a/src/function/table/sqlite/sqlite_master.cpp b/src/function/table/sqlite/sqlite_master.cpp
index 5ddf51eccff..1da3a2cbe0d 100644
--- a/src/function/table/sqlite/sqlite_master.cpp
+++ b/src/function/table/sqlite/sqlite_master.cpp
@@ -1,11 +1,11 @@
-#include "function/table/sqlite_functions.hpp"
-
-#include "catalog/catalog.hpp"
-#include "catalog/catalog_entry/schema_catalog_entry.hpp"
-#include "catalog/catalog_entry/table_catalog_entry.hpp"
-#include "common/exception.hpp"
-#include "main/client_context.hpp"
-#include "main/database.hpp"
+#include "duckdb/function/table/sqlite_functions.hpp"
+
+#include "duckdb/catalog/catalog.hpp"
+#include "duckdb/catalog/catalog_entry/schema_catalog_entry.hpp"
+#include "duckdb/catalog/catalog_entry/table_catalog_entry.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/main/client_context.hpp"
+#include "duckdb/main/database.hpp"
 
 #include <algorithm>
 
diff --git a/src/function/table/sqlite_functions.cpp b/src/function/table/sqlite_functions.cpp
index 35940b70268..7595115006f 100644
--- a/src/function/table/sqlite_functions.cpp
+++ b/src/function/table/sqlite_functions.cpp
@@ -1,4 +1,4 @@
-#include "function/table/sqlite_functions.hpp"
+#include "duckdb/function/table/sqlite_functions.hpp"
 
 using namespace std;
 
diff --git a/src/include/catalog/catalog_entry/list.hpp b/src/include/catalog/catalog_entry/list.hpp
deleted file mode 100644
index 880d550e450..00000000000
--- a/src/include/catalog/catalog_entry/list.hpp
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "catalog/catalog_entry/aggregate_function_catalog_entry.hpp"
-#include "catalog/catalog_entry/index_catalog_entry.hpp"
-#include "catalog/catalog_entry/prepared_statement_catalog_entry.hpp"
-#include "catalog/catalog_entry/scalar_function_catalog_entry.hpp"
-#include "catalog/catalog_entry/schema_catalog_entry.hpp"
-#include "catalog/catalog_entry/sequence_catalog_entry.hpp"
-#include "catalog/catalog_entry/table_catalog_entry.hpp"
-#include "catalog/catalog_entry/table_function_catalog_entry.hpp"
-#include "catalog/catalog_entry/view_catalog_entry.hpp"
diff --git a/src/include/duckdb.hpp b/src/include/duckdb.hpp
index 7e0af237a4e..8af2f7d6ec1 100644
--- a/src/include/duckdb.hpp
+++ b/src/include/duckdb.hpp
@@ -8,6 +8,6 @@
 
 #pragma once
 
-#include "main/connection.hpp"
-#include "main/database.hpp"
-#include "main/query_result.hpp"
+#include "duckdb/main/connection.hpp"
+#include "duckdb/main/database.hpp"
+#include "duckdb/main/query_result.hpp"
diff --git a/src/include/catalog/catalog.hpp b/src/include/duckdb/catalog/catalog.hpp
similarity index 96%
rename from src/include/catalog/catalog.hpp
rename to src/include/duckdb/catalog/catalog.hpp
index ca2bb3c8755..ab1cbee87ac 100644
--- a/src/include/catalog/catalog.hpp
+++ b/src/include/duckdb/catalog/catalog.hpp
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "catalog/catalog_entry.hpp"
-#include "catalog/catalog_set.hpp"
-#include "catalog/dependency_manager.hpp"
+#include "duckdb/catalog/catalog_entry.hpp"
+#include "duckdb/catalog/catalog_set.hpp"
+#include "duckdb/catalog/dependency_manager.hpp"
 
 #include <mutex>
 
diff --git a/src/include/catalog/catalog_entry.hpp b/src/include/duckdb/catalog/catalog_entry.hpp
similarity index 92%
rename from src/include/catalog/catalog_entry.hpp
rename to src/include/duckdb/catalog/catalog_entry.hpp
index 7236c2a4ad7..7b53b3473e1 100644
--- a/src/include/catalog/catalog_entry.hpp
+++ b/src/include/duckdb/catalog/catalog_entry.hpp
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "common/common.hpp"
-#include "common/enums/catalog_type.hpp"
-#include "common/exception.hpp"
+#include "duckdb/common/common.hpp"
+#include "duckdb/common/enums/catalog_type.hpp"
+#include "duckdb/common/exception.hpp"
 
 namespace duckdb {
 struct AlterInfo;
diff --git a/src/include/catalog/catalog_entry/aggregate_function_catalog_entry.hpp b/src/include/duckdb/catalog/catalog_entry/aggregate_function_catalog_entry.hpp
similarity index 81%
rename from src/include/catalog/catalog_entry/aggregate_function_catalog_entry.hpp
rename to src/include/duckdb/catalog/catalog_entry/aggregate_function_catalog_entry.hpp
index c4c8234c792..a37ec16d916 100644
--- a/src/include/catalog/catalog_entry/aggregate_function_catalog_entry.hpp
+++ b/src/include/duckdb/catalog/catalog_entry/aggregate_function_catalog_entry.hpp
@@ -8,10 +8,10 @@
 
 #pragma once
 
-#include "catalog/catalog_entry.hpp"
-#include "catalog/catalog_set.hpp"
-#include "function/function.hpp"
-#include "parser/parsed_data/create_aggregate_function_info.hpp"
+#include "duckdb/catalog/catalog_entry.hpp"
+#include "duckdb/catalog/catalog_set.hpp"
+#include "duckdb/function/function.hpp"
+#include "duckdb/parser/parsed_data/create_aggregate_function_info.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/catalog/catalog_entry/index_catalog_entry.hpp b/src/include/duckdb/catalog/catalog_entry/index_catalog_entry.hpp
similarity index 88%
rename from src/include/catalog/catalog_entry/index_catalog_entry.hpp
rename to src/include/duckdb/catalog/catalog_entry/index_catalog_entry.hpp
index 8d07885e302..eb5b690cdb2 100644
--- a/src/include/catalog/catalog_entry/index_catalog_entry.hpp
+++ b/src/include/duckdb/catalog/catalog_entry/index_catalog_entry.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "catalog/catalog_entry.hpp"
-#include "parser/parsed_data/create_index_info.hpp"
+#include "duckdb/catalog/catalog_entry.hpp"
+#include "duckdb/parser/parsed_data/create_index_info.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/duckdb/catalog/catalog_entry/list.hpp b/src/include/duckdb/catalog/catalog_entry/list.hpp
new file mode 100644
index 00000000000..634662a6cc7
--- /dev/null
+++ b/src/include/duckdb/catalog/catalog_entry/list.hpp
@@ -0,0 +1,9 @@
+#include "duckdb/catalog/catalog_entry/aggregate_function_catalog_entry.hpp"
+#include "duckdb/catalog/catalog_entry/index_catalog_entry.hpp"
+#include "duckdb/catalog/catalog_entry/prepared_statement_catalog_entry.hpp"
+#include "duckdb/catalog/catalog_entry/scalar_function_catalog_entry.hpp"
+#include "duckdb/catalog/catalog_entry/schema_catalog_entry.hpp"
+#include "duckdb/catalog/catalog_entry/sequence_catalog_entry.hpp"
+#include "duckdb/catalog/catalog_entry/table_catalog_entry.hpp"
+#include "duckdb/catalog/catalog_entry/table_function_catalog_entry.hpp"
+#include "duckdb/catalog/catalog_entry/view_catalog_entry.hpp"
diff --git a/src/include/catalog/catalog_entry/prepared_statement_catalog_entry.hpp b/src/include/duckdb/catalog/catalog_entry/prepared_statement_catalog_entry.hpp
similarity index 84%
rename from src/include/catalog/catalog_entry/prepared_statement_catalog_entry.hpp
rename to src/include/duckdb/catalog/catalog_entry/prepared_statement_catalog_entry.hpp
index 91d13f754b9..47d7425971b 100644
--- a/src/include/catalog/catalog_entry/prepared_statement_catalog_entry.hpp
+++ b/src/include/duckdb/catalog/catalog_entry/prepared_statement_catalog_entry.hpp
@@ -8,10 +8,10 @@
 
 #pragma once
 
-#include "catalog/catalog_entry.hpp"
-#include "common/unordered_map.hpp"
-#include "common/unordered_set.hpp"
-#include "execution/physical_operator.hpp"
+#include "duckdb/catalog/catalog_entry.hpp"
+#include "duckdb/common/unordered_map.hpp"
+#include "duckdb/common/unordered_set.hpp"
+#include "duckdb/execution/physical_operator.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/catalog/catalog_entry/scalar_function_catalog_entry.hpp b/src/include/duckdb/catalog/catalog_entry/scalar_function_catalog_entry.hpp
similarity index 80%
rename from src/include/catalog/catalog_entry/scalar_function_catalog_entry.hpp
rename to src/include/duckdb/catalog/catalog_entry/scalar_function_catalog_entry.hpp
index 34b03fffb1b..5340a64ec1d 100644
--- a/src/include/catalog/catalog_entry/scalar_function_catalog_entry.hpp
+++ b/src/include/duckdb/catalog/catalog_entry/scalar_function_catalog_entry.hpp
@@ -8,10 +8,10 @@
 
 #pragma once
 
-#include "catalog/catalog_entry.hpp"
-#include "catalog/catalog_set.hpp"
-#include "function/function.hpp"
-#include "parser/parsed_data/create_scalar_function_info.hpp"
+#include "duckdb/catalog/catalog_entry.hpp"
+#include "duckdb/catalog/catalog_set.hpp"
+#include "duckdb/function/function.hpp"
+#include "duckdb/parser/parsed_data/create_scalar_function_info.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/catalog/catalog_entry/schema_catalog_entry.hpp b/src/include/duckdb/catalog/catalog_entry/schema_catalog_entry.hpp
similarity index 97%
rename from src/include/catalog/catalog_entry/schema_catalog_entry.hpp
rename to src/include/duckdb/catalog/catalog_entry/schema_catalog_entry.hpp
index 753ae6b7739..4c85ab1d7ae 100644
--- a/src/include/catalog/catalog_entry/schema_catalog_entry.hpp
+++ b/src/include/duckdb/catalog/catalog_entry/schema_catalog_entry.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "catalog/catalog_entry.hpp"
-#include "catalog/catalog_set.hpp"
+#include "duckdb/catalog/catalog_entry.hpp"
+#include "duckdb/catalog/catalog_set.hpp"
 
 namespace duckdb {
 class FunctionExpression;
diff --git a/src/include/catalog/catalog_entry/sequence_catalog_entry.hpp b/src/include/duckdb/catalog/catalog_entry/sequence_catalog_entry.hpp
similarity index 93%
rename from src/include/catalog/catalog_entry/sequence_catalog_entry.hpp
rename to src/include/duckdb/catalog/catalog_entry/sequence_catalog_entry.hpp
index 0b662cd28a9..6c7ab686c71 100644
--- a/src/include/catalog/catalog_entry/sequence_catalog_entry.hpp
+++ b/src/include/duckdb/catalog/catalog_entry/sequence_catalog_entry.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "catalog/catalog_entry.hpp"
-#include "parser/parsed_data/create_sequence_info.hpp"
+#include "duckdb/catalog/catalog_entry.hpp"
+#include "duckdb/parser/parsed_data/create_sequence_info.hpp"
 
 #include <atomic>
 #include <mutex>
diff --git a/src/include/catalog/catalog_entry/table_catalog_entry.hpp b/src/include/duckdb/catalog/catalog_entry/table_catalog_entry.hpp
similarity index 88%
rename from src/include/catalog/catalog_entry/table_catalog_entry.hpp
rename to src/include/duckdb/catalog/catalog_entry/table_catalog_entry.hpp
index b1ce196cc72..4340a8468f2 100644
--- a/src/include/catalog/catalog_entry/table_catalog_entry.hpp
+++ b/src/include/duckdb/catalog/catalog_entry/table_catalog_entry.hpp
@@ -8,12 +8,12 @@
 
 #pragma once
 
-#include "catalog/catalog_entry.hpp"
-#include "common/unordered_map.hpp"
-#include "parser/column_definition.hpp"
-#include "parser/constraint.hpp"
-#include "planner/bound_constraint.hpp"
-#include "planner/expression.hpp"
+#include "duckdb/catalog/catalog_entry.hpp"
+#include "duckdb/common/unordered_map.hpp"
+#include "duckdb/parser/column_definition.hpp"
+#include "duckdb/parser/constraint.hpp"
+#include "duckdb/planner/bound_constraint.hpp"
+#include "duckdb/planner/expression.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/catalog/catalog_entry/table_function_catalog_entry.hpp b/src/include/duckdb/catalog/catalog_entry/table_function_catalog_entry.hpp
similarity index 88%
rename from src/include/catalog/catalog_entry/table_function_catalog_entry.hpp
rename to src/include/duckdb/catalog/catalog_entry/table_function_catalog_entry.hpp
index 46b759e848d..b10b96eb687 100644
--- a/src/include/catalog/catalog_entry/table_function_catalog_entry.hpp
+++ b/src/include/duckdb/catalog/catalog_entry/table_function_catalog_entry.hpp
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "catalog/catalog_entry.hpp"
-#include "common/unordered_map.hpp"
-#include "function/table_function.hpp"
+#include "duckdb/catalog/catalog_entry.hpp"
+#include "duckdb/common/unordered_map.hpp"
+#include "duckdb/function/table_function.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/catalog/catalog_entry/view_catalog_entry.hpp b/src/include/duckdb/catalog/catalog_entry/view_catalog_entry.hpp
similarity index 93%
rename from src/include/catalog/catalog_entry/view_catalog_entry.hpp
rename to src/include/duckdb/catalog/catalog_entry/view_catalog_entry.hpp
index 0bb8c76f719..a362d0bdc4d 100644
--- a/src/include/catalog/catalog_entry/view_catalog_entry.hpp
+++ b/src/include/duckdb/catalog/catalog_entry/view_catalog_entry.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "catalog/catalog_entry.hpp"
-#include "parser/query_node.hpp"
+#include "duckdb/catalog/catalog_entry.hpp"
+#include "duckdb/parser/query_node.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/catalog/catalog_set.hpp b/src/include/duckdb/catalog/catalog_set.hpp
similarity index 93%
rename from src/include/catalog/catalog_set.hpp
rename to src/include/duckdb/catalog/catalog_set.hpp
index 3e9377f245f..1219ef5d34f 100644
--- a/src/include/catalog/catalog_set.hpp
+++ b/src/include/duckdb/catalog/catalog_set.hpp
@@ -8,10 +8,10 @@
 
 #pragma once
 
-#include "catalog/catalog_entry.hpp"
-#include "common/common.hpp"
-#include "common/unordered_map.hpp"
-#include "common/unordered_set.hpp"
+#include "duckdb/catalog/catalog_entry.hpp"
+#include "duckdb/common/common.hpp"
+#include "duckdb/common/unordered_map.hpp"
+#include "duckdb/common/unordered_set.hpp"
 
 #include <functional>
 #include <memory>
diff --git a/src/include/catalog/dependency_manager.hpp b/src/include/duckdb/catalog/dependency_manager.hpp
similarity index 95%
rename from src/include/catalog/dependency_manager.hpp
rename to src/include/duckdb/catalog/dependency_manager.hpp
index 12bd8a9f649..49841d06192 100644
--- a/src/include/catalog/dependency_manager.hpp
+++ b/src/include/duckdb/catalog/dependency_manager.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "catalog/catalog_entry.hpp"
-#include "catalog/catalog_set.hpp"
+#include "duckdb/catalog/catalog_entry.hpp"
+#include "duckdb/catalog/catalog_set.hpp"
 
 #include <mutex>
 
diff --git a/src/include/catalog/view_catalog.hpp b/src/include/duckdb/catalog/view_catalog.hpp
similarity index 90%
rename from src/include/catalog/view_catalog.hpp
rename to src/include/duckdb/catalog/view_catalog.hpp
index de4e87c6304..9ef1f30ad4b 100644
--- a/src/include/catalog/view_catalog.hpp
+++ b/src/include/duckdb/catalog/view_catalog.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "catalog/catalog_entry.hpp"
-#include "parser/query_node.hpp"
+#include "duckdb/catalog/catalog_entry.hpp"
+#include "duckdb/parser/query_node.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/common/allocator.hpp b/src/include/duckdb/common/allocator.hpp
similarity index 97%
rename from src/include/common/allocator.hpp
rename to src/include/duckdb/common/allocator.hpp
index 259155fae7f..d669c41e128 100644
--- a/src/include/common/allocator.hpp
+++ b/src/include/duckdb/common/allocator.hpp
@@ -1,14 +1,14 @@
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// common/allocator.hpp
+// duckdb/common/allocator.hpp
 //
 //
 //===----------------------------------------------------------------------===//
 
 #pragma once
 
-#include "common/helper.hpp"
+#include "duckdb/common/helper.hpp"
 
 #include <limits>
 #include <memory>
diff --git a/src/include/common/assert.hpp b/src/include/duckdb/common/assert.hpp
similarity index 89%
rename from src/include/common/assert.hpp
rename to src/include/duckdb/common/assert.hpp
index ae29197fd2e..badd1466e56 100644
--- a/src/include/common/assert.hpp
+++ b/src/include/duckdb/common/assert.hpp
@@ -1,7 +1,7 @@
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// common/assert.hpp
+// duckdb/common/assert.hpp
 //
 //
 //===----------------------------------------------------------------------===//
diff --git a/src/include/common/bitset.hpp b/src/include/duckdb/common/bitset.hpp
similarity index 90%
rename from src/include/common/bitset.hpp
rename to src/include/duckdb/common/bitset.hpp
index 3c78eada4ed..608123503c9 100644
--- a/src/include/common/bitset.hpp
+++ b/src/include/duckdb/common/bitset.hpp
@@ -1,7 +1,7 @@
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// common/bitset.hpp
+// duckdb/common/bitset.hpp
 //
 //
 //===----------------------------------------------------------------------===//
diff --git a/src/include/common/checksum.hpp b/src/include/duckdb/common/checksum.hpp
similarity index 84%
rename from src/include/common/checksum.hpp
rename to src/include/duckdb/common/checksum.hpp
index 381bd5a5784..425d6b1f5ac 100644
--- a/src/include/common/checksum.hpp
+++ b/src/include/duckdb/common/checksum.hpp
@@ -1,14 +1,14 @@
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// common/checksum.hpp
+// duckdb/common/checksum.hpp
 //
 //
 //===----------------------------------------------------------------------===//
 
 #pragma once
 
-#include "common/constants.hpp"
+#include "duckdb/common/constants.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/common/common.hpp b/src/include/duckdb/common/common.hpp
similarity index 61%
rename from src/include/common/common.hpp
rename to src/include/duckdb/common/common.hpp
index 16775c1f00b..85935d200aa 100644
--- a/src/include/common/common.hpp
+++ b/src/include/duckdb/common/common.hpp
@@ -1,13 +1,13 @@
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// common/common.hpp
+// duckdb/common/common.hpp
 //
 //
 //===----------------------------------------------------------------------===//
 
 #pragma once
 
-#include "common/constants.hpp"
-#include "common/helper.hpp"
-#include "common/types.hpp"
+#include "duckdb/common/constants.hpp"
+#include "duckdb/common/helper.hpp"
+#include "duckdb/common/types.hpp"
diff --git a/src/include/common/constants.hpp b/src/include/duckdb/common/constants.hpp
similarity index 98%
rename from src/include/common/constants.hpp
rename to src/include/duckdb/common/constants.hpp
index d0a8c364dfc..9cf7f7903e9 100644
--- a/src/include/common/constants.hpp
+++ b/src/include/duckdb/common/constants.hpp
@@ -1,7 +1,7 @@
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// common/constants.hpp
+// duckdb/common/constants.hpp
 //
 //
 //===----------------------------------------------------------------------===//
diff --git a/src/include/common/enums/catalog_type.hpp b/src/include/duckdb/common/enums/catalog_type.hpp
similarity index 89%
rename from src/include/common/enums/catalog_type.hpp
rename to src/include/duckdb/common/enums/catalog_type.hpp
index fd50a41f5ab..7d053be2106 100644
--- a/src/include/common/enums/catalog_type.hpp
+++ b/src/include/duckdb/common/enums/catalog_type.hpp
@@ -1,14 +1,14 @@
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// common/enums/catalog_type.hpp
+// duckdb/common/enums/catalog_type.hpp
 //
 //
 //===----------------------------------------------------------------------===//
 
 #pragma once
 
-#include "common/constants.hpp"
+#include "duckdb/common/constants.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/common/enums/expression_type.hpp b/src/include/duckdb/common/enums/expression_type.hpp
similarity index 98%
rename from src/include/common/enums/expression_type.hpp
rename to src/include/duckdb/common/enums/expression_type.hpp
index 24f6d73943e..be22efcf89f 100644
--- a/src/include/common/enums/expression_type.hpp
+++ b/src/include/duckdb/common/enums/expression_type.hpp
@@ -1,14 +1,14 @@
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// common/enums/expression_type.hpp
+// duckdb/common/enums/expression_type.hpp
 //
 //
 //===----------------------------------------------------------------------===//
 
 #pragma once
 
-#include "common/constants.hpp"
+#include "duckdb/common/constants.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/common/enums/index_type.hpp b/src/include/duckdb/common/enums/index_type.hpp
similarity index 87%
rename from src/include/common/enums/index_type.hpp
rename to src/include/duckdb/common/enums/index_type.hpp
index 5e5f74a75d4..22f73b8ece6 100644
--- a/src/include/common/enums/index_type.hpp
+++ b/src/include/duckdb/common/enums/index_type.hpp
@@ -1,14 +1,14 @@
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// common/enums/index_type.hpp
+// duckdb/common/enums/index_type.hpp
 //
 //
 //===----------------------------------------------------------------------===//
 
 #pragma once
 
-#include "common/constants.hpp"
+#include "duckdb/common/constants.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/common/enums/join_type.hpp b/src/include/duckdb/common/enums/join_type.hpp
similarity index 93%
rename from src/include/common/enums/join_type.hpp
rename to src/include/duckdb/common/enums/join_type.hpp
index 130cd133c52..f40810afdc9 100644
--- a/src/include/common/enums/join_type.hpp
+++ b/src/include/duckdb/common/enums/join_type.hpp
@@ -1,14 +1,14 @@
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// common/enums/join_type.hpp
+// duckdb/common/enums/join_type.hpp
 //
 //
 //===----------------------------------------------------------------------===//
 
 #pragma once
 
-#include "common/constants.hpp"
+#include "duckdb/common/constants.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/common/enums/logical_operator_type.hpp b/src/include/duckdb/common/enums/logical_operator_type.hpp
similarity index 94%
rename from src/include/common/enums/logical_operator_type.hpp
rename to src/include/duckdb/common/enums/logical_operator_type.hpp
index cc3f8917972..0e0a46bb240 100644
--- a/src/include/common/enums/logical_operator_type.hpp
+++ b/src/include/duckdb/common/enums/logical_operator_type.hpp
@@ -1,14 +1,14 @@
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// common/enums/logical_operator_type.hpp
+// duckdb/common/enums/logical_operator_type.hpp
 //
 //
 //===----------------------------------------------------------------------===//
 
 #pragma once
 
-#include "common/constants.hpp"
+#include "duckdb/common/constants.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/common/enums/order_type.hpp b/src/include/duckdb/common/enums/order_type.hpp
similarity index 80%
rename from src/include/common/enums/order_type.hpp
rename to src/include/duckdb/common/enums/order_type.hpp
index 331a5977414..7ca88a11199 100644
--- a/src/include/common/enums/order_type.hpp
+++ b/src/include/duckdb/common/enums/order_type.hpp
@@ -1,14 +1,14 @@
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// common/enums/order_type.hpp
+// duckdb/common/enums/order_type.hpp
 //
 //
 //===----------------------------------------------------------------------===//
 
 #pragma once
 
-#include "common/constants.hpp"
+#include "duckdb/common/constants.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/common/enums/physical_operator_type.hpp b/src/include/duckdb/common/enums/physical_operator_type.hpp
similarity index 94%
rename from src/include/common/enums/physical_operator_type.hpp
rename to src/include/duckdb/common/enums/physical_operator_type.hpp
index 7f3dcdcee2e..6341a59d41e 100644
--- a/src/include/common/enums/physical_operator_type.hpp
+++ b/src/include/duckdb/common/enums/physical_operator_type.hpp
@@ -1,14 +1,14 @@
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// common/enums/physical_operator_type.hpp
+// duckdb/common/enums/physical_operator_type.hpp
 //
 //
 //===----------------------------------------------------------------------===//
 
 #pragma once
 
-#include "common/constants.hpp"
+#include "duckdb/common/constants.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/common/enums/profiler_format.hpp b/src/include/duckdb/common/enums/profiler_format.hpp
similarity index 80%
rename from src/include/common/enums/profiler_format.hpp
rename to src/include/duckdb/common/enums/profiler_format.hpp
index 9c7ab477e06..edf26c5275d 100644
--- a/src/include/common/enums/profiler_format.hpp
+++ b/src/include/duckdb/common/enums/profiler_format.hpp
@@ -1,14 +1,14 @@
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// common/enums/profiler_format.hpp
+// duckdb/common/enums/profiler_format.hpp
 //
 //
 //===----------------------------------------------------------------------===//
 
 #pragma once
 
-#include "common/constants.hpp"
+#include "duckdb/common/constants.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/common/enums/set_operation_type.hpp b/src/include/duckdb/common/enums/set_operation_type.hpp
similarity index 79%
rename from src/include/common/enums/set_operation_type.hpp
rename to src/include/duckdb/common/enums/set_operation_type.hpp
index 1bb2f1e9af8..45bd57faf62 100644
--- a/src/include/common/enums/set_operation_type.hpp
+++ b/src/include/duckdb/common/enums/set_operation_type.hpp
@@ -1,14 +1,14 @@
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// common/enums/set_operation_type.hpp
+// duckdb/common/enums/set_operation_type.hpp
 //
 //
 //===----------------------------------------------------------------------===//
 
 #pragma once
 
-#include "common/constants.hpp"
+#include "duckdb/common/constants.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/common/enums/statement_type.hpp b/src/include/duckdb/common/enums/statement_type.hpp
similarity index 94%
rename from src/include/common/enums/statement_type.hpp
rename to src/include/duckdb/common/enums/statement_type.hpp
index fb111591d67..1e41beb1c46 100644
--- a/src/include/common/enums/statement_type.hpp
+++ b/src/include/duckdb/common/enums/statement_type.hpp
@@ -1,14 +1,14 @@
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// common/enums/statement_type.hpp
+// duckdb/common/enums/statement_type.hpp
 //
 //
 //===----------------------------------------------------------------------===//
 
 #pragma once
 
-#include "common/constants.hpp"
+#include "duckdb/common/constants.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/common/enums/subquery_type.hpp b/src/include/duckdb/common/enums/subquery_type.hpp
similarity index 89%
rename from src/include/common/enums/subquery_type.hpp
rename to src/include/duckdb/common/enums/subquery_type.hpp
index c7d27ac683c..2415ef5b7d4 100644
--- a/src/include/common/enums/subquery_type.hpp
+++ b/src/include/duckdb/common/enums/subquery_type.hpp
@@ -1,14 +1,14 @@
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// common/enums/subquery_type.hpp
+// duckdb/common/enums/subquery_type.hpp
 //
 //
 //===----------------------------------------------------------------------===//
 
 #pragma once
 
-#include "common/constants.hpp"
+#include "duckdb/common/constants.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/common/enums/tableref_type.hpp b/src/include/duckdb/common/enums/tableref_type.hpp
similarity index 91%
rename from src/include/common/enums/tableref_type.hpp
rename to src/include/duckdb/common/enums/tableref_type.hpp
index 29348c14d98..97e5528461a 100644
--- a/src/include/common/enums/tableref_type.hpp
+++ b/src/include/duckdb/common/enums/tableref_type.hpp
@@ -1,14 +1,14 @@
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// common/enums/tableref_type.hpp
+// duckdb/common/enums/tableref_type.hpp
 //
 //
 //===----------------------------------------------------------------------===//
 
 #pragma once
 
-#include "common/constants.hpp"
+#include "duckdb/common/constants.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/common/enums/undo_flags.hpp b/src/include/duckdb/common/enums/undo_flags.hpp
similarity index 84%
rename from src/include/common/enums/undo_flags.hpp
rename to src/include/duckdb/common/enums/undo_flags.hpp
index 59fb94ec601..892b0a7e7d4 100644
--- a/src/include/common/enums/undo_flags.hpp
+++ b/src/include/duckdb/common/enums/undo_flags.hpp
@@ -1,14 +1,14 @@
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// common/enums/undo_flags.hpp
+// duckdb/common/enums/undo_flags.hpp
 //
 //
 //===----------------------------------------------------------------------===//
 
 #pragma once
 
-#include "common/constants.hpp"
+#include "duckdb/common/constants.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/common/enums/wal_type.hpp b/src/include/duckdb/common/enums/wal_type.hpp
similarity index 92%
rename from src/include/common/enums/wal_type.hpp
rename to src/include/duckdb/common/enums/wal_type.hpp
index 281ffd8d279..8ca4bef7c94 100644
--- a/src/include/common/enums/wal_type.hpp
+++ b/src/include/duckdb/common/enums/wal_type.hpp
@@ -1,14 +1,14 @@
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// common/enums/wal_type.hpp
+// duckdb/common/enums/wal_type.hpp
 //
 //
 //===----------------------------------------------------------------------===//
 
 #pragma once
 
-#include "common/constants.hpp"
+#include "duckdb/common/constants.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/common/exception.hpp b/src/include/duckdb/common/exception.hpp
similarity index 98%
rename from src/include/common/exception.hpp
rename to src/include/duckdb/common/exception.hpp
index 5abc0b03357..dd1a91d2b97 100644
--- a/src/include/common/exception.hpp
+++ b/src/include/duckdb/common/exception.hpp
@@ -1,14 +1,14 @@
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// common/exception.hpp
+// duckdb/common/exception.hpp
 //
 //
 //===----------------------------------------------------------------------===//
 
 #pragma once
 
-#include "common/types.hpp"
+#include "duckdb/common/types.hpp"
 
 #include <stdarg.h>
 #include <stdexcept>
diff --git a/src/include/common/file_buffer.hpp b/src/include/duckdb/common/file_buffer.hpp
similarity index 96%
rename from src/include/common/file_buffer.hpp
rename to src/include/duckdb/common/file_buffer.hpp
index 77a6bf333c5..4d6292c28bf 100644
--- a/src/include/common/file_buffer.hpp
+++ b/src/include/duckdb/common/file_buffer.hpp
@@ -1,14 +1,14 @@
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// common/file_buffer.hpp
+// duckdb/common/file_buffer.hpp
 //
 //
 //===----------------------------------------------------------------------===//
 
 #pragma once
 
-#include "common/constants.hpp"
+#include "duckdb/common/constants.hpp"
 
 namespace duckdb {
 struct FileHandle;
diff --git a/src/include/common/file_system.hpp b/src/include/duckdb/common/file_system.hpp
similarity index 97%
rename from src/include/common/file_system.hpp
rename to src/include/duckdb/common/file_system.hpp
index bfd8b9a31d1..345e2f92da1 100644
--- a/src/include/common/file_system.hpp
+++ b/src/include/duckdb/common/file_system.hpp
@@ -1,15 +1,15 @@
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// common/file_system.hpp
+// duckdb/common/file_system.hpp
 //
 //
 //===----------------------------------------------------------------------===//
 
 #pragma once
 
-#include "common/constants.hpp"
-#include "common/file_buffer.hpp"
+#include "duckdb/common/constants.hpp"
+#include "duckdb/common/file_buffer.hpp"
 
 #include <functional>
 
diff --git a/src/include/common/fstream.hpp b/src/include/duckdb/common/fstream.hpp
similarity index 93%
rename from src/include/common/fstream.hpp
rename to src/include/duckdb/common/fstream.hpp
index 790e37bfe48..ff866092333 100644
--- a/src/include/common/fstream.hpp
+++ b/src/include/duckdb/common/fstream.hpp
@@ -1,7 +1,7 @@
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// common/fstream.hpp
+// duckdb/common/fstream.hpp
 //
 //
 //===----------------------------------------------------------------------===//
diff --git a/src/include/common/fstream_util.hpp b/src/include/duckdb/common/fstream_util.hpp
similarity index 85%
rename from src/include/common/fstream_util.hpp
rename to src/include/duckdb/common/fstream_util.hpp
index 303b5daea09..1283345b00f 100644
--- a/src/include/common/fstream_util.hpp
+++ b/src/include/duckdb/common/fstream_util.hpp
@@ -1,16 +1,16 @@
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// common/fstream_util.hpp
+// duckdb/common/fstream_util.hpp
 //
 //
 //===----------------------------------------------------------------------===//
 
 #pragma once
 
-#include "common/constants.hpp"
-#include "common/exception.hpp"
-#include "common/fstream.hpp"
+#include "duckdb/common/constants.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/common/fstream.hpp"
 
 namespace duckdb {
 /**
diff --git a/src/include/common/gzip_stream.hpp b/src/include/duckdb/common/gzip_stream.hpp
similarity index 94%
rename from src/include/common/gzip_stream.hpp
rename to src/include/duckdb/common/gzip_stream.hpp
index 958192830c7..d7e2ed93a49 100644
--- a/src/include/common/gzip_stream.hpp
+++ b/src/include/duckdb/common/gzip_stream.hpp
@@ -1,14 +1,14 @@
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// common/gzip_stream.hpp
+// duckdb/common/gzip_stream.hpp
 //
 //
 //===----------------------------------------------------------------------===//
 
 #pragma once
 
-#include "common/constants.hpp"
+#include "duckdb/common/constants.hpp"
 
 #include <fstream>
 #include <sstream>
diff --git a/src/include/common/helper.hpp b/src/include/duckdb/common/helper.hpp
similarity index 94%
rename from src/include/common/helper.hpp
rename to src/include/duckdb/common/helper.hpp
index 33e9ad3446f..fa9dac5840b 100644
--- a/src/include/common/helper.hpp
+++ b/src/include/duckdb/common/helper.hpp
@@ -1,14 +1,14 @@
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// common/helper.hpp
+// duckdb/common/helper.hpp
 //
 //
 //===----------------------------------------------------------------------===//
 
 #pragma once
 
-#include "common/constants.hpp"
+#include "duckdb/common/constants.hpp"
 
 #include <algorithm>
 #include <limits>
diff --git a/src/include/common/limits.hpp b/src/include/duckdb/common/limits.hpp
similarity index 96%
rename from src/include/common/limits.hpp
rename to src/include/duckdb/common/limits.hpp
index adb64691dc7..64e462b07f9 100644
--- a/src/include/common/limits.hpp
+++ b/src/include/duckdb/common/limits.hpp
@@ -1,14 +1,14 @@
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// common/limits.hpp
+// duckdb/common/limits.hpp
 //
 //
 //===----------------------------------------------------------------------===//
 
 #pragma once
 
-#include "common/types.hpp"
+#include "duckdb/common/types.hpp"
 
 #include <limits>
 
diff --git a/src/include/common/operator/aggregate_operators.hpp b/src/include/duckdb/common/operator/aggregate_operators.hpp
similarity index 84%
rename from src/include/common/operator/aggregate_operators.hpp
rename to src/include/duckdb/common/operator/aggregate_operators.hpp
index 830d36bced9..3214a058c40 100644
--- a/src/include/common/operator/aggregate_operators.hpp
+++ b/src/include/duckdb/common/operator/aggregate_operators.hpp
@@ -1,7 +1,7 @@
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// common/operator/aggregate_operators.hpp
+// duckdb/common/operator/aggregate_operators.hpp
 //
 //
 //===----------------------------------------------------------------------===//
@@ -11,7 +11,7 @@
 #include <algorithm>
 #include <cstdint>
 #include <cstring>
-#include "common/operator/comparison_operators.hpp"
+#include "duckdb/common/operator/comparison_operators.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/common/operator/boolean_operators.hpp b/src/include/duckdb/common/operator/boolean_operators.hpp
similarity index 97%
rename from src/include/common/operator/boolean_operators.hpp
rename to src/include/duckdb/common/operator/boolean_operators.hpp
index bb5848803cd..5c637c409b0 100644
--- a/src/include/common/operator/boolean_operators.hpp
+++ b/src/include/duckdb/common/operator/boolean_operators.hpp
@@ -1,7 +1,7 @@
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// common/operator/boolean_operators.hpp
+// duckdb/common/operator/boolean_operators.hpp
 //
 //
 //===----------------------------------------------------------------------===//
diff --git a/src/include/common/operator/cast_operators.hpp b/src/include/duckdb/common/operator/cast_operators.hpp
similarity index 98%
rename from src/include/common/operator/cast_operators.hpp
rename to src/include/duckdb/common/operator/cast_operators.hpp
index 245c8f79d51..af65ad87328 100644
--- a/src/include/common/operator/cast_operators.hpp
+++ b/src/include/duckdb/common/operator/cast_operators.hpp
@@ -1,15 +1,15 @@
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// common/operator/cast_operators.hpp
+// duckdb/common/operator/cast_operators.hpp
 //
 //
 //===----------------------------------------------------------------------===//
 
 #pragma once
 
-#include "common/constants.hpp"
-#include "common/exception.hpp"
+#include "duckdb/common/constants.hpp"
+#include "duckdb/common/exception.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/common/operator/comparison_operators.hpp b/src/include/duckdb/common/operator/comparison_operators.hpp
similarity index 97%
rename from src/include/common/operator/comparison_operators.hpp
rename to src/include/duckdb/common/operator/comparison_operators.hpp
index 24fa87e39c6..636c1c77bd1 100644
--- a/src/include/common/operator/comparison_operators.hpp
+++ b/src/include/duckdb/common/operator/comparison_operators.hpp
@@ -1,7 +1,7 @@
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// common/operator/comparison_operators.hpp
+// duckdb/common/operator/comparison_operators.hpp
 //
 //
 //===----------------------------------------------------------------------===//
diff --git a/src/include/common/operator/constant_operators.hpp b/src/include/duckdb/common/operator/constant_operators.hpp
similarity index 94%
rename from src/include/common/operator/constant_operators.hpp
rename to src/include/duckdb/common/operator/constant_operators.hpp
index 8de3427e1f8..3ceea704f53 100644
--- a/src/include/common/operator/constant_operators.hpp
+++ b/src/include/duckdb/common/operator/constant_operators.hpp
@@ -1,7 +1,7 @@
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// common/operator/constant_operators.hpp
+// duckdb/common/operator/constant_operators.hpp
 //
 //
 //===----------------------------------------------------------------------===//
diff --git a/src/include/common/operator/hash_operators.hpp b/src/include/duckdb/common/operator/hash_operators.hpp
similarity index 73%
rename from src/include/common/operator/hash_operators.hpp
rename to src/include/duckdb/common/operator/hash_operators.hpp
index 591fe436fd5..00245082ef9 100644
--- a/src/include/common/operator/hash_operators.hpp
+++ b/src/include/duckdb/common/operator/hash_operators.hpp
@@ -1,16 +1,16 @@
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// common/operator/hash_operators.hpp
+// duckdb/common/operator/hash_operators.hpp
 //
 //
 //===----------------------------------------------------------------------===//
 
 #pragma once
 
-#include "common/common.hpp"
-#include "common/types/hash.hpp"
-#include "common/types/null_value.hpp"
+#include "duckdb/common/common.hpp"
+#include "duckdb/common/types/hash.hpp"
+#include "duckdb/common/types/null_value.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/common/operator/like_operators.hpp b/src/include/duckdb/common/operator/like_operators.hpp
similarity index 92%
rename from src/include/common/operator/like_operators.hpp
rename to src/include/duckdb/common/operator/like_operators.hpp
index 995fd4bbbdc..1bc9bfff2fd 100644
--- a/src/include/common/operator/like_operators.hpp
+++ b/src/include/duckdb/common/operator/like_operators.hpp
@@ -1,7 +1,7 @@
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// common/operator/like_operators.hpp
+// duckdb/common/operator/like_operators.hpp
 //
 //
 //===----------------------------------------------------------------------===//
diff --git a/src/include/common/operator/numeric_binary_operators.hpp b/src/include/duckdb/common/operator/numeric_binary_operators.hpp
similarity index 92%
rename from src/include/common/operator/numeric_binary_operators.hpp
rename to src/include/duckdb/common/operator/numeric_binary_operators.hpp
index 3d4a13c1a74..3c9bf778771 100644
--- a/src/include/common/operator/numeric_binary_operators.hpp
+++ b/src/include/duckdb/common/operator/numeric_binary_operators.hpp
@@ -1,14 +1,14 @@
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// common/operator/numeric_binary_operators.hpp
+// duckdb/common/operator/numeric_binary_operators.hpp
 //
 //
 //===----------------------------------------------------------------------===//
 
 #pragma once
 
-#include "common/assert.hpp"
+#include "duckdb/common/assert.hpp"
 #include <cmath>
 
 namespace duckdb {
diff --git a/src/include/common/operator/numeric_bitwise_operators.hpp b/src/include/duckdb/common/operator/numeric_bitwise_operators.hpp
similarity index 94%
rename from src/include/common/operator/numeric_bitwise_operators.hpp
rename to src/include/duckdb/common/operator/numeric_bitwise_operators.hpp
index 9b2cbdb80ca..9d8d50b85a6 100644
--- a/src/include/common/operator/numeric_bitwise_operators.hpp
+++ b/src/include/duckdb/common/operator/numeric_bitwise_operators.hpp
@@ -1,7 +1,7 @@
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// common/operator/numeric_bitwise_operators.hpp
+// duckdb/common/operator/numeric_bitwise_operators.hpp
 //
 //
 //===----------------------------------------------------------------------===//
diff --git a/src/include/common/operator/numeric_functions.hpp b/src/include/duckdb/common/operator/numeric_functions.hpp
similarity index 98%
rename from src/include/common/operator/numeric_functions.hpp
rename to src/include/duckdb/common/operator/numeric_functions.hpp
index f5c32cff18b..7be53d59ed7 100644
--- a/src/include/common/operator/numeric_functions.hpp
+++ b/src/include/duckdb/common/operator/numeric_functions.hpp
@@ -1,7 +1,7 @@
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// common/operator/numeric_functions.hpp
+// duckdb/common/operator/numeric_functions.hpp
 //
 //
 //===----------------------------------------------------------------------===//
diff --git a/src/include/common/operator/numeric_inplace_bitwise_operators.hpp b/src/include/duckdb/common/operator/numeric_inplace_bitwise_operators.hpp
similarity index 85%
rename from src/include/common/operator/numeric_inplace_bitwise_operators.hpp
rename to src/include/duckdb/common/operator/numeric_inplace_bitwise_operators.hpp
index c957f649ea7..34fb1b76a46 100644
--- a/src/include/common/operator/numeric_inplace_bitwise_operators.hpp
+++ b/src/include/duckdb/common/operator/numeric_inplace_bitwise_operators.hpp
@@ -1,7 +1,7 @@
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// common/operator/numeric_inplace_bitwise_operators.hpp
+// duckdb/common/operator/numeric_inplace_bitwise_operators.hpp
 //
 //
 //===----------------------------------------------------------------------===//
diff --git a/src/include/common/operator/numeric_inplace_operators.hpp b/src/include/duckdb/common/operator/numeric_inplace_operators.hpp
similarity index 95%
rename from src/include/common/operator/numeric_inplace_operators.hpp
rename to src/include/duckdb/common/operator/numeric_inplace_operators.hpp
index 24a76a9220c..b63c57d6e84 100644
--- a/src/include/common/operator/numeric_inplace_operators.hpp
+++ b/src/include/duckdb/common/operator/numeric_inplace_operators.hpp
@@ -1,7 +1,7 @@
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// common/operator/numeric_inplace_operators.hpp
+// duckdb/common/operator/numeric_inplace_operators.hpp
 //
 //
 //===----------------------------------------------------------------------===//
diff --git a/src/include/common/printer.hpp b/src/include/duckdb/common/printer.hpp
similarity index 86%
rename from src/include/common/printer.hpp
rename to src/include/duckdb/common/printer.hpp
index 0c432f4fc0f..007328edd9a 100644
--- a/src/include/common/printer.hpp
+++ b/src/include/duckdb/common/printer.hpp
@@ -1,14 +1,14 @@
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// common/printer.hpp
+// duckdb/common/printer.hpp
 //
 //
 //===----------------------------------------------------------------------===//
 
 #pragma once
 
-#include "common/constants.hpp"
+#include "duckdb/common/constants.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/common/profiler.hpp b/src/include/duckdb/common/profiler.hpp
similarity index 94%
rename from src/include/common/profiler.hpp
rename to src/include/duckdb/common/profiler.hpp
index e09417bfaa5..b6c47f2545b 100644
--- a/src/include/common/profiler.hpp
+++ b/src/include/duckdb/common/profiler.hpp
@@ -1,14 +1,14 @@
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// common/profiler.hpp
+// duckdb/common/profiler.hpp
 //
 //
 //===----------------------------------------------------------------------===//
 
 #pragma once
 
-#include "common/helper.hpp"
+#include "duckdb/common/helper.hpp"
 
 #include <chrono>
 
diff --git a/src/include/common/serializer.hpp b/src/include/duckdb/common/serializer.hpp
similarity index 94%
rename from src/include/common/serializer.hpp
rename to src/include/duckdb/common/serializer.hpp
index 3e072ab577a..a0b8209c347 100644
--- a/src/include/common/serializer.hpp
+++ b/src/include/duckdb/common/serializer.hpp
@@ -1,15 +1,15 @@
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// common/serializer.hpp
+// duckdb/common/serializer.hpp
 //
 //
 //===----------------------------------------------------------------------===//
 
 #pragma once
 
-#include "common/common.hpp"
-#include "common/exception.hpp"
+#include "duckdb/common/common.hpp"
+#include "duckdb/common/exception.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/common/serializer/buffered_deserializer.hpp b/src/include/duckdb/common/serializer/buffered_deserializer.hpp
similarity index 78%
rename from src/include/common/serializer/buffered_deserializer.hpp
rename to src/include/duckdb/common/serializer/buffered_deserializer.hpp
index c87769cddc7..b3f36ffb173 100644
--- a/src/include/common/serializer/buffered_deserializer.hpp
+++ b/src/include/duckdb/common/serializer/buffered_deserializer.hpp
@@ -1,15 +1,15 @@
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// common/serializer/buffered_deserializer.hpp
+// duckdb/common/serializer/buffered_deserializer.hpp
 //
 //
 //===----------------------------------------------------------------------===//
 
 #pragma once
 
-#include "common/serializer/buffered_serializer.hpp"
-#include "common/serializer.hpp"
+#include "duckdb/common/serializer/buffered_serializer.hpp"
+#include "duckdb/common/serializer.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/common/serializer/buffered_file_reader.hpp b/src/include/duckdb/common/serializer/buffered_file_reader.hpp
similarity index 86%
rename from src/include/common/serializer/buffered_file_reader.hpp
rename to src/include/duckdb/common/serializer/buffered_file_reader.hpp
index a4a538e920f..bf793d37f80 100644
--- a/src/include/common/serializer/buffered_file_reader.hpp
+++ b/src/include/duckdb/common/serializer/buffered_file_reader.hpp
@@ -1,14 +1,14 @@
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// common/serializer/buffered_file_reader.hpp
+// duckdb/common/serializer/buffered_file_reader.hpp
 //
 //
 //===----------------------------------------------------------------------===//
 
 #pragma once
 
-#include "common/serializer/buffered_file_writer.hpp"
+#include "duckdb/common/serializer/buffered_file_writer.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/common/serializer/buffered_file_writer.hpp b/src/include/duckdb/common/serializer/buffered_file_writer.hpp
similarity index 86%
rename from src/include/common/serializer/buffered_file_writer.hpp
rename to src/include/duckdb/common/serializer/buffered_file_writer.hpp
index c55d03aa105..546ae7b2e4f 100644
--- a/src/include/common/serializer/buffered_file_writer.hpp
+++ b/src/include/duckdb/common/serializer/buffered_file_writer.hpp
@@ -1,15 +1,15 @@
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// common/serializer/buffered_file_writer.hpp
+// duckdb/common/serializer/buffered_file_writer.hpp
 //
 //
 //===----------------------------------------------------------------------===//
 
 #pragma once
 
-#include "common/serializer.hpp"
-#include "common/file_system.hpp"
+#include "duckdb/common/serializer.hpp"
+#include "duckdb/common/file_system.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/common/serializer/buffered_serializer.hpp b/src/include/duckdb/common/serializer/buffered_serializer.hpp
similarity index 91%
rename from src/include/common/serializer/buffered_serializer.hpp
rename to src/include/duckdb/common/serializer/buffered_serializer.hpp
index cbc1bb81e58..b8ef2e7e338 100644
--- a/src/include/common/serializer/buffered_serializer.hpp
+++ b/src/include/duckdb/common/serializer/buffered_serializer.hpp
@@ -1,14 +1,14 @@
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// common/serializer/buffered_serializer.hpp
+// duckdb/common/serializer/buffered_serializer.hpp
 //
 //
 //===----------------------------------------------------------------------===//
 
 #pragma once
 
-#include "common/serializer.hpp"
+#include "duckdb/common/serializer.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/common/storage_util.hpp b/src/include/duckdb/common/storage_util.hpp
similarity index 96%
rename from src/include/common/storage_util.hpp
rename to src/include/duckdb/common/storage_util.hpp
index 0381be1b377..5a50a0356a0 100644
--- a/src/include/common/storage_util.hpp
+++ b/src/include/duckdb/common/storage_util.hpp
@@ -1,7 +1,7 @@
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// common/storage_util.hpp
+// duckdb/common/storage_util.hpp
 //
 //
 //===----------------------------------------------------------------------===//
diff --git a/src/include/common/string_util.hpp b/src/include/duckdb/common/string_util.hpp
similarity index 97%
rename from src/include/common/string_util.hpp
rename to src/include/duckdb/common/string_util.hpp
index 6aff7498b3b..4c0f56434b8 100644
--- a/src/include/common/string_util.hpp
+++ b/src/include/duckdb/common/string_util.hpp
@@ -1,14 +1,14 @@
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// common/string_util.hpp
+// duckdb/common/string_util.hpp
 //
 //
 //===----------------------------------------------------------------------===//
 
 #pragma once
 
-#include "common/constants.hpp"
+#include "duckdb/common/constants.hpp"
 
 namespace duckdb {
 /**
diff --git a/src/include/common/types.hpp b/src/include/duckdb/common/types.hpp
similarity index 97%
rename from src/include/common/types.hpp
rename to src/include/duckdb/common/types.hpp
index 73f53ea79f5..1804c536195 100644
--- a/src/include/common/types.hpp
+++ b/src/include/duckdb/common/types.hpp
@@ -1,15 +1,15 @@
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// common/types.hpp
+// duckdb/common/types.hpp
 //
 //
 //===----------------------------------------------------------------------===//
 
 #pragma once
 
-#include "common/assert.hpp"
-#include "common/constants.hpp"
+#include "duckdb/common/assert.hpp"
+#include "duckdb/common/constants.hpp"
 
 #include <type_traits>
 
diff --git a/src/include/common/types/chunk_collection.hpp b/src/include/duckdb/common/types/chunk_collection.hpp
similarity index 94%
rename from src/include/common/types/chunk_collection.hpp
rename to src/include/duckdb/common/types/chunk_collection.hpp
index 2f3935d958e..cf0aced7e10 100644
--- a/src/include/common/types/chunk_collection.hpp
+++ b/src/include/duckdb/common/types/chunk_collection.hpp
@@ -1,15 +1,15 @@
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// common/types/chunk_collection.hpp
+// duckdb/common/types/chunk_collection.hpp
 //
 //
 //===----------------------------------------------------------------------===//
 
 #pragma once
 
-#include "common/enums/order_type.hpp"
-#include "common/types/data_chunk.hpp"
+#include "duckdb/common/enums/order_type.hpp"
+#include "duckdb/common/types/data_chunk.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/common/types/constant_vector.hpp b/src/include/duckdb/common/types/constant_vector.hpp
similarity index 85%
rename from src/include/common/types/constant_vector.hpp
rename to src/include/duckdb/common/types/constant_vector.hpp
index e20a9418e06..98e1184b37e 100644
--- a/src/include/common/types/constant_vector.hpp
+++ b/src/include/duckdb/common/types/constant_vector.hpp
@@ -1,14 +1,14 @@
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// common/types/constant_vector.hpp
+// duckdb/common/types/constant_vector.hpp
 //
 //
 //===----------------------------------------------------------------------===//
 
 #pragma once
 
-#include "common/types/vector.hpp"
+#include "duckdb/common/types/vector.hpp"
 
 #include <type_traits>
 
diff --git a/src/include/common/types/data_chunk.hpp b/src/include/duckdb/common/types/data_chunk.hpp
similarity index 97%
rename from src/include/common/types/data_chunk.hpp
rename to src/include/duckdb/common/types/data_chunk.hpp
index b1e732aef2f..7a0863242d6 100644
--- a/src/include/common/types/data_chunk.hpp
+++ b/src/include/duckdb/common/types/data_chunk.hpp
@@ -1,15 +1,15 @@
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// common/types/data_chunk.hpp
+// duckdb/common/types/data_chunk.hpp
 //
 //
 //===----------------------------------------------------------------------===//
 
 #pragma once
 
-#include "common/common.hpp"
-#include "common/types/vector.hpp"
+#include "duckdb/common/common.hpp"
+#include "duckdb/common/types/vector.hpp"
 
 #include <vector>
 
diff --git a/src/include/common/types/date.hpp b/src/include/duckdb/common/types/date.hpp
similarity index 96%
rename from src/include/common/types/date.hpp
rename to src/include/duckdb/common/types/date.hpp
index 94b41482c0a..0f53f376652 100644
--- a/src/include/common/types/date.hpp
+++ b/src/include/duckdb/common/types/date.hpp
@@ -1,14 +1,14 @@
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// common/types/date.hpp
+// duckdb/common/types/date.hpp
 //
 //
 //===----------------------------------------------------------------------===//
 
 #pragma once
 
-#include "common/common.hpp"
+#include "duckdb/common/common.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/common/types/hash.hpp b/src/include/duckdb/common/types/hash.hpp
similarity index 95%
rename from src/include/common/types/hash.hpp
rename to src/include/duckdb/common/types/hash.hpp
index 92e9b85dc98..6067ffb008a 100644
--- a/src/include/common/types/hash.hpp
+++ b/src/include/duckdb/common/types/hash.hpp
@@ -1,14 +1,14 @@
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// common/types/hash.hpp
+// duckdb/common/types/hash.hpp
 //
 //
 //===----------------------------------------------------------------------===//
 
 #pragma once
 
-#include "common/common.hpp"
+#include "duckdb/common/common.hpp"
 
 #include <memory.h>
 
diff --git a/src/include/common/types/hyperloglog.hpp b/src/include/duckdb/common/types/hyperloglog.hpp
similarity index 92%
rename from src/include/common/types/hyperloglog.hpp
rename to src/include/duckdb/common/types/hyperloglog.hpp
index 4ea45d64416..91cd59b35a0 100644
--- a/src/include/common/types/hyperloglog.hpp
+++ b/src/include/duckdb/common/types/hyperloglog.hpp
@@ -1,14 +1,14 @@
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// common/types/hyperloglog.hpp
+// duckdb/common/types/hyperloglog.hpp
 //
 //
 //===----------------------------------------------------------------------===//
 
 #pragma once
 
-#include "common/types/vector.hpp"
+#include "duckdb/common/types/vector.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/common/types/null_value.hpp b/src/include/duckdb/common/types/null_value.hpp
similarity index 94%
rename from src/include/common/types/null_value.hpp
rename to src/include/duckdb/common/types/null_value.hpp
index 01183b408c5..e91b29799c5 100644
--- a/src/include/common/types/null_value.hpp
+++ b/src/include/duckdb/common/types/null_value.hpp
@@ -1,14 +1,14 @@
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// common/types/null_value.hpp
+// duckdb/common/types/null_value.hpp
 //
 //
 //===----------------------------------------------------------------------===//
 
 #pragma once
 
-#include "common/common.hpp"
+#include "duckdb/common/common.hpp"
 
 #include <cstring>
 
diff --git a/src/include/common/types/static_vector.hpp b/src/include/duckdb/common/types/static_vector.hpp
similarity index 94%
rename from src/include/common/types/static_vector.hpp
rename to src/include/duckdb/common/types/static_vector.hpp
index 027b8e55459..e301af5a21b 100644
--- a/src/include/common/types/static_vector.hpp
+++ b/src/include/duckdb/common/types/static_vector.hpp
@@ -1,14 +1,14 @@
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// common/types/static_vector.hpp
+// duckdb/common/types/static_vector.hpp
 //
 //
 //===----------------------------------------------------------------------===//
 
 #pragma once
 
-#include "common/types/vector.hpp"
+#include "duckdb/common/types/vector.hpp"
 
 #include <type_traits>
 
diff --git a/src/include/common/types/string_heap.hpp b/src/include/duckdb/common/types/string_heap.hpp
similarity index 93%
rename from src/include/common/types/string_heap.hpp
rename to src/include/duckdb/common/types/string_heap.hpp
index 43f3406b568..0efdb674932 100644
--- a/src/include/common/types/string_heap.hpp
+++ b/src/include/duckdb/common/types/string_heap.hpp
@@ -1,15 +1,15 @@
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// common/types/string_heap.hpp
+// duckdb/common/types/string_heap.hpp
 //
 //
 //===----------------------------------------------------------------------===//
 
 #pragma once
 
-#include "common/common.hpp"
-#include "common/types/value.hpp"
+#include "duckdb/common/common.hpp"
+#include "duckdb/common/types/value.hpp"
 
 namespace duckdb {
 //! A string heap is the owner of a set of strings, strings can be inserted into
diff --git a/src/include/common/types/time.hpp b/src/include/duckdb/common/types/time.hpp
similarity index 94%
rename from src/include/common/types/time.hpp
rename to src/include/duckdb/common/types/time.hpp
index 3e7b470581a..ebf326737ad 100644
--- a/src/include/common/types/time.hpp
+++ b/src/include/duckdb/common/types/time.hpp
@@ -1,14 +1,14 @@
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// common/types/time.hpp
+// duckdb/common/types/time.hpp
 //
 //
 //===----------------------------------------------------------------------===//
 
 #pragma once
 
-#include "common/common.hpp"
+#include "duckdb/common/common.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/common/types/timestamp.hpp b/src/include/duckdb/common/types/timestamp.hpp
similarity index 96%
rename from src/include/common/types/timestamp.hpp
rename to src/include/duckdb/common/types/timestamp.hpp
index aed0ed881b0..7e43831a31c 100644
--- a/src/include/common/types/timestamp.hpp
+++ b/src/include/duckdb/common/types/timestamp.hpp
@@ -1,14 +1,14 @@
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// common/types/timestamp.hpp
+// duckdb/common/types/timestamp.hpp
 //
 //
 //===----------------------------------------------------------------------===//
 
 #pragma once
 
-#include "common/common.hpp"
+#include "duckdb/common/common.hpp"
 
 #include <chrono>  // chrono::system_clock
 #include <ctime>   // localtime
diff --git a/src/include/common/types/value.hpp b/src/include/duckdb/common/types/value.hpp
similarity index 98%
rename from src/include/common/types/value.hpp
rename to src/include/duckdb/common/types/value.hpp
index ee0de40da95..10b52520c94 100644
--- a/src/include/common/types/value.hpp
+++ b/src/include/duckdb/common/types/value.hpp
@@ -1,15 +1,15 @@
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// common/types/value.hpp
+// duckdb/common/types/value.hpp
 //
 //
 //===----------------------------------------------------------------------===//
 
 #pragma once
 
-#include "common/common.hpp"
-#include "common/exception.hpp"
+#include "duckdb/common/common.hpp"
+#include "duckdb/common/exception.hpp"
 
 #include <iosfwd>
 #include <memory.h>
diff --git a/src/include/common/types/vector.hpp b/src/include/duckdb/common/types/vector.hpp
similarity index 96%
rename from src/include/common/types/vector.hpp
rename to src/include/duckdb/common/types/vector.hpp
index 0a57ce7b421..ef7d7fdc2a2 100644
--- a/src/include/common/types/vector.hpp
+++ b/src/include/duckdb/common/types/vector.hpp
@@ -1,17 +1,17 @@
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// common/types/vector.hpp
+// duckdb/common/types/vector.hpp
 //
 //
 //===----------------------------------------------------------------------===//
 
 #pragma once
 
-#include "common/bitset.hpp"
-#include "common/common.hpp"
-#include "common/types/string_heap.hpp"
-#include "common/types/value.hpp"
+#include "duckdb/common/bitset.hpp"
+#include "duckdb/common/common.hpp"
+#include "duckdb/common/types/string_heap.hpp"
+#include "duckdb/common/types/value.hpp"
 
 namespace duckdb {
 //! Type used for nullmasks
diff --git a/src/include/common/unordered_map.hpp b/src/include/duckdb/common/unordered_map.hpp
similarity index 89%
rename from src/include/common/unordered_map.hpp
rename to src/include/duckdb/common/unordered_map.hpp
index 5fc018373e0..9e6d2b821b5 100644
--- a/src/include/common/unordered_map.hpp
+++ b/src/include/duckdb/common/unordered_map.hpp
@@ -1,7 +1,7 @@
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// common/unordered_map.hpp
+// duckdb/common/unordered_map.hpp
 //
 //
 //===----------------------------------------------------------------------===//
diff --git a/src/include/common/unordered_set.hpp b/src/include/duckdb/common/unordered_set.hpp
similarity index 89%
rename from src/include/common/unordered_set.hpp
rename to src/include/duckdb/common/unordered_set.hpp
index 8a8b4f9393b..6d9defc0d83 100644
--- a/src/include/common/unordered_set.hpp
+++ b/src/include/duckdb/common/unordered_set.hpp
@@ -1,7 +1,7 @@
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// common/unordered_set.hpp
+// duckdb/common/unordered_set.hpp
 //
 //
 //===----------------------------------------------------------------------===//
diff --git a/src/include/common/value_operations/value_operations.hpp b/src/include/duckdb/common/value_operations/value_operations.hpp
similarity index 95%
rename from src/include/common/value_operations/value_operations.hpp
rename to src/include/duckdb/common/value_operations/value_operations.hpp
index bc7a6005036..37b70e6836e 100644
--- a/src/include/common/value_operations/value_operations.hpp
+++ b/src/include/duckdb/common/value_operations/value_operations.hpp
@@ -1,14 +1,14 @@
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// common/value_operations/value_operations.hpp
+// duckdb/common/value_operations/value_operations.hpp
 //
 //
 //===----------------------------------------------------------------------===//
 
 #pragma once
 
-#include "common/types/value.hpp"
+#include "duckdb/common/types/value.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/common/vector_operations/binary_loops.hpp b/src/include/duckdb/common/vector_operations/binary_loops.hpp
similarity index 97%
rename from src/include/common/vector_operations/binary_loops.hpp
rename to src/include/duckdb/common/vector_operations/binary_loops.hpp
index 80d959139ff..243cf375757 100644
--- a/src/include/common/vector_operations/binary_loops.hpp
+++ b/src/include/duckdb/common/vector_operations/binary_loops.hpp
@@ -1,16 +1,16 @@
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// common/vector_operations/binary_loops.hpp
+// duckdb/common/vector_operations/binary_loops.hpp
 //
 //
 //===----------------------------------------------------------------------===//
 
 #pragma once
 
-#include "common/exception.hpp"
-#include "common/types/vector.hpp"
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/common/types/vector.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/common/vector_operations/fold_loops.hpp b/src/include/duckdb/common/vector_operations/fold_loops.hpp
similarity index 90%
rename from src/include/common/vector_operations/fold_loops.hpp
rename to src/include/duckdb/common/vector_operations/fold_loops.hpp
index 64c06d42454..164b1046c38 100644
--- a/src/include/common/vector_operations/fold_loops.hpp
+++ b/src/include/duckdb/common/vector_operations/fold_loops.hpp
@@ -1,16 +1,16 @@
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// common/vector_operations/fold_loops.hpp
+// duckdb/common/vector_operations/fold_loops.hpp
 //
 //
 //===----------------------------------------------------------------------===//
 
 #pragma once
 
-#include "common/exception.hpp"
-#include "common/types/vector.hpp"
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/common/types/vector.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/common/vector_operations/inplace_loops.hpp b/src/include/duckdb/common/vector_operations/inplace_loops.hpp
similarity index 91%
rename from src/include/common/vector_operations/inplace_loops.hpp
rename to src/include/duckdb/common/vector_operations/inplace_loops.hpp
index 1a11a9b0c6e..17fc2709120 100644
--- a/src/include/common/vector_operations/inplace_loops.hpp
+++ b/src/include/duckdb/common/vector_operations/inplace_loops.hpp
@@ -1,16 +1,16 @@
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// common/vector_operations/inplace_loops.hpp
+// duckdb/common/vector_operations/inplace_loops.hpp
 //
 //
 //===----------------------------------------------------------------------===//
 
 #pragma once
 
-#include "common/exception.hpp"
-#include "common/types/vector.hpp"
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/common/types/vector.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/common/vector_operations/scatter_loops.hpp b/src/include/duckdb/common/vector_operations/scatter_loops.hpp
similarity index 88%
rename from src/include/common/vector_operations/scatter_loops.hpp
rename to src/include/duckdb/common/vector_operations/scatter_loops.hpp
index a8d2a1d5da7..4a99e89998c 100644
--- a/src/include/common/vector_operations/scatter_loops.hpp
+++ b/src/include/duckdb/common/vector_operations/scatter_loops.hpp
@@ -1,17 +1,17 @@
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// common/vector_operations/scatter_loops.hpp
+// duckdb/common/vector_operations/scatter_loops.hpp
 //
 //
 //===----------------------------------------------------------------------===//
 
 #pragma once
 
-#include "common/exception.hpp"
-#include "common/types/null_value.hpp"
-#include "common/types/vector.hpp"
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/common/types/null_value.hpp"
+#include "duckdb/common/types/vector.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/common/vector_operations/unary_loops.hpp b/src/include/duckdb/common/vector_operations/unary_loops.hpp
similarity index 93%
rename from src/include/common/vector_operations/unary_loops.hpp
rename to src/include/duckdb/common/vector_operations/unary_loops.hpp
index 2bd32e44b8a..8e1ae06b073 100644
--- a/src/include/common/vector_operations/unary_loops.hpp
+++ b/src/include/duckdb/common/vector_operations/unary_loops.hpp
@@ -1,16 +1,16 @@
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// common/vector_operations/unary_loops.hpp
+// duckdb/common/vector_operations/unary_loops.hpp
 //
 //
 //===----------------------------------------------------------------------===//
 
 #pragma once
 
-#include "common/exception.hpp"
-#include "common/types/vector.hpp"
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/common/types/vector.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/common/vector_operations/unary_numeric.hpp b/src/include/duckdb/common/vector_operations/unary_numeric.hpp
similarity index 93%
rename from src/include/common/vector_operations/unary_numeric.hpp
rename to src/include/duckdb/common/vector_operations/unary_numeric.hpp
index ecf90977e5f..8a9af0d6917 100644
--- a/src/include/common/vector_operations/unary_numeric.hpp
+++ b/src/include/duckdb/common/vector_operations/unary_numeric.hpp
@@ -1,16 +1,16 @@
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// common/vector_operations/unary_numeric.hpp
+// duckdb/common/vector_operations/unary_numeric.hpp
 //
 //
 //===----------------------------------------------------------------------===//
 
 #pragma once
 
-#include "common/exception.hpp"
-#include "common/types/vector.hpp"
-#include "common/vector_operations/unary_loops.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/common/types/vector.hpp"
+#include "duckdb/common/vector_operations/unary_loops.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/common/vector_operations/vector_operations.hpp b/src/include/duckdb/common/vector_operations/vector_operations.hpp
similarity index 99%
rename from src/include/common/vector_operations/vector_operations.hpp
rename to src/include/duckdb/common/vector_operations/vector_operations.hpp
index ba9be4a8c02..b9552d27b06 100644
--- a/src/include/common/vector_operations/vector_operations.hpp
+++ b/src/include/duckdb/common/vector_operations/vector_operations.hpp
@@ -1,14 +1,14 @@
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// common/vector_operations/vector_operations.hpp
+// duckdb/common/vector_operations/vector_operations.hpp
 //
 //
 //===----------------------------------------------------------------------===//
 
 #pragma once
 
-#include "common/types/vector.hpp"
+#include "duckdb/common/types/vector.hpp"
 
 #include <functional>
 
diff --git a/src/include/execution/aggregate_hashtable.hpp b/src/include/duckdb/execution/aggregate_hashtable.hpp
similarity index 95%
rename from src/include/execution/aggregate_hashtable.hpp
rename to src/include/duckdb/execution/aggregate_hashtable.hpp
index 7dd6a9221b2..257a586b595 100644
--- a/src/include/execution/aggregate_hashtable.hpp
+++ b/src/include/duckdb/execution/aggregate_hashtable.hpp
@@ -8,10 +8,10 @@
 
 #pragma once
 
-#include "common/common.hpp"
-#include "planner/expression.hpp"
-#include "common/types/data_chunk.hpp"
-#include "common/types/vector.hpp"
+#include "duckdb/common/common.hpp"
+#include "duckdb/planner/expression.hpp"
+#include "duckdb/common/types/data_chunk.hpp"
+#include "duckdb/common/types/vector.hpp"
 
 namespace duckdb {
 class BoundAggregateExpression;
diff --git a/src/include/execution/column_binding_resolver.hpp b/src/include/duckdb/execution/column_binding_resolver.hpp
similarity index 93%
rename from src/include/execution/column_binding_resolver.hpp
rename to src/include/duckdb/execution/column_binding_resolver.hpp
index 3e93b3bb76f..91f60bf101c 100644
--- a/src/include/execution/column_binding_resolver.hpp
+++ b/src/include/duckdb/execution/column_binding_resolver.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "planner/table_binding_resolver.hpp"
+#include "duckdb/planner/table_binding_resolver.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/execution/execution_context.hpp b/src/include/duckdb/execution/execution_context.hpp
similarity index 79%
rename from src/include/execution/execution_context.hpp
rename to src/include/duckdb/execution/execution_context.hpp
index 97716fbad07..2489e5afbe4 100644
--- a/src/include/execution/execution_context.hpp
+++ b/src/include/duckdb/execution/execution_context.hpp
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "common/types/data_chunk.hpp"
-#include "execution/physical_operator.hpp"
-#include "main/query_result.hpp"
+#include "duckdb/common/types/data_chunk.hpp"
+#include "duckdb/execution/physical_operator.hpp"
+#include "duckdb/main/query_result.hpp"
 
 namespace duckdb {
 class DuckDB;
diff --git a/src/include/execution/expression_executor.hpp b/src/include/duckdb/execution/expression_executor.hpp
similarity index 92%
rename from src/include/execution/expression_executor.hpp
rename to src/include/duckdb/execution/expression_executor.hpp
index 63c3a719dc2..34983edb2fa 100644
--- a/src/include/execution/expression_executor.hpp
+++ b/src/include/duckdb/execution/expression_executor.hpp
@@ -8,11 +8,11 @@
 
 #pragma once
 
-#include "common/common.hpp"
-#include "common/types/data_chunk.hpp"
-#include "common/unordered_map.hpp"
-#include "planner/bound_tokens.hpp"
-#include "planner/expression.hpp"
+#include "duckdb/common/common.hpp"
+#include "duckdb/common/types/data_chunk.hpp"
+#include "duckdb/common/unordered_map.hpp"
+#include "duckdb/planner/bound_tokens.hpp"
+#include "duckdb/planner/expression.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/execution/index/art/art.hpp b/src/include/duckdb/execution/index/art/art.hpp
similarity index 93%
rename from src/include/execution/index/art/art.hpp
rename to src/include/duckdb/execution/index/art/art.hpp
index 1c9a559e786..45bfe8a22d8 100644
--- a/src/include/execution/index/art/art.hpp
+++ b/src/include/duckdb/execution/index/art/art.hpp
@@ -8,13 +8,13 @@
 
 #pragma once
 
-#include "common/common.hpp"
-#include "common/types/data_chunk.hpp"
-#include "common/types/vector.hpp"
-#include "parser/parsed_expression.hpp"
-#include "storage/data_table.hpp"
-#include "storage/index.hpp"
-#include "common/types/static_vector.hpp"
+#include "duckdb/common/common.hpp"
+#include "duckdb/common/types/data_chunk.hpp"
+#include "duckdb/common/types/vector.hpp"
+#include "duckdb/parser/parsed_expression.hpp"
+#include "duckdb/storage/data_table.hpp"
+#include "duckdb/storage/index.hpp"
+#include "duckdb/common/types/static_vector.hpp"
 #include "art_key.hpp"
 #include "leaf.hpp"
 #include "node.hpp"
diff --git a/src/include/execution/index/art/art_key.hpp b/src/include/duckdb/execution/index/art/art_key.hpp
similarity index 95%
rename from src/include/execution/index/art/art_key.hpp
rename to src/include/duckdb/execution/index/art/art_key.hpp
index f912f110ef6..050f011c830 100644
--- a/src/include/execution/index/art/art_key.hpp
+++ b/src/include/duckdb/execution/index/art/art_key.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "common/common.hpp"
-#include "common/exception.hpp"
+#include "duckdb/common/common.hpp"
+#include "duckdb/common/exception.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/execution/index/art/leaf.hpp b/src/include/duckdb/execution/index/art/leaf.hpp
similarity index 100%
rename from src/include/execution/index/art/leaf.hpp
rename to src/include/duckdb/execution/index/art/leaf.hpp
diff --git a/src/include/execution/index/art/node.hpp b/src/include/duckdb/execution/index/art/node.hpp
similarity index 98%
rename from src/include/execution/index/art/node.hpp
rename to src/include/duckdb/execution/index/art/node.hpp
index de7f2c32bbc..7cdf88c143d 100644
--- a/src/include/execution/index/art/node.hpp
+++ b/src/include/duckdb/execution/index/art/node.hpp
@@ -9,7 +9,7 @@
 #pragma once
 
 #include "art_key.hpp"
-#include "common/common.hpp"
+#include "duckdb/common/common.hpp"
 
 namespace duckdb {
 enum class NodeType : uint8_t { N4 = 0, N16 = 1, N48 = 2, N256 = 3, NLeaf = 4 };
diff --git a/src/include/execution/index/art/node16.hpp b/src/include/duckdb/execution/index/art/node16.hpp
similarity index 100%
rename from src/include/execution/index/art/node16.hpp
rename to src/include/duckdb/execution/index/art/node16.hpp
diff --git a/src/include/execution/index/art/node256.hpp b/src/include/duckdb/execution/index/art/node256.hpp
similarity index 100%
rename from src/include/execution/index/art/node256.hpp
rename to src/include/duckdb/execution/index/art/node256.hpp
diff --git a/src/include/execution/index/art/node4.hpp b/src/include/duckdb/execution/index/art/node4.hpp
similarity index 100%
rename from src/include/execution/index/art/node4.hpp
rename to src/include/duckdb/execution/index/art/node4.hpp
diff --git a/src/include/execution/index/art/node48.hpp b/src/include/duckdb/execution/index/art/node48.hpp
similarity index 100%
rename from src/include/execution/index/art/node48.hpp
rename to src/include/duckdb/execution/index/art/node48.hpp
diff --git a/src/include/execution/join_hashtable.hpp b/src/include/duckdb/execution/join_hashtable.hpp
similarity index 96%
rename from src/include/execution/join_hashtable.hpp
rename to src/include/duckdb/execution/join_hashtable.hpp
index 139cfa0f230..afb1e3e6b2a 100644
--- a/src/include/execution/join_hashtable.hpp
+++ b/src/include/duckdb/execution/join_hashtable.hpp
@@ -8,11 +8,11 @@
 
 #pragma once
 
-#include "common/common.hpp"
-#include "common/types/data_chunk.hpp"
-#include "common/types/vector.hpp"
-#include "execution/aggregate_hashtable.hpp"
-#include "planner/operator/logical_comparison_join.hpp"
+#include "duckdb/common/common.hpp"
+#include "duckdb/common/types/data_chunk.hpp"
+#include "duckdb/common/types/vector.hpp"
+#include "duckdb/execution/aggregate_hashtable.hpp"
+#include "duckdb/planner/operator/logical_comparison_join.hpp"
 
 #include <mutex>
 
diff --git a/src/include/execution/merge_join.hpp b/src/include/duckdb/execution/merge_join.hpp
similarity index 95%
rename from src/include/execution/merge_join.hpp
rename to src/include/duckdb/execution/merge_join.hpp
index ffb281836dc..98494c74aad 100644
--- a/src/include/execution/merge_join.hpp
+++ b/src/include/duckdb/execution/merge_join.hpp
@@ -8,10 +8,10 @@
 
 #pragma once
 
-#include "common/common.hpp"
-#include "common/enums/expression_type.hpp"
-#include "common/types/chunk_collection.hpp"
-#include "common/types/vector.hpp"
+#include "duckdb/common/common.hpp"
+#include "duckdb/common/enums/expression_type.hpp"
+#include "duckdb/common/types/chunk_collection.hpp"
+#include "duckdb/common/types/vector.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/execution/nested_loop_join.hpp b/src/include/duckdb/execution/nested_loop_join.hpp
similarity index 78%
rename from src/include/execution/nested_loop_join.hpp
rename to src/include/duckdb/execution/nested_loop_join.hpp
index 50d46852d63..fe2d80b1d06 100644
--- a/src/include/execution/nested_loop_join.hpp
+++ b/src/include/duckdb/execution/nested_loop_join.hpp
@@ -8,10 +8,10 @@
 
 #pragma once
 
-#include "common/common.hpp"
-#include "common/types/chunk_collection.hpp"
-#include "common/types/vector.hpp"
-#include "planner/operator/logical_comparison_join.hpp"
+#include "duckdb/common/common.hpp"
+#include "duckdb/common/types/chunk_collection.hpp"
+#include "duckdb/common/types/vector.hpp"
+#include "duckdb/planner/operator/logical_comparison_join.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/execution/operator/aggregate/physical_hash_aggregate.hpp b/src/include/duckdb/execution/operator/aggregate/physical_hash_aggregate.hpp
similarity index 92%
rename from src/include/execution/operator/aggregate/physical_hash_aggregate.hpp
rename to src/include/duckdb/execution/operator/aggregate/physical_hash_aggregate.hpp
index 62b9b3df8ff..037300d26db 100644
--- a/src/include/execution/operator/aggregate/physical_hash_aggregate.hpp
+++ b/src/include/duckdb/execution/operator/aggregate/physical_hash_aggregate.hpp
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "execution/aggregate_hashtable.hpp"
-#include "execution/physical_operator.hpp"
-#include "storage/data_table.hpp"
+#include "duckdb/execution/aggregate_hashtable.hpp"
+#include "duckdb/execution/physical_operator.hpp"
+#include "duckdb/storage/data_table.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/execution/operator/aggregate/physical_simple_aggregate.hpp b/src/include/duckdb/execution/operator/aggregate/physical_simple_aggregate.hpp
similarity index 95%
rename from src/include/execution/operator/aggregate/physical_simple_aggregate.hpp
rename to src/include/duckdb/execution/operator/aggregate/physical_simple_aggregate.hpp
index 033d58ee911..415007707d9 100644
--- a/src/include/execution/operator/aggregate/physical_simple_aggregate.hpp
+++ b/src/include/duckdb/execution/operator/aggregate/physical_simple_aggregate.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "execution/physical_operator.hpp"
+#include "duckdb/execution/physical_operator.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/execution/operator/aggregate/physical_window.hpp b/src/include/duckdb/execution/operator/aggregate/physical_window.hpp
similarity index 92%
rename from src/include/execution/operator/aggregate/physical_window.hpp
rename to src/include/duckdb/execution/operator/aggregate/physical_window.hpp
index 3ef2215fa9c..c022cfda625 100644
--- a/src/include/execution/operator/aggregate/physical_window.hpp
+++ b/src/include/duckdb/execution/operator/aggregate/physical_window.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "common/types/chunk_collection.hpp"
-#include "execution/physical_operator.hpp"
+#include "duckdb/common/types/chunk_collection.hpp"
+#include "duckdb/execution/physical_operator.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/execution/operator/filter/physical_filter.hpp b/src/include/duckdb/execution/operator/filter/physical_filter.hpp
similarity index 95%
rename from src/include/execution/operator/filter/physical_filter.hpp
rename to src/include/duckdb/execution/operator/filter/physical_filter.hpp
index 17c5dbb635d..efee29e048a 100644
--- a/src/include/execution/operator/filter/physical_filter.hpp
+++ b/src/include/duckdb/execution/operator/filter/physical_filter.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "execution/physical_operator.hpp"
+#include "duckdb/execution/physical_operator.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/execution/operator/helper/physical_execute.hpp b/src/include/duckdb/execution/operator/helper/physical_execute.hpp
similarity index 93%
rename from src/include/execution/operator/helper/physical_execute.hpp
rename to src/include/duckdb/execution/operator/helper/physical_execute.hpp
index f1031f7fbbb..6c69485d408 100644
--- a/src/include/execution/operator/helper/physical_execute.hpp
+++ b/src/include/duckdb/execution/operator/helper/physical_execute.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "execution/physical_operator.hpp"
+#include "duckdb/execution/physical_operator.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/execution/operator/helper/physical_limit.hpp b/src/include/duckdb/execution/operator/helper/physical_limit.hpp
similarity index 95%
rename from src/include/execution/operator/helper/physical_limit.hpp
rename to src/include/duckdb/execution/operator/helper/physical_limit.hpp
index 0f78b5f7029..6b992406d85 100644
--- a/src/include/execution/operator/helper/physical_limit.hpp
+++ b/src/include/duckdb/execution/operator/helper/physical_limit.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "execution/physical_operator.hpp"
+#include "duckdb/execution/physical_operator.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/execution/operator/helper/physical_prune_columns.hpp b/src/include/duckdb/execution/operator/helper/physical_prune_columns.hpp
similarity index 93%
rename from src/include/execution/operator/helper/physical_prune_columns.hpp
rename to src/include/duckdb/execution/operator/helper/physical_prune_columns.hpp
index db36c752b49..3a9de48c2d7 100644
--- a/src/include/execution/operator/helper/physical_prune_columns.hpp
+++ b/src/include/duckdb/execution/operator/helper/physical_prune_columns.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "execution/physical_operator.hpp"
+#include "duckdb/execution/physical_operator.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/execution/operator/join/physical_blockwise_nl_join.hpp b/src/include/duckdb/execution/operator/join/physical_blockwise_nl_join.hpp
similarity index 94%
rename from src/include/execution/operator/join/physical_blockwise_nl_join.hpp
rename to src/include/duckdb/execution/operator/join/physical_blockwise_nl_join.hpp
index 472b01b6bfb..4c535ba94f9 100644
--- a/src/include/execution/operator/join/physical_blockwise_nl_join.hpp
+++ b/src/include/duckdb/execution/operator/join/physical_blockwise_nl_join.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "common/types/chunk_collection.hpp"
-#include "execution/operator/join/physical_join.hpp"
+#include "duckdb/common/types/chunk_collection.hpp"
+#include "duckdb/execution/operator/join/physical_join.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/execution/operator/join/physical_comparison_join.hpp b/src/include/duckdb/execution/operator/join/physical_comparison_join.hpp
similarity index 91%
rename from src/include/execution/operator/join/physical_comparison_join.hpp
rename to src/include/duckdb/execution/operator/join/physical_comparison_join.hpp
index d74ac9cdabc..19cf24bcea7 100644
--- a/src/include/execution/operator/join/physical_comparison_join.hpp
+++ b/src/include/duckdb/execution/operator/join/physical_comparison_join.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "execution/operator/join/physical_join.hpp"
+#include "duckdb/execution/operator/join/physical_join.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/execution/operator/join/physical_cross_product.hpp b/src/include/duckdb/execution/operator/join/physical_cross_product.hpp
similarity index 91%
rename from src/include/execution/operator/join/physical_cross_product.hpp
rename to src/include/duckdb/execution/operator/join/physical_cross_product.hpp
index b49842b3fe6..80d562d41ef 100644
--- a/src/include/execution/operator/join/physical_cross_product.hpp
+++ b/src/include/duckdb/execution/operator/join/physical_cross_product.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "common/types/chunk_collection.hpp"
-#include "execution/physical_operator.hpp"
+#include "duckdb/common/types/chunk_collection.hpp"
+#include "duckdb/execution/physical_operator.hpp"
 
 namespace duckdb {
 //! PhysicalCrossProduct represents a cross product between two tables
diff --git a/src/include/execution/operator/join/physical_delim_join.hpp b/src/include/duckdb/execution/operator/join/physical_delim_join.hpp
similarity index 92%
rename from src/include/execution/operator/join/physical_delim_join.hpp
rename to src/include/duckdb/execution/operator/join/physical_delim_join.hpp
index f9b4b47b749..2ac9ff97a22 100644
--- a/src/include/execution/operator/join/physical_delim_join.hpp
+++ b/src/include/duckdb/execution/operator/join/physical_delim_join.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "common/types/chunk_collection.hpp"
-#include "execution/physical_operator.hpp"
+#include "duckdb/common/types/chunk_collection.hpp"
+#include "duckdb/execution/physical_operator.hpp"
 
 namespace duckdb {
 //! PhysicalDelimJoin represents a join where the LHS will be duplicate eliminated and pushed into a
diff --git a/src/include/execution/operator/join/physical_hash_join.hpp b/src/include/duckdb/execution/operator/join/physical_hash_join.hpp
similarity index 81%
rename from src/include/execution/operator/join/physical_hash_join.hpp
rename to src/include/duckdb/execution/operator/join/physical_hash_join.hpp
index 0e4b34b555c..256bda261be 100644
--- a/src/include/execution/operator/join/physical_hash_join.hpp
+++ b/src/include/duckdb/execution/operator/join/physical_hash_join.hpp
@@ -8,11 +8,11 @@
 
 #pragma once
 
-#include "common/types/chunk_collection.hpp"
-#include "execution/join_hashtable.hpp"
-#include "execution/operator/join/physical_comparison_join.hpp"
-#include "execution/physical_operator.hpp"
-#include "planner/operator/logical_join.hpp"
+#include "duckdb/common/types/chunk_collection.hpp"
+#include "duckdb/execution/join_hashtable.hpp"
+#include "duckdb/execution/operator/join/physical_comparison_join.hpp"
+#include "duckdb/execution/physical_operator.hpp"
+#include "duckdb/planner/operator/logical_join.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/execution/operator/join/physical_join.hpp b/src/include/duckdb/execution/operator/join/physical_join.hpp
similarity index 85%
rename from src/include/execution/operator/join/physical_join.hpp
rename to src/include/duckdb/execution/operator/join/physical_join.hpp
index 83cfcc33a47..9468eb8be9c 100644
--- a/src/include/execution/operator/join/physical_join.hpp
+++ b/src/include/duckdb/execution/operator/join/physical_join.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "execution/physical_operator.hpp"
-#include "planner/operator/logical_comparison_join.hpp"
+#include "duckdb/execution/physical_operator.hpp"
+#include "duckdb/planner/operator/logical_comparison_join.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/execution/operator/join/physical_nested_loop_join.hpp b/src/include/duckdb/execution/operator/join/physical_nested_loop_join.hpp
similarity index 93%
rename from src/include/execution/operator/join/physical_nested_loop_join.hpp
rename to src/include/duckdb/execution/operator/join/physical_nested_loop_join.hpp
index 6b4da386800..730a4d48da9 100644
--- a/src/include/execution/operator/join/physical_nested_loop_join.hpp
+++ b/src/include/duckdb/execution/operator/join/physical_nested_loop_join.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "common/types/chunk_collection.hpp"
-#include "execution/operator/join/physical_comparison_join.hpp"
+#include "duckdb/common/types/chunk_collection.hpp"
+#include "duckdb/execution/operator/join/physical_comparison_join.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/execution/operator/join/physical_piecewise_merge_join.hpp b/src/include/duckdb/execution/operator/join/physical_piecewise_merge_join.hpp
similarity index 93%
rename from src/include/execution/operator/join/physical_piecewise_merge_join.hpp
rename to src/include/duckdb/execution/operator/join/physical_piecewise_merge_join.hpp
index 19ac98a4954..4ca5d246213 100644
--- a/src/include/execution/operator/join/physical_piecewise_merge_join.hpp
+++ b/src/include/duckdb/execution/operator/join/physical_piecewise_merge_join.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "execution/merge_join.hpp"
-#include "execution/operator/join/physical_comparison_join.hpp"
+#include "duckdb/execution/merge_join.hpp"
+#include "duckdb/execution/operator/join/physical_comparison_join.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/duckdb/execution/operator/list.hpp b/src/include/duckdb/execution/operator/list.hpp
new file mode 100644
index 00000000000..806de2998a8
--- /dev/null
+++ b/src/include/duckdb/execution/operator/list.hpp
@@ -0,0 +1,34 @@
+#include "duckdb/execution/operator/aggregate/physical_hash_aggregate.hpp"
+#include "duckdb/execution/operator/aggregate/physical_simple_aggregate.hpp"
+#include "duckdb/execution/operator/aggregate/physical_window.hpp"
+#include "duckdb/execution/operator/filter/physical_filter.hpp"
+#include "duckdb/execution/operator/helper/physical_execute.hpp"
+#include "duckdb/execution/operator/helper/physical_limit.hpp"
+#include "duckdb/execution/operator/helper/physical_prune_columns.hpp"
+#include "duckdb/execution/operator/join/physical_blockwise_nl_join.hpp"
+#include "duckdb/execution/operator/join/physical_comparison_join.hpp"
+#include "duckdb/execution/operator/join/physical_cross_product.hpp"
+#include "duckdb/execution/operator/join/physical_delim_join.hpp"
+#include "duckdb/execution/operator/join/physical_hash_join.hpp"
+#include "duckdb/execution/operator/join/physical_join.hpp"
+#include "duckdb/execution/operator/join/physical_nested_loop_join.hpp"
+#include "duckdb/execution/operator/join/physical_piecewise_merge_join.hpp"
+#include "duckdb/execution/operator/order/physical_order.hpp"
+#include "duckdb/execution/operator/order/physical_top_n.hpp"
+#include "duckdb/execution/operator/persistent/buffered_csv_reader.hpp"
+#include "duckdb/execution/operator/persistent/physical_copy_from_file.hpp"
+#include "duckdb/execution/operator/persistent/physical_copy_to_file.hpp"
+#include "duckdb/execution/operator/persistent/physical_delete.hpp"
+#include "duckdb/execution/operator/persistent/physical_insert.hpp"
+#include "duckdb/execution/operator/persistent/physical_update.hpp"
+#include "duckdb/execution/operator/projection/physical_projection.hpp"
+#include "duckdb/execution/operator/scan/physical_chunk_scan.hpp"
+#include "duckdb/execution/operator/scan/physical_dummy_scan.hpp"
+#include "duckdb/execution/operator/scan/physical_empty_result.hpp"
+#include "duckdb/execution/operator/scan/physical_expression_scan.hpp"
+#include "duckdb/execution/operator/scan/physical_index_scan.hpp"
+#include "duckdb/execution/operator/scan/physical_table_function.hpp"
+#include "duckdb/execution/operator/scan/physical_table_scan.hpp"
+#include "duckdb/execution/operator/schema/physical_create_index.hpp"
+#include "duckdb/execution/operator/schema/physical_create_table.hpp"
+#include "duckdb/execution/operator/set/physical_union.hpp"
diff --git a/src/include/execution/operator/order/physical_order.hpp b/src/include/duckdb/execution/operator/order/physical_order.hpp
similarity index 88%
rename from src/include/execution/operator/order/physical_order.hpp
rename to src/include/duckdb/execution/operator/order/physical_order.hpp
index 38bf292d160..2e97b72a1a3 100644
--- a/src/include/execution/operator/order/physical_order.hpp
+++ b/src/include/duckdb/execution/operator/order/physical_order.hpp
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "common/types/chunk_collection.hpp"
-#include "execution/physical_operator.hpp"
-#include "planner/bound_query_node.hpp"
+#include "duckdb/common/types/chunk_collection.hpp"
+#include "duckdb/execution/physical_operator.hpp"
+#include "duckdb/planner/bound_query_node.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/execution/operator/order/physical_top_n.hpp b/src/include/duckdb/execution/operator/order/physical_top_n.hpp
similarity index 89%
rename from src/include/execution/operator/order/physical_top_n.hpp
rename to src/include/duckdb/execution/operator/order/physical_top_n.hpp
index 6eedced1a0f..fac3bc106a5 100644
--- a/src/include/execution/operator/order/physical_top_n.hpp
+++ b/src/include/duckdb/execution/operator/order/physical_top_n.hpp
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "common/types/chunk_collection.hpp"
-#include "execution/physical_operator.hpp"
-#include "planner/bound_query_node.hpp"
+#include "duckdb/common/types/chunk_collection.hpp"
+#include "duckdb/execution/physical_operator.hpp"
+#include "duckdb/planner/bound_query_node.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/execution/operator/persistent/buffered_csv_reader.hpp b/src/include/duckdb/execution/operator/persistent/buffered_csv_reader.hpp
similarity index 95%
rename from src/include/execution/operator/persistent/buffered_csv_reader.hpp
rename to src/include/duckdb/execution/operator/persistent/buffered_csv_reader.hpp
index b55acede1f9..c7b16ce39bb 100644
--- a/src/include/execution/operator/persistent/buffered_csv_reader.hpp
+++ b/src/include/duckdb/execution/operator/persistent/buffered_csv_reader.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "execution/physical_operator.hpp"
-#include "parser/parsed_data/copy_info.hpp"
+#include "duckdb/execution/physical_operator.hpp"
+#include "duckdb/parser/parsed_data/copy_info.hpp"
 
 #include <queue>
 
diff --git a/src/include/execution/operator/persistent/physical_copy_from_file.hpp b/src/include/duckdb/execution/operator/persistent/physical_copy_from_file.hpp
similarity index 92%
rename from src/include/execution/operator/persistent/physical_copy_from_file.hpp
rename to src/include/duckdb/execution/operator/persistent/physical_copy_from_file.hpp
index e48ded4dfb1..4a2157e96a5 100644
--- a/src/include/execution/operator/persistent/physical_copy_from_file.hpp
+++ b/src/include/duckdb/execution/operator/persistent/physical_copy_from_file.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "execution/physical_operator.hpp"
-#include "parser/parsed_data/copy_info.hpp"
+#include "duckdb/execution/physical_operator.hpp"
+#include "duckdb/parser/parsed_data/copy_info.hpp"
 
 namespace duckdb {
 class BufferedCSVReader;
diff --git a/src/include/execution/operator/persistent/physical_copy_to_file.hpp b/src/include/duckdb/execution/operator/persistent/physical_copy_to_file.hpp
similarity index 89%
rename from src/include/execution/operator/persistent/physical_copy_to_file.hpp
rename to src/include/duckdb/execution/operator/persistent/physical_copy_to_file.hpp
index 267ee7d4f4d..b3338467112 100644
--- a/src/include/execution/operator/persistent/physical_copy_to_file.hpp
+++ b/src/include/duckdb/execution/operator/persistent/physical_copy_to_file.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "execution/physical_operator.hpp"
-#include "parser/parsed_data/copy_info.hpp"
+#include "duckdb/execution/physical_operator.hpp"
+#include "duckdb/parser/parsed_data/copy_info.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/execution/operator/persistent/physical_delete.hpp b/src/include/duckdb/execution/operator/persistent/physical_delete.hpp
similarity index 94%
rename from src/include/execution/operator/persistent/physical_delete.hpp
rename to src/include/duckdb/execution/operator/persistent/physical_delete.hpp
index 986b73071e0..f54525c76f0 100644
--- a/src/include/execution/operator/persistent/physical_delete.hpp
+++ b/src/include/duckdb/execution/operator/persistent/physical_delete.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "execution/physical_operator.hpp"
+#include "duckdb/execution/physical_operator.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/execution/operator/persistent/physical_insert.hpp b/src/include/duckdb/execution/operator/persistent/physical_insert.hpp
similarity index 95%
rename from src/include/execution/operator/persistent/physical_insert.hpp
rename to src/include/duckdb/execution/operator/persistent/physical_insert.hpp
index 4f652dd5ae6..0e8b6a7bca4 100644
--- a/src/include/execution/operator/persistent/physical_insert.hpp
+++ b/src/include/duckdb/execution/operator/persistent/physical_insert.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "execution/physical_operator.hpp"
+#include "duckdb/execution/physical_operator.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/execution/operator/persistent/physical_update.hpp b/src/include/duckdb/execution/operator/persistent/physical_update.hpp
similarity index 95%
rename from src/include/execution/operator/persistent/physical_update.hpp
rename to src/include/duckdb/execution/operator/persistent/physical_update.hpp
index cfa9ccef62b..a8c9e758f4d 100644
--- a/src/include/execution/operator/persistent/physical_update.hpp
+++ b/src/include/duckdb/execution/operator/persistent/physical_update.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "execution/physical_operator.hpp"
+#include "duckdb/execution/physical_operator.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/execution/operator/projection/physical_projection.hpp b/src/include/duckdb/execution/operator/projection/physical_projection.hpp
similarity index 94%
rename from src/include/execution/operator/projection/physical_projection.hpp
rename to src/include/duckdb/execution/operator/projection/physical_projection.hpp
index 8a033caaceb..fb200b0a6b9 100644
--- a/src/include/execution/operator/projection/physical_projection.hpp
+++ b/src/include/duckdb/execution/operator/projection/physical_projection.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "execution/physical_operator.hpp"
+#include "duckdb/execution/physical_operator.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/execution/operator/scan/physical_chunk_scan.hpp b/src/include/duckdb/execution/operator/scan/physical_chunk_scan.hpp
similarity index 91%
rename from src/include/execution/operator/scan/physical_chunk_scan.hpp
rename to src/include/duckdb/execution/operator/scan/physical_chunk_scan.hpp
index b617e1a1246..9385b6f7f9e 100644
--- a/src/include/execution/operator/scan/physical_chunk_scan.hpp
+++ b/src/include/duckdb/execution/operator/scan/physical_chunk_scan.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "common/types/chunk_collection.hpp"
-#include "execution/physical_operator.hpp"
+#include "duckdb/common/types/chunk_collection.hpp"
+#include "duckdb/execution/physical_operator.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/execution/operator/scan/physical_dummy_scan.hpp b/src/include/duckdb/execution/operator/scan/physical_dummy_scan.hpp
similarity index 92%
rename from src/include/execution/operator/scan/physical_dummy_scan.hpp
rename to src/include/duckdb/execution/operator/scan/physical_dummy_scan.hpp
index e2ab00ecd01..56d6b8448ee 100644
--- a/src/include/execution/operator/scan/physical_dummy_scan.hpp
+++ b/src/include/duckdb/execution/operator/scan/physical_dummy_scan.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "execution/physical_operator.hpp"
+#include "duckdb/execution/physical_operator.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/execution/operator/scan/physical_empty_result.hpp b/src/include/duckdb/execution/operator/scan/physical_empty_result.hpp
similarity index 92%
rename from src/include/execution/operator/scan/physical_empty_result.hpp
rename to src/include/duckdb/execution/operator/scan/physical_empty_result.hpp
index 2c16be88492..a01ec746df3 100644
--- a/src/include/execution/operator/scan/physical_empty_result.hpp
+++ b/src/include/duckdb/execution/operator/scan/physical_empty_result.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "execution/physical_operator.hpp"
+#include "duckdb/execution/physical_operator.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/execution/operator/scan/physical_expression_scan.hpp b/src/include/duckdb/execution/operator/scan/physical_expression_scan.hpp
similarity index 92%
rename from src/include/execution/operator/scan/physical_expression_scan.hpp
rename to src/include/duckdb/execution/operator/scan/physical_expression_scan.hpp
index 10c9323fdda..b6ea4783637 100644
--- a/src/include/execution/operator/scan/physical_expression_scan.hpp
+++ b/src/include/duckdb/execution/operator/scan/physical_expression_scan.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "common/types/chunk_collection.hpp"
-#include "execution/physical_operator.hpp"
+#include "duckdb/common/types/chunk_collection.hpp"
+#include "duckdb/execution/physical_operator.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/execution/operator/scan/physical_index_scan.hpp b/src/include/duckdb/execution/operator/scan/physical_index_scan.hpp
similarity index 92%
rename from src/include/execution/operator/scan/physical_index_scan.hpp
rename to src/include/duckdb/execution/operator/scan/physical_index_scan.hpp
index 00d23dccfec..5e9686a7be1 100644
--- a/src/include/execution/operator/scan/physical_index_scan.hpp
+++ b/src/include/duckdb/execution/operator/scan/physical_index_scan.hpp
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "execution/physical_operator.hpp"
-#include "storage/data_table.hpp"
-#include "storage/index.hpp"
+#include "duckdb/execution/physical_operator.hpp"
+#include "duckdb/storage/data_table.hpp"
+#include "duckdb/storage/index.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/execution/operator/scan/physical_table_function.hpp b/src/include/duckdb/execution/operator/scan/physical_table_function.hpp
similarity index 90%
rename from src/include/execution/operator/scan/physical_table_function.hpp
rename to src/include/duckdb/execution/operator/scan/physical_table_function.hpp
index 17dc7269c2c..c5a272a05af 100644
--- a/src/include/execution/operator/scan/physical_table_function.hpp
+++ b/src/include/duckdb/execution/operator/scan/physical_table_function.hpp
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "execution/physical_operator.hpp"
-#include "function/function.hpp"
-#include "storage/data_table.hpp"
+#include "duckdb/execution/physical_operator.hpp"
+#include "duckdb/function/function.hpp"
+#include "duckdb/storage/data_table.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/execution/operator/scan/physical_table_scan.hpp b/src/include/duckdb/execution/operator/scan/physical_table_scan.hpp
similarity index 92%
rename from src/include/execution/operator/scan/physical_table_scan.hpp
rename to src/include/duckdb/execution/operator/scan/physical_table_scan.hpp
index fb6d2e03c2f..a82fa404e86 100644
--- a/src/include/execution/operator/scan/physical_table_scan.hpp
+++ b/src/include/duckdb/execution/operator/scan/physical_table_scan.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "execution/physical_operator.hpp"
-#include "storage/data_table.hpp"
+#include "duckdb/execution/physical_operator.hpp"
+#include "duckdb/storage/data_table.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/execution/operator/schema/physical_create_index.hpp b/src/include/duckdb/execution/operator/schema/physical_create_index.hpp
similarity index 88%
rename from src/include/execution/operator/schema/physical_create_index.hpp
rename to src/include/duckdb/execution/operator/schema/physical_create_index.hpp
index 844583b21bc..31d6b8b86bf 100644
--- a/src/include/execution/operator/schema/physical_create_index.hpp
+++ b/src/include/duckdb/execution/operator/schema/physical_create_index.hpp
@@ -8,11 +8,11 @@
 
 #pragma once
 
-#include "execution/physical_operator.hpp"
-#include "execution/index/art/art.hpp"
-#include "parser/parsed_data/create_index_info.hpp"
+#include "duckdb/execution/physical_operator.hpp"
+#include "duckdb/execution/index/art/art.hpp"
+#include "duckdb/parser/parsed_data/create_index_info.hpp"
 
-#include "storage/data_table.hpp"
+#include "duckdb/storage/data_table.hpp"
 
 #include <fstream>
 
diff --git a/src/include/execution/operator/schema/physical_create_table.hpp b/src/include/duckdb/execution/operator/schema/physical_create_table.hpp
similarity index 88%
rename from src/include/execution/operator/schema/physical_create_table.hpp
rename to src/include/duckdb/execution/operator/schema/physical_create_table.hpp
index 6214fbd12ba..cb11f534e62 100644
--- a/src/include/execution/operator/schema/physical_create_table.hpp
+++ b/src/include/duckdb/execution/operator/schema/physical_create_table.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "execution/physical_operator.hpp"
-#include "planner/parsed_data/bound_create_table_info.hpp"
+#include "duckdb/execution/physical_operator.hpp"
+#include "duckdb/planner/parsed_data/bound_create_table_info.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/execution/operator/set/physical_union.hpp b/src/include/duckdb/execution/operator/set/physical_union.hpp
similarity index 94%
rename from src/include/execution/operator/set/physical_union.hpp
rename to src/include/duckdb/execution/operator/set/physical_union.hpp
index 56f0cac102f..f8695e129fe 100644
--- a/src/include/execution/operator/set/physical_union.hpp
+++ b/src/include/duckdb/execution/operator/set/physical_union.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "execution/physical_operator.hpp"
+#include "duckdb/execution/physical_operator.hpp"
 
 namespace duckdb {
 class PhysicalUnion : public PhysicalOperator {
diff --git a/src/include/execution/physical_operator.hpp b/src/include/duckdb/execution/physical_operator.hpp
similarity index 90%
rename from src/include/execution/physical_operator.hpp
rename to src/include/duckdb/execution/physical_operator.hpp
index b44f3c444b0..ef90421fd3a 100644
--- a/src/include/execution/physical_operator.hpp
+++ b/src/include/duckdb/execution/physical_operator.hpp
@@ -8,13 +8,13 @@
 
 #pragma once
 
-#include "catalog/catalog.hpp"
-#include "common/common.hpp"
-#include "common/enums/physical_operator_type.hpp"
-#include "common/types/data_chunk.hpp"
-#include "parser/statement/select_statement.hpp"
-#include "planner/expression.hpp"
-#include "planner/logical_operator.hpp"
+#include "duckdb/catalog/catalog.hpp"
+#include "duckdb/common/common.hpp"
+#include "duckdb/common/enums/physical_operator_type.hpp"
+#include "duckdb/common/types/data_chunk.hpp"
+#include "duckdb/parser/statement/select_statement.hpp"
+#include "duckdb/planner/expression.hpp"
+#include "duckdb/planner/logical_operator.hpp"
 
 namespace duckdb {
 class ClientContext;
diff --git a/src/include/execution/physical_plan_generator.hpp b/src/include/duckdb/execution/physical_plan_generator.hpp
similarity index 94%
rename from src/include/execution/physical_plan_generator.hpp
rename to src/include/duckdb/execution/physical_plan_generator.hpp
index a441d91e8fd..3b433775d93 100644
--- a/src/include/execution/physical_plan_generator.hpp
+++ b/src/include/duckdb/execution/physical_plan_generator.hpp
@@ -8,10 +8,10 @@
 
 #pragma once
 
-#include "common/common.hpp"
-#include "execution/physical_operator.hpp"
-#include "planner/logical_operator.hpp"
-#include "planner/logical_tokens.hpp"
+#include "duckdb/common/common.hpp"
+#include "duckdb/execution/physical_operator.hpp"
+#include "duckdb/planner/logical_operator.hpp"
+#include "duckdb/planner/logical_tokens.hpp"
 
 namespace duckdb {
 class ClientContext;
diff --git a/src/include/execution/window_segment_tree.hpp b/src/include/duckdb/execution/window_segment_tree.hpp
similarity index 86%
rename from src/include/execution/window_segment_tree.hpp
rename to src/include/duckdb/execution/window_segment_tree.hpp
index b94cec500e9..ef7bb056765 100644
--- a/src/include/execution/window_segment_tree.hpp
+++ b/src/include/duckdb/execution/window_segment_tree.hpp
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "common/types/chunk_collection.hpp"
-#include "execution/physical_operator.hpp"
-#include "function/aggregate_function.hpp"
+#include "duckdb/common/types/chunk_collection.hpp"
+#include "duckdb/execution/physical_operator.hpp"
+#include "duckdb/function/aggregate_function.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/function/aggregate/algebraic_functions.hpp b/src/include/duckdb/function/aggregate/algebraic_functions.hpp
similarity index 94%
rename from src/include/function/aggregate/algebraic_functions.hpp
rename to src/include/duckdb/function/aggregate/algebraic_functions.hpp
index cf83c11bf3f..d7f4cc2c76b 100644
--- a/src/include/function/aggregate/algebraic_functions.hpp
+++ b/src/include/duckdb/function/aggregate/algebraic_functions.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "function/aggregate_function.hpp"
+#include "duckdb/function/aggregate_function.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/function/aggregate/distributive_functions.hpp b/src/include/duckdb/function/aggregate/distributive_functions.hpp
similarity index 93%
rename from src/include/function/aggregate/distributive_functions.hpp
rename to src/include/duckdb/function/aggregate/distributive_functions.hpp
index 4912594eed0..fd1949e9a75 100644
--- a/src/include/function/aggregate/distributive_functions.hpp
+++ b/src/include/duckdb/function/aggregate/distributive_functions.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "function/aggregate_function.hpp"
-#include "function/function_set.hpp"
+#include "duckdb/function/aggregate_function.hpp"
+#include "duckdb/function/function_set.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/function/aggregate_function.hpp b/src/include/duckdb/function/aggregate_function.hpp
similarity index 98%
rename from src/include/function/aggregate_function.hpp
rename to src/include/duckdb/function/aggregate_function.hpp
index 7bee5552087..28b11355b29 100644
--- a/src/include/function/aggregate_function.hpp
+++ b/src/include/duckdb/function/aggregate_function.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "function/function.hpp"
+#include "duckdb/function/function.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/function/cast_rules.hpp b/src/include/duckdb/function/cast_rules.hpp
similarity index 93%
rename from src/include/function/cast_rules.hpp
rename to src/include/duckdb/function/cast_rules.hpp
index 8d406324416..ddc8c4b0392 100644
--- a/src/include/function/cast_rules.hpp
+++ b/src/include/duckdb/function/cast_rules.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "common/types.hpp"
+#include "duckdb/common/types.hpp"
 
 namespace duckdb {
 //! Contains a list of rules for casting
diff --git a/src/include/function/function.hpp b/src/include/duckdb/function/function.hpp
similarity index 96%
rename from src/include/function/function.hpp
rename to src/include/duckdb/function/function.hpp
index 2439a7e4e77..438c3318b64 100644
--- a/src/include/function/function.hpp
+++ b/src/include/duckdb/function/function.hpp
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "common/types/data_chunk.hpp"
-#include "common/unordered_set.hpp"
-#include "parser/column_definition.hpp"
+#include "duckdb/common/types/data_chunk.hpp"
+#include "duckdb/common/unordered_set.hpp"
+#include "duckdb/parser/column_definition.hpp"
 
 namespace duckdb {
 class CatalogEntry;
diff --git a/src/include/function/function_set.hpp b/src/include/duckdb/function/function_set.hpp
similarity index 89%
rename from src/include/function/function_set.hpp
rename to src/include/duckdb/function/function_set.hpp
index 69002bd5cfb..3c3328bb9e2 100644
--- a/src/include/function/function_set.hpp
+++ b/src/include/duckdb/function/function_set.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "function/aggregate_function.hpp"
-#include "function/scalar_function.hpp"
+#include "duckdb/function/aggregate_function.hpp"
+#include "duckdb/function/scalar_function.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/function/scalar/date_functions.hpp b/src/include/duckdb/function/scalar/date_functions.hpp
similarity index 89%
rename from src/include/function/scalar/date_functions.hpp
rename to src/include/duckdb/function/scalar/date_functions.hpp
index 11084bd91f4..9310b78f1fe 100644
--- a/src/include/function/scalar/date_functions.hpp
+++ b/src/include/duckdb/function/scalar/date_functions.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "function/scalar_function.hpp"
-#include "function/function_set.hpp"
+#include "duckdb/function/scalar_function.hpp"
+#include "duckdb/function/function_set.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/function/scalar/math_functions.hpp b/src/include/duckdb/function/scalar/math_functions.hpp
similarity index 94%
rename from src/include/function/scalar/math_functions.hpp
rename to src/include/duckdb/function/scalar/math_functions.hpp
index 11f3e9ae05d..7cf44bd58b4 100644
--- a/src/include/function/scalar/math_functions.hpp
+++ b/src/include/duckdb/function/scalar/math_functions.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "function/scalar_function.hpp"
-#include "function/function_set.hpp"
+#include "duckdb/function/scalar_function.hpp"
+#include "duckdb/function/function_set.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/function/scalar/operators.hpp b/src/include/duckdb/function/scalar/operators.hpp
similarity index 92%
rename from src/include/function/scalar/operators.hpp
rename to src/include/duckdb/function/scalar/operators.hpp
index 5899c3a10b5..2865acf7be2 100644
--- a/src/include/function/scalar/operators.hpp
+++ b/src/include/duckdb/function/scalar/operators.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "function/scalar_function.hpp"
-#include "function/function_set.hpp"
+#include "duckdb/function/scalar_function.hpp"
+#include "duckdb/function/function_set.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/function/scalar/sequence_functions.hpp b/src/include/duckdb/function/scalar/sequence_functions.hpp
similarity index 80%
rename from src/include/function/scalar/sequence_functions.hpp
rename to src/include/duckdb/function/scalar/sequence_functions.hpp
index 42de4981b5c..ab41c00edfb 100644
--- a/src/include/function/scalar/sequence_functions.hpp
+++ b/src/include/duckdb/function/scalar/sequence_functions.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "function/scalar_function.hpp"
-#include "function/function_set.hpp"
+#include "duckdb/function/scalar_function.hpp"
+#include "duckdb/function/function_set.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/function/scalar/string_functions.hpp b/src/include/duckdb/function/scalar/string_functions.hpp
similarity index 93%
rename from src/include/function/scalar/string_functions.hpp
rename to src/include/duckdb/function/scalar/string_functions.hpp
index a26f657bb30..4872dce19d5 100644
--- a/src/include/function/scalar/string_functions.hpp
+++ b/src/include/duckdb/function/scalar/string_functions.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "function/scalar_function.hpp"
-#include "function/function_set.hpp"
+#include "duckdb/function/scalar_function.hpp"
+#include "duckdb/function/function_set.hpp"
 
 namespace re2 {
 class RE2;
diff --git a/src/include/function/scalar/trigonometric_functions.hpp b/src/include/duckdb/function/scalar/trigonometric_functions.hpp
similarity index 90%
rename from src/include/function/scalar/trigonometric_functions.hpp
rename to src/include/duckdb/function/scalar/trigonometric_functions.hpp
index f2d34ce9b91..8e26f4dbfd3 100644
--- a/src/include/function/scalar/trigonometric_functions.hpp
+++ b/src/include/duckdb/function/scalar/trigonometric_functions.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "function/scalar_function.hpp"
-#include "function/function_set.hpp"
+#include "duckdb/function/scalar_function.hpp"
+#include "duckdb/function/function_set.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/function/scalar_function.hpp b/src/include/duckdb/function/scalar_function.hpp
similarity index 98%
rename from src/include/function/scalar_function.hpp
rename to src/include/duckdb/function/scalar_function.hpp
index de080a662ea..f675382fe9c 100644
--- a/src/include/function/scalar_function.hpp
+++ b/src/include/duckdb/function/scalar_function.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "function/function.hpp"
+#include "duckdb/function/function.hpp"
 
 namespace duckdb {
 class BoundFunctionExpression;
diff --git a/src/include/duckdb/function/table/list.hpp b/src/include/duckdb/function/table/list.hpp
new file mode 100644
index 00000000000..a774615337c
--- /dev/null
+++ b/src/include/duckdb/function/table/list.hpp
@@ -0,0 +1 @@
+#include "duckdb/function/table/sqlite_functions.hpp"
diff --git a/src/include/function/table/sqlite_functions.hpp b/src/include/duckdb/function/table/sqlite_functions.hpp
similarity index 92%
rename from src/include/function/table/sqlite_functions.hpp
rename to src/include/duckdb/function/table/sqlite_functions.hpp
index 5b4ce6de7a3..2b55dadb2be 100644
--- a/src/include/function/table/sqlite_functions.hpp
+++ b/src/include/duckdb/function/table/sqlite_functions.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "function/table_function.hpp"
+#include "duckdb/function/table_function.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/function/table_function.hpp b/src/include/duckdb/function/table_function.hpp
similarity index 97%
rename from src/include/function/table_function.hpp
rename to src/include/duckdb/function/table_function.hpp
index 643c2c9652d..e263f07a1bc 100644
--- a/src/include/function/table_function.hpp
+++ b/src/include/duckdb/function/table_function.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "function/function.hpp"
+#include "duckdb/function/function.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/main/appender.hpp b/src/include/duckdb/main/appender.hpp
similarity index 96%
rename from src/include/main/appender.hpp
rename to src/include/duckdb/main/appender.hpp
index ef26151a57f..b4f463c1b1d 100644
--- a/src/include/main/appender.hpp
+++ b/src/include/duckdb/main/appender.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "common/types/data_chunk.hpp"
-#include "main/client_context.hpp"
+#include "duckdb/common/types/data_chunk.hpp"
+#include "duckdb/main/client_context.hpp"
 
 #include <mutex>
 
diff --git a/src/include/main/client_context.hpp b/src/include/duckdb/main/client_context.hpp
similarity index 91%
rename from src/include/main/client_context.hpp
rename to src/include/duckdb/main/client_context.hpp
index cfd9126958f..3f3a6995f5e 100644
--- a/src/include/main/client_context.hpp
+++ b/src/include/duckdb/main/client_context.hpp
@@ -8,14 +8,14 @@
 
 #pragma once
 
-#include "catalog/catalog_set.hpp"
-#include "execution/execution_context.hpp"
-#include "main/query_profiler.hpp"
-#include "main/stream_query_result.hpp"
-#include "transaction/transaction_context.hpp"
-#include "common/unordered_set.hpp"
-#include "main/prepared_statement.hpp"
-#include "catalog/catalog_entry/schema_catalog_entry.hpp"
+#include "duckdb/catalog/catalog_set.hpp"
+#include "duckdb/execution/execution_context.hpp"
+#include "duckdb/main/query_profiler.hpp"
+#include "duckdb/main/stream_query_result.hpp"
+#include "duckdb/transaction/transaction_context.hpp"
+#include "duckdb/common/unordered_set.hpp"
+#include "duckdb/main/prepared_statement.hpp"
+#include "duckdb/catalog/catalog_entry/schema_catalog_entry.hpp"
 #include <random>
 
 namespace duckdb {
diff --git a/src/include/main/connection.hpp b/src/include/duckdb/main/connection.hpp
similarity index 90%
rename from src/include/main/connection.hpp
rename to src/include/duckdb/main/connection.hpp
index ebe5d5bfcdf..c18f03392e5 100644
--- a/src/include/main/connection.hpp
+++ b/src/include/duckdb/main/connection.hpp
@@ -8,12 +8,12 @@
 
 #pragma once
 
-#include "main/materialized_query_result.hpp"
-#include "main/query_result.hpp"
-#include "main/stream_query_result.hpp"
-#include "main/prepared_statement.hpp"
-#include "main/appender.hpp"
-#include "common/enums/profiler_format.hpp"
+#include "duckdb/main/materialized_query_result.hpp"
+#include "duckdb/main/query_result.hpp"
+#include "duckdb/main/stream_query_result.hpp"
+#include "duckdb/main/prepared_statement.hpp"
+#include "duckdb/main/appender.hpp"
+#include "duckdb/common/enums/profiler_format.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/main/connection_manager.hpp b/src/include/duckdb/main/connection_manager.hpp
similarity index 90%
rename from src/include/main/connection_manager.hpp
rename to src/include/duckdb/main/connection_manager.hpp
index c4f90ddaaec..5f6ca128c75 100644
--- a/src/include/main/connection_manager.hpp
+++ b/src/include/duckdb/main/connection_manager.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "common/common.hpp"
-#include "common/unordered_set.hpp"
+#include "duckdb/common/common.hpp"
+#include "duckdb/common/unordered_set.hpp"
 
 #include <mutex>
 
diff --git a/src/include/main/database.hpp b/src/include/duckdb/main/database.hpp
similarity index 96%
rename from src/include/main/database.hpp
rename to src/include/duckdb/main/database.hpp
index eb6b3c28dc5..f0f3c0da538 100644
--- a/src/include/main/database.hpp
+++ b/src/include/duckdb/main/database.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "common/common.hpp"
-#include "common/file_system.hpp"
+#include "duckdb/common/common.hpp"
+#include "duckdb/common/file_system.hpp"
 
 namespace duckdb {
 class StorageManager;
diff --git a/src/include/main/materialized_query_result.hpp b/src/include/duckdb/main/materialized_query_result.hpp
similarity index 93%
rename from src/include/main/materialized_query_result.hpp
rename to src/include/duckdb/main/materialized_query_result.hpp
index b80f581c69c..66721c964d9 100644
--- a/src/include/main/materialized_query_result.hpp
+++ b/src/include/duckdb/main/materialized_query_result.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "common/types/chunk_collection.hpp"
-#include "main/query_result.hpp"
+#include "duckdb/common/types/chunk_collection.hpp"
+#include "duckdb/main/query_result.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/main/prepared_statement.hpp b/src/include/duckdb/main/prepared_statement.hpp
similarity index 97%
rename from src/include/main/prepared_statement.hpp
rename to src/include/duckdb/main/prepared_statement.hpp
index 041abf0a1a7..9f35d163ea3 100644
--- a/src/include/main/prepared_statement.hpp
+++ b/src/include/duckdb/main/prepared_statement.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "main/materialized_query_result.hpp"
+#include "duckdb/main/materialized_query_result.hpp"
 
 namespace duckdb {
 class ClientContext;
diff --git a/src/include/main/query_profiler.hpp b/src/include/duckdb/main/query_profiler.hpp
similarity index 91%
rename from src/include/main/query_profiler.hpp
rename to src/include/duckdb/main/query_profiler.hpp
index 38976f87365..7d6b3d58d21 100644
--- a/src/include/main/query_profiler.hpp
+++ b/src/include/duckdb/main/query_profiler.hpp
@@ -8,12 +8,12 @@
 
 #pragma once
 
-#include "common/common.hpp"
-#include "common/profiler.hpp"
-#include "common/string_util.hpp"
-#include "common/types/data_chunk.hpp"
-#include "common/unordered_map.hpp"
-#include "common/enums/profiler_format.hpp"
+#include "duckdb/common/common.hpp"
+#include "duckdb/common/profiler.hpp"
+#include "duckdb/common/string_util.hpp"
+#include "duckdb/common/types/data_chunk.hpp"
+#include "duckdb/common/unordered_map.hpp"
+#include "duckdb/common/enums/profiler_format.hpp"
 
 #include <stack>
 
diff --git a/src/include/main/query_result.hpp b/src/include/duckdb/main/query_result.hpp
similarity index 96%
rename from src/include/main/query_result.hpp
rename to src/include/duckdb/main/query_result.hpp
index 7756eccfd46..d1eb7a0c968 100644
--- a/src/include/main/query_result.hpp
+++ b/src/include/duckdb/main/query_result.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "common/types/data_chunk.hpp"
-#include "common/enums/statement_type.hpp"
+#include "duckdb/common/types/data_chunk.hpp"
+#include "duckdb/common/enums/statement_type.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/main/stream_query_result.hpp b/src/include/duckdb/main/stream_query_result.hpp
similarity index 97%
rename from src/include/main/stream_query_result.hpp
rename to src/include/duckdb/main/stream_query_result.hpp
index eebc153e5ae..d26008274bd 100644
--- a/src/include/main/stream_query_result.hpp
+++ b/src/include/duckdb/main/stream_query_result.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "main/query_result.hpp"
+#include "duckdb/main/query_result.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/optimizer/ca_optimizer.hpp b/src/include/duckdb/optimizer/ca_optimizer.hpp
similarity index 76%
rename from src/include/optimizer/ca_optimizer.hpp
rename to src/include/duckdb/optimizer/ca_optimizer.hpp
index cb300bbff03..6e234de8914 100644
--- a/src/include/optimizer/ca_optimizer.hpp
+++ b/src/include/duckdb/optimizer/ca_optimizer.hpp
@@ -8,12 +8,12 @@
 
 #pragma once
 
-#include "common/unordered_map.hpp"
-#include "parser/expression_map.hpp"
-#include "planner/expression/bound_columnref_expression.hpp"
-#include "planner/operator/logical_aggregate.hpp"
-#include "planner/operator/logical_filter.hpp"
-#include "planner/operator/logical_projection.hpp"
+#include "duckdb/common/unordered_map.hpp"
+#include "duckdb/parser/expression_map.hpp"
+#include "duckdb/planner/expression/bound_columnref_expression.hpp"
+#include "duckdb/planner/operator/logical_aggregate.hpp"
+#include "duckdb/planner/operator/logical_filter.hpp"
+#include "duckdb/planner/operator/logical_projection.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/include/optimizer/cse_optimizer.hpp b/src/include/duckdb/optimizer/cse_optimizer.hpp
similarity index 90%
rename from src/include/optimizer/cse_optimizer.hpp
rename to src/include/duckdb/optimizer/cse_optimizer.hpp
index de8dbe5f388..a8d8526859a 100644
--- a/src/include/optimizer/cse_optimizer.hpp
+++ b/src/include/duckdb/optimizer/cse_optimizer.hpp
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "optimizer/rule.hpp"
-#include "parser/expression_map.hpp"
-#include "planner/logical_operator_visitor.hpp"
+#include "duckdb/optimizer/rule.hpp"
+#include "duckdb/parser/expression_map.hpp"
+#include "duckdb/planner/logical_operator_visitor.hpp"
 
 namespace duckdb {
 //! The CommonSubExpression optimizer traverses the expressions of a LogicalOperator to look for duplicate expressions,
diff --git a/src/include/optimizer/expression_rewriter.hpp b/src/include/duckdb/optimizer/expression_rewriter.hpp
similarity index 96%
rename from src/include/optimizer/expression_rewriter.hpp
rename to src/include/duckdb/optimizer/expression_rewriter.hpp
index 7448f0fae0f..0323aff10f8 100644
--- a/src/include/optimizer/expression_rewriter.hpp
+++ b/src/include/duckdb/optimizer/expression_rewriter.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "optimizer/rule.hpp"
+#include "duckdb/optimizer/rule.hpp"
 
 namespace duckdb {
 class ClientContext;
diff --git a/src/include/optimizer/filter_combiner.hpp b/src/include/duckdb/optimizer/filter_combiner.hpp
similarity index 91%
rename from src/include/optimizer/filter_combiner.hpp
rename to src/include/duckdb/optimizer/filter_combiner.hpp
index 05b34200fda..729435b990d 100644
--- a/src/include/optimizer/filter_combiner.hpp
+++ b/src/include/duckdb/optimizer/filter_combiner.hpp
@@ -8,10 +8,10 @@
 
 #pragma once
 
-#include "common/types/value.hpp"
-#include "common/unordered_map.hpp"
-#include "parser/expression_map.hpp"
-#include "planner/expression.hpp"
+#include "duckdb/common/types/value.hpp"
+#include "duckdb/common/unordered_map.hpp"
+#include "duckdb/parser/expression_map.hpp"
+#include "duckdb/planner/expression.hpp"
 
 #include <functional>
 
diff --git a/src/include/optimizer/filter_pushdown.hpp b/src/include/duckdb/optimizer/filter_pushdown.hpp
similarity index 96%
rename from src/include/optimizer/filter_pushdown.hpp
rename to src/include/duckdb/optimizer/filter_pushdown.hpp
index b4a712d3b1a..83f24ab80ed 100644
--- a/src/include/optimizer/filter_pushdown.hpp
+++ b/src/include/duckdb/optimizer/filter_pushdown.hpp
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "common/unordered_set.hpp"
-#include "optimizer/filter_combiner.hpp"
-#include "optimizer/rule.hpp"
+#include "duckdb/common/unordered_set.hpp"
+#include "duckdb/optimizer/filter_combiner.hpp"
+#include "duckdb/optimizer/rule.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/optimizer/index_scan.hpp b/src/include/duckdb/optimizer/index_scan.hpp
similarity index 87%
rename from src/include/optimizer/index_scan.hpp
rename to src/include/duckdb/optimizer/index_scan.hpp
index 5bd1933839a..109b0a96c69 100644
--- a/src/include/optimizer/index_scan.hpp
+++ b/src/include/duckdb/optimizer/index_scan.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "optimizer/filter_combiner.hpp"
-#include "optimizer/rule.hpp"
+#include "duckdb/optimizer/filter_combiner.hpp"
+#include "duckdb/optimizer/rule.hpp"
 
 namespace duckdb {
 class Optimizer;
diff --git a/src/include/optimizer/join_order/query_graph.hpp b/src/include/duckdb/optimizer/join_order/query_graph.hpp
similarity index 91%
rename from src/include/optimizer/join_order/query_graph.hpp
rename to src/include/duckdb/optimizer/join_order/query_graph.hpp
index beff6ae21f7..1ee1e62d807 100644
--- a/src/include/optimizer/join_order/query_graph.hpp
+++ b/src/include/duckdb/optimizer/join_order/query_graph.hpp
@@ -8,10 +8,10 @@
 
 #pragma once
 
-#include "common/common.hpp"
-#include "common/unordered_map.hpp"
-#include "common/unordered_set.hpp"
-#include "optimizer/join_order/relation.hpp"
+#include "duckdb/common/common.hpp"
+#include "duckdb/common/unordered_map.hpp"
+#include "duckdb/common/unordered_set.hpp"
+#include "duckdb/optimizer/join_order/relation.hpp"
 
 #include <functional>
 
diff --git a/src/include/optimizer/join_order/relation.hpp b/src/include/duckdb/optimizer/join_order/relation.hpp
similarity index 94%
rename from src/include/optimizer/join_order/relation.hpp
rename to src/include/duckdb/optimizer/join_order/relation.hpp
index 733110dc9ae..782247a35b5 100644
--- a/src/include/optimizer/join_order/relation.hpp
+++ b/src/include/duckdb/optimizer/join_order/relation.hpp
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "common/common.hpp"
-#include "common/unordered_map.hpp"
-#include "common/unordered_set.hpp"
+#include "duckdb/common/common.hpp"
+#include "duckdb/common/unordered_map.hpp"
+#include "duckdb/common/unordered_set.hpp"
 
 namespace duckdb {
 class LogicalOperator;
diff --git a/src/include/optimizer/join_order_optimizer.hpp b/src/include/duckdb/optimizer/join_order_optimizer.hpp
similarity index 92%
rename from src/include/optimizer/join_order_optimizer.hpp
rename to src/include/duckdb/optimizer/join_order_optimizer.hpp
index 5bcffa411d0..3f078addf0a 100644
--- a/src/include/optimizer/join_order_optimizer.hpp
+++ b/src/include/duckdb/optimizer/join_order_optimizer.hpp
@@ -8,13 +8,13 @@
 
 #pragma once
 
-#include "common/unordered_map.hpp"
-#include "common/unordered_set.hpp"
-#include "optimizer/join_order/query_graph.hpp"
-#include "optimizer/join_order/relation.hpp"
-#include "parser/expression_map.hpp"
-#include "planner/logical_operator.hpp"
-#include "planner/logical_operator_visitor.hpp"
+#include "duckdb/common/unordered_map.hpp"
+#include "duckdb/common/unordered_set.hpp"
+#include "duckdb/optimizer/join_order/query_graph.hpp"
+#include "duckdb/optimizer/join_order/relation.hpp"
+#include "duckdb/parser/expression_map.hpp"
+#include "duckdb/planner/logical_operator.hpp"
+#include "duckdb/planner/logical_operator_visitor.hpp"
 
 #include <functional>
 
diff --git a/src/include/optimizer/matcher/expression_matcher.hpp b/src/include/duckdb/optimizer/matcher/expression_matcher.hpp
similarity index 93%
rename from src/include/optimizer/matcher/expression_matcher.hpp
rename to src/include/duckdb/optimizer/matcher/expression_matcher.hpp
index c5de3e8e506..e92f7bedf39 100644
--- a/src/include/optimizer/matcher/expression_matcher.hpp
+++ b/src/include/duckdb/optimizer/matcher/expression_matcher.hpp
@@ -8,12 +8,12 @@
 
 #pragma once
 
-#include "common/exception.hpp"
-#include "optimizer/matcher/expression_type_matcher.hpp"
-#include "optimizer/matcher/set_matcher.hpp"
-#include "optimizer/matcher/type_matcher.hpp"
-#include "optimizer/matcher/function_matcher.hpp"
-#include "planner/logical_operator.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/optimizer/matcher/expression_type_matcher.hpp"
+#include "duckdb/optimizer/matcher/set_matcher.hpp"
+#include "duckdb/optimizer/matcher/type_matcher.hpp"
+#include "duckdb/optimizer/matcher/function_matcher.hpp"
+#include "duckdb/planner/logical_operator.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/optimizer/matcher/expression_type_matcher.hpp b/src/include/duckdb/optimizer/matcher/expression_type_matcher.hpp
similarity index 95%
rename from src/include/optimizer/matcher/expression_type_matcher.hpp
rename to src/include/duckdb/optimizer/matcher/expression_type_matcher.hpp
index 74c21488319..413bc3a0f56 100644
--- a/src/include/optimizer/matcher/expression_type_matcher.hpp
+++ b/src/include/duckdb/optimizer/matcher/expression_type_matcher.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "common/common.hpp"
-#include "common/enums/expression_type.hpp"
+#include "duckdb/common/common.hpp"
+#include "duckdb/common/enums/expression_type.hpp"
 
 #include <algorithm>
 
diff --git a/src/include/optimizer/matcher/function_matcher.hpp b/src/include/duckdb/optimizer/matcher/function_matcher.hpp
similarity index 97%
rename from src/include/optimizer/matcher/function_matcher.hpp
rename to src/include/duckdb/optimizer/matcher/function_matcher.hpp
index a0a1dd0c91a..763d5e52b1e 100644
--- a/src/include/optimizer/matcher/function_matcher.hpp
+++ b/src/include/duckdb/optimizer/matcher/function_matcher.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "common/common.hpp"
+#include "duckdb/common/common.hpp"
 
 #include <algorithm>
 
diff --git a/src/include/optimizer/matcher/logical_operator_matcher.hpp b/src/include/duckdb/optimizer/matcher/logical_operator_matcher.hpp
similarity index 94%
rename from src/include/optimizer/matcher/logical_operator_matcher.hpp
rename to src/include/duckdb/optimizer/matcher/logical_operator_matcher.hpp
index 9f10ed728b6..cf3d0e6d17b 100644
--- a/src/include/optimizer/matcher/logical_operator_matcher.hpp
+++ b/src/include/duckdb/optimizer/matcher/logical_operator_matcher.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "common/enums/logical_operator_type.hpp"
+#include "duckdb/common/enums/logical_operator_type.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/optimizer/matcher/set_matcher.hpp b/src/include/duckdb/optimizer/matcher/set_matcher.hpp
similarity index 98%
rename from src/include/optimizer/matcher/set_matcher.hpp
rename to src/include/duckdb/optimizer/matcher/set_matcher.hpp
index 4d4aa18c606..a2100da9d13 100644
--- a/src/include/optimizer/matcher/set_matcher.hpp
+++ b/src/include/duckdb/optimizer/matcher/set_matcher.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "common/common.hpp"
-#include "common/unordered_set.hpp"
+#include "duckdb/common/common.hpp"
+#include "duckdb/common/unordered_set.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/optimizer/matcher/type_matcher.hpp b/src/include/duckdb/optimizer/matcher/type_matcher.hpp
similarity index 97%
rename from src/include/optimizer/matcher/type_matcher.hpp
rename to src/include/duckdb/optimizer/matcher/type_matcher.hpp
index 0d74104ce14..c2b2b404392 100644
--- a/src/include/optimizer/matcher/type_matcher.hpp
+++ b/src/include/duckdb/optimizer/matcher/type_matcher.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "common/types.hpp"
+#include "duckdb/common/types.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/optimizer/optimizer.hpp b/src/include/duckdb/optimizer/optimizer.hpp
similarity index 77%
rename from src/include/optimizer/optimizer.hpp
rename to src/include/duckdb/optimizer/optimizer.hpp
index 89da647f0eb..31b68b6b1ee 100644
--- a/src/include/optimizer/optimizer.hpp
+++ b/src/include/duckdb/optimizer/optimizer.hpp
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "optimizer/expression_rewriter.hpp"
-#include "planner/logical_operator.hpp"
-#include "planner/logical_operator_visitor.hpp"
+#include "duckdb/optimizer/expression_rewriter.hpp"
+#include "duckdb/planner/logical_operator.hpp"
+#include "duckdb/planner/logical_operator_visitor.hpp"
 
 namespace duckdb {
 class Binder;
diff --git a/src/include/optimizer/regex_range_filter.hpp b/src/include/duckdb/optimizer/regex_range_filter.hpp
similarity index 92%
rename from src/include/optimizer/regex_range_filter.hpp
rename to src/include/duckdb/optimizer/regex_range_filter.hpp
index 19f911c03e3..9e8fbe54ba0 100644
--- a/src/include/optimizer/regex_range_filter.hpp
+++ b/src/include/duckdb/optimizer/regex_range_filter.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "optimizer/rule.hpp"
+#include "duckdb/optimizer/rule.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/optimizer/rule.hpp b/src/include/duckdb/optimizer/rule.hpp
similarity index 85%
rename from src/include/optimizer/rule.hpp
rename to src/include/duckdb/optimizer/rule.hpp
index 5f46cffe175..634401f695d 100644
--- a/src/include/optimizer/rule.hpp
+++ b/src/include/duckdb/optimizer/rule.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "optimizer/matcher/expression_matcher.hpp"
-#include "optimizer/matcher/logical_operator_matcher.hpp"
+#include "duckdb/optimizer/matcher/expression_matcher.hpp"
+#include "duckdb/optimizer/matcher/logical_operator_matcher.hpp"
 
 namespace duckdb {
 class ExpressionRewriter;
diff --git a/src/include/optimizer/rule/arithmetic_simplification.hpp b/src/include/duckdb/optimizer/rule/arithmetic_simplification.hpp
similarity index 94%
rename from src/include/optimizer/rule/arithmetic_simplification.hpp
rename to src/include/duckdb/optimizer/rule/arithmetic_simplification.hpp
index 98b0651cf5b..28ba9b50463 100644
--- a/src/include/optimizer/rule/arithmetic_simplification.hpp
+++ b/src/include/duckdb/optimizer/rule/arithmetic_simplification.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "optimizer/rule.hpp"
+#include "duckdb/optimizer/rule.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/optimizer/rule/case_simplification.hpp b/src/include/duckdb/optimizer/rule/case_simplification.hpp
similarity index 94%
rename from src/include/optimizer/rule/case_simplification.hpp
rename to src/include/duckdb/optimizer/rule/case_simplification.hpp
index 19bdcfbf980..b0d9899258d 100644
--- a/src/include/optimizer/rule/case_simplification.hpp
+++ b/src/include/duckdb/optimizer/rule/case_simplification.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "optimizer/rule.hpp"
+#include "duckdb/optimizer/rule.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/optimizer/rule/comparison_simplification.hpp b/src/include/duckdb/optimizer/rule/comparison_simplification.hpp
similarity index 94%
rename from src/include/optimizer/rule/comparison_simplification.hpp
rename to src/include/duckdb/optimizer/rule/comparison_simplification.hpp
index d2f95d29e2f..cff3cdf0bf4 100644
--- a/src/include/optimizer/rule/comparison_simplification.hpp
+++ b/src/include/duckdb/optimizer/rule/comparison_simplification.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "optimizer/rule.hpp"
+#include "duckdb/optimizer/rule.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/optimizer/rule/conjunction_simplification.hpp b/src/include/duckdb/optimizer/rule/conjunction_simplification.hpp
similarity index 94%
rename from src/include/optimizer/rule/conjunction_simplification.hpp
rename to src/include/duckdb/optimizer/rule/conjunction_simplification.hpp
index ba34e28fe8d..6381647fcf2 100644
--- a/src/include/optimizer/rule/conjunction_simplification.hpp
+++ b/src/include/duckdb/optimizer/rule/conjunction_simplification.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "optimizer/rule.hpp"
+#include "duckdb/optimizer/rule.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/optimizer/rule/constant_folding.hpp b/src/include/duckdb/optimizer/rule/constant_folding.hpp
similarity index 94%
rename from src/include/optimizer/rule/constant_folding.hpp
rename to src/include/duckdb/optimizer/rule/constant_folding.hpp
index 8c0563a8def..d1147d58d1b 100644
--- a/src/include/optimizer/rule/constant_folding.hpp
+++ b/src/include/duckdb/optimizer/rule/constant_folding.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "optimizer/rule.hpp"
+#include "duckdb/optimizer/rule.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/optimizer/rule/distributivity.hpp b/src/include/duckdb/optimizer/rule/distributivity.hpp
similarity index 93%
rename from src/include/optimizer/rule/distributivity.hpp
rename to src/include/duckdb/optimizer/rule/distributivity.hpp
index 626ed29a0f2..d5c30a00bc3 100644
--- a/src/include/optimizer/rule/distributivity.hpp
+++ b/src/include/duckdb/optimizer/rule/distributivity.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "optimizer/rule.hpp"
+#include "duckdb/optimizer/rule.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/duckdb/optimizer/rule/list.hpp b/src/include/duckdb/optimizer/rule/list.hpp
new file mode 100644
index 00000000000..09ce4465e00
--- /dev/null
+++ b/src/include/duckdb/optimizer/rule/list.hpp
@@ -0,0 +1,7 @@
+#include "duckdb/optimizer/rule/arithmetic_simplification.hpp"
+#include "duckdb/optimizer/rule/case_simplification.hpp"
+#include "duckdb/optimizer/rule/comparison_simplification.hpp"
+#include "duckdb/optimizer/rule/conjunction_simplification.hpp"
+#include "duckdb/optimizer/rule/constant_folding.hpp"
+#include "duckdb/optimizer/rule/distributivity.hpp"
+#include "duckdb/optimizer/rule/move_constants.hpp"
diff --git a/src/include/optimizer/rule/move_constants.hpp b/src/include/duckdb/optimizer/rule/move_constants.hpp
similarity index 94%
rename from src/include/optimizer/rule/move_constants.hpp
rename to src/include/duckdb/optimizer/rule/move_constants.hpp
index 4c713d45214..59f754e21bb 100644
--- a/src/include/optimizer/rule/move_constants.hpp
+++ b/src/include/duckdb/optimizer/rule/move_constants.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "optimizer/rule.hpp"
+#include "duckdb/optimizer/rule.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/optimizer/topn_optimizer.hpp b/src/include/duckdb/optimizer/topn_optimizer.hpp
similarity index 100%
rename from src/include/optimizer/topn_optimizer.hpp
rename to src/include/duckdb/optimizer/topn_optimizer.hpp
diff --git a/src/include/parser/base_expression.hpp b/src/include/duckdb/parser/base_expression.hpp
similarity index 96%
rename from src/include/parser/base_expression.hpp
rename to src/include/duckdb/parser/base_expression.hpp
index a89907dd3af..a8eaf93c8be 100644
--- a/src/include/parser/base_expression.hpp
+++ b/src/include/duckdb/parser/base_expression.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "common/common.hpp"
-#include "common/enums/expression_type.hpp"
+#include "duckdb/common/common.hpp"
+#include "duckdb/common/enums/expression_type.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/parser/column_definition.hpp b/src/include/duckdb/parser/column_definition.hpp
similarity index 86%
rename from src/include/parser/column_definition.hpp
rename to src/include/duckdb/parser/column_definition.hpp
index d24e975bd1e..f1fe1a4638f 100644
--- a/src/include/parser/column_definition.hpp
+++ b/src/include/duckdb/parser/column_definition.hpp
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "common/common.hpp"
-#include "common/types/value.hpp"
-#include "parser/parsed_expression.hpp"
+#include "duckdb/common/common.hpp"
+#include "duckdb/common/types/value.hpp"
+#include "duckdb/parser/parsed_expression.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/parser/constraint.hpp b/src/include/duckdb/parser/constraint.hpp
similarity index 97%
rename from src/include/parser/constraint.hpp
rename to src/include/duckdb/parser/constraint.hpp
index 11f007c3e5d..cf41b082147 100644
--- a/src/include/parser/constraint.hpp
+++ b/src/include/duckdb/parser/constraint.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "common/common.hpp"
+#include "duckdb/common/common.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/parser/constraints/check_constraint.hpp b/src/include/duckdb/parser/constraints/check_constraint.hpp
similarity index 87%
rename from src/include/parser/constraints/check_constraint.hpp
rename to src/include/duckdb/parser/constraints/check_constraint.hpp
index ccd4a12da35..54125d5022c 100644
--- a/src/include/parser/constraints/check_constraint.hpp
+++ b/src/include/duckdb/parser/constraints/check_constraint.hpp
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "common/string_util.hpp"
-#include "parser/constraint.hpp"
-#include "parser/parsed_expression.hpp"
+#include "duckdb/common/string_util.hpp"
+#include "duckdb/parser/constraint.hpp"
+#include "duckdb/parser/parsed_expression.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/duckdb/parser/constraints/list.hpp b/src/include/duckdb/parser/constraints/list.hpp
new file mode 100644
index 00000000000..e952bf1b4a5
--- /dev/null
+++ b/src/include/duckdb/parser/constraints/list.hpp
@@ -0,0 +1,3 @@
+#include "duckdb/parser/constraints/check_constraint.hpp"
+#include "duckdb/parser/constraints/not_null_constraint.hpp"
+#include "duckdb/parser/constraints/unique_constraint.hpp"
diff --git a/src/include/parser/constraints/not_null_constraint.hpp b/src/include/duckdb/parser/constraints/not_null_constraint.hpp
similarity index 95%
rename from src/include/parser/constraints/not_null_constraint.hpp
rename to src/include/duckdb/parser/constraints/not_null_constraint.hpp
index 2f34fca1d0d..a39f2087ac9 100644
--- a/src/include/parser/constraints/not_null_constraint.hpp
+++ b/src/include/duckdb/parser/constraints/not_null_constraint.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "parser/constraint.hpp"
+#include "duckdb/parser/constraint.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/parser/constraints/unique_constraint.hpp b/src/include/duckdb/parser/constraints/unique_constraint.hpp
similarity index 97%
rename from src/include/parser/constraints/unique_constraint.hpp
rename to src/include/duckdb/parser/constraints/unique_constraint.hpp
index 5460c89f535..89ed67192d6 100644
--- a/src/include/parser/constraints/unique_constraint.hpp
+++ b/src/include/duckdb/parser/constraints/unique_constraint.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "parser/constraint.hpp"
+#include "duckdb/parser/constraint.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/parser/expression/bound_expression.hpp b/src/include/duckdb/parser/expression/bound_expression.hpp
similarity index 91%
rename from src/include/parser/expression/bound_expression.hpp
rename to src/include/duckdb/parser/expression/bound_expression.hpp
index ac75a5344af..ad303cf53fb 100644
--- a/src/include/parser/expression/bound_expression.hpp
+++ b/src/include/duckdb/parser/expression/bound_expression.hpp
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "common/exception.hpp"
-#include "parser/parsed_expression.hpp"
-#include "planner/expression.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/parser/parsed_expression.hpp"
+#include "duckdb/planner/expression.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/parser/expression/case_expression.hpp b/src/include/duckdb/parser/expression/case_expression.hpp
similarity index 95%
rename from src/include/parser/expression/case_expression.hpp
rename to src/include/duckdb/parser/expression/case_expression.hpp
index 6d7950d4be2..eec587f085c 100644
--- a/src/include/parser/expression/case_expression.hpp
+++ b/src/include/duckdb/parser/expression/case_expression.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "parser/parsed_expression.hpp"
+#include "duckdb/parser/parsed_expression.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/parser/expression/cast_expression.hpp b/src/include/duckdb/parser/expression/cast_expression.hpp
similarity index 95%
rename from src/include/parser/expression/cast_expression.hpp
rename to src/include/duckdb/parser/expression/cast_expression.hpp
index d97e5d6e2b6..b7bf9b59bc2 100644
--- a/src/include/parser/expression/cast_expression.hpp
+++ b/src/include/duckdb/parser/expression/cast_expression.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "parser/parsed_expression.hpp"
+#include "duckdb/parser/parsed_expression.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/parser/expression/columnref_expression.hpp b/src/include/duckdb/parser/expression/columnref_expression.hpp
similarity index 96%
rename from src/include/parser/expression/columnref_expression.hpp
rename to src/include/duckdb/parser/expression/columnref_expression.hpp
index 46a5e6a5ee2..e8fee3f9e81 100644
--- a/src/include/parser/expression/columnref_expression.hpp
+++ b/src/include/duckdb/parser/expression/columnref_expression.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "parser/parsed_expression.hpp"
+#include "duckdb/parser/parsed_expression.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/parser/expression/comparison_expression.hpp b/src/include/duckdb/parser/expression/comparison_expression.hpp
similarity index 95%
rename from src/include/parser/expression/comparison_expression.hpp
rename to src/include/duckdb/parser/expression/comparison_expression.hpp
index 23c62ec96a4..c7ffdc60612 100644
--- a/src/include/parser/expression/comparison_expression.hpp
+++ b/src/include/duckdb/parser/expression/comparison_expression.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "parser/parsed_expression.hpp"
+#include "duckdb/parser/parsed_expression.hpp"
 
 namespace duckdb {
 //! ComparisonExpression represents a boolean comparison (e.g. =, >=, <>). Always returns a boolean
diff --git a/src/include/parser/expression/conjunction_expression.hpp b/src/include/duckdb/parser/expression/conjunction_expression.hpp
similarity index 95%
rename from src/include/parser/expression/conjunction_expression.hpp
rename to src/include/duckdb/parser/expression/conjunction_expression.hpp
index f7ad0bc67ff..549cd21782a 100644
--- a/src/include/parser/expression/conjunction_expression.hpp
+++ b/src/include/duckdb/parser/expression/conjunction_expression.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "parser/parsed_expression.hpp"
+#include "duckdb/parser/parsed_expression.hpp"
 
 namespace duckdb {
 //! Represents a conjunction (AND/OR)
diff --git a/src/include/parser/expression/constant_expression.hpp b/src/include/duckdb/parser/expression/constant_expression.hpp
similarity index 91%
rename from src/include/parser/expression/constant_expression.hpp
rename to src/include/duckdb/parser/expression/constant_expression.hpp
index 740ac83b902..c5dd27ab49e 100644
--- a/src/include/parser/expression/constant_expression.hpp
+++ b/src/include/duckdb/parser/expression/constant_expression.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "common/types/value.hpp"
-#include "parser/parsed_expression.hpp"
+#include "duckdb/common/types/value.hpp"
+#include "duckdb/parser/parsed_expression.hpp"
 
 namespace duckdb {
 //! ConstantExpression represents a constant value in the query
diff --git a/src/include/parser/expression/default_expression.hpp b/src/include/duckdb/parser/expression/default_expression.hpp
similarity index 93%
rename from src/include/parser/expression/default_expression.hpp
rename to src/include/duckdb/parser/expression/default_expression.hpp
index c87a015815f..e49f838e4fe 100644
--- a/src/include/parser/expression/default_expression.hpp
+++ b/src/include/duckdb/parser/expression/default_expression.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "parser/parsed_expression.hpp"
+#include "duckdb/parser/parsed_expression.hpp"
 
 namespace duckdb {
 //! Represents the default value of a column
diff --git a/src/include/parser/expression/function_expression.hpp b/src/include/duckdb/parser/expression/function_expression.hpp
similarity index 97%
rename from src/include/parser/expression/function_expression.hpp
rename to src/include/duckdb/parser/expression/function_expression.hpp
index 3f71ee9ec55..d1b63e47720 100644
--- a/src/include/parser/expression/function_expression.hpp
+++ b/src/include/duckdb/parser/expression/function_expression.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "parser/parsed_expression.hpp"
+#include "duckdb/parser/parsed_expression.hpp"
 
 namespace duckdb {
 //! Represents a function call
diff --git a/src/include/duckdb/parser/expression/list.hpp b/src/include/duckdb/parser/expression/list.hpp
new file mode 100644
index 00000000000..53f236b4e21
--- /dev/null
+++ b/src/include/duckdb/parser/expression/list.hpp
@@ -0,0 +1,14 @@
+#include "duckdb/parser/expression/bound_expression.hpp"
+#include "duckdb/parser/expression/case_expression.hpp"
+#include "duckdb/parser/expression/cast_expression.hpp"
+#include "duckdb/parser/expression/columnref_expression.hpp"
+#include "duckdb/parser/expression/comparison_expression.hpp"
+#include "duckdb/parser/expression/conjunction_expression.hpp"
+#include "duckdb/parser/expression/constant_expression.hpp"
+#include "duckdb/parser/expression/default_expression.hpp"
+#include "duckdb/parser/expression/function_expression.hpp"
+#include "duckdb/parser/expression/operator_expression.hpp"
+#include "duckdb/parser/expression/parameter_expression.hpp"
+#include "duckdb/parser/expression/star_expression.hpp"
+#include "duckdb/parser/expression/subquery_expression.hpp"
+#include "duckdb/parser/expression/window_expression.hpp"
diff --git a/src/include/parser/expression/operator_expression.hpp b/src/include/duckdb/parser/expression/operator_expression.hpp
similarity index 95%
rename from src/include/parser/expression/operator_expression.hpp
rename to src/include/duckdb/parser/expression/operator_expression.hpp
index c68707ca9d4..0d7565796fc 100644
--- a/src/include/parser/expression/operator_expression.hpp
+++ b/src/include/duckdb/parser/expression/operator_expression.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "parser/parsed_expression.hpp"
+#include "duckdb/parser/parsed_expression.hpp"
 
 namespace duckdb {
 //! Represents a built-in operator expression
diff --git a/src/include/parser/expression/parameter_expression.hpp b/src/include/duckdb/parser/expression/parameter_expression.hpp
similarity index 94%
rename from src/include/parser/expression/parameter_expression.hpp
rename to src/include/duckdb/parser/expression/parameter_expression.hpp
index f76d12394a9..3afb6c3bc26 100644
--- a/src/include/parser/expression/parameter_expression.hpp
+++ b/src/include/duckdb/parser/expression/parameter_expression.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "parser/parsed_expression.hpp"
+#include "duckdb/parser/parsed_expression.hpp"
 
 namespace duckdb {
 class ParameterExpression : public ParsedExpression {
diff --git a/src/include/parser/expression/star_expression.hpp b/src/include/duckdb/parser/expression/star_expression.hpp
similarity index 93%
rename from src/include/parser/expression/star_expression.hpp
rename to src/include/duckdb/parser/expression/star_expression.hpp
index e7a1f8a961b..288ec399867 100644
--- a/src/include/parser/expression/star_expression.hpp
+++ b/src/include/duckdb/parser/expression/star_expression.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "parser/parsed_expression.hpp"
+#include "duckdb/parser/parsed_expression.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/parser/expression/subquery_expression.hpp b/src/include/duckdb/parser/expression/subquery_expression.hpp
similarity index 90%
rename from src/include/parser/expression/subquery_expression.hpp
rename to src/include/duckdb/parser/expression/subquery_expression.hpp
index 0444f8226cb..57b07952625 100644
--- a/src/include/parser/expression/subquery_expression.hpp
+++ b/src/include/duckdb/parser/expression/subquery_expression.hpp
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "common/enums/subquery_type.hpp"
-#include "parser/parsed_expression.hpp"
-#include "parser/query_node.hpp"
+#include "duckdb/common/enums/subquery_type.hpp"
+#include "duckdb/parser/parsed_expression.hpp"
+#include "duckdb/parser/query_node.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/parser/expression/window_expression.hpp b/src/include/duckdb/parser/expression/window_expression.hpp
similarity index 95%
rename from src/include/parser/expression/window_expression.hpp
rename to src/include/duckdb/parser/expression/window_expression.hpp
index 04bae0daa66..00715ab2521 100644
--- a/src/include/parser/expression/window_expression.hpp
+++ b/src/include/duckdb/parser/expression/window_expression.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "parser/parsed_expression.hpp"
-#include "parser/query_node.hpp"
+#include "duckdb/parser/parsed_expression.hpp"
+#include "duckdb/parser/query_node.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/parser/expression_map.hpp b/src/include/duckdb/parser/expression_map.hpp
similarity index 86%
rename from src/include/parser/expression_map.hpp
rename to src/include/duckdb/parser/expression_map.hpp
index bf8004db384..17d141152c9 100644
--- a/src/include/parser/expression_map.hpp
+++ b/src/include/duckdb/parser/expression_map.hpp
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "common/unordered_map.hpp"
-#include "common/unordered_set.hpp"
-#include "parser/base_expression.hpp"
+#include "duckdb/common/unordered_map.hpp"
+#include "duckdb/common/unordered_set.hpp"
+#include "duckdb/parser/base_expression.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/parser/parsed_data/alter_table_info.hpp b/src/include/duckdb/parser/parsed_data/alter_table_info.hpp
similarity index 97%
rename from src/include/parser/parsed_data/alter_table_info.hpp
rename to src/include/duckdb/parser/parsed_data/alter_table_info.hpp
index 7356e2ac5ac..eecd579440e 100644
--- a/src/include/parser/parsed_data/alter_table_info.hpp
+++ b/src/include/duckdb/parser/parsed_data/alter_table_info.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "common/common.hpp"
+#include "duckdb/common/common.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/parser/parsed_data/copy_info.hpp b/src/include/duckdb/parser/parsed_data/copy_info.hpp
similarity index 98%
rename from src/include/parser/parsed_data/copy_info.hpp
rename to src/include/duckdb/parser/parsed_data/copy_info.hpp
index 2d3b7bab48a..f4c74634f0e 100644
--- a/src/include/parser/parsed_data/copy_info.hpp
+++ b/src/include/duckdb/parser/parsed_data/copy_info.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "common/common.hpp"
+#include "duckdb/common/common.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/parser/parsed_data/create_aggregate_function_info.hpp b/src/include/duckdb/parser/parsed_data/create_aggregate_function_info.hpp
similarity index 88%
rename from src/include/parser/parsed_data/create_aggregate_function_info.hpp
rename to src/include/duckdb/parser/parsed_data/create_aggregate_function_info.hpp
index ea69bf12d60..3e2959989ec 100644
--- a/src/include/parser/parsed_data/create_aggregate_function_info.hpp
+++ b/src/include/duckdb/parser/parsed_data/create_aggregate_function_info.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "parser/parsed_data/create_function_info.hpp"
-#include "function/function_set.hpp"
+#include "duckdb/parser/parsed_data/create_function_info.hpp"
+#include "duckdb/function/function_set.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/parser/parsed_data/create_function_info.hpp b/src/include/duckdb/parser/parsed_data/create_function_info.hpp
similarity index 90%
rename from src/include/parser/parsed_data/create_function_info.hpp
rename to src/include/duckdb/parser/parsed_data/create_function_info.hpp
index 2300bed38e1..995f024042c 100644
--- a/src/include/parser/parsed_data/create_function_info.hpp
+++ b/src/include/duckdb/parser/parsed_data/create_function_info.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "common/common.hpp"
-#include "function/function.hpp"
+#include "duckdb/common/common.hpp"
+#include "duckdb/function/function.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/parser/parsed_data/create_index_info.hpp b/src/include/duckdb/parser/parsed_data/create_index_info.hpp
similarity index 88%
rename from src/include/parser/parsed_data/create_index_info.hpp
rename to src/include/duckdb/parser/parsed_data/create_index_info.hpp
index 09edf0a4bba..5652df4b6a1 100644
--- a/src/include/parser/parsed_data/create_index_info.hpp
+++ b/src/include/duckdb/parser/parsed_data/create_index_info.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "common/common.hpp"
-#include "common/enums/index_type.hpp"
+#include "duckdb/common/common.hpp"
+#include "duckdb/common/enums/index_type.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/parser/parsed_data/create_scalar_function_info.hpp b/src/include/duckdb/parser/parsed_data/create_scalar_function_info.hpp
similarity index 82%
rename from src/include/parser/parsed_data/create_scalar_function_info.hpp
rename to src/include/duckdb/parser/parsed_data/create_scalar_function_info.hpp
index 90c32fa144b..1edfcf0971a 100644
--- a/src/include/parser/parsed_data/create_scalar_function_info.hpp
+++ b/src/include/duckdb/parser/parsed_data/create_scalar_function_info.hpp
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "parser/parsed_data/create_function_info.hpp"
-#include "function/scalar_function.hpp"
-#include "function/function_set.hpp"
+#include "duckdb/parser/parsed_data/create_function_info.hpp"
+#include "duckdb/function/scalar_function.hpp"
+#include "duckdb/function/function_set.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/parser/parsed_data/create_schema_info.hpp b/src/include/duckdb/parser/parsed_data/create_schema_info.hpp
similarity index 93%
rename from src/include/parser/parsed_data/create_schema_info.hpp
rename to src/include/duckdb/parser/parsed_data/create_schema_info.hpp
index e7154842490..3948022c437 100644
--- a/src/include/parser/parsed_data/create_schema_info.hpp
+++ b/src/include/duckdb/parser/parsed_data/create_schema_info.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "common/common.hpp"
+#include "duckdb/common/common.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/parser/parsed_data/create_sequence_info.hpp b/src/include/duckdb/parser/parsed_data/create_sequence_info.hpp
similarity index 96%
rename from src/include/parser/parsed_data/create_sequence_info.hpp
rename to src/include/duckdb/parser/parsed_data/create_sequence_info.hpp
index ee3956c46cc..d4713282b9c 100644
--- a/src/include/parser/parsed_data/create_sequence_info.hpp
+++ b/src/include/duckdb/parser/parsed_data/create_sequence_info.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "common/common.hpp"
+#include "duckdb/common/common.hpp"
 
 #include <limits>
 
diff --git a/src/include/parser/parsed_data/create_table_function_info.hpp b/src/include/duckdb/parser/parsed_data/create_table_function_info.hpp
similarity index 93%
rename from src/include/parser/parsed_data/create_table_function_info.hpp
rename to src/include/duckdb/parser/parsed_data/create_table_function_info.hpp
index 384a142baa4..e99e2b78fce 100644
--- a/src/include/parser/parsed_data/create_table_function_info.hpp
+++ b/src/include/duckdb/parser/parsed_data/create_table_function_info.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "function/table_function.hpp"
+#include "duckdb/function/table_function.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/parser/parsed_data/create_table_info.hpp b/src/include/duckdb/parser/parsed_data/create_table_info.hpp
similarity index 85%
rename from src/include/parser/parsed_data/create_table_info.hpp
rename to src/include/duckdb/parser/parsed_data/create_table_info.hpp
index eb248d6bab2..28e1e600bd4 100644
--- a/src/include/parser/parsed_data/create_table_info.hpp
+++ b/src/include/duckdb/parser/parsed_data/create_table_info.hpp
@@ -8,10 +8,10 @@
 
 #pragma once
 
-#include "common/common.hpp"
-#include "common/unordered_set.hpp"
-#include "parser/column_definition.hpp"
-#include "parser/constraint.hpp"
+#include "duckdb/common/common.hpp"
+#include "duckdb/common/unordered_set.hpp"
+#include "duckdb/parser/column_definition.hpp"
+#include "duckdb/parser/constraint.hpp"
 
 namespace duckdb {
 struct CreateTableInfo {
diff --git a/src/include/parser/parsed_data/create_view_info.hpp b/src/include/duckdb/parser/parsed_data/create_view_info.hpp
similarity index 91%
rename from src/include/parser/parsed_data/create_view_info.hpp
rename to src/include/duckdb/parser/parsed_data/create_view_info.hpp
index ff7d088722a..5718b696204 100644
--- a/src/include/parser/parsed_data/create_view_info.hpp
+++ b/src/include/duckdb/parser/parsed_data/create_view_info.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "common/common.hpp"
-#include "parser/query_node.hpp"
+#include "duckdb/common/common.hpp"
+#include "duckdb/parser/query_node.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/parser/parsed_data/drop_info.hpp b/src/include/duckdb/parser/parsed_data/drop_info.hpp
similarity index 89%
rename from src/include/parser/parsed_data/drop_info.hpp
rename to src/include/duckdb/parser/parsed_data/drop_info.hpp
index dfdf8f3472b..577ffce6301 100644
--- a/src/include/parser/parsed_data/drop_info.hpp
+++ b/src/include/duckdb/parser/parsed_data/drop_info.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "common/common.hpp"
-#include "common/enums/catalog_type.hpp"
+#include "duckdb/common/common.hpp"
+#include "duckdb/common/enums/catalog_type.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/parser/parsed_expression.hpp b/src/include/duckdb/parser/parsed_expression.hpp
similarity index 97%
rename from src/include/parser/parsed_expression.hpp
rename to src/include/duckdb/parser/parsed_expression.hpp
index d602f64ccb3..367770aa467 100644
--- a/src/include/parser/parsed_expression.hpp
+++ b/src/include/duckdb/parser/parsed_expression.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "parser/base_expression.hpp"
+#include "duckdb/parser/base_expression.hpp"
 
 namespace duckdb {
 class Serializer;
diff --git a/src/include/parser/parsed_expression_iterator.hpp b/src/include/duckdb/parser/parsed_expression_iterator.hpp
similarity index 91%
rename from src/include/parser/parsed_expression_iterator.hpp
rename to src/include/duckdb/parser/parsed_expression_iterator.hpp
index 13fae6f7c2e..2e7c85180ff 100644
--- a/src/include/parser/parsed_expression_iterator.hpp
+++ b/src/include/duckdb/parser/parsed_expression_iterator.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "parser/parsed_expression.hpp"
+#include "duckdb/parser/parsed_expression.hpp"
 
 #include <functional>
 
diff --git a/src/include/parser/parser.hpp b/src/include/duckdb/parser/parser.hpp
similarity index 96%
rename from src/include/parser/parser.hpp
rename to src/include/duckdb/parser/parser.hpp
index 18cff37bcf8..603207c8bec 100644
--- a/src/include/parser/parser.hpp
+++ b/src/include/duckdb/parser/parser.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "parser/sql_statement.hpp"
+#include "duckdb/parser/sql_statement.hpp"
 
 namespace postgres {
 struct Node;
diff --git a/src/include/parser/pragma_parser.hpp b/src/include/duckdb/parser/pragma_parser.hpp
similarity index 95%
rename from src/include/parser/pragma_parser.hpp
rename to src/include/duckdb/parser/pragma_parser.hpp
index 97b1cf13f63..f6e7443fa21 100644
--- a/src/include/parser/pragma_parser.hpp
+++ b/src/include/duckdb/parser/pragma_parser.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "common/common.hpp"
+#include "duckdb/common/common.hpp"
 
 namespace duckdb {
 class ClientContext;
diff --git a/src/include/parser/query_node.hpp b/src/include/duckdb/parser/query_node.hpp
similarity index 90%
rename from src/include/parser/query_node.hpp
rename to src/include/duckdb/parser/query_node.hpp
index d0812f5057a..2bdd600881b 100644
--- a/src/include/parser/query_node.hpp
+++ b/src/include/duckdb/parser/query_node.hpp
@@ -8,10 +8,10 @@
 
 #pragma once
 
-#include "common/common.hpp"
-#include "common/enums/order_type.hpp"
-#include "common/serializer.hpp"
-#include "parser/parsed_expression.hpp"
+#include "duckdb/common/common.hpp"
+#include "duckdb/common/enums/order_type.hpp"
+#include "duckdb/common/serializer.hpp"
+#include "duckdb/parser/parsed_expression.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/parser/query_node/select_node.hpp b/src/include/duckdb/parser/query_node/select_node.hpp
similarity index 91%
rename from src/include/parser/query_node/select_node.hpp
rename to src/include/duckdb/parser/query_node/select_node.hpp
index 90b6efe85e6..149dc7458ab 100644
--- a/src/include/parser/query_node/select_node.hpp
+++ b/src/include/duckdb/parser/query_node/select_node.hpp
@@ -8,10 +8,10 @@
 
 #pragma once
 
-#include "parser/parsed_expression.hpp"
-#include "parser/query_node.hpp"
-#include "parser/sql_statement.hpp"
-#include "parser/tableref.hpp"
+#include "duckdb/parser/parsed_expression.hpp"
+#include "duckdb/parser/query_node.hpp"
+#include "duckdb/parser/sql_statement.hpp"
+#include "duckdb/parser/tableref.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/parser/query_node/set_operation_node.hpp b/src/include/duckdb/parser/query_node/set_operation_node.hpp
similarity index 86%
rename from src/include/parser/query_node/set_operation_node.hpp
rename to src/include/duckdb/parser/query_node/set_operation_node.hpp
index 761f34150fb..a38cc7a2063 100644
--- a/src/include/parser/query_node/set_operation_node.hpp
+++ b/src/include/duckdb/parser/query_node/set_operation_node.hpp
@@ -8,10 +8,10 @@
 
 #pragma once
 
-#include "common/enums/set_operation_type.hpp"
-#include "parser/parsed_expression.hpp"
-#include "parser/query_node.hpp"
-#include "parser/sql_statement.hpp"
+#include "duckdb/common/enums/set_operation_type.hpp"
+#include "duckdb/parser/parsed_expression.hpp"
+#include "duckdb/parser/query_node.hpp"
+#include "duckdb/parser/sql_statement.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/parser/sql_statement.hpp b/src/include/duckdb/parser/sql_statement.hpp
similarity index 75%
rename from src/include/parser/sql_statement.hpp
rename to src/include/duckdb/parser/sql_statement.hpp
index 483dfc5c43a..61e2d9ed4f8 100644
--- a/src/include/parser/sql_statement.hpp
+++ b/src/include/duckdb/parser/sql_statement.hpp
@@ -8,10 +8,10 @@
 
 #pragma once
 
-#include "common/common.hpp"
-#include "common/enums/statement_type.hpp"
-#include "common/exception.hpp"
-#include "common/printer.hpp"
+#include "duckdb/common/common.hpp"
+#include "duckdb/common/enums/statement_type.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/common/printer.hpp"
 
 namespace duckdb {
 //! SQLStatement is the base class of any type of SQL statement.
diff --git a/src/include/parser/statement/alter_table_statement.hpp b/src/include/duckdb/parser/statement/alter_table_statement.hpp
similarity index 74%
rename from src/include/parser/statement/alter_table_statement.hpp
rename to src/include/duckdb/parser/statement/alter_table_statement.hpp
index 92a5c052dd0..6796b530197 100644
--- a/src/include/parser/statement/alter_table_statement.hpp
+++ b/src/include/duckdb/parser/statement/alter_table_statement.hpp
@@ -8,10 +8,10 @@
 
 #pragma once
 
-#include "parser/column_definition.hpp"
-#include "parser/parsed_data/alter_table_info.hpp"
-#include "parser/sql_statement.hpp"
-#include "parser/tableref.hpp"
+#include "duckdb/parser/column_definition.hpp"
+#include "duckdb/parser/parsed_data/alter_table_info.hpp"
+#include "duckdb/parser/sql_statement.hpp"
+#include "duckdb/parser/tableref.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/parser/statement/copy_statement.hpp b/src/include/duckdb/parser/statement/copy_statement.hpp
similarity index 82%
rename from src/include/parser/statement/copy_statement.hpp
rename to src/include/duckdb/parser/statement/copy_statement.hpp
index c7d0ba21773..c9bb6ac587a 100644
--- a/src/include/parser/statement/copy_statement.hpp
+++ b/src/include/duckdb/parser/statement/copy_statement.hpp
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "parser/parsed_data/copy_info.hpp"
-#include "parser/query_node.hpp"
-#include "parser/sql_statement.hpp"
+#include "duckdb/parser/parsed_data/copy_info.hpp"
+#include "duckdb/parser/query_node.hpp"
+#include "duckdb/parser/sql_statement.hpp"
 
 #include <vector>
 
diff --git a/src/include/parser/statement/create_index_statement.hpp b/src/include/duckdb/parser/statement/create_index_statement.hpp
similarity index 77%
rename from src/include/parser/statement/create_index_statement.hpp
rename to src/include/duckdb/parser/statement/create_index_statement.hpp
index f2c1ce5fa3d..86247c24643 100644
--- a/src/include/parser/statement/create_index_statement.hpp
+++ b/src/include/duckdb/parser/statement/create_index_statement.hpp
@@ -8,10 +8,10 @@
 
 #pragma once
 
-#include "parser/column_definition.hpp"
-#include "parser/parsed_data/create_index_info.hpp"
-#include "parser/sql_statement.hpp"
-#include "parser/tableref/basetableref.hpp"
+#include "duckdb/parser/column_definition.hpp"
+#include "duckdb/parser/parsed_data/create_index_info.hpp"
+#include "duckdb/parser/sql_statement.hpp"
+#include "duckdb/parser/tableref/basetableref.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/parser/statement/create_schema_statement.hpp b/src/include/duckdb/parser/statement/create_schema_statement.hpp
similarity index 83%
rename from src/include/parser/statement/create_schema_statement.hpp
rename to src/include/duckdb/parser/statement/create_schema_statement.hpp
index d7c2ed01f34..085f56deadf 100644
--- a/src/include/parser/statement/create_schema_statement.hpp
+++ b/src/include/duckdb/parser/statement/create_schema_statement.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "parser/parsed_data/create_schema_info.hpp"
-#include "parser/sql_statement.hpp"
+#include "duckdb/parser/parsed_data/create_schema_info.hpp"
+#include "duckdb/parser/sql_statement.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/parser/statement/create_sequence_statement.hpp b/src/include/duckdb/parser/statement/create_sequence_statement.hpp
similarity index 83%
rename from src/include/parser/statement/create_sequence_statement.hpp
rename to src/include/duckdb/parser/statement/create_sequence_statement.hpp
index 9a2bb251517..b7fe20a4304 100644
--- a/src/include/parser/statement/create_sequence_statement.hpp
+++ b/src/include/duckdb/parser/statement/create_sequence_statement.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "parser/parsed_data/create_sequence_info.hpp"
-#include "parser/sql_statement.hpp"
+#include "duckdb/parser/parsed_data/create_sequence_info.hpp"
+#include "duckdb/parser/sql_statement.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/parser/statement/create_table_statement.hpp b/src/include/duckdb/parser/statement/create_table_statement.hpp
similarity index 73%
rename from src/include/parser/statement/create_table_statement.hpp
rename to src/include/duckdb/parser/statement/create_table_statement.hpp
index 7133df05228..9e33b137234 100644
--- a/src/include/parser/statement/create_table_statement.hpp
+++ b/src/include/duckdb/parser/statement/create_table_statement.hpp
@@ -8,10 +8,10 @@
 
 #pragma once
 
-#include "parser/column_definition.hpp"
-#include "parser/parsed_data/create_table_info.hpp"
-#include "parser/sql_statement.hpp"
-#include "parser/statement/select_statement.hpp"
+#include "duckdb/parser/column_definition.hpp"
+#include "duckdb/parser/parsed_data/create_table_info.hpp"
+#include "duckdb/parser/sql_statement.hpp"
+#include "duckdb/parser/statement/select_statement.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/parser/statement/create_view_statement.hpp b/src/include/duckdb/parser/statement/create_view_statement.hpp
similarity index 83%
rename from src/include/parser/statement/create_view_statement.hpp
rename to src/include/duckdb/parser/statement/create_view_statement.hpp
index 9dbff6084e1..855332adf10 100644
--- a/src/include/parser/statement/create_view_statement.hpp
+++ b/src/include/duckdb/parser/statement/create_view_statement.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "parser/parsed_data/create_view_info.hpp"
-#include "parser/sql_statement.hpp"
+#include "duckdb/parser/parsed_data/create_view_info.hpp"
+#include "duckdb/parser/sql_statement.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/parser/statement/deallocate_statement.hpp b/src/include/duckdb/parser/statement/deallocate_statement.hpp
similarity index 91%
rename from src/include/parser/statement/deallocate_statement.hpp
rename to src/include/duckdb/parser/statement/deallocate_statement.hpp
index 8993f2d02da..96e6538069c 100644
--- a/src/include/parser/statement/deallocate_statement.hpp
+++ b/src/include/duckdb/parser/statement/deallocate_statement.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "parser/sql_statement.hpp"
+#include "duckdb/parser/sql_statement.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/parser/statement/delete_statement.hpp b/src/include/duckdb/parser/statement/delete_statement.hpp
similarity index 79%
rename from src/include/parser/statement/delete_statement.hpp
rename to src/include/duckdb/parser/statement/delete_statement.hpp
index 3f823c3ee04..44539c46eb7 100644
--- a/src/include/parser/statement/delete_statement.hpp
+++ b/src/include/duckdb/parser/statement/delete_statement.hpp
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "parser/parsed_expression.hpp"
-#include "parser/sql_statement.hpp"
-#include "parser/tableref.hpp"
+#include "duckdb/parser/parsed_expression.hpp"
+#include "duckdb/parser/sql_statement.hpp"
+#include "duckdb/parser/tableref.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/parser/statement/drop_statement.hpp b/src/include/duckdb/parser/statement/drop_statement.hpp
similarity index 83%
rename from src/include/parser/statement/drop_statement.hpp
rename to src/include/duckdb/parser/statement/drop_statement.hpp
index c7a9c9d46b5..7ae4a2788fe 100644
--- a/src/include/parser/statement/drop_statement.hpp
+++ b/src/include/duckdb/parser/statement/drop_statement.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "parser/parsed_data/drop_info.hpp"
-#include "parser/sql_statement.hpp"
+#include "duckdb/parser/parsed_data/drop_info.hpp"
+#include "duckdb/parser/sql_statement.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/parser/statement/execute_statement.hpp b/src/include/duckdb/parser/statement/execute_statement.hpp
similarity index 84%
rename from src/include/parser/statement/execute_statement.hpp
rename to src/include/duckdb/parser/statement/execute_statement.hpp
index 12cbd08ef01..e42f36414b0 100644
--- a/src/include/parser/statement/execute_statement.hpp
+++ b/src/include/duckdb/parser/statement/execute_statement.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "parser/parsed_expression.hpp"
-#include "parser/sql_statement.hpp"
+#include "duckdb/parser/parsed_expression.hpp"
+#include "duckdb/parser/sql_statement.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/parser/statement/explain_statement.hpp b/src/include/duckdb/parser/statement/explain_statement.hpp
similarity index 84%
rename from src/include/parser/statement/explain_statement.hpp
rename to src/include/duckdb/parser/statement/explain_statement.hpp
index 738f0ab231c..dfdd2c7e8f0 100644
--- a/src/include/parser/statement/explain_statement.hpp
+++ b/src/include/duckdb/parser/statement/explain_statement.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "parser/parsed_expression.hpp"
-#include "parser/sql_statement.hpp"
+#include "duckdb/parser/parsed_expression.hpp"
+#include "duckdb/parser/sql_statement.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/parser/statement/insert_statement.hpp b/src/include/duckdb/parser/statement/insert_statement.hpp
similarity index 88%
rename from src/include/parser/statement/insert_statement.hpp
rename to src/include/duckdb/parser/statement/insert_statement.hpp
index f97178fe2f3..84bdd1e56fa 100644
--- a/src/include/parser/statement/insert_statement.hpp
+++ b/src/include/duckdb/parser/statement/insert_statement.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "parser/parsed_expression.hpp"
-#include "parser/statement/select_statement.hpp"
+#include "duckdb/parser/parsed_expression.hpp"
+#include "duckdb/parser/statement/select_statement.hpp"
 
 #include <vector>
 
diff --git a/src/include/duckdb/parser/statement/list.hpp b/src/include/duckdb/parser/statement/list.hpp
new file mode 100644
index 00000000000..853231a627c
--- /dev/null
+++ b/src/include/duckdb/parser/statement/list.hpp
@@ -0,0 +1,17 @@
+#include "duckdb/parser/statement/alter_table_statement.hpp"
+#include "duckdb/parser/statement/copy_statement.hpp"
+#include "duckdb/parser/statement/create_index_statement.hpp"
+#include "duckdb/parser/statement/create_schema_statement.hpp"
+#include "duckdb/parser/statement/create_sequence_statement.hpp"
+#include "duckdb/parser/statement/create_table_statement.hpp"
+#include "duckdb/parser/statement/create_view_statement.hpp"
+#include "duckdb/parser/statement/deallocate_statement.hpp"
+#include "duckdb/parser/statement/delete_statement.hpp"
+#include "duckdb/parser/statement/drop_statement.hpp"
+#include "duckdb/parser/statement/execute_statement.hpp"
+#include "duckdb/parser/statement/explain_statement.hpp"
+#include "duckdb/parser/statement/insert_statement.hpp"
+#include "duckdb/parser/statement/prepare_statement.hpp"
+#include "duckdb/parser/statement/select_statement.hpp"
+#include "duckdb/parser/statement/transaction_statement.hpp"
+#include "duckdb/parser/statement/update_statement.hpp"
diff --git a/src/include/parser/statement/prepare_statement.hpp b/src/include/duckdb/parser/statement/prepare_statement.hpp
similarity index 84%
rename from src/include/parser/statement/prepare_statement.hpp
rename to src/include/duckdb/parser/statement/prepare_statement.hpp
index 1e22ae11a8d..734422f9373 100644
--- a/src/include/parser/statement/prepare_statement.hpp
+++ b/src/include/duckdb/parser/statement/prepare_statement.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "parser/parsed_expression.hpp"
-#include "parser/sql_statement.hpp"
+#include "duckdb/parser/parsed_expression.hpp"
+#include "duckdb/parser/sql_statement.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/parser/statement/select_statement.hpp b/src/include/duckdb/parser/statement/select_statement.hpp
similarity index 79%
rename from src/include/parser/statement/select_statement.hpp
rename to src/include/duckdb/parser/statement/select_statement.hpp
index 61ed5d5a2e8..1be5a6213ad 100644
--- a/src/include/parser/statement/select_statement.hpp
+++ b/src/include/duckdb/parser/statement/select_statement.hpp
@@ -8,12 +8,12 @@
 
 #pragma once
 
-#include "common/unordered_map.hpp"
-#include "parser/parsed_expression.hpp"
-#include "parser/query_node.hpp"
-#include "parser/query_node/select_node.hpp"
-#include "parser/sql_statement.hpp"
-#include "parser/tableref.hpp"
+#include "duckdb/common/unordered_map.hpp"
+#include "duckdb/parser/parsed_expression.hpp"
+#include "duckdb/parser/query_node.hpp"
+#include "duckdb/parser/query_node/select_node.hpp"
+#include "duckdb/parser/sql_statement.hpp"
+#include "duckdb/parser/tableref.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/parser/statement/transaction_statement.hpp b/src/include/duckdb/parser/statement/transaction_statement.hpp
similarity index 87%
rename from src/include/parser/statement/transaction_statement.hpp
rename to src/include/duckdb/parser/statement/transaction_statement.hpp
index a444dc3626f..5e5012066e1 100644
--- a/src/include/parser/statement/transaction_statement.hpp
+++ b/src/include/duckdb/parser/statement/transaction_statement.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "parser/parsed_expression.hpp"
-#include "parser/sql_statement.hpp"
+#include "duckdb/parser/parsed_expression.hpp"
+#include "duckdb/parser/sql_statement.hpp"
 
 #include <vector>
 
diff --git a/src/include/parser/statement/update_statement.hpp b/src/include/duckdb/parser/statement/update_statement.hpp
similarity index 81%
rename from src/include/parser/statement/update_statement.hpp
rename to src/include/duckdb/parser/statement/update_statement.hpp
index 4da70828bfb..ec6ea5a12e3 100644
--- a/src/include/parser/statement/update_statement.hpp
+++ b/src/include/duckdb/parser/statement/update_statement.hpp
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "parser/parsed_expression.hpp"
-#include "parser/sql_statement.hpp"
-#include "parser/tableref.hpp"
+#include "duckdb/parser/parsed_expression.hpp"
+#include "duckdb/parser/sql_statement.hpp"
+#include "duckdb/parser/tableref.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/parser/tableref.hpp b/src/include/duckdb/parser/tableref.hpp
similarity index 92%
rename from src/include/parser/tableref.hpp
rename to src/include/duckdb/parser/tableref.hpp
index 4df553d2d7b..2dc6d4589e1 100644
--- a/src/include/parser/tableref.hpp
+++ b/src/include/duckdb/parser/tableref.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "common/common.hpp"
-#include "common/enums/tableref_type.hpp"
+#include "duckdb/common/common.hpp"
+#include "duckdb/common/enums/tableref_type.hpp"
 
 namespace duckdb {
 class Deserializer;
diff --git a/src/include/parser/tableref/basetableref.hpp b/src/include/duckdb/parser/tableref/basetableref.hpp
similarity index 96%
rename from src/include/parser/tableref/basetableref.hpp
rename to src/include/duckdb/parser/tableref/basetableref.hpp
index bf9cb3d2390..0a848760fb6 100644
--- a/src/include/parser/tableref/basetableref.hpp
+++ b/src/include/duckdb/parser/tableref/basetableref.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "parser/tableref.hpp"
+#include "duckdb/parser/tableref.hpp"
 
 namespace duckdb {
 //! Represents a TableReference to a base table in the schema
diff --git a/src/include/parser/tableref/crossproductref.hpp b/src/include/duckdb/parser/tableref/crossproductref.hpp
similarity index 96%
rename from src/include/parser/tableref/crossproductref.hpp
rename to src/include/duckdb/parser/tableref/crossproductref.hpp
index fe4e7643682..e3b5cf9ea85 100644
--- a/src/include/parser/tableref/crossproductref.hpp
+++ b/src/include/duckdb/parser/tableref/crossproductref.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "parser/tableref.hpp"
+#include "duckdb/parser/tableref.hpp"
 
 namespace duckdb {
 //! Represents a cross product
diff --git a/src/include/parser/tableref/emptytableref.hpp b/src/include/duckdb/parser/tableref/emptytableref.hpp
similarity index 95%
rename from src/include/parser/tableref/emptytableref.hpp
rename to src/include/duckdb/parser/tableref/emptytableref.hpp
index 920211bc484..df2b3310fe6 100644
--- a/src/include/parser/tableref/emptytableref.hpp
+++ b/src/include/duckdb/parser/tableref/emptytableref.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "parser/tableref.hpp"
+#include "duckdb/parser/tableref.hpp"
 
 namespace duckdb {
 //! Represents a cross product
diff --git a/src/include/parser/tableref/joinref.hpp b/src/include/duckdb/parser/tableref/joinref.hpp
similarity index 86%
rename from src/include/parser/tableref/joinref.hpp
rename to src/include/duckdb/parser/tableref/joinref.hpp
index 68a40e2977e..fc21a2ab98b 100644
--- a/src/include/parser/tableref/joinref.hpp
+++ b/src/include/duckdb/parser/tableref/joinref.hpp
@@ -8,10 +8,10 @@
 
 #pragma once
 
-#include "common/enums/join_type.hpp"
-#include "common/unordered_set.hpp"
-#include "parser/parsed_expression.hpp"
-#include "parser/tableref.hpp"
+#include "duckdb/common/enums/join_type.hpp"
+#include "duckdb/common/unordered_set.hpp"
+#include "duckdb/parser/parsed_expression.hpp"
+#include "duckdb/parser/tableref.hpp"
 
 namespace duckdb {
 //! Represents a JOIN between two expressions
diff --git a/src/include/duckdb/parser/tableref/list.hpp b/src/include/duckdb/parser/tableref/list.hpp
new file mode 100644
index 00000000000..67f95760a44
--- /dev/null
+++ b/src/include/duckdb/parser/tableref/list.hpp
@@ -0,0 +1,6 @@
+#include "duckdb/parser/tableref/basetableref.hpp"
+#include "duckdb/parser/tableref/crossproductref.hpp"
+#include "duckdb/parser/tableref/emptytableref.hpp"
+#include "duckdb/parser/tableref/joinref.hpp"
+#include "duckdb/parser/tableref/subqueryref.hpp"
+#include "duckdb/parser/tableref/table_function_ref.hpp"
diff --git a/src/include/parser/tableref/subqueryref.hpp b/src/include/duckdb/parser/tableref/subqueryref.hpp
similarity index 91%
rename from src/include/parser/tableref/subqueryref.hpp
rename to src/include/duckdb/parser/tableref/subqueryref.hpp
index 98bc1537008..39298a3fef8 100644
--- a/src/include/parser/tableref/subqueryref.hpp
+++ b/src/include/duckdb/parser/tableref/subqueryref.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "parser/query_node.hpp"
-#include "parser/tableref.hpp"
+#include "duckdb/parser/query_node.hpp"
+#include "duckdb/parser/tableref.hpp"
 
 namespace duckdb {
 //! Represents a subquery
diff --git a/src/include/parser/tableref/table_function_ref.hpp b/src/include/duckdb/parser/tableref/table_function_ref.hpp
similarity index 91%
rename from src/include/parser/tableref/table_function_ref.hpp
rename to src/include/duckdb/parser/tableref/table_function_ref.hpp
index 0ccaf8eb5af..1dd627ed825 100644
--- a/src/include/parser/tableref/table_function_ref.hpp
+++ b/src/include/duckdb/parser/tableref/table_function_ref.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "parser/parsed_expression.hpp"
-#include "parser/tableref.hpp"
+#include "duckdb/parser/parsed_expression.hpp"
+#include "duckdb/parser/tableref.hpp"
 
 namespace duckdb {
 //! Represents a Table producing function
diff --git a/src/include/parser/tokens.hpp b/src/include/duckdb/parser/tokens.hpp
similarity index 100%
rename from src/include/parser/tokens.hpp
rename to src/include/duckdb/parser/tokens.hpp
diff --git a/src/include/parser/transformer.hpp b/src/include/duckdb/parser/transformer.hpp
similarity index 97%
rename from src/include/parser/transformer.hpp
rename to src/include/duckdb/parser/transformer.hpp
index 59e5368a2d4..67e26290eaa 100644
--- a/src/include/parser/transformer.hpp
+++ b/src/include/duckdb/parser/transformer.hpp
@@ -8,11 +8,11 @@
 
 #pragma once
 
-#include "common/constants.hpp"
-#include "common/enums/expression_type.hpp"
-#include "common/types.hpp"
-#include "common/unordered_map.hpp"
-#include "parser/tokens.hpp"
+#include "duckdb/common/constants.hpp"
+#include "duckdb/common/enums/expression_type.hpp"
+#include "duckdb/common/types.hpp"
+#include "duckdb/common/unordered_map.hpp"
+#include "duckdb/parser/tokens.hpp"
 
 namespace postgres {
 #include "pg_definitions.h"
diff --git a/src/include/planner/bind_context.hpp b/src/include/duckdb/planner/bind_context.hpp
similarity index 78%
rename from src/include/planner/bind_context.hpp
rename to src/include/duckdb/planner/bind_context.hpp
index 753873e51bc..90ab93f4416 100644
--- a/src/include/planner/bind_context.hpp
+++ b/src/include/duckdb/planner/bind_context.hpp
@@ -8,16 +8,16 @@
 
 #pragma once
 
-#include "catalog/catalog.hpp"
-#include "catalog/catalog_entry/table_catalog_entry.hpp"
-#include "catalog/catalog_entry/table_function_catalog_entry.hpp"
-#include "common/unordered_map.hpp"
-#include "common/unordered_set.hpp"
-#include "parser/expression/columnref_expression.hpp"
-#include "parser/parsed_expression.hpp"
-#include "planner/expression.hpp"
-#include "planner/expression_binder.hpp"
-#include "planner/table_binding.hpp"
+#include "duckdb/catalog/catalog.hpp"
+#include "duckdb/catalog/catalog_entry/table_catalog_entry.hpp"
+#include "duckdb/catalog/catalog_entry/table_function_catalog_entry.hpp"
+#include "duckdb/common/unordered_map.hpp"
+#include "duckdb/common/unordered_set.hpp"
+#include "duckdb/parser/expression/columnref_expression.hpp"
+#include "duckdb/parser/parsed_expression.hpp"
+#include "duckdb/planner/expression.hpp"
+#include "duckdb/planner/expression_binder.hpp"
+#include "duckdb/planner/table_binding.hpp"
 
 namespace duckdb {
 class BoundQueryNode;
diff --git a/src/include/planner/binder.hpp b/src/include/duckdb/planner/binder.hpp
similarity index 93%
rename from src/include/planner/binder.hpp
rename to src/include/duckdb/planner/binder.hpp
index 55d6f987188..7cc96e479ce 100644
--- a/src/include/planner/binder.hpp
+++ b/src/include/duckdb/planner/binder.hpp
@@ -8,12 +8,12 @@
 
 #pragma once
 
-#include "common/unordered_map.hpp"
-#include "parser/column_definition.hpp"
-#include "parser/tokens.hpp"
-#include "planner/bind_context.hpp"
-#include "planner/bound_tokens.hpp"
-#include "planner/expression/bound_columnref_expression.hpp"
+#include "duckdb/common/unordered_map.hpp"
+#include "duckdb/parser/column_definition.hpp"
+#include "duckdb/parser/tokens.hpp"
+#include "duckdb/planner/bind_context.hpp"
+#include "duckdb/planner/bound_tokens.hpp"
+#include "duckdb/planner/expression/bound_columnref_expression.hpp"
 
 namespace duckdb {
 class ClientContext;
diff --git a/src/include/planner/bound_constraint.hpp b/src/include/duckdb/planner/bound_constraint.hpp
similarity index 86%
rename from src/include/planner/bound_constraint.hpp
rename to src/include/duckdb/planner/bound_constraint.hpp
index 329d1dd1d35..2f230a425db 100644
--- a/src/include/planner/bound_constraint.hpp
+++ b/src/include/duckdb/planner/bound_constraint.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "common/common.hpp"
-#include "parser/constraint.hpp"
+#include "duckdb/common/common.hpp"
+#include "duckdb/parser/constraint.hpp"
 
 namespace duckdb {
 //! Bound equivalent of Constraint
diff --git a/src/include/planner/bound_query_node.hpp b/src/include/duckdb/planner/bound_query_node.hpp
similarity index 90%
rename from src/include/planner/bound_query_node.hpp
rename to src/include/duckdb/planner/bound_query_node.hpp
index 55df3a35992..cec038c857f 100644
--- a/src/include/planner/bound_query_node.hpp
+++ b/src/include/duckdb/planner/bound_query_node.hpp
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "common/enums/order_type.hpp"
-#include "parser/query_node.hpp"
-#include "planner/expression.hpp"
+#include "duckdb/common/enums/order_type.hpp"
+#include "duckdb/parser/query_node.hpp"
+#include "duckdb/planner/expression.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/planner/bound_sql_statement.hpp b/src/include/duckdb/planner/bound_sql_statement.hpp
similarity index 86%
rename from src/include/planner/bound_sql_statement.hpp
rename to src/include/duckdb/planner/bound_sql_statement.hpp
index a8c3cfc7aa3..ad2e5c21b6f 100644
--- a/src/include/planner/bound_sql_statement.hpp
+++ b/src/include/duckdb/planner/bound_sql_statement.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "common/common.hpp"
-#include "common/enums/statement_type.hpp"
+#include "duckdb/common/common.hpp"
+#include "duckdb/common/enums/statement_type.hpp"
 
 namespace duckdb {
 //! Bound equivalent of SQLStatement
diff --git a/src/include/planner/bound_tableref.hpp b/src/include/duckdb/planner/bound_tableref.hpp
similarity index 84%
rename from src/include/planner/bound_tableref.hpp
rename to src/include/duckdb/planner/bound_tableref.hpp
index 0749641c667..15dbdb2dbe4 100644
--- a/src/include/planner/bound_tableref.hpp
+++ b/src/include/duckdb/planner/bound_tableref.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "common/common.hpp"
-#include "common/enums/tableref_type.hpp"
+#include "duckdb/common/common.hpp"
+#include "duckdb/common/enums/tableref_type.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/planner/bound_tokens.hpp b/src/include/duckdb/planner/bound_tokens.hpp
similarity index 100%
rename from src/include/planner/bound_tokens.hpp
rename to src/include/duckdb/planner/bound_tokens.hpp
diff --git a/src/include/planner/column_binding.hpp b/src/include/duckdb/planner/column_binding.hpp
similarity index 94%
rename from src/include/planner/column_binding.hpp
rename to src/include/duckdb/planner/column_binding.hpp
index aaa80af05f9..aee3b2f7517 100644
--- a/src/include/planner/column_binding.hpp
+++ b/src/include/duckdb/planner/column_binding.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "common/common.hpp"
+#include "duckdb/common/common.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/planner/column_binding_map.hpp b/src/include/duckdb/planner/column_binding_map.hpp
similarity index 85%
rename from src/include/planner/column_binding_map.hpp
rename to src/include/duckdb/planner/column_binding_map.hpp
index 0f8ceccf124..9e7963a189c 100644
--- a/src/include/planner/column_binding_map.hpp
+++ b/src/include/duckdb/planner/column_binding_map.hpp
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "common/types/hash.hpp"
-#include "common/unordered_map.hpp"
-#include "planner/column_binding.hpp"
+#include "duckdb/common/types/hash.hpp"
+#include "duckdb/common/unordered_map.hpp"
+#include "duckdb/planner/column_binding.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/planner/constraints/bound_check_constraint.hpp b/src/include/duckdb/planner/constraints/bound_check_constraint.hpp
similarity index 84%
rename from src/include/planner/constraints/bound_check_constraint.hpp
rename to src/include/duckdb/planner/constraints/bound_check_constraint.hpp
index 481e47818a0..3c0f9e5da40 100644
--- a/src/include/planner/constraints/bound_check_constraint.hpp
+++ b/src/include/duckdb/planner/constraints/bound_check_constraint.hpp
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "common/exception.hpp"
-#include "planner/bound_constraint.hpp"
-#include "planner/expression.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/planner/bound_constraint.hpp"
+#include "duckdb/planner/expression.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/planner/constraints/bound_not_null_constraint.hpp b/src/include/duckdb/planner/constraints/bound_not_null_constraint.hpp
similarity index 92%
rename from src/include/planner/constraints/bound_not_null_constraint.hpp
rename to src/include/duckdb/planner/constraints/bound_not_null_constraint.hpp
index a12c2a673f1..33df538b53f 100644
--- a/src/include/planner/constraints/bound_not_null_constraint.hpp
+++ b/src/include/duckdb/planner/constraints/bound_not_null_constraint.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "planner/bound_constraint.hpp"
+#include "duckdb/planner/bound_constraint.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/planner/constraints/bound_unique_constraint.hpp b/src/include/duckdb/planner/constraints/bound_unique_constraint.hpp
similarity index 93%
rename from src/include/planner/constraints/bound_unique_constraint.hpp
rename to src/include/duckdb/planner/constraints/bound_unique_constraint.hpp
index cc9c3f5ea60..c7bd944a347 100644
--- a/src/include/planner/constraints/bound_unique_constraint.hpp
+++ b/src/include/duckdb/planner/constraints/bound_unique_constraint.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "planner/bound_constraint.hpp"
+#include "duckdb/planner/bound_constraint.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/duckdb/planner/constraints/list.hpp b/src/include/duckdb/planner/constraints/list.hpp
new file mode 100644
index 00000000000..52671e7c929
--- /dev/null
+++ b/src/include/duckdb/planner/constraints/list.hpp
@@ -0,0 +1,3 @@
+#include "duckdb/planner/constraints/bound_check_constraint.hpp"
+#include "duckdb/planner/constraints/bound_not_null_constraint.hpp"
+#include "duckdb/planner/constraints/bound_unique_constraint.hpp"
diff --git a/src/include/planner/expression.hpp b/src/include/duckdb/planner/expression.hpp
similarity index 96%
rename from src/include/planner/expression.hpp
rename to src/include/duckdb/planner/expression.hpp
index 7639478f323..5cb6eb687bb 100644
--- a/src/include/planner/expression.hpp
+++ b/src/include/duckdb/planner/expression.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "parser/base_expression.hpp"
+#include "duckdb/parser/base_expression.hpp"
 
 namespace duckdb {
 //!  The Expression class represents a bound Expression with a return type
diff --git a/src/include/planner/expression/bound_aggregate_expression.hpp b/src/include/duckdb/planner/expression/bound_aggregate_expression.hpp
similarity index 91%
rename from src/include/planner/expression/bound_aggregate_expression.hpp
rename to src/include/duckdb/planner/expression/bound_aggregate_expression.hpp
index ea78f2532f0..b5a6c67c1a9 100644
--- a/src/include/planner/expression/bound_aggregate_expression.hpp
+++ b/src/include/duckdb/planner/expression/bound_aggregate_expression.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "planner/expression.hpp"
-#include "function/aggregate_function.hpp"
+#include "duckdb/planner/expression.hpp"
+#include "duckdb/function/aggregate_function.hpp"
 
 namespace duckdb {
 class BoundAggregateExpression : public Expression {
diff --git a/src/include/planner/expression/bound_case_expression.hpp b/src/include/duckdb/planner/expression/bound_case_expression.hpp
similarity index 94%
rename from src/include/planner/expression/bound_case_expression.hpp
rename to src/include/duckdb/planner/expression/bound_case_expression.hpp
index 587707400bb..2b116d75bf4 100644
--- a/src/include/planner/expression/bound_case_expression.hpp
+++ b/src/include/duckdb/planner/expression/bound_case_expression.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "planner/expression.hpp"
+#include "duckdb/planner/expression.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/planner/expression/bound_cast_expression.hpp b/src/include/duckdb/planner/expression/bound_cast_expression.hpp
similarity index 95%
rename from src/include/planner/expression/bound_cast_expression.hpp
rename to src/include/duckdb/planner/expression/bound_cast_expression.hpp
index 096d2952cec..410087e1ac7 100644
--- a/src/include/planner/expression/bound_cast_expression.hpp
+++ b/src/include/duckdb/planner/expression/bound_cast_expression.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "planner/expression.hpp"
+#include "duckdb/planner/expression.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/planner/expression/bound_columnref_expression.hpp b/src/include/duckdb/planner/expression/bound_columnref_expression.hpp
similarity index 94%
rename from src/include/planner/expression/bound_columnref_expression.hpp
rename to src/include/duckdb/planner/expression/bound_columnref_expression.hpp
index c97e50dbd46..e5a0eee850a 100644
--- a/src/include/planner/expression/bound_columnref_expression.hpp
+++ b/src/include/duckdb/planner/expression/bound_columnref_expression.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "planner/column_binding.hpp"
-#include "planner/expression.hpp"
+#include "duckdb/planner/column_binding.hpp"
+#include "duckdb/planner/expression.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/planner/expression/bound_comparison_expression.hpp b/src/include/duckdb/planner/expression/bound_comparison_expression.hpp
similarity index 94%
rename from src/include/planner/expression/bound_comparison_expression.hpp
rename to src/include/duckdb/planner/expression/bound_comparison_expression.hpp
index aa01217f4e3..19ce4690dad 100644
--- a/src/include/planner/expression/bound_comparison_expression.hpp
+++ b/src/include/duckdb/planner/expression/bound_comparison_expression.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "planner/expression.hpp"
+#include "duckdb/planner/expression.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/planner/expression/bound_conjunction_expression.hpp b/src/include/duckdb/planner/expression/bound_conjunction_expression.hpp
similarity index 94%
rename from src/include/planner/expression/bound_conjunction_expression.hpp
rename to src/include/duckdb/planner/expression/bound_conjunction_expression.hpp
index 21eed91d574..e91a5bfaebc 100644
--- a/src/include/planner/expression/bound_conjunction_expression.hpp
+++ b/src/include/duckdb/planner/expression/bound_conjunction_expression.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "planner/expression.hpp"
+#include "duckdb/planner/expression.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/planner/expression/bound_constant_expression.hpp b/src/include/duckdb/planner/expression/bound_constant_expression.hpp
similarity index 88%
rename from src/include/planner/expression/bound_constant_expression.hpp
rename to src/include/duckdb/planner/expression/bound_constant_expression.hpp
index dd0370cd9df..1c8b2c96a78 100644
--- a/src/include/planner/expression/bound_constant_expression.hpp
+++ b/src/include/duckdb/planner/expression/bound_constant_expression.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "common/types/value.hpp"
-#include "planner/expression.hpp"
+#include "duckdb/common/types/value.hpp"
+#include "duckdb/planner/expression.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/planner/expression/bound_default_expression.hpp b/src/include/duckdb/planner/expression/bound_default_expression.hpp
similarity index 95%
rename from src/include/planner/expression/bound_default_expression.hpp
rename to src/include/duckdb/planner/expression/bound_default_expression.hpp
index 3ed3f6e6db1..525cf3ca08c 100644
--- a/src/include/planner/expression/bound_default_expression.hpp
+++ b/src/include/duckdb/planner/expression/bound_default_expression.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "planner/expression.hpp"
+#include "duckdb/planner/expression.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/planner/expression/bound_function_expression.hpp b/src/include/duckdb/planner/expression/bound_function_expression.hpp
similarity index 92%
rename from src/include/planner/expression/bound_function_expression.hpp
rename to src/include/duckdb/planner/expression/bound_function_expression.hpp
index 4c2be968b18..97f8eb3be57 100644
--- a/src/include/planner/expression/bound_function_expression.hpp
+++ b/src/include/duckdb/planner/expression/bound_function_expression.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "function/scalar_function.hpp"
-#include "planner/expression.hpp"
+#include "duckdb/function/scalar_function.hpp"
+#include "duckdb/planner/expression.hpp"
 
 namespace duckdb {
 class ScalarFunctionCatalogEntry;
diff --git a/src/include/planner/expression/bound_operator_expression.hpp b/src/include/duckdb/planner/expression/bound_operator_expression.hpp
similarity index 93%
rename from src/include/planner/expression/bound_operator_expression.hpp
rename to src/include/duckdb/planner/expression/bound_operator_expression.hpp
index 366e2862b46..ff7d8c272c8 100644
--- a/src/include/planner/expression/bound_operator_expression.hpp
+++ b/src/include/duckdb/planner/expression/bound_operator_expression.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "planner/expression.hpp"
+#include "duckdb/planner/expression.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/planner/expression/bound_parameter_expression.hpp b/src/include/duckdb/planner/expression/bound_parameter_expression.hpp
similarity index 90%
rename from src/include/planner/expression/bound_parameter_expression.hpp
rename to src/include/duckdb/planner/expression/bound_parameter_expression.hpp
index e3ca24183a8..60a7135e41e 100644
--- a/src/include/planner/expression/bound_parameter_expression.hpp
+++ b/src/include/duckdb/planner/expression/bound_parameter_expression.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "common/types/value.hpp"
-#include "planner/expression.hpp"
+#include "duckdb/common/types/value.hpp"
+#include "duckdb/planner/expression.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/planner/expression/bound_reference_expression.hpp b/src/include/duckdb/planner/expression/bound_reference_expression.hpp
similarity index 95%
rename from src/include/planner/expression/bound_reference_expression.hpp
rename to src/include/duckdb/planner/expression/bound_reference_expression.hpp
index b1a2de40d6c..0a8fc7ec4e7 100644
--- a/src/include/planner/expression/bound_reference_expression.hpp
+++ b/src/include/duckdb/planner/expression/bound_reference_expression.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "planner/expression.hpp"
+#include "duckdb/planner/expression.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/planner/expression/bound_subquery_expression.hpp b/src/include/duckdb/planner/expression/bound_subquery_expression.hpp
similarity index 89%
rename from src/include/planner/expression/bound_subquery_expression.hpp
rename to src/include/duckdb/planner/expression/bound_subquery_expression.hpp
index 7adf79a533f..9682ef3c5ab 100644
--- a/src/include/planner/expression/bound_subquery_expression.hpp
+++ b/src/include/duckdb/planner/expression/bound_subquery_expression.hpp
@@ -8,10 +8,10 @@
 
 #pragma once
 
-#include "common/enums/subquery_type.hpp"
-#include "planner/binder.hpp"
-#include "planner/bound_query_node.hpp"
-#include "planner/expression.hpp"
+#include "duckdb/common/enums/subquery_type.hpp"
+#include "duckdb/planner/binder.hpp"
+#include "duckdb/planner/bound_query_node.hpp"
+#include "duckdb/planner/expression.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/planner/expression/bound_window_expression.hpp b/src/include/duckdb/planner/expression/bound_window_expression.hpp
similarity index 90%
rename from src/include/planner/expression/bound_window_expression.hpp
rename to src/include/duckdb/planner/expression/bound_window_expression.hpp
index caeb4be2e16..1535e12ab3a 100644
--- a/src/include/planner/expression/bound_window_expression.hpp
+++ b/src/include/duckdb/planner/expression/bound_window_expression.hpp
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "parser/expression/window_expression.hpp"
-#include "planner/bound_query_node.hpp"
-#include "planner/expression.hpp"
+#include "duckdb/parser/expression/window_expression.hpp"
+#include "duckdb/planner/bound_query_node.hpp"
+#include "duckdb/planner/expression.hpp"
 
 namespace duckdb {
 class AggregateFunction;
diff --git a/src/include/planner/expression/common_subexpression.hpp b/src/include/duckdb/planner/expression/common_subexpression.hpp
similarity index 96%
rename from src/include/planner/expression/common_subexpression.hpp
rename to src/include/duckdb/planner/expression/common_subexpression.hpp
index b3375b0a939..28bdce81fb6 100644
--- a/src/include/planner/expression/common_subexpression.hpp
+++ b/src/include/duckdb/planner/expression/common_subexpression.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "planner/expression.hpp"
+#include "duckdb/planner/expression.hpp"
 
 namespace duckdb {
 //! Represents a CommonSubExpression, this is only generated by the optimizers. CSEs cannot be serialized, deserialized
diff --git a/src/include/duckdb/planner/expression/list.hpp b/src/include/duckdb/planner/expression/list.hpp
new file mode 100644
index 00000000000..7e06465b267
--- /dev/null
+++ b/src/include/duckdb/planner/expression/list.hpp
@@ -0,0 +1,15 @@
+#include "duckdb/planner/expression/bound_aggregate_expression.hpp"
+#include "duckdb/planner/expression/bound_case_expression.hpp"
+#include "duckdb/planner/expression/bound_cast_expression.hpp"
+#include "duckdb/planner/expression/bound_columnref_expression.hpp"
+#include "duckdb/planner/expression/bound_comparison_expression.hpp"
+#include "duckdb/planner/expression/bound_conjunction_expression.hpp"
+#include "duckdb/planner/expression/bound_constant_expression.hpp"
+#include "duckdb/planner/expression/bound_default_expression.hpp"
+#include "duckdb/planner/expression/bound_function_expression.hpp"
+#include "duckdb/planner/expression/bound_operator_expression.hpp"
+#include "duckdb/planner/expression/bound_parameter_expression.hpp"
+#include "duckdb/planner/expression/bound_reference_expression.hpp"
+#include "duckdb/planner/expression/bound_subquery_expression.hpp"
+#include "duckdb/planner/expression/bound_window_expression.hpp"
+#include "duckdb/planner/expression/common_subexpression.hpp"
diff --git a/src/include/planner/expression_binder.hpp b/src/include/duckdb/planner/expression_binder.hpp
similarity index 93%
rename from src/include/planner/expression_binder.hpp
rename to src/include/duckdb/planner/expression_binder.hpp
index a91a65e4de4..a1a33b20db1 100644
--- a/src/include/planner/expression_binder.hpp
+++ b/src/include/duckdb/planner/expression_binder.hpp
@@ -8,11 +8,11 @@
 
 #pragma once
 
-#include "common/exception.hpp"
-#include "parser/parsed_expression.hpp"
-#include "parser/expression/bound_expression.hpp"
-#include "parser/tokens.hpp"
-#include "planner/expression.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/parser/parsed_expression.hpp"
+#include "duckdb/parser/expression/bound_expression.hpp"
+#include "duckdb/parser/tokens.hpp"
+#include "duckdb/planner/expression.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/planner/expression_binder/aggregate_binder.hpp b/src/include/duckdb/planner/expression_binder/aggregate_binder.hpp
similarity index 94%
rename from src/include/planner/expression_binder/aggregate_binder.hpp
rename to src/include/duckdb/planner/expression_binder/aggregate_binder.hpp
index b615b482f33..73b827a9537 100644
--- a/src/include/planner/expression_binder/aggregate_binder.hpp
+++ b/src/include/duckdb/planner/expression_binder/aggregate_binder.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "planner/expression_binder.hpp"
+#include "duckdb/planner/expression_binder.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/planner/expression_binder/check_binder.hpp b/src/include/duckdb/planner/expression_binder/check_binder.hpp
similarity index 87%
rename from src/include/planner/expression_binder/check_binder.hpp
rename to src/include/duckdb/planner/expression_binder/check_binder.hpp
index e4306700898..925302d439e 100644
--- a/src/include/planner/expression_binder/check_binder.hpp
+++ b/src/include/duckdb/planner/expression_binder/check_binder.hpp
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "parser/column_definition.hpp"
-#include "planner/expression_binder.hpp"
-#include "common/unordered_set.hpp"
+#include "duckdb/parser/column_definition.hpp"
+#include "duckdb/planner/expression_binder.hpp"
+#include "duckdb/common/unordered_set.hpp"
 
 namespace duckdb {
 //! The CHECK binder is responsible for binding an expression within a CHECK constraint
diff --git a/src/include/planner/expression_binder/constant_binder.hpp b/src/include/duckdb/planner/expression_binder/constant_binder.hpp
similarity index 94%
rename from src/include/planner/expression_binder/constant_binder.hpp
rename to src/include/duckdb/planner/expression_binder/constant_binder.hpp
index 70c93ef8880..89215f3cee5 100644
--- a/src/include/planner/expression_binder/constant_binder.hpp
+++ b/src/include/duckdb/planner/expression_binder/constant_binder.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "planner/expression_binder.hpp"
+#include "duckdb/planner/expression_binder.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/planner/expression_binder/group_binder.hpp b/src/include/duckdb/planner/expression_binder/group_binder.hpp
similarity index 90%
rename from src/include/planner/expression_binder/group_binder.hpp
rename to src/include/duckdb/planner/expression_binder/group_binder.hpp
index 3c9b1162609..fcb56289973 100644
--- a/src/include/planner/expression_binder/group_binder.hpp
+++ b/src/include/duckdb/planner/expression_binder/group_binder.hpp
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "common/unordered_map.hpp"
-#include "common/unordered_set.hpp"
-#include "planner/expression_binder.hpp"
+#include "duckdb/common/unordered_map.hpp"
+#include "duckdb/common/unordered_set.hpp"
+#include "duckdb/planner/expression_binder.hpp"
 
 namespace duckdb {
 class ConstantExpression;
diff --git a/src/include/planner/expression_binder/having_binder.hpp b/src/include/duckdb/planner/expression_binder/having_binder.hpp
similarity index 91%
rename from src/include/planner/expression_binder/having_binder.hpp
rename to src/include/duckdb/planner/expression_binder/having_binder.hpp
index 6721f7ffa16..2ef7c05ad97 100644
--- a/src/include/planner/expression_binder/having_binder.hpp
+++ b/src/include/duckdb/planner/expression_binder/having_binder.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "planner/expression_binder/select_binder.hpp"
+#include "duckdb/planner/expression_binder/select_binder.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/planner/expression_binder/index_binder.hpp b/src/include/duckdb/planner/expression_binder/index_binder.hpp
similarity index 88%
rename from src/include/planner/expression_binder/index_binder.hpp
rename to src/include/duckdb/planner/expression_binder/index_binder.hpp
index 9c065480547..94097be12b6 100644
--- a/src/include/planner/expression_binder/index_binder.hpp
+++ b/src/include/duckdb/planner/expression_binder/index_binder.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "planner/expression_binder.hpp"
-#include "common/unordered_map.hpp"
+#include "duckdb/planner/expression_binder.hpp"
+#include "duckdb/common/unordered_map.hpp"
 
 namespace duckdb {
 class BoundColumnRefExpression;
diff --git a/src/include/planner/expression_binder/insert_binder.hpp b/src/include/duckdb/planner/expression_binder/insert_binder.hpp
similarity index 93%
rename from src/include/planner/expression_binder/insert_binder.hpp
rename to src/include/duckdb/planner/expression_binder/insert_binder.hpp
index f049c7defe9..08a27f87d02 100644
--- a/src/include/planner/expression_binder/insert_binder.hpp
+++ b/src/include/duckdb/planner/expression_binder/insert_binder.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "planner/expression_binder.hpp"
+#include "duckdb/planner/expression_binder.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/planner/expression_binder/order_binder.hpp b/src/include/duckdb/planner/expression_binder/order_binder.hpp
similarity index 84%
rename from src/include/planner/expression_binder/order_binder.hpp
rename to src/include/duckdb/planner/expression_binder/order_binder.hpp
index 078160a74b2..2a32cf21f71 100644
--- a/src/include/planner/expression_binder/order_binder.hpp
+++ b/src/include/duckdb/planner/expression_binder/order_binder.hpp
@@ -8,10 +8,10 @@
 
 #pragma once
 
-#include "common/unordered_map.hpp"
-#include "parser/expression_map.hpp"
-#include "parser/parsed_expression.hpp"
-#include "planner/expression/bound_columnref_expression.hpp"
+#include "duckdb/common/unordered_map.hpp"
+#include "duckdb/parser/expression_map.hpp"
+#include "duckdb/parser/parsed_expression.hpp"
+#include "duckdb/planner/expression/bound_columnref_expression.hpp"
 
 namespace duckdb {
 class Expression;
diff --git a/src/include/planner/expression_binder/select_binder.hpp b/src/include/duckdb/planner/expression_binder/select_binder.hpp
similarity index 90%
rename from src/include/planner/expression_binder/select_binder.hpp
rename to src/include/duckdb/planner/expression_binder/select_binder.hpp
index bcfea1c636e..61198ef863d 100644
--- a/src/include/planner/expression_binder/select_binder.hpp
+++ b/src/include/duckdb/planner/expression_binder/select_binder.hpp
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "common/unordered_map.hpp"
-#include "parser/expression_map.hpp"
-#include "planner/expression_binder.hpp"
+#include "duckdb/common/unordered_map.hpp"
+#include "duckdb/parser/expression_map.hpp"
+#include "duckdb/planner/expression_binder.hpp"
 
 namespace duckdb {
 class BoundColumnRefExpression;
diff --git a/src/include/planner/expression_binder/update_binder.hpp b/src/include/duckdb/planner/expression_binder/update_binder.hpp
similarity index 93%
rename from src/include/planner/expression_binder/update_binder.hpp
rename to src/include/duckdb/planner/expression_binder/update_binder.hpp
index 399457000c4..8f82269b317 100644
--- a/src/include/planner/expression_binder/update_binder.hpp
+++ b/src/include/duckdb/planner/expression_binder/update_binder.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "planner/expression_binder.hpp"
+#include "duckdb/planner/expression_binder.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/planner/expression_binder/where_binder.hpp b/src/include/duckdb/planner/expression_binder/where_binder.hpp
similarity index 93%
rename from src/include/planner/expression_binder/where_binder.hpp
rename to src/include/duckdb/planner/expression_binder/where_binder.hpp
index a0bdb3b69f3..a87567aa955 100644
--- a/src/include/planner/expression_binder/where_binder.hpp
+++ b/src/include/duckdb/planner/expression_binder/where_binder.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "planner/expression_binder.hpp"
+#include "duckdb/planner/expression_binder.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/planner/expression_iterator.hpp b/src/include/duckdb/planner/expression_iterator.hpp
similarity index 93%
rename from src/include/planner/expression_iterator.hpp
rename to src/include/duckdb/planner/expression_iterator.hpp
index c6f9e67d03f..c54cfe66ffe 100644
--- a/src/include/planner/expression_iterator.hpp
+++ b/src/include/duckdb/planner/expression_iterator.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "common/common.hpp"
-#include "planner/expression.hpp"
+#include "duckdb/common/common.hpp"
+#include "duckdb/planner/expression.hpp"
 
 #include <functional>
 
diff --git a/src/include/planner/joinside.hpp b/src/include/duckdb/planner/joinside.hpp
similarity index 95%
rename from src/include/planner/joinside.hpp
rename to src/include/duckdb/planner/joinside.hpp
index f9bcb8f1ed9..96540f5af59 100644
--- a/src/include/planner/joinside.hpp
+++ b/src/include/duckdb/planner/joinside.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "common/unordered_set.hpp"
-#include "planner/expression.hpp"
+#include "duckdb/common/unordered_set.hpp"
+#include "duckdb/planner/expression.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/planner/logical_operator.hpp b/src/include/duckdb/planner/logical_operator.hpp
similarity index 88%
rename from src/include/planner/logical_operator.hpp
rename to src/include/duckdb/planner/logical_operator.hpp
index d1e76b60cc6..66126a1c162 100644
--- a/src/include/planner/logical_operator.hpp
+++ b/src/include/duckdb/planner/logical_operator.hpp
@@ -8,11 +8,11 @@
 
 #pragma once
 
-#include "catalog/catalog.hpp"
-#include "common/common.hpp"
-#include "common/enums/logical_operator_type.hpp"
-#include "planner/expression.hpp"
-#include "planner/logical_operator_visitor.hpp"
+#include "duckdb/catalog/catalog.hpp"
+#include "duckdb/common/common.hpp"
+#include "duckdb/common/enums/logical_operator_type.hpp"
+#include "duckdb/planner/expression.hpp"
+#include "duckdb/planner/logical_operator_visitor.hpp"
 
 #include <functional>
 
diff --git a/src/include/planner/logical_operator_visitor.hpp b/src/include/duckdb/planner/logical_operator_visitor.hpp
similarity index 95%
rename from src/include/planner/logical_operator_visitor.hpp
rename to src/include/duckdb/planner/logical_operator_visitor.hpp
index ff6b8d0f273..999fb3c17e2 100644
--- a/src/include/planner/logical_operator_visitor.hpp
+++ b/src/include/duckdb/planner/logical_operator_visitor.hpp
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "common/common.hpp"
-#include "planner/bound_tokens.hpp"
-#include "planner/logical_tokens.hpp"
+#include "duckdb/common/common.hpp"
+#include "duckdb/planner/bound_tokens.hpp"
+#include "duckdb/planner/logical_tokens.hpp"
 
 namespace duckdb {
 //! The LogicalOperatorVisitor is an abstract base class that implements the
diff --git a/src/include/planner/logical_plan_generator.hpp b/src/include/duckdb/planner/logical_plan_generator.hpp
similarity index 95%
rename from src/include/planner/logical_plan_generator.hpp
rename to src/include/duckdb/planner/logical_plan_generator.hpp
index 8a017432f02..def7722ab32 100644
--- a/src/include/planner/logical_plan_generator.hpp
+++ b/src/include/duckdb/planner/logical_plan_generator.hpp
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "planner/binder.hpp"
-#include "planner/bound_tokens.hpp"
-#include "planner/logical_operator.hpp"
+#include "duckdb/planner/binder.hpp"
+#include "duckdb/planner/bound_tokens.hpp"
+#include "duckdb/planner/logical_operator.hpp"
 
 namespace duckdb {
 class ClientContext;
diff --git a/src/include/planner/logical_tokens.hpp b/src/include/duckdb/planner/logical_tokens.hpp
similarity index 100%
rename from src/include/planner/logical_tokens.hpp
rename to src/include/duckdb/planner/logical_tokens.hpp
diff --git a/src/include/duckdb/planner/operator/list.hpp b/src/include/duckdb/planner/operator/list.hpp
new file mode 100644
index 00000000000..51b61b769cc
--- /dev/null
+++ b/src/include/duckdb/planner/operator/list.hpp
@@ -0,0 +1,33 @@
+#include "duckdb/planner/operator/logical_aggregate.hpp"
+#include "duckdb/planner/operator/logical_any_join.hpp"
+#include "duckdb/planner/operator/logical_chunk_get.hpp"
+#include "duckdb/planner/operator/logical_comparison_join.hpp"
+#include "duckdb/planner/operator/logical_copy_from_file.hpp"
+#include "duckdb/planner/operator/logical_copy_to_file.hpp"
+#include "duckdb/planner/operator/logical_create_index.hpp"
+#include "duckdb/planner/operator/logical_create_table.hpp"
+#include "duckdb/planner/operator/logical_cross_product.hpp"
+#include "duckdb/planner/operator/logical_delete.hpp"
+#include "duckdb/planner/operator/logical_delim_get.hpp"
+#include "duckdb/planner/operator/logical_delim_join.hpp"
+#include "duckdb/planner/operator/logical_distinct.hpp"
+#include "duckdb/planner/operator/logical_empty_result.hpp"
+#include "duckdb/planner/operator/logical_execute.hpp"
+#include "duckdb/planner/operator/logical_explain.hpp"
+#include "duckdb/planner/operator/logical_expression_get.hpp"
+#include "duckdb/planner/operator/logical_filter.hpp"
+#include "duckdb/planner/operator/logical_get.hpp"
+#include "duckdb/planner/operator/logical_index_scan.hpp"
+#include "duckdb/planner/operator/logical_insert.hpp"
+#include "duckdb/planner/operator/logical_join.hpp"
+#include "duckdb/planner/operator/logical_limit.hpp"
+#include "duckdb/planner/operator/logical_order.hpp"
+#include "duckdb/planner/operator/logical_prepare.hpp"
+#include "duckdb/planner/operator/logical_projection.hpp"
+#include "duckdb/planner/operator/logical_prune_columns.hpp"
+#include "duckdb/planner/operator/logical_set_operation.hpp"
+#include "duckdb/planner/operator/logical_subquery.hpp"
+#include "duckdb/planner/operator/logical_table_function.hpp"
+#include "duckdb/planner/operator/logical_top_n.hpp"
+#include "duckdb/planner/operator/logical_update.hpp"
+#include "duckdb/planner/operator/logical_window.hpp"
diff --git a/src/include/planner/operator/logical_aggregate.hpp b/src/include/duckdb/planner/operator/logical_aggregate.hpp
similarity index 95%
rename from src/include/planner/operator/logical_aggregate.hpp
rename to src/include/duckdb/planner/operator/logical_aggregate.hpp
index 0b8ae3d5549..1e359665e3e 100644
--- a/src/include/planner/operator/logical_aggregate.hpp
+++ b/src/include/duckdb/planner/operator/logical_aggregate.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "planner/logical_operator.hpp"
+#include "duckdb/planner/logical_operator.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/planner/operator/logical_any_join.hpp b/src/include/duckdb/planner/operator/logical_any_join.hpp
similarity index 86%
rename from src/include/planner/operator/logical_any_join.hpp
rename to src/include/duckdb/planner/operator/logical_any_join.hpp
index ae0ff3d95cf..3761fc2ec1c 100644
--- a/src/include/planner/operator/logical_any_join.hpp
+++ b/src/include/duckdb/planner/operator/logical_any_join.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "parser/parsed_expression.hpp"
-#include "planner/operator/logical_join.hpp"
+#include "duckdb/parser/parsed_expression.hpp"
+#include "duckdb/planner/operator/logical_join.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/planner/operator/logical_chunk_get.hpp b/src/include/duckdb/planner/operator/logical_chunk_get.hpp
similarity index 91%
rename from src/include/planner/operator/logical_chunk_get.hpp
rename to src/include/duckdb/planner/operator/logical_chunk_get.hpp
index 59d96ebdfac..94e55e9b4f0 100644
--- a/src/include/planner/operator/logical_chunk_get.hpp
+++ b/src/include/duckdb/planner/operator/logical_chunk_get.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "common/types/chunk_collection.hpp"
-#include "planner/logical_operator.hpp"
+#include "duckdb/common/types/chunk_collection.hpp"
+#include "duckdb/planner/logical_operator.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/planner/operator/logical_comparison_join.hpp b/src/include/duckdb/planner/operator/logical_comparison_join.hpp
similarity index 87%
rename from src/include/planner/operator/logical_comparison_join.hpp
rename to src/include/duckdb/planner/operator/logical_comparison_join.hpp
index eeca1383ebd..ca40e33f404 100644
--- a/src/include/planner/operator/logical_comparison_join.hpp
+++ b/src/include/duckdb/planner/operator/logical_comparison_join.hpp
@@ -8,10 +8,10 @@
 
 #pragma once
 
-#include "common/constants.hpp"
-#include "common/unordered_set.hpp"
-#include "planner/joinside.hpp"
-#include "planner/operator/logical_join.hpp"
+#include "duckdb/common/constants.hpp"
+#include "duckdb/common/unordered_set.hpp"
+#include "duckdb/planner/joinside.hpp"
+#include "duckdb/planner/operator/logical_join.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/planner/operator/logical_copy_from_file.hpp b/src/include/duckdb/planner/operator/logical_copy_from_file.hpp
similarity index 88%
rename from src/include/planner/operator/logical_copy_from_file.hpp
rename to src/include/duckdb/planner/operator/logical_copy_from_file.hpp
index 4b568b98429..7ad15fa30fc 100644
--- a/src/include/planner/operator/logical_copy_from_file.hpp
+++ b/src/include/duckdb/planner/operator/logical_copy_from_file.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "parser/parsed_data/copy_info.hpp"
-#include "planner/logical_operator.hpp"
+#include "duckdb/parser/parsed_data/copy_info.hpp"
+#include "duckdb/planner/logical_operator.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/planner/operator/logical_copy_to_file.hpp b/src/include/duckdb/planner/operator/logical_copy_to_file.hpp
similarity index 87%
rename from src/include/planner/operator/logical_copy_to_file.hpp
rename to src/include/duckdb/planner/operator/logical_copy_to_file.hpp
index c533dd647ee..80d950eaccc 100644
--- a/src/include/planner/operator/logical_copy_to_file.hpp
+++ b/src/include/duckdb/planner/operator/logical_copy_to_file.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "parser/parsed_data/copy_info.hpp"
-#include "planner/logical_operator.hpp"
+#include "duckdb/parser/parsed_data/copy_info.hpp"
+#include "duckdb/planner/logical_operator.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/planner/operator/logical_create_index.hpp b/src/include/duckdb/planner/operator/logical_create_index.hpp
similarity index 91%
rename from src/include/planner/operator/logical_create_index.hpp
rename to src/include/duckdb/planner/operator/logical_create_index.hpp
index 61d183bba64..50ce551988d 100644
--- a/src/include/planner/operator/logical_create_index.hpp
+++ b/src/include/duckdb/planner/operator/logical_create_index.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "parser/parsed_data/create_index_info.hpp"
-#include "planner/logical_operator.hpp"
+#include "duckdb/parser/parsed_data/create_index_info.hpp"
+#include "duckdb/planner/logical_operator.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/planner/operator/logical_create_table.hpp b/src/include/duckdb/planner/operator/logical_create_table.hpp
similarity index 87%
rename from src/include/planner/operator/logical_create_table.hpp
rename to src/include/duckdb/planner/operator/logical_create_table.hpp
index 5963e71ea28..64582339ee3 100644
--- a/src/include/planner/operator/logical_create_table.hpp
+++ b/src/include/duckdb/planner/operator/logical_create_table.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "planner/parsed_data/bound_create_table_info.hpp"
-#include "planner/logical_operator.hpp"
+#include "duckdb/planner/parsed_data/bound_create_table_info.hpp"
+#include "duckdb/planner/logical_operator.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/planner/operator/logical_cross_product.hpp b/src/include/duckdb/planner/operator/logical_cross_product.hpp
similarity index 92%
rename from src/include/planner/operator/logical_cross_product.hpp
rename to src/include/duckdb/planner/operator/logical_cross_product.hpp
index 608a1c3f6eb..0c6aa468a51 100644
--- a/src/include/planner/operator/logical_cross_product.hpp
+++ b/src/include/duckdb/planner/operator/logical_cross_product.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "planner/logical_operator.hpp"
+#include "duckdb/planner/logical_operator.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/planner/operator/logical_delete.hpp b/src/include/duckdb/planner/operator/logical_delete.hpp
similarity index 92%
rename from src/include/planner/operator/logical_delete.hpp
rename to src/include/duckdb/planner/operator/logical_delete.hpp
index 8c33234cb5a..385448309e2 100644
--- a/src/include/planner/operator/logical_delete.hpp
+++ b/src/include/duckdb/planner/operator/logical_delete.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "planner/logical_operator.hpp"
+#include "duckdb/planner/logical_operator.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/planner/operator/logical_delim_get.hpp b/src/include/duckdb/planner/operator/logical_delim_get.hpp
similarity index 95%
rename from src/include/planner/operator/logical_delim_get.hpp
rename to src/include/duckdb/planner/operator/logical_delim_get.hpp
index 08bd7ba96a2..4e60c84c156 100644
--- a/src/include/planner/operator/logical_delim_get.hpp
+++ b/src/include/duckdb/planner/operator/logical_delim_get.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "planner/logical_operator.hpp"
+#include "duckdb/planner/logical_operator.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/planner/operator/logical_delim_join.hpp b/src/include/duckdb/planner/operator/logical_delim_join.hpp
similarity index 93%
rename from src/include/planner/operator/logical_delim_join.hpp
rename to src/include/duckdb/planner/operator/logical_delim_join.hpp
index a294adc7dc5..24fe502604b 100644
--- a/src/include/planner/operator/logical_delim_join.hpp
+++ b/src/include/duckdb/planner/operator/logical_delim_join.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "planner/operator/logical_comparison_join.hpp"
+#include "duckdb/planner/operator/logical_comparison_join.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/planner/operator/logical_distinct.hpp b/src/include/duckdb/planner/operator/logical_distinct.hpp
similarity index 94%
rename from src/include/planner/operator/logical_distinct.hpp
rename to src/include/duckdb/planner/operator/logical_distinct.hpp
index 971cc2c3532..9577d686993 100644
--- a/src/include/planner/operator/logical_distinct.hpp
+++ b/src/include/duckdb/planner/operator/logical_distinct.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "planner/logical_operator.hpp"
+#include "duckdb/planner/logical_operator.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/planner/operator/logical_empty_result.hpp b/src/include/duckdb/planner/operator/logical_empty_result.hpp
similarity index 89%
rename from src/include/planner/operator/logical_empty_result.hpp
rename to src/include/duckdb/planner/operator/logical_empty_result.hpp
index 437d148a52c..14a8b72d6f6 100644
--- a/src/include/planner/operator/logical_empty_result.hpp
+++ b/src/include/duckdb/planner/operator/logical_empty_result.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "planner/logical_operator.hpp"
-#include "planner/table_binding_resolver.hpp"
+#include "duckdb/planner/logical_operator.hpp"
+#include "duckdb/planner/table_binding_resolver.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/planner/operator/logical_execute.hpp b/src/include/duckdb/planner/operator/logical_execute.hpp
similarity index 83%
rename from src/include/planner/operator/logical_execute.hpp
rename to src/include/duckdb/planner/operator/logical_execute.hpp
index 90800adb9fd..90735f7f2d6 100644
--- a/src/include/planner/operator/logical_execute.hpp
+++ b/src/include/duckdb/planner/operator/logical_execute.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "catalog/catalog_entry/prepared_statement_catalog_entry.hpp"
-#include "planner/logical_operator.hpp"
+#include "duckdb/catalog/catalog_entry/prepared_statement_catalog_entry.hpp"
+#include "duckdb/planner/logical_operator.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/planner/operator/logical_explain.hpp b/src/include/duckdb/planner/operator/logical_explain.hpp
similarity index 93%
rename from src/include/planner/operator/logical_explain.hpp
rename to src/include/duckdb/planner/operator/logical_explain.hpp
index 41ca3436f31..05640cac2ac 100644
--- a/src/include/planner/operator/logical_explain.hpp
+++ b/src/include/duckdb/planner/operator/logical_explain.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "planner/logical_operator.hpp"
+#include "duckdb/planner/logical_operator.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/planner/operator/logical_expression_get.hpp b/src/include/duckdb/planner/operator/logical_expression_get.hpp
similarity index 95%
rename from src/include/planner/operator/logical_expression_get.hpp
rename to src/include/duckdb/planner/operator/logical_expression_get.hpp
index 6a87bef7459..24c7adacb7d 100644
--- a/src/include/planner/operator/logical_expression_get.hpp
+++ b/src/include/duckdb/planner/operator/logical_expression_get.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "planner/logical_operator.hpp"
+#include "duckdb/planner/logical_operator.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/planner/operator/logical_filter.hpp b/src/include/duckdb/planner/operator/logical_filter.hpp
similarity index 94%
rename from src/include/planner/operator/logical_filter.hpp
rename to src/include/duckdb/planner/operator/logical_filter.hpp
index c4d22b3ea6f..a9986869f11 100644
--- a/src/include/planner/operator/logical_filter.hpp
+++ b/src/include/duckdb/planner/operator/logical_filter.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "planner/logical_operator.hpp"
+#include "duckdb/planner/logical_operator.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/planner/operator/logical_get.hpp b/src/include/duckdb/planner/operator/logical_get.hpp
similarity index 91%
rename from src/include/planner/operator/logical_get.hpp
rename to src/include/duckdb/planner/operator/logical_get.hpp
index 1387e721614..55419679e62 100644
--- a/src/include/planner/operator/logical_get.hpp
+++ b/src/include/duckdb/planner/operator/logical_get.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "catalog/catalog_entry/table_catalog_entry.hpp"
-#include "planner/logical_operator.hpp"
+#include "duckdb/catalog/catalog_entry/table_catalog_entry.hpp"
+#include "duckdb/planner/logical_operator.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/planner/operator/logical_index_scan.hpp b/src/include/duckdb/planner/operator/logical_index_scan.hpp
similarity index 91%
rename from src/include/planner/operator/logical_index_scan.hpp
rename to src/include/duckdb/planner/operator/logical_index_scan.hpp
index bc4f99633a2..07a10e82702 100644
--- a/src/include/planner/operator/logical_index_scan.hpp
+++ b/src/include/duckdb/planner/operator/logical_index_scan.hpp
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "planner/logical_operator.hpp"
-#include "catalog/catalog_entry/table_catalog_entry.hpp"
-#include <storage/index.hpp>
+#include "duckdb/planner/logical_operator.hpp"
+#include "duckdb/catalog/catalog_entry/table_catalog_entry.hpp"
+#include "duckdb/storage/index.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/planner/operator/logical_insert.hpp b/src/include/duckdb/planner/operator/logical_insert.hpp
similarity index 95%
rename from src/include/planner/operator/logical_insert.hpp
rename to src/include/duckdb/planner/operator/logical_insert.hpp
index 60483433d70..cd6af4d146a 100644
--- a/src/include/planner/operator/logical_insert.hpp
+++ b/src/include/duckdb/planner/operator/logical_insert.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "planner/logical_operator.hpp"
+#include "duckdb/planner/logical_operator.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/planner/operator/logical_join.hpp b/src/include/duckdb/planner/operator/logical_join.hpp
similarity index 86%
rename from src/include/planner/operator/logical_join.hpp
rename to src/include/duckdb/planner/operator/logical_join.hpp
index 8ae75bb9748..3f30348ab47 100644
--- a/src/include/planner/operator/logical_join.hpp
+++ b/src/include/duckdb/planner/operator/logical_join.hpp
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "common/enums/join_type.hpp"
-#include "common/unordered_set.hpp"
-#include "planner/logical_operator.hpp"
+#include "duckdb/common/enums/join_type.hpp"
+#include "duckdb/common/unordered_set.hpp"
+#include "duckdb/planner/logical_operator.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/planner/operator/logical_limit.hpp b/src/include/duckdb/planner/operator/logical_limit.hpp
similarity index 94%
rename from src/include/planner/operator/logical_limit.hpp
rename to src/include/duckdb/planner/operator/logical_limit.hpp
index 2be87daad13..45bc2d20376 100644
--- a/src/include/planner/operator/logical_limit.hpp
+++ b/src/include/duckdb/planner/operator/logical_limit.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "planner/logical_operator.hpp"
+#include "duckdb/planner/logical_operator.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/planner/operator/logical_order.hpp b/src/include/duckdb/planner/operator/logical_order.hpp
similarity index 87%
rename from src/include/planner/operator/logical_order.hpp
rename to src/include/duckdb/planner/operator/logical_order.hpp
index 6a34b3424d4..e4754e619fa 100644
--- a/src/include/planner/operator/logical_order.hpp
+++ b/src/include/duckdb/planner/operator/logical_order.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "planner/bound_query_node.hpp"
-#include "planner/logical_operator.hpp"
+#include "duckdb/planner/bound_query_node.hpp"
+#include "duckdb/planner/logical_operator.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/planner/operator/logical_prepare.hpp b/src/include/duckdb/planner/operator/logical_prepare.hpp
similarity index 84%
rename from src/include/planner/operator/logical_prepare.hpp
rename to src/include/duckdb/planner/operator/logical_prepare.hpp
index cd09326d97b..53346c96b4c 100644
--- a/src/include/planner/operator/logical_prepare.hpp
+++ b/src/include/duckdb/planner/operator/logical_prepare.hpp
@@ -8,10 +8,10 @@
 
 #pragma once
 
-#include "catalog/catalog_entry/prepared_statement_catalog_entry.hpp"
-#include "common/unordered_map.hpp"
-#include "common/unordered_set.hpp"
-#include "planner/logical_operator.hpp"
+#include "duckdb/catalog/catalog_entry/prepared_statement_catalog_entry.hpp"
+#include "duckdb/common/unordered_map.hpp"
+#include "duckdb/common/unordered_set.hpp"
+#include "duckdb/planner/logical_operator.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/planner/operator/logical_projection.hpp b/src/include/duckdb/planner/operator/logical_projection.hpp
similarity index 93%
rename from src/include/planner/operator/logical_projection.hpp
rename to src/include/duckdb/planner/operator/logical_projection.hpp
index 3471dc48187..ced91d6c788 100644
--- a/src/include/planner/operator/logical_projection.hpp
+++ b/src/include/duckdb/planner/operator/logical_projection.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "planner/logical_operator.hpp"
+#include "duckdb/planner/logical_operator.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/planner/operator/logical_prune_columns.hpp b/src/include/duckdb/planner/operator/logical_prune_columns.hpp
similarity index 93%
rename from src/include/planner/operator/logical_prune_columns.hpp
rename to src/include/duckdb/planner/operator/logical_prune_columns.hpp
index aa4645e6ff3..73fa92e4a81 100644
--- a/src/include/planner/operator/logical_prune_columns.hpp
+++ b/src/include/duckdb/planner/operator/logical_prune_columns.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "planner/logical_operator.hpp"
+#include "duckdb/planner/logical_operator.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/planner/operator/logical_set_operation.hpp b/src/include/duckdb/planner/operator/logical_set_operation.hpp
similarity index 95%
rename from src/include/planner/operator/logical_set_operation.hpp
rename to src/include/duckdb/planner/operator/logical_set_operation.hpp
index 2d9a4591452..aa8e2e1815d 100644
--- a/src/include/planner/operator/logical_set_operation.hpp
+++ b/src/include/duckdb/planner/operator/logical_set_operation.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "planner/logical_operator.hpp"
+#include "duckdb/planner/logical_operator.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/planner/operator/logical_subquery.hpp b/src/include/duckdb/planner/operator/logical_subquery.hpp
similarity index 90%
rename from src/include/planner/operator/logical_subquery.hpp
rename to src/include/duckdb/planner/operator/logical_subquery.hpp
index f76f1f5dc08..93b144082e8 100644
--- a/src/include/planner/operator/logical_subquery.hpp
+++ b/src/include/duckdb/planner/operator/logical_subquery.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "planner/logical_operator.hpp"
-#include "planner/table_binding_resolver.hpp"
+#include "duckdb/planner/logical_operator.hpp"
+#include "duckdb/planner/table_binding_resolver.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/planner/operator/logical_table_function.hpp b/src/include/duckdb/planner/operator/logical_table_function.hpp
similarity index 95%
rename from src/include/planner/operator/logical_table_function.hpp
rename to src/include/duckdb/planner/operator/logical_table_function.hpp
index 5f5664d6ac0..8524eeb862a 100644
--- a/src/include/planner/operator/logical_table_function.hpp
+++ b/src/include/duckdb/planner/operator/logical_table_function.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "planner/logical_operator.hpp"
+#include "duckdb/planner/logical_operator.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/planner/operator/logical_top_n.hpp b/src/include/duckdb/planner/operator/logical_top_n.hpp
similarity index 90%
rename from src/include/planner/operator/logical_top_n.hpp
rename to src/include/duckdb/planner/operator/logical_top_n.hpp
index 68c5b47faf4..cab6b52bcd9 100644
--- a/src/include/planner/operator/logical_top_n.hpp
+++ b/src/include/duckdb/planner/operator/logical_top_n.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "planner/bound_query_node.hpp"
-#include "planner/logical_operator.hpp"
+#include "duckdb/planner/bound_query_node.hpp"
+#include "duckdb/planner/logical_operator.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/planner/operator/logical_update.hpp b/src/include/duckdb/planner/operator/logical_update.hpp
similarity index 95%
rename from src/include/planner/operator/logical_update.hpp
rename to src/include/duckdb/planner/operator/logical_update.hpp
index 54baa4d03e9..733ac4006db 100644
--- a/src/include/planner/operator/logical_update.hpp
+++ b/src/include/duckdb/planner/operator/logical_update.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "planner/logical_operator.hpp"
+#include "duckdb/planner/logical_operator.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/planner/operator/logical_window.hpp b/src/include/duckdb/planner/operator/logical_window.hpp
similarity index 93%
rename from src/include/planner/operator/logical_window.hpp
rename to src/include/duckdb/planner/operator/logical_window.hpp
index 1d5e6910a89..09bc6909b37 100644
--- a/src/include/planner/operator/logical_window.hpp
+++ b/src/include/duckdb/planner/operator/logical_window.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "planner/logical_operator.hpp"
+#include "duckdb/planner/logical_operator.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/planner/parsed_data/bound_create_table_info.hpp b/src/include/duckdb/planner/parsed_data/bound_create_table_info.hpp
similarity index 84%
rename from src/include/planner/parsed_data/bound_create_table_info.hpp
rename to src/include/duckdb/planner/parsed_data/bound_create_table_info.hpp
index 15e91f04e43..da5204ab5b7 100644
--- a/src/include/planner/parsed_data/bound_create_table_info.hpp
+++ b/src/include/duckdb/planner/parsed_data/bound_create_table_info.hpp
@@ -8,10 +8,10 @@
 
 #pragma once
 
-#include "parser/parsed_data/create_table_info.hpp"
-#include "planner/bound_constraint.hpp"
-#include "planner/expression.hpp"
-#include "storage/table/persistent_segment.hpp"
+#include "duckdb/parser/parsed_data/create_table_info.hpp"
+#include "duckdb/planner/bound_constraint.hpp"
+#include "duckdb/planner/expression.hpp"
+#include "duckdb/storage/table/persistent_segment.hpp"
 
 namespace duckdb {
 class CatalogEntry;
diff --git a/src/include/planner/planner.hpp b/src/include/duckdb/planner/planner.hpp
similarity index 88%
rename from src/include/planner/planner.hpp
rename to src/include/duckdb/planner/planner.hpp
index 254af587293..72645656632 100644
--- a/src/include/planner/planner.hpp
+++ b/src/include/duckdb/planner/planner.hpp
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "parser/sql_statement.hpp"
-#include "planner/binder.hpp"
-#include "planner/logical_operator.hpp"
+#include "duckdb/parser/sql_statement.hpp"
+#include "duckdb/planner/binder.hpp"
+#include "duckdb/planner/logical_operator.hpp"
 
 namespace duckdb {
 class ClientContext;
diff --git a/src/include/planner/query_node/bound_select_node.hpp b/src/include/duckdb/planner/query_node/bound_select_node.hpp
similarity index 94%
rename from src/include/planner/query_node/bound_select_node.hpp
rename to src/include/duckdb/planner/query_node/bound_select_node.hpp
index ec4e21f59ca..fd470075f27 100644
--- a/src/include/planner/query_node/bound_select_node.hpp
+++ b/src/include/duckdb/planner/query_node/bound_select_node.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "planner/bound_query_node.hpp"
-#include "planner/bound_tableref.hpp"
+#include "duckdb/planner/bound_query_node.hpp"
+#include "duckdb/planner/bound_tableref.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/planner/query_node/bound_set_operation_node.hpp b/src/include/duckdb/planner/query_node/bound_set_operation_node.hpp
similarity index 87%
rename from src/include/planner/query_node/bound_set_operation_node.hpp
rename to src/include/duckdb/planner/query_node/bound_set_operation_node.hpp
index 60f94c3cbc1..f04a8043036 100644
--- a/src/include/planner/query_node/bound_set_operation_node.hpp
+++ b/src/include/duckdb/planner/query_node/bound_set_operation_node.hpp
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "common/enums/set_operation_type.hpp"
-#include "planner/binder.hpp"
-#include "planner/bound_query_node.hpp"
+#include "duckdb/common/enums/set_operation_type.hpp"
+#include "duckdb/planner/binder.hpp"
+#include "duckdb/planner/bound_query_node.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/planner/statement/bound_copy_statement.hpp b/src/include/duckdb/planner/statement/bound_copy_statement.hpp
similarity index 85%
rename from src/include/planner/statement/bound_copy_statement.hpp
rename to src/include/duckdb/planner/statement/bound_copy_statement.hpp
index 91a3433c3a0..75f554aebc2 100644
--- a/src/include/planner/statement/bound_copy_statement.hpp
+++ b/src/include/duckdb/planner/statement/bound_copy_statement.hpp
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "planner/bound_query_node.hpp"
-#include "planner/bound_sql_statement.hpp"
-#include "planner/statement/bound_insert_statement.hpp"
+#include "duckdb/planner/bound_query_node.hpp"
+#include "duckdb/planner/bound_sql_statement.hpp"
+#include "duckdb/planner/statement/bound_insert_statement.hpp"
 
 namespace duckdb {
 class TableCatalogEntry;
diff --git a/src/include/planner/statement/bound_create_index_statement.hpp b/src/include/duckdb/planner/statement/bound_create_index_statement.hpp
similarity index 80%
rename from src/include/planner/statement/bound_create_index_statement.hpp
rename to src/include/duckdb/planner/statement/bound_create_index_statement.hpp
index b4cab5ad5ed..179f086fd80 100644
--- a/src/include/planner/statement/bound_create_index_statement.hpp
+++ b/src/include/duckdb/planner/statement/bound_create_index_statement.hpp
@@ -8,10 +8,10 @@
 
 #pragma once
 
-#include "parser/parsed_data/create_index_info.hpp"
-#include "planner/bound_sql_statement.hpp"
-#include "planner/bound_tableref.hpp"
-#include "planner/statement/bound_select_statement.hpp"
+#include "duckdb/parser/parsed_data/create_index_info.hpp"
+#include "duckdb/planner/bound_sql_statement.hpp"
+#include "duckdb/planner/bound_tableref.hpp"
+#include "duckdb/planner/statement/bound_select_statement.hpp"
 
 namespace duckdb {
 class BoundColumnRefExpression;
diff --git a/src/include/planner/statement/bound_create_table_statement.hpp b/src/include/duckdb/planner/statement/bound_create_table_statement.hpp
similarity index 82%
rename from src/include/planner/statement/bound_create_table_statement.hpp
rename to src/include/duckdb/planner/statement/bound_create_table_statement.hpp
index f66a5b95a7f..acdcef33399 100644
--- a/src/include/planner/statement/bound_create_table_statement.hpp
+++ b/src/include/duckdb/planner/statement/bound_create_table_statement.hpp
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "planner/bound_sql_statement.hpp"
-#include "planner/parsed_data/bound_create_table_info.hpp"
-#include "planner/statement/bound_select_statement.hpp"
+#include "duckdb/planner/bound_sql_statement.hpp"
+#include "duckdb/planner/parsed_data/bound_create_table_info.hpp"
+#include "duckdb/planner/statement/bound_select_statement.hpp"
 
 namespace duckdb {
 class SchemaCatalogEntry;
diff --git a/src/include/planner/statement/bound_delete_statement.hpp b/src/include/duckdb/planner/statement/bound_delete_statement.hpp
similarity index 88%
rename from src/include/planner/statement/bound_delete_statement.hpp
rename to src/include/duckdb/planner/statement/bound_delete_statement.hpp
index cffacd5cfb1..59e32c387f5 100644
--- a/src/include/planner/statement/bound_delete_statement.hpp
+++ b/src/include/duckdb/planner/statement/bound_delete_statement.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "planner/bound_sql_statement.hpp"
-#include "planner/bound_tableref.hpp"
+#include "duckdb/planner/bound_sql_statement.hpp"
+#include "duckdb/planner/bound_tableref.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/planner/statement/bound_execute_statement.hpp b/src/include/duckdb/planner/statement/bound_execute_statement.hpp
similarity index 84%
rename from src/include/planner/statement/bound_execute_statement.hpp
rename to src/include/duckdb/planner/statement/bound_execute_statement.hpp
index 9512b704f8b..d038979fb6e 100644
--- a/src/include/planner/statement/bound_execute_statement.hpp
+++ b/src/include/duckdb/planner/statement/bound_execute_statement.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "catalog/catalog_entry/prepared_statement_catalog_entry.hpp"
-#include "planner/bound_sql_statement.hpp"
+#include "duckdb/catalog/catalog_entry/prepared_statement_catalog_entry.hpp"
+#include "duckdb/planner/bound_sql_statement.hpp"
 
 namespace duckdb {
 //! Bound equivalent to ExecuteStatement
diff --git a/src/include/planner/statement/bound_insert_statement.hpp b/src/include/duckdb/planner/statement/bound_insert_statement.hpp
similarity index 91%
rename from src/include/planner/statement/bound_insert_statement.hpp
rename to src/include/duckdb/planner/statement/bound_insert_statement.hpp
index 0f370f399e6..4f986d2fdca 100644
--- a/src/include/planner/statement/bound_insert_statement.hpp
+++ b/src/include/duckdb/planner/statement/bound_insert_statement.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "planner/bound_sql_statement.hpp"
-#include "planner/statement/bound_select_statement.hpp"
+#include "duckdb/planner/bound_sql_statement.hpp"
+#include "duckdb/planner/statement/bound_select_statement.hpp"
 
 namespace duckdb {
 class TableCatalogEntry;
diff --git a/src/include/planner/statement/bound_select_statement.hpp b/src/include/duckdb/planner/statement/bound_select_statement.hpp
similarity index 87%
rename from src/include/planner/statement/bound_select_statement.hpp
rename to src/include/duckdb/planner/statement/bound_select_statement.hpp
index a3704a4be08..e1036c1fcd3 100644
--- a/src/include/planner/statement/bound_select_statement.hpp
+++ b/src/include/duckdb/planner/statement/bound_select_statement.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "planner/bound_query_node.hpp"
-#include "planner/bound_sql_statement.hpp"
+#include "duckdb/planner/bound_query_node.hpp"
+#include "duckdb/planner/bound_sql_statement.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/planner/statement/bound_update_statement.hpp b/src/include/duckdb/planner/statement/bound_update_statement.hpp
similarity index 92%
rename from src/include/planner/statement/bound_update_statement.hpp
rename to src/include/duckdb/planner/statement/bound_update_statement.hpp
index 802161585ee..d0067d84f74 100644
--- a/src/include/planner/statement/bound_update_statement.hpp
+++ b/src/include/duckdb/planner/statement/bound_update_statement.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "planner/bound_sql_statement.hpp"
-#include "planner/bound_tableref.hpp"
+#include "duckdb/planner/bound_sql_statement.hpp"
+#include "duckdb/planner/bound_tableref.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/duckdb/planner/statement/list.hpp b/src/include/duckdb/planner/statement/list.hpp
new file mode 100644
index 00000000000..130588af607
--- /dev/null
+++ b/src/include/duckdb/planner/statement/list.hpp
@@ -0,0 +1,8 @@
+#include "duckdb/planner/statement/bound_copy_statement.hpp"
+#include "duckdb/planner/statement/bound_create_index_statement.hpp"
+#include "duckdb/planner/statement/bound_create_table_statement.hpp"
+#include "duckdb/planner/statement/bound_delete_statement.hpp"
+#include "duckdb/planner/statement/bound_execute_statement.hpp"
+#include "duckdb/planner/statement/bound_insert_statement.hpp"
+#include "duckdb/planner/statement/bound_select_statement.hpp"
+#include "duckdb/planner/statement/bound_update_statement.hpp"
diff --git a/src/include/planner/subquery/flatten_dependent_join.hpp b/src/include/duckdb/planner/subquery/flatten_dependent_join.hpp
similarity index 88%
rename from src/include/planner/subquery/flatten_dependent_join.hpp
rename to src/include/duckdb/planner/subquery/flatten_dependent_join.hpp
index 9d5bb978cdb..8c8a185155c 100644
--- a/src/include/planner/subquery/flatten_dependent_join.hpp
+++ b/src/include/duckdb/planner/subquery/flatten_dependent_join.hpp
@@ -8,10 +8,10 @@
 
 #pragma once
 
-#include "common/unordered_map.hpp"
-#include "planner/binder.hpp"
-#include "planner/column_binding_map.hpp"
-#include "planner/logical_operator.hpp"
+#include "duckdb/common/unordered_map.hpp"
+#include "duckdb/planner/binder.hpp"
+#include "duckdb/planner/column_binding_map.hpp"
+#include "duckdb/planner/logical_operator.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/planner/subquery/has_correlated_expressions.hpp b/src/include/duckdb/planner/subquery/has_correlated_expressions.hpp
similarity index 91%
rename from src/include/planner/subquery/has_correlated_expressions.hpp
rename to src/include/duckdb/planner/subquery/has_correlated_expressions.hpp
index 82671352689..ce6877f31a5 100644
--- a/src/include/planner/subquery/has_correlated_expressions.hpp
+++ b/src/include/duckdb/planner/subquery/has_correlated_expressions.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "planner/binder.hpp"
-#include "planner/logical_operator.hpp"
+#include "duckdb/planner/binder.hpp"
+#include "duckdb/planner/logical_operator.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/planner/subquery/rewrite_correlated_expressions.hpp b/src/include/duckdb/planner/subquery/rewrite_correlated_expressions.hpp
similarity index 93%
rename from src/include/planner/subquery/rewrite_correlated_expressions.hpp
rename to src/include/duckdb/planner/subquery/rewrite_correlated_expressions.hpp
index ee986473706..c74b12a48b5 100644
--- a/src/include/planner/subquery/rewrite_correlated_expressions.hpp
+++ b/src/include/duckdb/planner/subquery/rewrite_correlated_expressions.hpp
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "planner/binder.hpp"
-#include "planner/column_binding_map.hpp"
-#include "planner/logical_operator.hpp"
+#include "duckdb/planner/binder.hpp"
+#include "duckdb/planner/column_binding_map.hpp"
+#include "duckdb/planner/logical_operator.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/planner/table_binding.hpp b/src/include/duckdb/planner/table_binding.hpp
similarity index 92%
rename from src/include/planner/table_binding.hpp
rename to src/include/duckdb/planner/table_binding.hpp
index dfb682e250b..dd521f43890 100644
--- a/src/include/planner/table_binding.hpp
+++ b/src/include/duckdb/planner/table_binding.hpp
@@ -8,11 +8,11 @@
 
 #pragma once
 
-#include "common/common.hpp"
-#include "common/unordered_map.hpp"
-#include "parser/column_definition.hpp"
-#include "parser/parsed_expression.hpp"
-#include "planner/expression_binder.hpp"
+#include "duckdb/common/common.hpp"
+#include "duckdb/common/unordered_map.hpp"
+#include "duckdb/parser/column_definition.hpp"
+#include "duckdb/parser/parsed_expression.hpp"
+#include "duckdb/planner/expression_binder.hpp"
 
 namespace duckdb {
 class BindContext;
diff --git a/src/include/planner/table_binding_resolver.hpp b/src/include/duckdb/planner/table_binding_resolver.hpp
similarity index 95%
rename from src/include/planner/table_binding_resolver.hpp
rename to src/include/duckdb/planner/table_binding_resolver.hpp
index cf3d942eae6..ea8a278b3e3 100644
--- a/src/include/planner/table_binding_resolver.hpp
+++ b/src/include/duckdb/planner/table_binding_resolver.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "planner/logical_operator.hpp"
-#include "planner/logical_operator_visitor.hpp"
+#include "duckdb/planner/logical_operator.hpp"
+#include "duckdb/planner/logical_operator_visitor.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/planner/tableref/bound_basetableref.hpp b/src/include/duckdb/planner/tableref/bound_basetableref.hpp
similarity index 94%
rename from src/include/planner/tableref/bound_basetableref.hpp
rename to src/include/duckdb/planner/tableref/bound_basetableref.hpp
index 39777f32568..0cd1edfd84f 100644
--- a/src/include/planner/tableref/bound_basetableref.hpp
+++ b/src/include/duckdb/planner/tableref/bound_basetableref.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "planner/bound_tableref.hpp"
+#include "duckdb/planner/bound_tableref.hpp"
 
 namespace duckdb {
 class TableCatalogEntry;
diff --git a/src/include/planner/tableref/bound_crossproductref.hpp b/src/include/duckdb/planner/tableref/bound_crossproductref.hpp
similarity index 93%
rename from src/include/planner/tableref/bound_crossproductref.hpp
rename to src/include/duckdb/planner/tableref/bound_crossproductref.hpp
index 9206bc61b51..047f63fcb11 100644
--- a/src/include/planner/tableref/bound_crossproductref.hpp
+++ b/src/include/duckdb/planner/tableref/bound_crossproductref.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "planner/bound_tableref.hpp"
+#include "duckdb/planner/bound_tableref.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/planner/tableref/bound_dummytableref.hpp b/src/include/duckdb/planner/tableref/bound_dummytableref.hpp
similarity index 92%
rename from src/include/planner/tableref/bound_dummytableref.hpp
rename to src/include/duckdb/planner/tableref/bound_dummytableref.hpp
index ecd9d33ab1c..64c12572fb1 100644
--- a/src/include/planner/tableref/bound_dummytableref.hpp
+++ b/src/include/duckdb/planner/tableref/bound_dummytableref.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "planner/bound_tableref.hpp"
+#include "duckdb/planner/bound_tableref.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/planner/tableref/bound_joinref.hpp b/src/include/duckdb/planner/tableref/bound_joinref.hpp
similarity index 83%
rename from src/include/planner/tableref/bound_joinref.hpp
rename to src/include/duckdb/planner/tableref/bound_joinref.hpp
index 5391a590836..08b2dde439f 100644
--- a/src/include/planner/tableref/bound_joinref.hpp
+++ b/src/include/duckdb/planner/tableref/bound_joinref.hpp
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "common/enums/join_type.hpp"
-#include "planner/bound_tableref.hpp"
-#include "planner/expression.hpp"
+#include "duckdb/common/enums/join_type.hpp"
+#include "duckdb/planner/bound_tableref.hpp"
+#include "duckdb/planner/expression.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/planner/tableref/bound_subqueryref.hpp b/src/include/duckdb/planner/tableref/bound_subqueryref.hpp
similarity index 86%
rename from src/include/planner/tableref/bound_subqueryref.hpp
rename to src/include/duckdb/planner/tableref/bound_subqueryref.hpp
index d06b40f9e44..69d6e437d77 100644
--- a/src/include/planner/tableref/bound_subqueryref.hpp
+++ b/src/include/duckdb/planner/tableref/bound_subqueryref.hpp
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "planner/binder.hpp"
-#include "planner/bound_query_node.hpp"
-#include "planner/bound_tableref.hpp"
+#include "duckdb/planner/binder.hpp"
+#include "duckdb/planner/bound_query_node.hpp"
+#include "duckdb/planner/bound_tableref.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/planner/tableref/bound_table_function.hpp b/src/include/duckdb/planner/tableref/bound_table_function.hpp
similarity index 91%
rename from src/include/planner/tableref/bound_table_function.hpp
rename to src/include/duckdb/planner/tableref/bound_table_function.hpp
index 605a2924216..46639056a58 100644
--- a/src/include/planner/tableref/bound_table_function.hpp
+++ b/src/include/duckdb/planner/tableref/bound_table_function.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "common/types/value.hpp"
-#include "planner/bound_tableref.hpp"
+#include "duckdb/common/types/value.hpp"
+#include "duckdb/planner/bound_tableref.hpp"
 
 namespace duckdb {
 class TableFunctionCatalogEntry;
diff --git a/src/include/duckdb/planner/tableref/list.hpp b/src/include/duckdb/planner/tableref/list.hpp
new file mode 100644
index 00000000000..c2fbb95a534
--- /dev/null
+++ b/src/include/duckdb/planner/tableref/list.hpp
@@ -0,0 +1,6 @@
+#include "duckdb/planner/tableref/bound_basetableref.hpp"
+#include "duckdb/planner/tableref/bound_crossproductref.hpp"
+#include "duckdb/planner/tableref/bound_dummytableref.hpp"
+#include "duckdb/planner/tableref/bound_joinref.hpp"
+#include "duckdb/planner/tableref/bound_subqueryref.hpp"
+#include "duckdb/planner/tableref/bound_table_function.hpp"
diff --git a/src/include/storage/block.hpp b/src/include/duckdb/storage/block.hpp
similarity index 75%
rename from src/include/storage/block.hpp
rename to src/include/duckdb/storage/block.hpp
index 336d02742f4..a6e7c020db1 100644
--- a/src/include/storage/block.hpp
+++ b/src/include/duckdb/storage/block.hpp
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "common/common.hpp"
-#include "storage/storage_info.hpp"
-#include "common/file_buffer.hpp"
+#include "duckdb/common/common.hpp"
+#include "duckdb/storage/storage_info.hpp"
+#include "duckdb/common/file_buffer.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/storage/block_manager.hpp b/src/include/duckdb/storage/block_manager.hpp
similarity index 91%
rename from src/include/storage/block_manager.hpp
rename to src/include/duckdb/storage/block_manager.hpp
index c0529f243cd..77f46f928d2 100644
--- a/src/include/storage/block_manager.hpp
+++ b/src/include/duckdb/storage/block_manager.hpp
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "common/common.hpp"
-#include "storage/block.hpp"
-#include "storage/storage_info.hpp"
+#include "duckdb/common/common.hpp"
+#include "duckdb/storage/block.hpp"
+#include "duckdb/storage/storage_info.hpp"
 
 namespace duckdb {
 //! BlockManager is an abstract representation to manage blocks on DuckDB. When writing or reading blocks, the
diff --git a/src/include/storage/buffer/buffer_handle.hpp b/src/include/duckdb/storage/buffer/buffer_handle.hpp
similarity index 93%
rename from src/include/storage/buffer/buffer_handle.hpp
rename to src/include/duckdb/storage/buffer/buffer_handle.hpp
index 72b86318b77..2e92ab9a153 100644
--- a/src/include/storage/buffer/buffer_handle.hpp
+++ b/src/include/duckdb/storage/buffer/buffer_handle.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "storage/storage_info.hpp"
+#include "duckdb/storage/storage_info.hpp"
 
 namespace duckdb {
 class BufferManager;
diff --git a/src/include/storage/buffer/buffer_list.hpp b/src/include/duckdb/storage/buffer/buffer_list.hpp
similarity index 96%
rename from src/include/storage/buffer/buffer_list.hpp
rename to src/include/duckdb/storage/buffer/buffer_list.hpp
index 4baa61a32ea..70345576810 100644
--- a/src/include/storage/buffer/buffer_list.hpp
+++ b/src/include/duckdb/storage/buffer/buffer_list.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "common/file_buffer.hpp"
+#include "duckdb/common/file_buffer.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/storage/buffer/managed_buffer.hpp b/src/include/duckdb/storage/buffer/managed_buffer.hpp
similarity index 90%
rename from src/include/storage/buffer/managed_buffer.hpp
rename to src/include/duckdb/storage/buffer/managed_buffer.hpp
index 5b752c11463..22237c3a78b 100644
--- a/src/include/storage/buffer/managed_buffer.hpp
+++ b/src/include/duckdb/storage/buffer/managed_buffer.hpp
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "common/common.hpp"
-#include "common/file_buffer.hpp"
-#include "storage/storage_info.hpp"
+#include "duckdb/common/common.hpp"
+#include "duckdb/common/file_buffer.hpp"
+#include "duckdb/storage/storage_info.hpp"
 
 namespace duckdb {
 class BufferManager;
diff --git a/src/include/storage/buffer_manager.hpp b/src/include/duckdb/storage/buffer_manager.hpp
similarity index 91%
rename from src/include/storage/buffer_manager.hpp
rename to src/include/duckdb/storage/buffer_manager.hpp
index 5ca2a69bd07..48b379fb086 100644
--- a/src/include/storage/buffer_manager.hpp
+++ b/src/include/duckdb/storage/buffer_manager.hpp
@@ -8,12 +8,12 @@
 
 #pragma once
 
-#include "storage/buffer/buffer_handle.hpp"
-#include "storage/buffer/buffer_list.hpp"
-#include "storage/buffer/managed_buffer.hpp"
-#include "storage/block_manager.hpp"
-#include "common/file_system.hpp"
-#include "common/unordered_map.hpp"
+#include "duckdb/storage/buffer/buffer_handle.hpp"
+#include "duckdb/storage/buffer/buffer_list.hpp"
+#include "duckdb/storage/buffer/managed_buffer.hpp"
+#include "duckdb/storage/block_manager.hpp"
+#include "duckdb/common/file_system.hpp"
+#include "duckdb/common/unordered_map.hpp"
 
 #include <mutex>
 
diff --git a/src/include/storage/checkpoint/table_data_reader.hpp b/src/include/duckdb/storage/checkpoint/table_data_reader.hpp
similarity index 93%
rename from src/include/storage/checkpoint/table_data_reader.hpp
rename to src/include/duckdb/storage/checkpoint/table_data_reader.hpp
index 79ac86fa313..c29e686140f 100644
--- a/src/include/storage/checkpoint/table_data_reader.hpp
+++ b/src/include/duckdb/storage/checkpoint/table_data_reader.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "storage/checkpoint_manager.hpp"
+#include "duckdb/storage/checkpoint_manager.hpp"
 
 namespace duckdb {
 struct BoundCreateTableInfo;
diff --git a/src/include/storage/checkpoint/table_data_writer.hpp b/src/include/duckdb/storage/checkpoint/table_data_writer.hpp
similarity index 91%
rename from src/include/storage/checkpoint/table_data_writer.hpp
rename to src/include/duckdb/storage/checkpoint/table_data_writer.hpp
index 2bc9ec33a90..97054a918ff 100644
--- a/src/include/storage/checkpoint/table_data_writer.hpp
+++ b/src/include/duckdb/storage/checkpoint/table_data_writer.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "storage/checkpoint_manager.hpp"
-#include "common/unordered_map.hpp"
+#include "duckdb/storage/checkpoint_manager.hpp"
+#include "duckdb/common/unordered_map.hpp"
 
 namespace duckdb {
 class UncompressedSegment;
diff --git a/src/include/storage/checkpoint_manager.hpp b/src/include/duckdb/storage/checkpoint_manager.hpp
similarity index 91%
rename from src/include/storage/checkpoint_manager.hpp
rename to src/include/duckdb/storage/checkpoint_manager.hpp
index 2f1418b5677..afc27080dfd 100644
--- a/src/include/storage/checkpoint_manager.hpp
+++ b/src/include/duckdb/storage/checkpoint_manager.hpp
@@ -8,10 +8,10 @@
 
 #pragma once
 
-#include "common/common.hpp"
-#include "common/types/chunk_collection.hpp"
-#include "storage/storage_manager.hpp"
-#include "storage/meta_block_writer.hpp"
+#include "duckdb/common/common.hpp"
+#include "duckdb/common/types/chunk_collection.hpp"
+#include "duckdb/storage/storage_manager.hpp"
+#include "duckdb/storage/meta_block_writer.hpp"
 
 namespace duckdb {
 class ClientContext;
diff --git a/src/include/storage/column_data.hpp b/src/include/duckdb/storage/column_data.hpp
similarity index 90%
rename from src/include/storage/column_data.hpp
rename to src/include/duckdb/storage/column_data.hpp
index cf5a654b43b..3929a09ba20 100644
--- a/src/include/storage/column_data.hpp
+++ b/src/include/duckdb/storage/column_data.hpp
@@ -8,10 +8,10 @@
 
 #pragma once
 
-#include "common/types/data_chunk.hpp"
-#include "storage/table/append_state.hpp"
-#include "storage/table/scan_state.hpp"
-#include "storage/table/persistent_segment.hpp"
+#include "duckdb/common/types/data_chunk.hpp"
+#include "duckdb/storage/table/append_state.hpp"
+#include "duckdb/storage/table/scan_state.hpp"
+#include "duckdb/storage/table/persistent_segment.hpp"
 
 namespace duckdb {
 class DataTable;
diff --git a/src/include/storage/data_block.hpp b/src/include/duckdb/storage/data_block.hpp
similarity index 100%
rename from src/include/storage/data_block.hpp
rename to src/include/duckdb/storage/data_block.hpp
diff --git a/src/include/storage/data_table.hpp b/src/include/duckdb/storage/data_table.hpp
similarity index 93%
rename from src/include/storage/data_table.hpp
rename to src/include/duckdb/storage/data_table.hpp
index ef9909a77f6..594221ad570 100644
--- a/src/include/storage/data_table.hpp
+++ b/src/include/duckdb/storage/data_table.hpp
@@ -8,16 +8,16 @@
 
 #pragma once
 
-#include "common/enums/index_type.hpp"
-#include "common/types/data_chunk.hpp"
-#include "storage/index.hpp"
-#include "storage/table_statistics.hpp"
-#include "storage/block.hpp"
-#include "storage/column_data.hpp"
-#include "storage/table/column_segment.hpp"
-#include "storage/table/persistent_segment.hpp"
-#include "storage/table/version_manager.hpp"
-#include "transaction/local_storage.hpp"
+#include "duckdb/common/enums/index_type.hpp"
+#include "duckdb/common/types/data_chunk.hpp"
+#include "duckdb/storage/index.hpp"
+#include "duckdb/storage/table_statistics.hpp"
+#include "duckdb/storage/block.hpp"
+#include "duckdb/storage/column_data.hpp"
+#include "duckdb/storage/table/column_segment.hpp"
+#include "duckdb/storage/table/persistent_segment.hpp"
+#include "duckdb/storage/table/version_manager.hpp"
+#include "duckdb/transaction/local_storage.hpp"
 
 #include <atomic>
 #include <mutex>
diff --git a/src/include/storage/in_memory_block_manager.hpp b/src/include/duckdb/storage/in_memory_block_manager.hpp
similarity index 93%
rename from src/include/storage/in_memory_block_manager.hpp
rename to src/include/duckdb/storage/in_memory_block_manager.hpp
index 4bc0a5fbdd3..d5d4a205632 100644
--- a/src/include/storage/in_memory_block_manager.hpp
+++ b/src/include/duckdb/storage/in_memory_block_manager.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "common/common.hpp"
-#include "common/exception.hpp"
+#include "duckdb/common/common.hpp"
+#include "duckdb/common/exception.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/storage/index.hpp b/src/include/duckdb/storage/index.hpp
similarity index 92%
rename from src/include/storage/index.hpp
rename to src/include/duckdb/storage/index.hpp
index f7b2f3dc3d2..85a7911f2a1 100644
--- a/src/include/storage/index.hpp
+++ b/src/include/duckdb/storage/index.hpp
@@ -8,12 +8,12 @@
 
 #pragma once
 
-#include "common/unordered_set.hpp"
-#include "common/enums/index_type.hpp"
-#include "common/types/data_chunk.hpp"
-#include "parser/parsed_expression.hpp"
-#include "planner/expression.hpp"
-#include "storage/table/scan_state.hpp"
+#include "duckdb/common/unordered_set.hpp"
+#include "duckdb/common/enums/index_type.hpp"
+#include "duckdb/common/types/data_chunk.hpp"
+#include "duckdb/parser/parsed_expression.hpp"
+#include "duckdb/planner/expression.hpp"
+#include "duckdb/storage/table/scan_state.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/storage/meta_block_reader.hpp b/src/include/duckdb/storage/meta_block_reader.hpp
similarity index 82%
rename from src/include/storage/meta_block_reader.hpp
rename to src/include/duckdb/storage/meta_block_reader.hpp
index a33b0531031..ae312b8f5d9 100644
--- a/src/include/storage/meta_block_reader.hpp
+++ b/src/include/duckdb/storage/meta_block_reader.hpp
@@ -8,10 +8,10 @@
 
 #pragma once
 
-#include "common/common.hpp"
-#include "common/serializer.hpp"
-#include "storage/block.hpp"
-#include "storage/buffer_manager.hpp"
+#include "duckdb/common/common.hpp"
+#include "duckdb/common/serializer.hpp"
+#include "duckdb/storage/block.hpp"
+#include "duckdb/storage/buffer_manager.hpp"
 
 namespace duckdb {
 //! This struct is responsible for reading meta data from disk
diff --git a/src/include/storage/meta_block_writer.hpp b/src/include/duckdb/storage/meta_block_writer.hpp
similarity index 80%
rename from src/include/storage/meta_block_writer.hpp
rename to src/include/duckdb/storage/meta_block_writer.hpp
index baf711726cc..573b704e085 100644
--- a/src/include/storage/meta_block_writer.hpp
+++ b/src/include/duckdb/storage/meta_block_writer.hpp
@@ -8,10 +8,10 @@
 
 #pragma once
 
-#include "common/common.hpp"
-#include "common/serializer.hpp"
-#include "storage/block.hpp"
-#include "storage/block_manager.hpp"
+#include "duckdb/common/common.hpp"
+#include "duckdb/common/serializer.hpp"
+#include "duckdb/storage/block.hpp"
+#include "duckdb/storage/block_manager.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/storage/numeric_segment.hpp b/src/include/duckdb/storage/numeric_segment.hpp
similarity index 98%
rename from src/include/storage/numeric_segment.hpp
rename to src/include/duckdb/storage/numeric_segment.hpp
index 2724fdb6b0f..0d09ea38567 100644
--- a/src/include/storage/numeric_segment.hpp
+++ b/src/include/duckdb/storage/numeric_segment.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "storage/uncompressed_segment.hpp"
+#include "duckdb/storage/uncompressed_segment.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/storage/single_file_block_manager.hpp b/src/include/duckdb/storage/single_file_block_manager.hpp
similarity index 93%
rename from src/include/storage/single_file_block_manager.hpp
rename to src/include/duckdb/storage/single_file_block_manager.hpp
index d59f34ddf4b..fe9bc534f6d 100644
--- a/src/include/storage/single_file_block_manager.hpp
+++ b/src/include/duckdb/storage/single_file_block_manager.hpp
@@ -8,10 +8,10 @@
 
 #pragma once
 
-#include "common/common.hpp"
-#include "storage/block_manager.hpp"
-#include "storage/block.hpp"
-#include "common/file_system.hpp"
+#include "duckdb/common/common.hpp"
+#include "duckdb/storage/block_manager.hpp"
+#include "duckdb/storage/block.hpp"
+#include "duckdb/common/file_system.hpp"
 
 namespace duckdb {
 class FileBuffer;
diff --git a/src/include/storage/storage_info.hpp b/src/include/duckdb/storage/storage_info.hpp
similarity index 97%
rename from src/include/storage/storage_info.hpp
rename to src/include/duckdb/storage/storage_info.hpp
index 0a6d737a0cc..f27455c384f 100644
--- a/src/include/storage/storage_info.hpp
+++ b/src/include/duckdb/storage/storage_info.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "common/constants.hpp"
+#include "duckdb/common/constants.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/storage/storage_lock.hpp b/src/include/duckdb/storage/storage_lock.hpp
similarity index 96%
rename from src/include/storage/storage_lock.hpp
rename to src/include/duckdb/storage/storage_lock.hpp
index 43405eb1c59..2b9a2e2d3e4 100644
--- a/src/include/storage/storage_lock.hpp
+++ b/src/include/duckdb/storage/storage_lock.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "common/constants.hpp"
+#include "duckdb/common/constants.hpp"
 #include <atomic>
 #include <mutex>
 
diff --git a/src/include/storage/storage_manager.hpp b/src/include/duckdb/storage/storage_manager.hpp
similarity index 89%
rename from src/include/storage/storage_manager.hpp
rename to src/include/duckdb/storage/storage_manager.hpp
index 17e53de7894..29760ea959f 100644
--- a/src/include/storage/storage_manager.hpp
+++ b/src/include/duckdb/storage/storage_manager.hpp
@@ -8,10 +8,10 @@
 
 #pragma once
 
-#include "common/helper.hpp"
-#include "storage/buffer_manager.hpp"
-#include "storage/data_table.hpp"
-#include "storage/write_ahead_log.hpp"
+#include "duckdb/common/helper.hpp"
+#include "duckdb/storage/buffer_manager.hpp"
+#include "duckdb/storage/data_table.hpp"
+#include "duckdb/storage/write_ahead_log.hpp"
 
 namespace duckdb {
 class BlockManager;
diff --git a/src/include/storage/string_segment.hpp b/src/include/duckdb/storage/string_segment.hpp
similarity index 99%
rename from src/include/storage/string_segment.hpp
rename to src/include/duckdb/storage/string_segment.hpp
index 040c7fa62d1..8543dfd0361 100644
--- a/src/include/storage/string_segment.hpp
+++ b/src/include/duckdb/storage/string_segment.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "storage/uncompressed_segment.hpp"
+#include "duckdb/storage/uncompressed_segment.hpp"
 
 namespace duckdb {
 class OverflowStringWriter {
diff --git a/src/include/storage/table/append_state.hpp b/src/include/duckdb/storage/table/append_state.hpp
similarity index 85%
rename from src/include/storage/table/append_state.hpp
rename to src/include/duckdb/storage/table/append_state.hpp
index e0d1a52a9f6..f0a339cda16 100644
--- a/src/include/storage/table/append_state.hpp
+++ b/src/include/duckdb/storage/table/append_state.hpp
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "common/common.hpp"
-#include "storage/storage_lock.hpp"
-#include "storage/buffer/buffer_handle.hpp"
+#include "duckdb/common/common.hpp"
+#include "duckdb/storage/storage_lock.hpp"
+#include "duckdb/storage/buffer/buffer_handle.hpp"
 
 namespace duckdb {
 class TransientSegment;
diff --git a/src/include/storage/table/chunk_info.hpp b/src/include/duckdb/storage/table/chunk_info.hpp
similarity index 98%
rename from src/include/storage/table/chunk_info.hpp
rename to src/include/duckdb/storage/table/chunk_info.hpp
index e79faa731d2..e408053d5c5 100644
--- a/src/include/storage/table/chunk_info.hpp
+++ b/src/include/duckdb/storage/table/chunk_info.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "common/common.hpp"
+#include "duckdb/common/common.hpp"
 
 namespace duckdb {
 class Transaction;
diff --git a/src/include/storage/table/column_segment.hpp b/src/include/duckdb/storage/table/column_segment.hpp
similarity index 93%
rename from src/include/storage/table/column_segment.hpp
rename to src/include/duckdb/storage/table/column_segment.hpp
index 2aa0d13348b..7da85ec8da1 100644
--- a/src/include/storage/table/column_segment.hpp
+++ b/src/include/duckdb/storage/table/column_segment.hpp
@@ -8,10 +8,10 @@
 
 #pragma once
 
-#include "storage/block.hpp"
-#include "storage/table/segment_tree.hpp"
-#include "common/types.hpp"
-#include "storage/buffer_manager.hpp"
+#include "duckdb/storage/block.hpp"
+#include "duckdb/storage/table/segment_tree.hpp"
+#include "duckdb/common/types.hpp"
+#include "duckdb/storage/buffer_manager.hpp"
 
 namespace duckdb {
 class BlockManager;
diff --git a/src/include/storage/table/persistent_segment.hpp b/src/include/duckdb/storage/table/persistent_segment.hpp
similarity index 89%
rename from src/include/storage/table/persistent_segment.hpp
rename to src/include/duckdb/storage/table/persistent_segment.hpp
index 14eea9cedab..704e5c6f548 100644
--- a/src/include/storage/table/persistent_segment.hpp
+++ b/src/include/duckdb/storage/table/persistent_segment.hpp
@@ -8,10 +8,10 @@
 
 #pragma once
 
-#include "storage/table/column_segment.hpp"
-#include "storage/block.hpp"
-#include "storage/buffer_manager.hpp"
-#include "storage/uncompressed_segment.hpp"
+#include "duckdb/storage/table/column_segment.hpp"
+#include "duckdb/storage/block.hpp"
+#include "duckdb/storage/buffer_manager.hpp"
+#include "duckdb/storage/uncompressed_segment.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/storage/table/scan_state.hpp b/src/include/duckdb/storage/table/scan_state.hpp
similarity index 92%
rename from src/include/storage/table/scan_state.hpp
rename to src/include/duckdb/storage/table/scan_state.hpp
index 1a44821dab8..eefe723a3ed 100644
--- a/src/include/storage/table/scan_state.hpp
+++ b/src/include/duckdb/storage/table/scan_state.hpp
@@ -8,10 +8,10 @@
 
 #pragma once
 
-#include "common/common.hpp"
-#include "storage/table/column_segment.hpp"
-#include "storage/storage_lock.hpp"
-#include "storage/buffer/buffer_handle.hpp"
+#include "duckdb/common/common.hpp"
+#include "duckdb/storage/table/column_segment.hpp"
+#include "duckdb/storage/storage_lock.hpp"
+#include "duckdb/storage/buffer/buffer_handle.hpp"
 
 namespace duckdb {
 class LocalTableStorage;
diff --git a/src/include/storage/table/segment_base.hpp b/src/include/duckdb/storage/table/segment_base.hpp
similarity index 94%
rename from src/include/storage/table/segment_base.hpp
rename to src/include/duckdb/storage/table/segment_base.hpp
index c13a8e6001f..36863b7614a 100644
--- a/src/include/storage/table/segment_base.hpp
+++ b/src/include/duckdb/storage/table/segment_base.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "common/constants.hpp"
+#include "duckdb/common/constants.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/storage/table/segment_tree.hpp b/src/include/duckdb/storage/table/segment_tree.hpp
similarity index 89%
rename from src/include/storage/table/segment_tree.hpp
rename to src/include/duckdb/storage/table/segment_tree.hpp
index bd77a7d84e7..43219bec2f3 100644
--- a/src/include/storage/table/segment_tree.hpp
+++ b/src/include/duckdb/storage/table/segment_tree.hpp
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "common/constants.hpp"
-#include "storage/storage_lock.hpp"
-#include "storage/table/segment_base.hpp"
+#include "duckdb/common/constants.hpp"
+#include "duckdb/storage/storage_lock.hpp"
+#include "duckdb/storage/table/segment_base.hpp"
 
 #include <mutex>
 
diff --git a/src/include/storage/table/transient_segment.hpp b/src/include/duckdb/storage/table/transient_segment.hpp
similarity index 90%
rename from src/include/storage/table/transient_segment.hpp
rename to src/include/duckdb/storage/table/transient_segment.hpp
index 3e549adb7fb..b95f04d4874 100644
--- a/src/include/storage/table/transient_segment.hpp
+++ b/src/include/duckdb/storage/table/transient_segment.hpp
@@ -8,10 +8,10 @@
 
 #pragma once
 
-#include "storage/table/column_segment.hpp"
-#include "storage/block.hpp"
-#include "storage/buffer_manager.hpp"
-#include "storage/uncompressed_segment.hpp"
+#include "duckdb/storage/table/column_segment.hpp"
+#include "duckdb/storage/block.hpp"
+#include "duckdb/storage/buffer_manager.hpp"
+#include "duckdb/storage/uncompressed_segment.hpp"
 
 namespace duckdb {
 struct ColumnAppendState;
diff --git a/src/include/storage/table/version_manager.hpp b/src/include/duckdb/storage/table/version_manager.hpp
similarity index 89%
rename from src/include/storage/table/version_manager.hpp
rename to src/include/duckdb/storage/table/version_manager.hpp
index a5efcdded30..ed41b8df6ea 100644
--- a/src/include/storage/table/version_manager.hpp
+++ b/src/include/duckdb/storage/table/version_manager.hpp
@@ -8,12 +8,12 @@
 
 #pragma once
 
-#include "common/common.hpp"
-#include "common/unordered_map.hpp"
-#include "common/types/vector.hpp"
+#include "duckdb/common/common.hpp"
+#include "duckdb/common/unordered_map.hpp"
+#include "duckdb/common/types/vector.hpp"
 
-#include "storage/table/chunk_info.hpp"
-#include "storage/storage_lock.hpp"
+#include "duckdb/storage/table/chunk_info.hpp"
+#include "duckdb/storage/storage_lock.hpp"
 
 namespace duckdb {
 class DataTable;
diff --git a/src/include/storage/table_statistics.hpp b/src/include/duckdb/storage/table_statistics.hpp
similarity index 81%
rename from src/include/storage/table_statistics.hpp
rename to src/include/duckdb/storage/table_statistics.hpp
index 30a7a9eb8e8..8e910a775ec 100644
--- a/src/include/storage/table_statistics.hpp
+++ b/src/include/duckdb/storage/table_statistics.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "common/common.hpp"
-#include "common/types/data_chunk.hpp"
+#include "duckdb/common/common.hpp"
+#include "duckdb/common/types/data_chunk.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/storage/uncompressed_segment.hpp b/src/include/duckdb/storage/uncompressed_segment.hpp
similarity index 95%
rename from src/include/storage/uncompressed_segment.hpp
rename to src/include/duckdb/storage/uncompressed_segment.hpp
index 171998b6d30..91960f1f47b 100644
--- a/src/include/storage/uncompressed_segment.hpp
+++ b/src/include/duckdb/storage/uncompressed_segment.hpp
@@ -8,10 +8,10 @@
 
 #pragma once
 
-#include "storage/table/column_segment.hpp"
-#include "storage/block.hpp"
-#include "storage/storage_lock.hpp"
-#include "storage/table/scan_state.hpp"
+#include "duckdb/storage/table/column_segment.hpp"
+#include "duckdb/storage/block.hpp"
+#include "duckdb/storage/storage_lock.hpp"
+#include "duckdb/storage/table/scan_state.hpp"
 
 namespace duckdb {
 class BufferManager;
diff --git a/src/include/storage/write_ahead_log.hpp b/src/include/duckdb/storage/write_ahead_log.hpp
similarity index 88%
rename from src/include/storage/write_ahead_log.hpp
rename to src/include/duckdb/storage/write_ahead_log.hpp
index 7c4c393a684..1027bdecb7e 100644
--- a/src/include/storage/write_ahead_log.hpp
+++ b/src/include/duckdb/storage/write_ahead_log.hpp
@@ -8,11 +8,11 @@
 
 #pragma once
 
-#include "common/helper.hpp"
-#include "common/types/data_chunk.hpp"
-#include "common/enums/wal_type.hpp"
-#include "common/serializer/buffered_file_writer.hpp"
-#include "catalog/catalog_entry/sequence_catalog_entry.hpp"
+#include "duckdb/common/helper.hpp"
+#include "duckdb/common/types/data_chunk.hpp"
+#include "duckdb/common/enums/wal_type.hpp"
+#include "duckdb/common/serializer/buffered_file_writer.hpp"
+#include "duckdb/catalog/catalog_entry/sequence_catalog_entry.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/transaction/cleanup_state.hpp b/src/include/duckdb/transaction/cleanup_state.hpp
similarity index 93%
rename from src/include/transaction/cleanup_state.hpp
rename to src/include/duckdb/transaction/cleanup_state.hpp
index 2f6429ed95e..4f149498f27 100644
--- a/src/include/transaction/cleanup_state.hpp
+++ b/src/include/duckdb/transaction/cleanup_state.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "transaction/undo_buffer.hpp"
+#include "duckdb/transaction/undo_buffer.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/transaction/commit_state.hpp b/src/include/duckdb/transaction/commit_state.hpp
similarity index 95%
rename from src/include/transaction/commit_state.hpp
rename to src/include/duckdb/transaction/commit_state.hpp
index 3a536babaa8..1194257a4e2 100644
--- a/src/include/transaction/commit_state.hpp
+++ b/src/include/duckdb/transaction/commit_state.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "transaction/undo_buffer.hpp"
+#include "duckdb/transaction/undo_buffer.hpp"
 
 namespace duckdb {
 class DataChunk;
diff --git a/src/include/transaction/delete_info.hpp b/src/include/duckdb/transaction/delete_info.hpp
similarity index 91%
rename from src/include/transaction/delete_info.hpp
rename to src/include/duckdb/transaction/delete_info.hpp
index 0d6895ef87b..bd1a482e41b 100644
--- a/src/include/transaction/delete_info.hpp
+++ b/src/include/duckdb/transaction/delete_info.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "common/constants.hpp"
+#include "duckdb/common/constants.hpp"
 
 namespace duckdb {
 class ChunkInfo;
diff --git a/src/include/transaction/local_storage.hpp b/src/include/duckdb/transaction/local_storage.hpp
similarity index 94%
rename from src/include/transaction/local_storage.hpp
rename to src/include/duckdb/transaction/local_storage.hpp
index 81f379d83ef..50ed91d117d 100644
--- a/src/include/transaction/local_storage.hpp
+++ b/src/include/duckdb/transaction/local_storage.hpp
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "common/types/chunk_collection.hpp"
-#include "storage/table/scan_state.hpp"
-#include "storage/index.hpp"
+#include "duckdb/common/types/chunk_collection.hpp"
+#include "duckdb/storage/table/scan_state.hpp"
+#include "duckdb/storage/index.hpp"
 
 namespace duckdb {
 class DataTable;
diff --git a/src/include/transaction/rollback_state.hpp b/src/include/duckdb/transaction/rollback_state.hpp
similarity index 91%
rename from src/include/transaction/rollback_state.hpp
rename to src/include/duckdb/transaction/rollback_state.hpp
index 5c57643e948..0dc663eeff1 100644
--- a/src/include/transaction/rollback_state.hpp
+++ b/src/include/duckdb/transaction/rollback_state.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "transaction/undo_buffer.hpp"
+#include "duckdb/transaction/undo_buffer.hpp"
 
 namespace duckdb {
 class DataChunk;
diff --git a/src/include/transaction/transaction.hpp b/src/include/duckdb/transaction/transaction.hpp
similarity index 91%
rename from src/include/transaction/transaction.hpp
rename to src/include/duckdb/transaction/transaction.hpp
index 1f9ea2c6277..916cbe43e2c 100644
--- a/src/include/transaction/transaction.hpp
+++ b/src/include/duckdb/transaction/transaction.hpp
@@ -8,11 +8,11 @@
 
 #pragma once
 
-#include "catalog/catalog_entry/sequence_catalog_entry.hpp"
-#include "common/types/data_chunk.hpp"
-#include "common/unordered_map.hpp"
-#include "transaction/undo_buffer.hpp"
-#include "transaction/local_storage.hpp"
+#include "duckdb/catalog/catalog_entry/sequence_catalog_entry.hpp"
+#include "duckdb/common/types/data_chunk.hpp"
+#include "duckdb/common/unordered_map.hpp"
+#include "duckdb/transaction/undo_buffer.hpp"
+#include "duckdb/transaction/local_storage.hpp"
 
 namespace duckdb {
 class SequenceCatalogEntry;
diff --git a/src/include/transaction/transaction_context.hpp b/src/include/duckdb/transaction/transaction_context.hpp
similarity index 97%
rename from src/include/transaction/transaction_context.hpp
rename to src/include/duckdb/transaction/transaction_context.hpp
index 11700f6dd04..c5e1bfd3a09 100644
--- a/src/include/transaction/transaction_context.hpp
+++ b/src/include/duckdb/transaction/transaction_context.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "common/common.hpp"
+#include "duckdb/common/common.hpp"
 
 namespace duckdb {
 
diff --git a/src/include/transaction/transaction_manager.hpp b/src/include/duckdb/transaction/transaction_manager.hpp
similarity index 96%
rename from src/include/transaction/transaction_manager.hpp
rename to src/include/duckdb/transaction/transaction_manager.hpp
index dacf153f71c..81522dca514 100644
--- a/src/include/transaction/transaction_manager.hpp
+++ b/src/include/duckdb/transaction/transaction_manager.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "catalog/catalog_set.hpp"
-#include "common/common.hpp"
+#include "duckdb/catalog/catalog_set.hpp"
+#include "duckdb/common/common.hpp"
 
 #include <atomic>
 #include <memory>
diff --git a/src/include/transaction/undo_buffer.hpp b/src/include/duckdb/transaction/undo_buffer.hpp
similarity index 94%
rename from src/include/transaction/undo_buffer.hpp
rename to src/include/duckdb/transaction/undo_buffer.hpp
index b13ddddc9b0..4702557f6f8 100644
--- a/src/include/transaction/undo_buffer.hpp
+++ b/src/include/duckdb/transaction/undo_buffer.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "common/common.hpp"
-#include "common/enums/undo_flags.hpp"
+#include "duckdb/common/common.hpp"
+#include "duckdb/common/enums/undo_flags.hpp"
 
 #include <memory>
 #include <vector>
diff --git a/src/include/transaction/update_info.hpp b/src/include/duckdb/transaction/update_info.hpp
similarity index 95%
rename from src/include/transaction/update_info.hpp
rename to src/include/duckdb/transaction/update_info.hpp
index a1b5b9d5d6a..539bcc8dd31 100644
--- a/src/include/transaction/update_info.hpp
+++ b/src/include/duckdb/transaction/update_info.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "common/constants.hpp"
-#include "transaction/transaction.hpp"
+#include "duckdb/common/constants.hpp"
+#include "duckdb/transaction/transaction.hpp"
 
 namespace duckdb {
 class ColumnData;
diff --git a/src/include/execution/operator/list.hpp b/src/include/execution/operator/list.hpp
deleted file mode 100644
index a8090666151..00000000000
--- a/src/include/execution/operator/list.hpp
+++ /dev/null
@@ -1,34 +0,0 @@
-#include "execution/operator/aggregate/physical_hash_aggregate.hpp"
-#include "execution/operator/aggregate/physical_simple_aggregate.hpp"
-#include "execution/operator/aggregate/physical_window.hpp"
-#include "execution/operator/filter/physical_filter.hpp"
-#include "execution/operator/helper/physical_execute.hpp"
-#include "execution/operator/helper/physical_limit.hpp"
-#include "execution/operator/helper/physical_prune_columns.hpp"
-#include "execution/operator/join/physical_blockwise_nl_join.hpp"
-#include "execution/operator/join/physical_comparison_join.hpp"
-#include "execution/operator/join/physical_cross_product.hpp"
-#include "execution/operator/join/physical_delim_join.hpp"
-#include "execution/operator/join/physical_hash_join.hpp"
-#include "execution/operator/join/physical_join.hpp"
-#include "execution/operator/join/physical_nested_loop_join.hpp"
-#include "execution/operator/join/physical_piecewise_merge_join.hpp"
-#include "execution/operator/order/physical_order.hpp"
-#include "execution/operator/order/physical_top_n.hpp"
-#include "execution/operator/persistent/buffered_csv_reader.hpp"
-#include "execution/operator/persistent/physical_copy_from_file.hpp"
-#include "execution/operator/persistent/physical_copy_to_file.hpp"
-#include "execution/operator/persistent/physical_delete.hpp"
-#include "execution/operator/persistent/physical_insert.hpp"
-#include "execution/operator/persistent/physical_update.hpp"
-#include "execution/operator/projection/physical_projection.hpp"
-#include "execution/operator/scan/physical_chunk_scan.hpp"
-#include "execution/operator/scan/physical_dummy_scan.hpp"
-#include "execution/operator/scan/physical_empty_result.hpp"
-#include "execution/operator/scan/physical_expression_scan.hpp"
-#include "execution/operator/scan/physical_index_scan.hpp"
-#include "execution/operator/scan/physical_table_function.hpp"
-#include "execution/operator/scan/physical_table_scan.hpp"
-#include "execution/operator/schema/physical_create_index.hpp"
-#include "execution/operator/schema/physical_create_table.hpp"
-#include "execution/operator/set/physical_union.hpp"
diff --git a/src/include/function/table/list.hpp b/src/include/function/table/list.hpp
deleted file mode 100644
index 0ec9d9841ba..00000000000
--- a/src/include/function/table/list.hpp
+++ /dev/null
@@ -1 +0,0 @@
-#include "function/table/sqlite_functions.hpp"
diff --git a/src/include/optimizer/rule/list.hpp b/src/include/optimizer/rule/list.hpp
deleted file mode 100644
index 84d1cf4c075..00000000000
--- a/src/include/optimizer/rule/list.hpp
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "optimizer/rule/arithmetic_simplification.hpp"
-#include "optimizer/rule/case_simplification.hpp"
-#include "optimizer/rule/comparison_simplification.hpp"
-#include "optimizer/rule/conjunction_simplification.hpp"
-#include "optimizer/rule/constant_folding.hpp"
-#include "optimizer/rule/distributivity.hpp"
-#include "optimizer/rule/move_constants.hpp"
diff --git a/src/include/parser/constraints/list.hpp b/src/include/parser/constraints/list.hpp
deleted file mode 100644
index 7997a540abe..00000000000
--- a/src/include/parser/constraints/list.hpp
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "parser/constraints/check_constraint.hpp"
-#include "parser/constraints/not_null_constraint.hpp"
-#include "parser/constraints/unique_constraint.hpp"
diff --git a/src/include/parser/expression/list.hpp b/src/include/parser/expression/list.hpp
deleted file mode 100644
index 3f344739f3a..00000000000
--- a/src/include/parser/expression/list.hpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include "parser/expression/bound_expression.hpp"
-#include "parser/expression/case_expression.hpp"
-#include "parser/expression/cast_expression.hpp"
-#include "parser/expression/columnref_expression.hpp"
-#include "parser/expression/comparison_expression.hpp"
-#include "parser/expression/conjunction_expression.hpp"
-#include "parser/expression/constant_expression.hpp"
-#include "parser/expression/default_expression.hpp"
-#include "parser/expression/function_expression.hpp"
-#include "parser/expression/operator_expression.hpp"
-#include "parser/expression/parameter_expression.hpp"
-#include "parser/expression/star_expression.hpp"
-#include "parser/expression/subquery_expression.hpp"
-#include "parser/expression/window_expression.hpp"
diff --git a/src/include/parser/statement/list.hpp b/src/include/parser/statement/list.hpp
deleted file mode 100644
index 146e9ff0f14..00000000000
--- a/src/include/parser/statement/list.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-#include "parser/statement/alter_table_statement.hpp"
-#include "parser/statement/copy_statement.hpp"
-#include "parser/statement/create_index_statement.hpp"
-#include "parser/statement/create_schema_statement.hpp"
-#include "parser/statement/create_sequence_statement.hpp"
-#include "parser/statement/create_table_statement.hpp"
-#include "parser/statement/create_view_statement.hpp"
-#include "parser/statement/deallocate_statement.hpp"
-#include "parser/statement/delete_statement.hpp"
-#include "parser/statement/drop_statement.hpp"
-#include "parser/statement/execute_statement.hpp"
-#include "parser/statement/explain_statement.hpp"
-#include "parser/statement/insert_statement.hpp"
-#include "parser/statement/prepare_statement.hpp"
-#include "parser/statement/select_statement.hpp"
-#include "parser/statement/transaction_statement.hpp"
-#include "parser/statement/update_statement.hpp"
diff --git a/src/include/parser/tableref/list.hpp b/src/include/parser/tableref/list.hpp
deleted file mode 100644
index a8e8c3db6ce..00000000000
--- a/src/include/parser/tableref/list.hpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "parser/tableref/basetableref.hpp"
-#include "parser/tableref/crossproductref.hpp"
-#include "parser/tableref/emptytableref.hpp"
-#include "parser/tableref/joinref.hpp"
-#include "parser/tableref/subqueryref.hpp"
-#include "parser/tableref/table_function_ref.hpp"
diff --git a/src/include/planner/constraints/list.hpp b/src/include/planner/constraints/list.hpp
deleted file mode 100644
index 5f2cd1f50b1..00000000000
--- a/src/include/planner/constraints/list.hpp
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "planner/constraints/bound_check_constraint.hpp"
-#include "planner/constraints/bound_not_null_constraint.hpp"
-#include "planner/constraints/bound_unique_constraint.hpp"
diff --git a/src/include/planner/expression/list.hpp b/src/include/planner/expression/list.hpp
deleted file mode 100644
index cec39098c2d..00000000000
--- a/src/include/planner/expression/list.hpp
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "planner/expression/bound_aggregate_expression.hpp"
-#include "planner/expression/bound_case_expression.hpp"
-#include "planner/expression/bound_cast_expression.hpp"
-#include "planner/expression/bound_columnref_expression.hpp"
-#include "planner/expression/bound_comparison_expression.hpp"
-#include "planner/expression/bound_conjunction_expression.hpp"
-#include "planner/expression/bound_constant_expression.hpp"
-#include "planner/expression/bound_default_expression.hpp"
-#include "planner/expression/bound_function_expression.hpp"
-#include "planner/expression/bound_operator_expression.hpp"
-#include "planner/expression/bound_parameter_expression.hpp"
-#include "planner/expression/bound_reference_expression.hpp"
-#include "planner/expression/bound_subquery_expression.hpp"
-#include "planner/expression/bound_window_expression.hpp"
-#include "planner/expression/common_subexpression.hpp"
diff --git a/src/include/planner/operator/list.hpp b/src/include/planner/operator/list.hpp
deleted file mode 100644
index 67106fbe927..00000000000
--- a/src/include/planner/operator/list.hpp
+++ /dev/null
@@ -1,33 +0,0 @@
-#include "planner/operator/logical_aggregate.hpp"
-#include "planner/operator/logical_any_join.hpp"
-#include "planner/operator/logical_chunk_get.hpp"
-#include "planner/operator/logical_comparison_join.hpp"
-#include "planner/operator/logical_copy_from_file.hpp"
-#include "planner/operator/logical_copy_to_file.hpp"
-#include "planner/operator/logical_create_index.hpp"
-#include "planner/operator/logical_create_table.hpp"
-#include "planner/operator/logical_cross_product.hpp"
-#include "planner/operator/logical_delete.hpp"
-#include "planner/operator/logical_delim_get.hpp"
-#include "planner/operator/logical_delim_join.hpp"
-#include "planner/operator/logical_distinct.hpp"
-#include "planner/operator/logical_empty_result.hpp"
-#include "planner/operator/logical_execute.hpp"
-#include "planner/operator/logical_explain.hpp"
-#include "planner/operator/logical_expression_get.hpp"
-#include "planner/operator/logical_filter.hpp"
-#include "planner/operator/logical_get.hpp"
-#include "planner/operator/logical_index_scan.hpp"
-#include "planner/operator/logical_insert.hpp"
-#include "planner/operator/logical_join.hpp"
-#include "planner/operator/logical_limit.hpp"
-#include "planner/operator/logical_order.hpp"
-#include "planner/operator/logical_prepare.hpp"
-#include "planner/operator/logical_projection.hpp"
-#include "planner/operator/logical_prune_columns.hpp"
-#include "planner/operator/logical_set_operation.hpp"
-#include "planner/operator/logical_subquery.hpp"
-#include "planner/operator/logical_table_function.hpp"
-#include "planner/operator/logical_top_n.hpp"
-#include "planner/operator/logical_update.hpp"
-#include "planner/operator/logical_window.hpp"
diff --git a/src/include/planner/statement/list.hpp b/src/include/planner/statement/list.hpp
deleted file mode 100644
index 5f3198d2c4a..00000000000
--- a/src/include/planner/statement/list.hpp
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "planner/statement/bound_copy_statement.hpp"
-#include "planner/statement/bound_create_index_statement.hpp"
-#include "planner/statement/bound_create_table_statement.hpp"
-#include "planner/statement/bound_delete_statement.hpp"
-#include "planner/statement/bound_execute_statement.hpp"
-#include "planner/statement/bound_insert_statement.hpp"
-#include "planner/statement/bound_select_statement.hpp"
-#include "planner/statement/bound_update_statement.hpp"
diff --git a/src/include/planner/tableref/list.hpp b/src/include/planner/tableref/list.hpp
deleted file mode 100644
index df3f1721e24..00000000000
--- a/src/include/planner/tableref/list.hpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "planner/tableref/bound_basetableref.hpp"
-#include "planner/tableref/bound_crossproductref.hpp"
-#include "planner/tableref/bound_dummytableref.hpp"
-#include "planner/tableref/bound_joinref.hpp"
-#include "planner/tableref/bound_subqueryref.hpp"
-#include "planner/tableref/bound_table_function.hpp"
diff --git a/src/main/appender.cpp b/src/main/appender.cpp
index 4e187e8989d..0dfb1221dbc 100644
--- a/src/main/appender.cpp
+++ b/src/main/appender.cpp
@@ -1,10 +1,10 @@
-#include "main/appender.hpp"
+#include "duckdb/main/appender.hpp"
 
-#include "catalog/catalog_entry/table_catalog_entry.hpp"
-#include "common/exception.hpp"
-#include "main/connection.hpp"
-#include "main/database.hpp"
-#include "storage/data_table.hpp"
+#include "duckdb/catalog/catalog_entry/table_catalog_entry.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/main/connection.hpp"
+#include "duckdb/main/database.hpp"
+#include "duckdb/storage/data_table.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/main/client_context.cpp b/src/main/client_context.cpp
index 48901e69af3..930ecbe13e0 100644
--- a/src/main/client_context.cpp
+++ b/src/main/client_context.cpp
@@ -1,23 +1,23 @@
-#include "main/client_context.hpp"
-
-#include "common/serializer/buffered_deserializer.hpp"
-#include "common/serializer/buffered_serializer.hpp"
-#include "execution/physical_plan_generator.hpp"
-#include "main/database.hpp"
-#include "main/materialized_query_result.hpp"
-#include "main/query_result.hpp"
-#include "main/stream_query_result.hpp"
-#include "optimizer/optimizer.hpp"
-#include "parser/parser.hpp"
-#include "parser/expression/constant_expression.hpp"
-#include "parser/statement/execute_statement.hpp"
-#include "parser/statement/explain_statement.hpp"
-#include "parser/statement/prepare_statement.hpp"
-#include "planner/operator/logical_execute.hpp"
-#include "planner/planner.hpp"
-#include "transaction/transaction_manager.hpp"
-#include "transaction/transaction.hpp"
-#include "parser/statement/deallocate_statement.hpp"
+#include "duckdb/main/client_context.hpp"
+
+#include "duckdb/common/serializer/buffered_deserializer.hpp"
+#include "duckdb/common/serializer/buffered_serializer.hpp"
+#include "duckdb/execution/physical_plan_generator.hpp"
+#include "duckdb/main/database.hpp"
+#include "duckdb/main/materialized_query_result.hpp"
+#include "duckdb/main/query_result.hpp"
+#include "duckdb/main/stream_query_result.hpp"
+#include "duckdb/optimizer/optimizer.hpp"
+#include "duckdb/parser/parser.hpp"
+#include "duckdb/parser/expression/constant_expression.hpp"
+#include "duckdb/parser/statement/execute_statement.hpp"
+#include "duckdb/parser/statement/explain_statement.hpp"
+#include "duckdb/parser/statement/prepare_statement.hpp"
+#include "duckdb/planner/operator/logical_execute.hpp"
+#include "duckdb/planner/planner.hpp"
+#include "duckdb/transaction/transaction_manager.hpp"
+#include "duckdb/transaction/transaction.hpp"
+#include "duckdb/parser/statement/deallocate_statement.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/main/connection.cpp b/src/main/connection.cpp
index 3fb93de8526..a3ec4abeb92 100644
--- a/src/main/connection.cpp
+++ b/src/main/connection.cpp
@@ -1,9 +1,9 @@
-#include "main/connection.hpp"
+#include "duckdb/main/connection.hpp"
 
-#include "main/client_context.hpp"
-#include "main/connection_manager.hpp"
-#include "main/database.hpp"
-#include "main/appender.hpp"
+#include "duckdb/main/client_context.hpp"
+#include "duckdb/main/connection_manager.hpp"
+#include "duckdb/main/database.hpp"
+#include "duckdb/main/appender.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/main/connection_manager.cpp b/src/main/connection_manager.cpp
index 6169a0cdaff..4656b063d8b 100644
--- a/src/main/connection_manager.cpp
+++ b/src/main/connection_manager.cpp
@@ -1,7 +1,7 @@
-#include "main/connection_manager.hpp"
+#include "duckdb/main/connection_manager.hpp"
 
-#include "main/client_context.hpp"
-#include "main/connection.hpp"
+#include "duckdb/main/client_context.hpp"
+#include "duckdb/main/connection.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/main/database.cpp b/src/main/database.cpp
index d5fb370a680..fe56f4aac3a 100644
--- a/src/main/database.cpp
+++ b/src/main/database.cpp
@@ -1,10 +1,10 @@
-#include "main/database.hpp"
+#include "duckdb/main/database.hpp"
 
-#include "catalog/catalog.hpp"
-#include "common/file_system.hpp"
-#include "main/connection_manager.hpp"
-#include "storage/storage_manager.hpp"
-#include "transaction/transaction_manager.hpp"
+#include "duckdb/catalog/catalog.hpp"
+#include "duckdb/common/file_system.hpp"
+#include "duckdb/main/connection_manager.hpp"
+#include "duckdb/storage/storage_manager.hpp"
+#include "duckdb/transaction/transaction_manager.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/main/duckdb-c.cpp b/src/main/duckdb-c.cpp
index 57a19fe5c4b..7234b1521ec 100644
--- a/src/main/duckdb-c.cpp
+++ b/src/main/duckdb-c.cpp
@@ -1,7 +1,7 @@
-#include "common/types/date.hpp"
-#include "common/types/time.hpp"
-#include "common/types/timestamp.hpp"
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/common/types/date.hpp"
+#include "duckdb/common/types/time.hpp"
+#include "duckdb/common/types/timestamp.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 #include "duckdb.h"
 #include "duckdb.hpp"
 
diff --git a/src/main/materialized_query_result.cpp b/src/main/materialized_query_result.cpp
index 28ab2e98c78..ba211915ab6 100644
--- a/src/main/materialized_query_result.cpp
+++ b/src/main/materialized_query_result.cpp
@@ -1,4 +1,4 @@
-#include "main/materialized_query_result.hpp"
+#include "duckdb/main/materialized_query_result.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/main/prepared_statement.cpp b/src/main/prepared_statement.cpp
index 84eeedcfc4b..23b0b45592f 100644
--- a/src/main/prepared_statement.cpp
+++ b/src/main/prepared_statement.cpp
@@ -1,6 +1,6 @@
-#include "main/prepared_statement.hpp"
-#include "common/exception.hpp"
-#include "main/client_context.hpp"
+#include "duckdb/main/prepared_statement.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/main/client_context.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/main/query_profiler.cpp b/src/main/query_profiler.cpp
index dfa61d63755..cc93a3c89c5 100644
--- a/src/main/query_profiler.cpp
+++ b/src/main/query_profiler.cpp
@@ -1,8 +1,8 @@
-#include "main/query_profiler.hpp"
+#include "duckdb/main/query_profiler.hpp"
 
-#include "common/fstream.hpp"
-#include "common/printer.hpp"
-#include "execution/physical_operator.hpp"
+#include "duckdb/common/fstream.hpp"
+#include "duckdb/common/printer.hpp"
+#include "duckdb/execution/physical_operator.hpp"
 
 #include <iostream>
 
diff --git a/src/main/query_result.cpp b/src/main/query_result.cpp
index 3e59e83298f..91f18420c28 100644
--- a/src/main/query_result.cpp
+++ b/src/main/query_result.cpp
@@ -1,6 +1,6 @@
-#include "main/query_result.hpp"
+#include "duckdb/main/query_result.hpp"
 
-#include "main/client_context.hpp"
+#include "duckdb/main/client_context.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/main/stream_query_result.cpp b/src/main/stream_query_result.cpp
index 91c29b9fae1..9083b2c432f 100644
--- a/src/main/stream_query_result.cpp
+++ b/src/main/stream_query_result.cpp
@@ -1,7 +1,7 @@
-#include "main/stream_query_result.hpp"
+#include "duckdb/main/stream_query_result.hpp"
 
-#include "main/client_context.hpp"
-#include "main/materialized_query_result.hpp"
+#include "duckdb/main/client_context.hpp"
+#include "duckdb/main/materialized_query_result.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/optimizer/ca_optimizer.cpp b/src/optimizer/ca_optimizer.cpp
index 247b860d348..8e34ef09984 100644
--- a/src/optimizer/ca_optimizer.cpp
+++ b/src/optimizer/ca_optimizer.cpp
@@ -1,8 +1,8 @@
-#include "optimizer/ca_optimizer.hpp"
+#include "duckdb/optimizer/ca_optimizer.hpp"
 
-#include "planner/expression_iterator.hpp"
-#include "planner/operator/logical_filter.hpp"
-#include "planner/operator/logical_projection.hpp"
+#include "duckdb/planner/expression_iterator.hpp"
+#include "duckdb/planner/operator/logical_filter.hpp"
+#include "duckdb/planner/operator/logical_projection.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/optimizer/cse_optimizer.cpp b/src/optimizer/cse_optimizer.cpp
index 779f4d67804..1b55ba6511f 100644
--- a/src/optimizer/cse_optimizer.cpp
+++ b/src/optimizer/cse_optimizer.cpp
@@ -1,9 +1,9 @@
-#include "optimizer/cse_optimizer.hpp"
+#include "duckdb/optimizer/cse_optimizer.hpp"
 
-#include "planner/expression/common_subexpression.hpp"
-#include "planner/expression_iterator.hpp"
-#include "planner/operator/logical_filter.hpp"
-#include "planner/operator/logical_projection.hpp"
+#include "duckdb/planner/expression/common_subexpression.hpp"
+#include "duckdb/planner/expression_iterator.hpp"
+#include "duckdb/planner/operator/logical_filter.hpp"
+#include "duckdb/planner/operator/logical_projection.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/optimizer/expression_rewriter.cpp b/src/optimizer/expression_rewriter.cpp
index cc8b29316a1..3ffd678714e 100644
--- a/src/optimizer/expression_rewriter.cpp
+++ b/src/optimizer/expression_rewriter.cpp
@@ -1,8 +1,8 @@
-#include "optimizer/expression_rewriter.hpp"
+#include "duckdb/optimizer/expression_rewriter.hpp"
 
-#include "common/exception.hpp"
-#include "planner/expression_iterator.hpp"
-#include "planner/operator/logical_filter.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/planner/expression_iterator.hpp"
+#include "duckdb/planner/operator/logical_filter.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/optimizer/filter_combiner.cpp b/src/optimizer/filter_combiner.cpp
index 9e176fa5eeb..1694b6ed7f8 100644
--- a/src/optimizer/filter_combiner.cpp
+++ b/src/optimizer/filter_combiner.cpp
@@ -1,10 +1,10 @@
-#include "optimizer/filter_combiner.hpp"
+#include "duckdb/optimizer/filter_combiner.hpp"
 
-#include "execution/expression_executor.hpp"
-#include "planner/expression/bound_comparison_expression.hpp"
-#include "planner/expression/bound_constant_expression.hpp"
-#include "planner/operator/logical_empty_result.hpp"
-#include "planner/operator/logical_filter.hpp"
+#include "duckdb/execution/expression_executor.hpp"
+#include "duckdb/planner/expression/bound_comparison_expression.hpp"
+#include "duckdb/planner/expression/bound_constant_expression.hpp"
+#include "duckdb/planner/operator/logical_empty_result.hpp"
+#include "duckdb/planner/operator/logical_filter.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/optimizer/filter_pushdown.cpp b/src/optimizer/filter_pushdown.cpp
index a8dff76e8f2..2ba88a62d29 100644
--- a/src/optimizer/filter_pushdown.cpp
+++ b/src/optimizer/filter_pushdown.cpp
@@ -1,8 +1,8 @@
-#include "optimizer/filter_pushdown.hpp"
+#include "duckdb/optimizer/filter_pushdown.hpp"
 
-#include "optimizer/filter_combiner.hpp"
-#include "planner/operator/logical_filter.hpp"
-#include "planner/operator/logical_join.hpp"
+#include "duckdb/optimizer/filter_combiner.hpp"
+#include "duckdb/planner/operator/logical_filter.hpp"
+#include "duckdb/planner/operator/logical_join.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/optimizer/index_scan.cpp b/src/optimizer/index_scan.cpp
index 34215e96aef..1b3e621c206 100644
--- a/src/optimizer/index_scan.cpp
+++ b/src/optimizer/index_scan.cpp
@@ -1,17 +1,17 @@
-#include "optimizer/index_scan.hpp"
-#include "optimizer/matcher/expression_matcher.hpp"
+#include "duckdb/optimizer/index_scan.hpp"
+#include "duckdb/optimizer/matcher/expression_matcher.hpp"
 
-#include "parser/expression/comparison_expression.hpp"
+#include "duckdb/parser/expression/comparison_expression.hpp"
 
-#include "planner/expression/bound_columnref_expression.hpp"
-#include "planner/expression/bound_comparison_expression.hpp"
-#include "planner/expression/bound_constant_expression.hpp"
-#include "planner/expression_iterator.hpp"
-#include "planner/operator/logical_filter.hpp"
-#include "planner/operator/logical_get.hpp"
-#include "planner/operator/logical_index_scan.hpp"
+#include "duckdb/planner/expression/bound_columnref_expression.hpp"
+#include "duckdb/planner/expression/bound_comparison_expression.hpp"
+#include "duckdb/planner/expression/bound_constant_expression.hpp"
+#include "duckdb/planner/expression_iterator.hpp"
+#include "duckdb/planner/operator/logical_filter.hpp"
+#include "duckdb/planner/operator/logical_get.hpp"
+#include "duckdb/planner/operator/logical_index_scan.hpp"
 
-#include "storage/data_table.hpp"
+#include "duckdb/storage/data_table.hpp"
 using namespace duckdb;
 using namespace std;
 
diff --git a/src/optimizer/join_order/query_graph.cpp b/src/optimizer/join_order/query_graph.cpp
index 1ec98e42fc4..2fefc4c8934 100644
--- a/src/optimizer/join_order/query_graph.cpp
+++ b/src/optimizer/join_order/query_graph.cpp
@@ -1,7 +1,7 @@
-#include "optimizer/join_order/query_graph.hpp"
+#include "duckdb/optimizer/join_order/query_graph.hpp"
 
-#include "common/printer.hpp"
-#include "common/string_util.hpp"
+#include "duckdb/common/printer.hpp"
+#include "duckdb/common/string_util.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/optimizer/join_order/relation.cpp b/src/optimizer/join_order/relation.cpp
index e9df4356175..df4d280e16e 100644
--- a/src/optimizer/join_order/relation.cpp
+++ b/src/optimizer/join_order/relation.cpp
@@ -1,4 +1,4 @@
-#include "optimizer/join_order/relation.hpp"
+#include "duckdb/optimizer/join_order/relation.hpp"
 
 #include <algorithm>
 
diff --git a/src/optimizer/join_order_optimizer.cpp b/src/optimizer/join_order_optimizer.cpp
index 1e810d825a5..aacda31ec4d 100644
--- a/src/optimizer/join_order_optimizer.cpp
+++ b/src/optimizer/join_order_optimizer.cpp
@@ -1,8 +1,8 @@
-#include "optimizer/join_order_optimizer.hpp"
+#include "duckdb/optimizer/join_order_optimizer.hpp"
 
-#include "planner/expression/list.hpp"
-#include "planner/expression_iterator.hpp"
-#include "planner/operator/list.hpp"
+#include "duckdb/planner/expression/list.hpp"
+#include "duckdb/planner/expression_iterator.hpp"
+#include "duckdb/planner/operator/list.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/optimizer/matcher/expression_matcher.cpp b/src/optimizer/matcher/expression_matcher.cpp
index 276cb70126c..cfbc99a718b 100644
--- a/src/optimizer/matcher/expression_matcher.cpp
+++ b/src/optimizer/matcher/expression_matcher.cpp
@@ -1,6 +1,6 @@
-#include "optimizer/matcher/expression_matcher.hpp"
+#include "duckdb/optimizer/matcher/expression_matcher.hpp"
 
-#include "planner/expression/list.hpp"
+#include "duckdb/planner/expression/list.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/optimizer/optimizer.cpp b/src/optimizer/optimizer.cpp
index 9d734d3e572..8c2ad5a5afd 100644
--- a/src/optimizer/optimizer.cpp
+++ b/src/optimizer/optimizer.cpp
@@ -1,20 +1,20 @@
-#include "optimizer/optimizer.hpp"
-
-#include "execution/expression_executor.hpp"
-#include "main/client_context.hpp"
-#include "optimizer/ca_optimizer.hpp"
-#include "optimizer/cse_optimizer.hpp"
-#include "optimizer/filter_pushdown.hpp"
-#include "optimizer/index_scan.hpp"
-#include "optimizer/join_order_optimizer.hpp"
-#include "optimizer/regex_range_filter.hpp"
-#include "optimizer/rule/list.hpp"
-#include "optimizer/topn_optimizer.hpp"
-#include "planner/binder.hpp"
-#include "planner/expression/bound_columnref_expression.hpp"
-#include "planner/expression/bound_operator_expression.hpp"
-#include "planner/expression/common_subexpression.hpp"
-#include "planner/operator/list.hpp"
+#include "duckdb/optimizer/optimizer.hpp"
+
+#include "duckdb/execution/expression_executor.hpp"
+#include "duckdb/main/client_context.hpp"
+#include "duckdb/optimizer/ca_optimizer.hpp"
+#include "duckdb/optimizer/cse_optimizer.hpp"
+#include "duckdb/optimizer/filter_pushdown.hpp"
+#include "duckdb/optimizer/index_scan.hpp"
+#include "duckdb/optimizer/join_order_optimizer.hpp"
+#include "duckdb/optimizer/regex_range_filter.hpp"
+#include "duckdb/optimizer/rule/list.hpp"
+#include "duckdb/optimizer/topn_optimizer.hpp"
+#include "duckdb/planner/binder.hpp"
+#include "duckdb/planner/expression/bound_columnref_expression.hpp"
+#include "duckdb/planner/expression/bound_operator_expression.hpp"
+#include "duckdb/planner/expression/common_subexpression.hpp"
+#include "duckdb/planner/operator/list.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/optimizer/pushdown/pushdown_aggregate.cpp b/src/optimizer/pushdown/pushdown_aggregate.cpp
index 1706bb77ee8..7f6a7d0ca1f 100644
--- a/src/optimizer/pushdown/pushdown_aggregate.cpp
+++ b/src/optimizer/pushdown/pushdown_aggregate.cpp
@@ -1,9 +1,9 @@
-#include "optimizer/filter_pushdown.hpp"
-#include "planner/expression/bound_columnref_expression.hpp"
-#include "planner/expression_iterator.hpp"
-#include "planner/operator/logical_aggregate.hpp"
-#include "planner/operator/logical_empty_result.hpp"
-#include "planner/operator/logical_join.hpp"
+#include "duckdb/optimizer/filter_pushdown.hpp"
+#include "duckdb/planner/expression/bound_columnref_expression.hpp"
+#include "duckdb/planner/expression_iterator.hpp"
+#include "duckdb/planner/operator/logical_aggregate.hpp"
+#include "duckdb/planner/operator/logical_empty_result.hpp"
+#include "duckdb/planner/operator/logical_join.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/optimizer/pushdown/pushdown_cross_product.cpp b/src/optimizer/pushdown/pushdown_cross_product.cpp
index dc1cd831b09..99c253ad366 100644
--- a/src/optimizer/pushdown/pushdown_cross_product.cpp
+++ b/src/optimizer/pushdown/pushdown_cross_product.cpp
@@ -1,6 +1,6 @@
-#include "optimizer/filter_pushdown.hpp"
-#include "planner/operator/logical_comparison_join.hpp"
-#include "planner/operator/logical_cross_product.hpp"
+#include "duckdb/optimizer/filter_pushdown.hpp"
+#include "duckdb/planner/operator/logical_comparison_join.hpp"
+#include "duckdb/planner/operator/logical_cross_product.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/optimizer/pushdown/pushdown_filter.cpp b/src/optimizer/pushdown/pushdown_filter.cpp
index ebd7c570738..fd73a96c77a 100644
--- a/src/optimizer/pushdown/pushdown_filter.cpp
+++ b/src/optimizer/pushdown/pushdown_filter.cpp
@@ -1,6 +1,6 @@
-#include "optimizer/filter_pushdown.hpp"
-#include "planner/operator/logical_empty_result.hpp"
-#include "planner/operator/logical_filter.hpp"
+#include "duckdb/optimizer/filter_pushdown.hpp"
+#include "duckdb/planner/operator/logical_empty_result.hpp"
+#include "duckdb/planner/operator/logical_filter.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/optimizer/pushdown/pushdown_inner_join.cpp b/src/optimizer/pushdown/pushdown_inner_join.cpp
index e01f8594d60..1adf34f5cd2 100644
--- a/src/optimizer/pushdown/pushdown_inner_join.cpp
+++ b/src/optimizer/pushdown/pushdown_inner_join.cpp
@@ -1,8 +1,8 @@
-#include "optimizer/filter_pushdown.hpp"
-#include "planner/operator/logical_any_join.hpp"
-#include "planner/operator/logical_comparison_join.hpp"
-#include "planner/operator/logical_cross_product.hpp"
-#include "planner/operator/logical_empty_result.hpp"
+#include "duckdb/optimizer/filter_pushdown.hpp"
+#include "duckdb/planner/operator/logical_any_join.hpp"
+#include "duckdb/planner/operator/logical_comparison_join.hpp"
+#include "duckdb/planner/operator/logical_cross_product.hpp"
+#include "duckdb/planner/operator/logical_empty_result.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/optimizer/pushdown/pushdown_left_join.cpp b/src/optimizer/pushdown/pushdown_left_join.cpp
index 74bf1ead11b..7af2154c6e1 100644
--- a/src/optimizer/pushdown/pushdown_left_join.cpp
+++ b/src/optimizer/pushdown/pushdown_left_join.cpp
@@ -1,12 +1,12 @@
-#include "execution/expression_executor.hpp"
-#include "optimizer/filter_pushdown.hpp"
-#include "optimizer/optimizer.hpp"
-#include "planner/expression/bound_columnref_expression.hpp"
-#include "planner/expression/bound_comparison_expression.hpp"
-#include "planner/expression/bound_constant_expression.hpp"
-#include "planner/expression_iterator.hpp"
-#include "planner/operator/logical_comparison_join.hpp"
-#include "planner/operator/logical_filter.hpp"
+#include "duckdb/execution/expression_executor.hpp"
+#include "duckdb/optimizer/filter_pushdown.hpp"
+#include "duckdb/optimizer/optimizer.hpp"
+#include "duckdb/planner/expression/bound_columnref_expression.hpp"
+#include "duckdb/planner/expression/bound_comparison_expression.hpp"
+#include "duckdb/planner/expression/bound_constant_expression.hpp"
+#include "duckdb/planner/expression_iterator.hpp"
+#include "duckdb/planner/operator/logical_comparison_join.hpp"
+#include "duckdb/planner/operator/logical_filter.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/optimizer/pushdown/pushdown_mark_join.cpp b/src/optimizer/pushdown/pushdown_mark_join.cpp
index 153d4ed89cf..a759d1830a2 100644
--- a/src/optimizer/pushdown/pushdown_mark_join.cpp
+++ b/src/optimizer/pushdown/pushdown_mark_join.cpp
@@ -1,6 +1,6 @@
-#include "optimizer/filter_pushdown.hpp"
-#include "planner/expression/bound_operator_expression.hpp"
-#include "planner/operator/logical_comparison_join.hpp"
+#include "duckdb/optimizer/filter_pushdown.hpp"
+#include "duckdb/planner/expression/bound_operator_expression.hpp"
+#include "duckdb/planner/operator/logical_comparison_join.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/optimizer/pushdown/pushdown_projection.cpp b/src/optimizer/pushdown/pushdown_projection.cpp
index 9b7b50d277c..7aacf1f6d43 100644
--- a/src/optimizer/pushdown/pushdown_projection.cpp
+++ b/src/optimizer/pushdown/pushdown_projection.cpp
@@ -1,8 +1,8 @@
-#include "optimizer/filter_pushdown.hpp"
-#include "planner/expression/bound_columnref_expression.hpp"
-#include "planner/expression_iterator.hpp"
-#include "planner/operator/logical_empty_result.hpp"
-#include "planner/operator/logical_projection.hpp"
+#include "duckdb/optimizer/filter_pushdown.hpp"
+#include "duckdb/planner/expression/bound_columnref_expression.hpp"
+#include "duckdb/planner/expression_iterator.hpp"
+#include "duckdb/planner/operator/logical_empty_result.hpp"
+#include "duckdb/planner/operator/logical_projection.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/optimizer/pushdown/pushdown_set_operation.cpp b/src/optimizer/pushdown/pushdown_set_operation.cpp
index 5cc000838aa..d8ba5b5be7b 100644
--- a/src/optimizer/pushdown/pushdown_set_operation.cpp
+++ b/src/optimizer/pushdown/pushdown_set_operation.cpp
@@ -1,10 +1,10 @@
-#include "optimizer/filter_pushdown.hpp"
-#include "optimizer/optimizer.hpp"
-#include "planner/binder.hpp"
-#include "planner/expression/bound_columnref_expression.hpp"
-#include "planner/expression_iterator.hpp"
-#include "planner/operator/logical_set_operation.hpp"
-#include "planner/operator/logical_subquery.hpp"
+#include "duckdb/optimizer/filter_pushdown.hpp"
+#include "duckdb/optimizer/optimizer.hpp"
+#include "duckdb/planner/binder.hpp"
+#include "duckdb/planner/expression/bound_columnref_expression.hpp"
+#include "duckdb/planner/expression_iterator.hpp"
+#include "duckdb/planner/operator/logical_set_operation.hpp"
+#include "duckdb/planner/operator/logical_subquery.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/optimizer/pushdown/pushdown_single_join.cpp b/src/optimizer/pushdown/pushdown_single_join.cpp
index ad3845aebbf..bb8f883d539 100644
--- a/src/optimizer/pushdown/pushdown_single_join.cpp
+++ b/src/optimizer/pushdown/pushdown_single_join.cpp
@@ -1,5 +1,5 @@
-#include "optimizer/filter_pushdown.hpp"
-#include "planner/operator/logical_comparison_join.hpp"
+#include "duckdb/optimizer/filter_pushdown.hpp"
+#include "duckdb/planner/operator/logical_comparison_join.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/optimizer/pushdown/pushdown_subquery.cpp b/src/optimizer/pushdown/pushdown_subquery.cpp
index 01083b20855..2b1cf58050a 100644
--- a/src/optimizer/pushdown/pushdown_subquery.cpp
+++ b/src/optimizer/pushdown/pushdown_subquery.cpp
@@ -1,7 +1,7 @@
-#include "optimizer/filter_pushdown.hpp"
-#include "planner/expression/bound_columnref_expression.hpp"
-#include "planner/expression_iterator.hpp"
-#include "planner/operator/logical_subquery.hpp"
+#include "duckdb/optimizer/filter_pushdown.hpp"
+#include "duckdb/planner/expression/bound_columnref_expression.hpp"
+#include "duckdb/planner/expression_iterator.hpp"
+#include "duckdb/planner/operator/logical_subquery.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/optimizer/regex_range_filter.cpp b/src/optimizer/regex_range_filter.cpp
index acc3f4f635b..01449853bb7 100644
--- a/src/optimizer/regex_range_filter.cpp
+++ b/src/optimizer/regex_range_filter.cpp
@@ -1,11 +1,11 @@
-#include "catalog/catalog_entry/scalar_function_catalog_entry.hpp"
-#include "planner/expression.hpp"
-#include "planner/expression/bound_comparison_expression.hpp"
-#include "planner/expression/bound_conjunction_expression.hpp"
-#include "planner/expression/bound_constant_expression.hpp"
-#include "planner/expression/bound_function_expression.hpp"
-#include "planner/operator/logical_filter.hpp"
-#include "function/scalar/string_functions.hpp"
+#include "duckdb/catalog/catalog_entry/scalar_function_catalog_entry.hpp"
+#include "duckdb/planner/expression.hpp"
+#include "duckdb/planner/expression/bound_comparison_expression.hpp"
+#include "duckdb/planner/expression/bound_conjunction_expression.hpp"
+#include "duckdb/planner/expression/bound_constant_expression.hpp"
+#include "duckdb/planner/expression/bound_function_expression.hpp"
+#include "duckdb/planner/operator/logical_filter.hpp"
+#include "duckdb/function/scalar/string_functions.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/optimizer/rule/arithmetic_simplification.cpp b/src/optimizer/rule/arithmetic_simplification.cpp
index 934c120d55b..af7b3eb315b 100644
--- a/src/optimizer/rule/arithmetic_simplification.cpp
+++ b/src/optimizer/rule/arithmetic_simplification.cpp
@@ -1,8 +1,8 @@
-#include "optimizer/rule/arithmetic_simplification.hpp"
+#include "duckdb/optimizer/rule/arithmetic_simplification.hpp"
 
-#include "common/exception.hpp"
-#include "planner/expression/bound_constant_expression.hpp"
-#include "planner/expression/bound_function_expression.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/planner/expression/bound_constant_expression.hpp"
+#include "duckdb/planner/expression/bound_function_expression.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/optimizer/rule/case_simplification.cpp b/src/optimizer/rule/case_simplification.cpp
index 328ba2c07d9..9a65590a2e7 100644
--- a/src/optimizer/rule/case_simplification.cpp
+++ b/src/optimizer/rule/case_simplification.cpp
@@ -1,7 +1,7 @@
-#include "optimizer/rule/case_simplification.hpp"
+#include "duckdb/optimizer/rule/case_simplification.hpp"
 
-#include "execution/expression_executor.hpp"
-#include "planner/expression/bound_case_expression.hpp"
+#include "duckdb/execution/expression_executor.hpp"
+#include "duckdb/planner/expression/bound_case_expression.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/optimizer/rule/comparison_simplification.cpp b/src/optimizer/rule/comparison_simplification.cpp
index a87ca9c8a6d..ef3e7e6138f 100644
--- a/src/optimizer/rule/comparison_simplification.cpp
+++ b/src/optimizer/rule/comparison_simplification.cpp
@@ -1,7 +1,7 @@
-#include "optimizer/rule/comparison_simplification.hpp"
+#include "duckdb/optimizer/rule/comparison_simplification.hpp"
 
-#include "execution/expression_executor.hpp"
-#include "planner/expression/bound_constant_expression.hpp"
+#include "duckdb/execution/expression_executor.hpp"
+#include "duckdb/planner/expression/bound_constant_expression.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/optimizer/rule/conjunction_simplification.cpp b/src/optimizer/rule/conjunction_simplification.cpp
index e7c454b06f0..435d5f52a3b 100644
--- a/src/optimizer/rule/conjunction_simplification.cpp
+++ b/src/optimizer/rule/conjunction_simplification.cpp
@@ -1,8 +1,8 @@
-#include "optimizer/rule/conjunction_simplification.hpp"
+#include "duckdb/optimizer/rule/conjunction_simplification.hpp"
 
-#include "execution/expression_executor.hpp"
-#include "planner/expression/bound_conjunction_expression.hpp"
-#include "planner/expression/bound_constant_expression.hpp"
+#include "duckdb/execution/expression_executor.hpp"
+#include "duckdb/planner/expression/bound_conjunction_expression.hpp"
+#include "duckdb/planner/expression/bound_constant_expression.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/optimizer/rule/constant_folding.cpp b/src/optimizer/rule/constant_folding.cpp
index 5cf3a2c191a..260ba2bd082 100644
--- a/src/optimizer/rule/constant_folding.cpp
+++ b/src/optimizer/rule/constant_folding.cpp
@@ -1,9 +1,9 @@
-#include "optimizer/rule/constant_folding.hpp"
+#include "duckdb/optimizer/rule/constant_folding.hpp"
 
-#include "common/exception.hpp"
-#include "execution/expression_executor.hpp"
-#include "optimizer/expression_rewriter.hpp"
-#include "planner/expression/bound_constant_expression.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/execution/expression_executor.hpp"
+#include "duckdb/optimizer/expression_rewriter.hpp"
+#include "duckdb/planner/expression/bound_constant_expression.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/optimizer/rule/distributivity.cpp b/src/optimizer/rule/distributivity.cpp
index 8f25d114e54..e4744cbe639 100644
--- a/src/optimizer/rule/distributivity.cpp
+++ b/src/optimizer/rule/distributivity.cpp
@@ -1,10 +1,10 @@
-#include "optimizer/rule/distributivity.hpp"
+#include "duckdb/optimizer/rule/distributivity.hpp"
 
-#include "optimizer/matcher/expression_matcher.hpp"
-#include "planner/expression/bound_conjunction_expression.hpp"
-#include "planner/expression/bound_constant_expression.hpp"
-#include "planner/expression_iterator.hpp"
-#include "planner/operator/logical_filter.hpp"
+#include "duckdb/optimizer/matcher/expression_matcher.hpp"
+#include "duckdb/planner/expression/bound_conjunction_expression.hpp"
+#include "duckdb/planner/expression/bound_constant_expression.hpp"
+#include "duckdb/planner/expression_iterator.hpp"
+#include "duckdb/planner/operator/logical_filter.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/optimizer/rule/move_constants.cpp b/src/optimizer/rule/move_constants.cpp
index d68a37d1ee0..58d47ab435d 100644
--- a/src/optimizer/rule/move_constants.cpp
+++ b/src/optimizer/rule/move_constants.cpp
@@ -1,10 +1,10 @@
-#include "optimizer/rule/move_constants.hpp"
+#include "duckdb/optimizer/rule/move_constants.hpp"
 
-#include "common/exception.hpp"
-#include "common/value_operations/value_operations.hpp"
-#include "planner/expression/bound_comparison_expression.hpp"
-#include "planner/expression/bound_constant_expression.hpp"
-#include "planner/expression/bound_function_expression.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/common/value_operations/value_operations.hpp"
+#include "duckdb/planner/expression/bound_comparison_expression.hpp"
+#include "duckdb/planner/expression/bound_constant_expression.hpp"
+#include "duckdb/planner/expression/bound_function_expression.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/optimizer/topn_optimizer.cpp b/src/optimizer/topn_optimizer.cpp
index 3bda751a23e..8c09ecc394f 100644
--- a/src/optimizer/topn_optimizer.cpp
+++ b/src/optimizer/topn_optimizer.cpp
@@ -1,7 +1,7 @@
-#include "optimizer/topn_optimizer.hpp"
-#include "planner/operator/logical_order.hpp"
-#include "planner/operator/logical_limit.hpp"
-#include "planner/operator/logical_top_n.hpp"
+#include "duckdb/optimizer/topn_optimizer.hpp"
+#include "duckdb/planner/operator/logical_order.hpp"
+#include "duckdb/planner/operator/logical_limit.hpp"
+#include "duckdb/planner/operator/logical_top_n.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/parser/base_expression.cpp b/src/parser/base_expression.cpp
index 705e09f4d47..cb7f748da31 100644
--- a/src/parser/base_expression.cpp
+++ b/src/parser/base_expression.cpp
@@ -1,6 +1,6 @@
-#include "parser/base_expression.hpp"
+#include "duckdb/parser/base_expression.hpp"
 
-#include "common/printer.hpp"
+#include "duckdb/common/printer.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/parser/constraint.cpp b/src/parser/constraint.cpp
index 24759e31915..260733656b8 100644
--- a/src/parser/constraint.cpp
+++ b/src/parser/constraint.cpp
@@ -1,8 +1,8 @@
-#include "parser/constraint.hpp"
+#include "duckdb/parser/constraint.hpp"
 
-#include "common/printer.hpp"
-#include "common/serializer.hpp"
-#include "parser/constraints/list.hpp"
+#include "duckdb/common/printer.hpp"
+#include "duckdb/common/serializer.hpp"
+#include "duckdb/parser/constraints/list.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/parser/constraints/check_constraint.cpp b/src/parser/constraints/check_constraint.cpp
index 1733b3dcd31..279167c636c 100644
--- a/src/parser/constraints/check_constraint.cpp
+++ b/src/parser/constraints/check_constraint.cpp
@@ -1,6 +1,6 @@
-#include "parser/constraints/check_constraint.hpp"
+#include "duckdb/parser/constraints/check_constraint.hpp"
 
-#include "common/serializer.hpp"
+#include "duckdb/common/serializer.hpp"
 
 using namespace std;
 using namespace duckdb;
diff --git a/src/parser/constraints/not_null_constraint.cpp b/src/parser/constraints/not_null_constraint.cpp
index e4ad8f67a27..0ae223cc927 100644
--- a/src/parser/constraints/not_null_constraint.cpp
+++ b/src/parser/constraints/not_null_constraint.cpp
@@ -1,6 +1,6 @@
-#include "parser/constraints/not_null_constraint.hpp"
+#include "duckdb/parser/constraints/not_null_constraint.hpp"
 
-#include "common/serializer.hpp"
+#include "duckdb/common/serializer.hpp"
 
 using namespace std;
 using namespace duckdb;
diff --git a/src/parser/constraints/unique_constraint.cpp b/src/parser/constraints/unique_constraint.cpp
index fe6fc666f90..c66624e1846 100644
--- a/src/parser/constraints/unique_constraint.cpp
+++ b/src/parser/constraints/unique_constraint.cpp
@@ -1,6 +1,6 @@
-#include "parser/constraints/unique_constraint.hpp"
+#include "duckdb/parser/constraints/unique_constraint.hpp"
 
-#include "common/serializer.hpp"
+#include "duckdb/common/serializer.hpp"
 
 using namespace std;
 using namespace duckdb;
diff --git a/src/parser/expression/case_expression.cpp b/src/parser/expression/case_expression.cpp
index b90cbd252cb..0d4d8f57527 100644
--- a/src/parser/expression/case_expression.cpp
+++ b/src/parser/expression/case_expression.cpp
@@ -1,6 +1,6 @@
-#include "parser/expression/case_expression.hpp"
+#include "duckdb/parser/expression/case_expression.hpp"
 
-#include "common/exception.hpp"
+#include "duckdb/common/exception.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/parser/expression/cast_expression.cpp b/src/parser/expression/cast_expression.cpp
index 6bdcc8decba..6916db907d4 100644
--- a/src/parser/expression/cast_expression.cpp
+++ b/src/parser/expression/cast_expression.cpp
@@ -1,6 +1,6 @@
-#include "parser/expression/cast_expression.hpp"
+#include "duckdb/parser/expression/cast_expression.hpp"
 
-#include "common/exception.hpp"
+#include "duckdb/common/exception.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/parser/expression/columnref_expression.cpp b/src/parser/expression/columnref_expression.cpp
index e8199269152..d3c2dfb1a0a 100644
--- a/src/parser/expression/columnref_expression.cpp
+++ b/src/parser/expression/columnref_expression.cpp
@@ -1,8 +1,8 @@
-#include "parser/expression/columnref_expression.hpp"
+#include "duckdb/parser/expression/columnref_expression.hpp"
 
-#include "common/exception.hpp"
-#include "common/serializer.hpp"
-#include "common/types/hash.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/common/serializer.hpp"
+#include "duckdb/common/types/hash.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/parser/expression/comparison_expression.cpp b/src/parser/expression/comparison_expression.cpp
index 2bd10847220..85a6148edf1 100644
--- a/src/parser/expression/comparison_expression.cpp
+++ b/src/parser/expression/comparison_expression.cpp
@@ -1,8 +1,8 @@
-#include "parser/expression/comparison_expression.hpp"
+#include "duckdb/parser/expression/comparison_expression.hpp"
 
-#include "common/exception.hpp"
-#include "common/serializer.hpp"
-#include "parser/expression/cast_expression.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/common/serializer.hpp"
+#include "duckdb/parser/expression/cast_expression.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/parser/expression/conjunction_expression.cpp b/src/parser/expression/conjunction_expression.cpp
index a7d5f2865cf..ce27bdd9f27 100644
--- a/src/parser/expression/conjunction_expression.cpp
+++ b/src/parser/expression/conjunction_expression.cpp
@@ -1,7 +1,7 @@
-#include "parser/expression/conjunction_expression.hpp"
+#include "duckdb/parser/expression/conjunction_expression.hpp"
 
-#include "common/exception.hpp"
-#include "parser/expression/cast_expression.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/parser/expression/cast_expression.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/parser/expression/constant_expression.cpp b/src/parser/expression/constant_expression.cpp
index 66c688455a5..5c9de012be0 100644
--- a/src/parser/expression/constant_expression.cpp
+++ b/src/parser/expression/constant_expression.cpp
@@ -1,8 +1,8 @@
-#include "parser/expression/constant_expression.hpp"
+#include "duckdb/parser/expression/constant_expression.hpp"
 
-#include "common/exception.hpp"
-#include "common/types/hash.hpp"
-#include "common/value_operations/value_operations.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/common/types/hash.hpp"
+#include "duckdb/common/value_operations/value_operations.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/parser/expression/default_expression.cpp b/src/parser/expression/default_expression.cpp
index 0ce2d0d6732..fcc86ad088f 100644
--- a/src/parser/expression/default_expression.cpp
+++ b/src/parser/expression/default_expression.cpp
@@ -1,6 +1,6 @@
-#include "parser/expression/default_expression.hpp"
+#include "duckdb/parser/expression/default_expression.hpp"
 
-#include "common/exception.hpp"
+#include "duckdb/common/exception.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/parser/expression/function_expression.cpp b/src/parser/expression/function_expression.cpp
index 149c5373a9d..3069a7a3565 100644
--- a/src/parser/expression/function_expression.cpp
+++ b/src/parser/expression/function_expression.cpp
@@ -1,8 +1,8 @@
-#include "parser/expression/function_expression.hpp"
-#include "common/string_util.hpp"
-#include "common/exception.hpp"
-#include "common/serializer.hpp"
-#include "common/types/hash.hpp"
+#include "duckdb/parser/expression/function_expression.hpp"
+#include "duckdb/common/string_util.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/common/serializer.hpp"
+#include "duckdb/common/types/hash.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/parser/expression/operator_expression.cpp b/src/parser/expression/operator_expression.cpp
index c864e25cf79..1eda6efde8b 100644
--- a/src/parser/expression/operator_expression.cpp
+++ b/src/parser/expression/operator_expression.cpp
@@ -1,7 +1,7 @@
-#include "parser/expression/operator_expression.hpp"
+#include "duckdb/parser/expression/operator_expression.hpp"
 
-#include "common/exception.hpp"
-#include "common/serializer.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/common/serializer.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/parser/expression/parameter_expression.cpp b/src/parser/expression/parameter_expression.cpp
index 567f007fd2f..a6ef3e1ab1d 100644
--- a/src/parser/expression/parameter_expression.cpp
+++ b/src/parser/expression/parameter_expression.cpp
@@ -1,7 +1,7 @@
-#include "parser/expression/parameter_expression.hpp"
+#include "duckdb/parser/expression/parameter_expression.hpp"
 
-#include "common/exception.hpp"
-#include "common/serializer.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/common/serializer.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/parser/expression/star_expression.cpp b/src/parser/expression/star_expression.cpp
index 77bb360c663..c81a91d15eb 100644
--- a/src/parser/expression/star_expression.cpp
+++ b/src/parser/expression/star_expression.cpp
@@ -1,4 +1,4 @@
-#include "parser/expression/star_expression.hpp"
+#include "duckdb/parser/expression/star_expression.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/parser/expression/subquery_expression.cpp b/src/parser/expression/subquery_expression.cpp
index 07e10661c6c..82b008be7d7 100644
--- a/src/parser/expression/subquery_expression.cpp
+++ b/src/parser/expression/subquery_expression.cpp
@@ -1,7 +1,7 @@
-#include "parser/expression/subquery_expression.hpp"
+#include "duckdb/parser/expression/subquery_expression.hpp"
 
-#include "common/exception.hpp"
-#include "common/serializer.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/common/serializer.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/parser/expression/window_expression.cpp b/src/parser/expression/window_expression.cpp
index 21d11222131..0711321ac2c 100644
--- a/src/parser/expression/window_expression.cpp
+++ b/src/parser/expression/window_expression.cpp
@@ -1,7 +1,7 @@
-#include "parser/expression/window_expression.hpp"
+#include "duckdb/parser/expression/window_expression.hpp"
 
-#include "common/serializer.hpp"
-#include "common/string_util.hpp"
+#include "duckdb/common/serializer.hpp"
+#include "duckdb/common/string_util.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/parser/parsed_expression.cpp b/src/parser/parsed_expression.cpp
index 4d1dd407fce..d9ba380c3d5 100644
--- a/src/parser/parsed_expression.cpp
+++ b/src/parser/parsed_expression.cpp
@@ -1,9 +1,9 @@
-#include "parser/parsed_expression.hpp"
+#include "duckdb/parser/parsed_expression.hpp"
 
-#include "common/serializer.hpp"
-#include "common/types/hash.hpp"
-#include "parser/expression/list.hpp"
-#include "parser/parsed_expression_iterator.hpp"
+#include "duckdb/common/serializer.hpp"
+#include "duckdb/common/types/hash.hpp"
+#include "duckdb/parser/expression/list.hpp"
+#include "duckdb/parser/parsed_expression_iterator.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/parser/parsed_expression_iterator.cpp b/src/parser/parsed_expression_iterator.cpp
index 8d5aa99757c..0ad5ff2e52f 100644
--- a/src/parser/parsed_expression_iterator.cpp
+++ b/src/parser/parsed_expression_iterator.cpp
@@ -1,6 +1,6 @@
-#include "parser/parsed_expression_iterator.hpp"
+#include "duckdb/parser/parsed_expression_iterator.hpp"
 
-#include "parser/expression/list.hpp"
+#include "duckdb/parser/expression/list.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/parser/parser.cpp b/src/parser/parser.cpp
index a8f02fa59f7..866743ca68a 100644
--- a/src/parser/parser.cpp
+++ b/src/parser/parser.cpp
@@ -1,7 +1,7 @@
-#include "parser/parser.hpp"
+#include "duckdb/parser/parser.hpp"
 
-#include "parser/transformer.hpp"
-#include "parser/pragma_parser.hpp"
+#include "duckdb/parser/transformer.hpp"
+#include "duckdb/parser/pragma_parser.hpp"
 #include "postgres_parser.hpp"
 
 namespace postgres {
diff --git a/src/parser/pragma_parser.cpp b/src/parser/pragma_parser.cpp
index 6dfe62aa3e4..9f241f55d23 100644
--- a/src/parser/pragma_parser.cpp
+++ b/src/parser/pragma_parser.cpp
@@ -1,9 +1,9 @@
-#include "parser/pragma_parser.hpp"
-#include "main/client_context.hpp"
-#include "main/database.hpp"
-#include "storage/storage_manager.hpp"
-#include "storage/buffer_manager.hpp"
-#include "common/operator/cast_operators.hpp"
+#include "duckdb/parser/pragma_parser.hpp"
+#include "duckdb/main/client_context.hpp"
+#include "duckdb/main/database.hpp"
+#include "duckdb/storage/storage_manager.hpp"
+#include "duckdb/storage/buffer_manager.hpp"
+#include "duckdb/common/operator/cast_operators.hpp"
 #include <cctype>
 
 using namespace duckdb;
diff --git a/src/parser/query_node.cpp b/src/parser/query_node.cpp
index 6836a038490..077b47f0d3d 100644
--- a/src/parser/query_node.cpp
+++ b/src/parser/query_node.cpp
@@ -1,7 +1,7 @@
-#include "parser/query_node.hpp"
+#include "duckdb/parser/query_node.hpp"
 
-#include "parser/query_node/select_node.hpp"
-#include "parser/query_node/set_operation_node.hpp"
+#include "duckdb/parser/query_node/select_node.hpp"
+#include "duckdb/parser/query_node/set_operation_node.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/parser/query_node/select_node.cpp b/src/parser/query_node/select_node.cpp
index 843522687fb..d3c1af348b2 100644
--- a/src/parser/query_node/select_node.cpp
+++ b/src/parser/query_node/select_node.cpp
@@ -1,4 +1,4 @@
-#include "parser/query_node/select_node.hpp"
+#include "duckdb/parser/query_node/select_node.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/parser/query_node/set_operation_node.cpp b/src/parser/query_node/set_operation_node.cpp
index 3c10f320de0..20eb509f404 100644
--- a/src/parser/query_node/set_operation_node.cpp
+++ b/src/parser/query_node/set_operation_node.cpp
@@ -1,4 +1,4 @@
-#include "parser/query_node/set_operation_node.hpp"
+#include "duckdb/parser/query_node/set_operation_node.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/parser/statement/select_statement.cpp b/src/parser/statement/select_statement.cpp
index 6333fb60d03..6b8dc036a17 100644
--- a/src/parser/statement/select_statement.cpp
+++ b/src/parser/statement/select_statement.cpp
@@ -1,7 +1,7 @@
-#include "parser/statement/select_statement.hpp"
+#include "duckdb/parser/statement/select_statement.hpp"
 
-#include "common/assert.hpp"
-#include "common/serializer.hpp"
+#include "duckdb/common/assert.hpp"
+#include "duckdb/common/serializer.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/parser/tableref.cpp b/src/parser/tableref.cpp
index 09d05d45d7d..b72ced83b31 100644
--- a/src/parser/tableref.cpp
+++ b/src/parser/tableref.cpp
@@ -1,8 +1,8 @@
-#include "parser/tableref.hpp"
+#include "duckdb/parser/tableref.hpp"
 
-#include "common/printer.hpp"
-#include "common/serializer.hpp"
-#include "parser/tableref/list.hpp"
+#include "duckdb/common/printer.hpp"
+#include "duckdb/common/serializer.hpp"
+#include "duckdb/parser/tableref/list.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/parser/tableref/basetableref.cpp b/src/parser/tableref/basetableref.cpp
index 7b27aa0aa51..86def25c94c 100644
--- a/src/parser/tableref/basetableref.cpp
+++ b/src/parser/tableref/basetableref.cpp
@@ -1,6 +1,6 @@
-#include "parser/tableref/basetableref.hpp"
+#include "duckdb/parser/tableref/basetableref.hpp"
 
-#include "common/serializer.hpp"
+#include "duckdb/common/serializer.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/parser/tableref/crossproductref.cpp b/src/parser/tableref/crossproductref.cpp
index b188dc917b2..69155818457 100644
--- a/src/parser/tableref/crossproductref.cpp
+++ b/src/parser/tableref/crossproductref.cpp
@@ -1,6 +1,6 @@
-#include "parser/tableref/crossproductref.hpp"
+#include "duckdb/parser/tableref/crossproductref.hpp"
 
-#include "common/serializer.hpp"
+#include "duckdb/common/serializer.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/parser/tableref/emptytableref.cpp b/src/parser/tableref/emptytableref.cpp
index 421131ff9bb..9299bae4111 100644
--- a/src/parser/tableref/emptytableref.cpp
+++ b/src/parser/tableref/emptytableref.cpp
@@ -1,6 +1,6 @@
-#include "parser/tableref/emptytableref.hpp"
+#include "duckdb/parser/tableref/emptytableref.hpp"
 
-#include "common/serializer.hpp"
+#include "duckdb/common/serializer.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/parser/tableref/joinref.cpp b/src/parser/tableref/joinref.cpp
index 0af8a772878..5b01517fcb3 100644
--- a/src/parser/tableref/joinref.cpp
+++ b/src/parser/tableref/joinref.cpp
@@ -1,6 +1,6 @@
-#include "parser/tableref/joinref.hpp"
+#include "duckdb/parser/tableref/joinref.hpp"
 
-#include "common/serializer.hpp"
+#include "duckdb/common/serializer.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/parser/tableref/subqueryref.cpp b/src/parser/tableref/subqueryref.cpp
index 9c0a89d3e2b..8db310d7287 100644
--- a/src/parser/tableref/subqueryref.cpp
+++ b/src/parser/tableref/subqueryref.cpp
@@ -1,6 +1,6 @@
-#include "parser/tableref/subqueryref.hpp"
+#include "duckdb/parser/tableref/subqueryref.hpp"
 
-#include "common/serializer.hpp"
+#include "duckdb/common/serializer.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/parser/tableref/table_function.cpp b/src/parser/tableref/table_function.cpp
index 3b8d55332fc..b167a24a888 100644
--- a/src/parser/tableref/table_function.cpp
+++ b/src/parser/tableref/table_function.cpp
@@ -1,6 +1,6 @@
-#include "parser/tableref/table_function_ref.hpp"
+#include "duckdb/parser/tableref/table_function_ref.hpp"
 
-#include "common/serializer.hpp"
+#include "duckdb/common/serializer.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/parser/transform/constraint/transform_constraint.cpp b/src/parser/transform/constraint/transform_constraint.cpp
index d01b70d444e..5bbd0515788 100644
--- a/src/parser/transform/constraint/transform_constraint.cpp
+++ b/src/parser/transform/constraint/transform_constraint.cpp
@@ -1,7 +1,7 @@
-#include "parser/column_definition.hpp"
-#include "parser/constraint.hpp"
-#include "parser/constraints/list.hpp"
-#include "parser/transformer.hpp"
+#include "duckdb/parser/column_definition.hpp"
+#include "duckdb/parser/constraint.hpp"
+#include "duckdb/parser/constraints/list.hpp"
+#include "duckdb/parser/transformer.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/parser/transform/expression/transform_bool_expr.cpp b/src/parser/transform/expression/transform_bool_expr.cpp
index 3c46d787860..4449ef47772 100644
--- a/src/parser/transform/expression/transform_bool_expr.cpp
+++ b/src/parser/transform/expression/transform_bool_expr.cpp
@@ -1,6 +1,6 @@
-#include "parser/expression/conjunction_expression.hpp"
-#include "parser/expression/operator_expression.hpp"
-#include "parser/transformer.hpp"
+#include "duckdb/parser/expression/conjunction_expression.hpp"
+#include "duckdb/parser/expression/operator_expression.hpp"
+#include "duckdb/parser/transformer.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/parser/transform/expression/transform_case.cpp b/src/parser/transform/expression/transform_case.cpp
index 7b604802d33..23fc485f8fc 100644
--- a/src/parser/transform/expression/transform_case.cpp
+++ b/src/parser/transform/expression/transform_case.cpp
@@ -1,7 +1,7 @@
-#include "parser/expression/case_expression.hpp"
-#include "parser/expression/comparison_expression.hpp"
-#include "parser/expression/constant_expression.hpp"
-#include "parser/transformer.hpp"
+#include "duckdb/parser/expression/case_expression.hpp"
+#include "duckdb/parser/expression/comparison_expression.hpp"
+#include "duckdb/parser/expression/constant_expression.hpp"
+#include "duckdb/parser/transformer.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/parser/transform/expression/transform_cast.cpp b/src/parser/transform/expression/transform_cast.cpp
index 115044861bc..e82465ea5de 100644
--- a/src/parser/transform/expression/transform_cast.cpp
+++ b/src/parser/transform/expression/transform_cast.cpp
@@ -1,7 +1,7 @@
-#include "common/limits.hpp"
-#include "parser/expression/cast_expression.hpp"
-#include "parser/expression/constant_expression.hpp"
-#include "parser/transformer.hpp"
+#include "duckdb/common/limits.hpp"
+#include "duckdb/parser/expression/cast_expression.hpp"
+#include "duckdb/parser/expression/constant_expression.hpp"
+#include "duckdb/parser/transformer.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/parser/transform/expression/transform_coalesce.cpp b/src/parser/transform/expression/transform_coalesce.cpp
index e0d95b7d4e1..011f2eaf6c3 100644
--- a/src/parser/transform/expression/transform_coalesce.cpp
+++ b/src/parser/transform/expression/transform_coalesce.cpp
@@ -1,6 +1,6 @@
-#include "parser/expression/case_expression.hpp"
-#include "parser/expression/operator_expression.hpp"
-#include "parser/transformer.hpp"
+#include "duckdb/parser/expression/case_expression.hpp"
+#include "duckdb/parser/expression/operator_expression.hpp"
+#include "duckdb/parser/transformer.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/parser/transform/expression/transform_columnref.cpp b/src/parser/transform/expression/transform_columnref.cpp
index 51351c69622..8e7edd250f1 100644
--- a/src/parser/transform/expression/transform_columnref.cpp
+++ b/src/parser/transform/expression/transform_columnref.cpp
@@ -1,7 +1,7 @@
-#include "common/exception.hpp"
-#include "parser/expression/columnref_expression.hpp"
-#include "parser/expression/star_expression.hpp"
-#include "parser/transformer.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/parser/expression/columnref_expression.hpp"
+#include "duckdb/parser/expression/star_expression.hpp"
+#include "duckdb/parser/transformer.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/parser/transform/expression/transform_constant.cpp b/src/parser/transform/expression/transform_constant.cpp
index a899ead534a..7de8178a05e 100644
--- a/src/parser/transform/expression/transform_constant.cpp
+++ b/src/parser/transform/expression/transform_constant.cpp
@@ -1,6 +1,6 @@
-#include "parser/expression/constant_expression.hpp"
-#include "parser/transformer.hpp"
-#include "common/operator/cast_operators.hpp"
+#include "duckdb/parser/expression/constant_expression.hpp"
+#include "duckdb/parser/transformer.hpp"
+#include "duckdb/common/operator/cast_operators.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/parser/transform/expression/transform_expression.cpp b/src/parser/transform/expression/transform_expression.cpp
index 6865d4f8082..76af355efd3 100644
--- a/src/parser/transform/expression/transform_expression.cpp
+++ b/src/parser/transform/expression/transform_expression.cpp
@@ -1,6 +1,6 @@
-#include "common/exception.hpp"
-#include "parser/expression/default_expression.hpp"
-#include "parser/transformer.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/parser/expression/default_expression.hpp"
+#include "duckdb/parser/transformer.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/parser/transform/expression/transform_function.cpp b/src/parser/transform/expression/transform_function.cpp
index 1fe8f45bd2f..e5697c8551e 100644
--- a/src/parser/transform/expression/transform_function.cpp
+++ b/src/parser/transform/expression/transform_function.cpp
@@ -1,11 +1,11 @@
-#include "parser/expression/cast_expression.hpp"
-#include "parser/expression/function_expression.hpp"
-#include "parser/expression/operator_expression.hpp"
-#include "parser/expression/star_expression.hpp"
-#include "parser/expression/window_expression.hpp"
-#include "parser/transformer.hpp"
-#include "common/string_util.hpp"
-#include "main/client_context.hpp"
+#include "duckdb/parser/expression/cast_expression.hpp"
+#include "duckdb/parser/expression/function_expression.hpp"
+#include "duckdb/parser/expression/operator_expression.hpp"
+#include "duckdb/parser/expression/star_expression.hpp"
+#include "duckdb/parser/expression/window_expression.hpp"
+#include "duckdb/parser/transformer.hpp"
+#include "duckdb/common/string_util.hpp"
+#include "duckdb/main/client_context.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/parser/transform/expression/transform_is_null.cpp b/src/parser/transform/expression/transform_is_null.cpp
index ae4d63cdfac..91810e60c05 100644
--- a/src/parser/transform/expression/transform_is_null.cpp
+++ b/src/parser/transform/expression/transform_is_null.cpp
@@ -1,6 +1,6 @@
-#include "common/exception.hpp"
-#include "parser/expression/operator_expression.hpp"
-#include "parser/transformer.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/parser/expression/operator_expression.hpp"
+#include "duckdb/parser/transformer.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/parser/transform/expression/transform_operator.cpp b/src/parser/transform/expression/transform_operator.cpp
index 28997ff9201..848348a22c8 100644
--- a/src/parser/transform/expression/transform_operator.cpp
+++ b/src/parser/transform/expression/transform_operator.cpp
@@ -1,10 +1,10 @@
-#include "parser/expression/case_expression.hpp"
-#include "parser/expression/comparison_expression.hpp"
-#include "parser/expression/conjunction_expression.hpp"
-#include "parser/expression/constant_expression.hpp"
-#include "parser/expression/function_expression.hpp"
-#include "parser/expression/operator_expression.hpp"
-#include "parser/transformer.hpp"
+#include "duckdb/parser/expression/case_expression.hpp"
+#include "duckdb/parser/expression/comparison_expression.hpp"
+#include "duckdb/parser/expression/conjunction_expression.hpp"
+#include "duckdb/parser/expression/constant_expression.hpp"
+#include "duckdb/parser/expression/function_expression.hpp"
+#include "duckdb/parser/expression/operator_expression.hpp"
+#include "duckdb/parser/transformer.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/parser/transform/expression/transform_param_ref.cpp b/src/parser/transform/expression/transform_param_ref.cpp
index 8fc3baf3568..b40ffd283aa 100644
--- a/src/parser/transform/expression/transform_param_ref.cpp
+++ b/src/parser/transform/expression/transform_param_ref.cpp
@@ -1,5 +1,5 @@
-#include "parser/expression/parameter_expression.hpp"
-#include "parser/transformer.hpp"
+#include "duckdb/parser/expression/parameter_expression.hpp"
+#include "duckdb/parser/transformer.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/parser/transform/expression/transform_subquery.cpp b/src/parser/transform/expression/transform_subquery.cpp
index b3fb1c80aeb..c09bfce3cc1 100644
--- a/src/parser/transform/expression/transform_subquery.cpp
+++ b/src/parser/transform/expression/transform_subquery.cpp
@@ -1,6 +1,6 @@
-#include "parser/expression/operator_expression.hpp"
-#include "parser/expression/subquery_expression.hpp"
-#include "parser/transformer.hpp"
+#include "duckdb/parser/expression/operator_expression.hpp"
+#include "duckdb/parser/expression/subquery_expression.hpp"
+#include "duckdb/parser/transformer.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/parser/transform/helpers/nodetype_to_string.cpp b/src/parser/transform/helpers/nodetype_to_string.cpp
index aa6a7f19b9d..5cdd7624aec 100644
--- a/src/parser/transform/helpers/nodetype_to_string.cpp
+++ b/src/parser/transform/helpers/nodetype_to_string.cpp
@@ -1,4 +1,4 @@
-#include "parser/transformer.hpp"
+#include "duckdb/parser/transformer.hpp"
 
 using namespace duckdb;
 
diff --git a/src/parser/transform/helpers/transform_alias.cpp b/src/parser/transform/helpers/transform_alias.cpp
index 7bc47d8aff0..38a31731e79 100644
--- a/src/parser/transform/helpers/transform_alias.cpp
+++ b/src/parser/transform/helpers/transform_alias.cpp
@@ -1,4 +1,4 @@
-#include "parser/transformer.hpp"
+#include "duckdb/parser/transformer.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/parser/transform/helpers/transform_cte.cpp b/src/parser/transform/helpers/transform_cte.cpp
index b08bf8e480f..b9782641df9 100644
--- a/src/parser/transform/helpers/transform_cte.cpp
+++ b/src/parser/transform/helpers/transform_cte.cpp
@@ -1,6 +1,6 @@
-#include "common/exception.hpp"
-#include "parser/statement/select_statement.hpp"
-#include "parser/transformer.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/parser/statement/select_statement.hpp"
+#include "duckdb/parser/transformer.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/parser/transform/helpers/transform_groupby.cpp b/src/parser/transform/helpers/transform_groupby.cpp
index 1db12a5b3e4..e87ce01bd6d 100644
--- a/src/parser/transform/helpers/transform_groupby.cpp
+++ b/src/parser/transform/helpers/transform_groupby.cpp
@@ -1,5 +1,5 @@
-#include "parser/parsed_expression.hpp"
-#include "parser/transformer.hpp"
+#include "duckdb/parser/parsed_expression.hpp"
+#include "duckdb/parser/transformer.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/parser/transform/helpers/transform_orderby.cpp b/src/parser/transform/helpers/transform_orderby.cpp
index 99cf3b54f23..86912dcc4bf 100644
--- a/src/parser/transform/helpers/transform_orderby.cpp
+++ b/src/parser/transform/helpers/transform_orderby.cpp
@@ -1,6 +1,6 @@
-#include "parser/expression/constant_expression.hpp"
-#include "parser/statement/select_statement.hpp"
-#include "parser/transformer.hpp"
+#include "duckdb/parser/expression/constant_expression.hpp"
+#include "duckdb/parser/statement/select_statement.hpp"
+#include "duckdb/parser/transformer.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/parser/transform/helpers/transform_typename.cpp b/src/parser/transform/helpers/transform_typename.cpp
index 905796ced1e..78b6cce2c8b 100644
--- a/src/parser/transform/helpers/transform_typename.cpp
+++ b/src/parser/transform/helpers/transform_typename.cpp
@@ -1,6 +1,6 @@
-#include "common/exception.hpp"
-#include "common/string_util.hpp"
-#include "parser/transformer.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/common/string_util.hpp"
+#include "duckdb/parser/transformer.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/parser/transform/statement/transform_alter_table.cpp b/src/parser/transform/statement/transform_alter_table.cpp
index cb2c2bfa157..1e88bc03d1e 100644
--- a/src/parser/transform/statement/transform_alter_table.cpp
+++ b/src/parser/transform/statement/transform_alter_table.cpp
@@ -1,5 +1,5 @@
-#include "parser/statement/alter_table_statement.hpp"
-#include "parser/transformer.hpp"
+#include "duckdb/parser/statement/alter_table_statement.hpp"
+#include "duckdb/parser/transformer.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/parser/transform/statement/transform_copy.cpp b/src/parser/transform/statement/transform_copy.cpp
index 175e378bde8..315b5b15498 100644
--- a/src/parser/transform/statement/transform_copy.cpp
+++ b/src/parser/transform/statement/transform_copy.cpp
@@ -1,10 +1,10 @@
-#include "parser/expression/columnref_expression.hpp"
-#include "parser/expression/star_expression.hpp"
-#include "parser/statement/copy_statement.hpp"
-#include "parser/statement/select_statement.hpp"
-#include "parser/tableref/basetableref.hpp"
-#include "parser/transformer.hpp"
-#include "common/string_util.hpp"
+#include "duckdb/parser/expression/columnref_expression.hpp"
+#include "duckdb/parser/expression/star_expression.hpp"
+#include "duckdb/parser/statement/copy_statement.hpp"
+#include "duckdb/parser/statement/select_statement.hpp"
+#include "duckdb/parser/tableref/basetableref.hpp"
+#include "duckdb/parser/transformer.hpp"
+#include "duckdb/common/string_util.hpp"
 
 #include <cstring>
 
diff --git a/src/parser/transform/statement/transform_create_index.cpp b/src/parser/transform/statement/transform_create_index.cpp
index ce496e5f146..33045f6fadd 100644
--- a/src/parser/transform/statement/transform_create_index.cpp
+++ b/src/parser/transform/statement/transform_create_index.cpp
@@ -1,8 +1,8 @@
-#include "parser/expression/columnref_expression.hpp"
-#include "parser/statement/create_index_statement.hpp"
-#include "parser/tableref/basetableref.hpp"
-#include "parser/transformer.hpp"
-#include "common/string_util.hpp"
+#include "duckdb/parser/expression/columnref_expression.hpp"
+#include "duckdb/parser/statement/create_index_statement.hpp"
+#include "duckdb/parser/tableref/basetableref.hpp"
+#include "duckdb/parser/transformer.hpp"
+#include "duckdb/common/string_util.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/parser/transform/statement/transform_create_schema.cpp b/src/parser/transform/statement/transform_create_schema.cpp
index bca29f405cb..f31be084bfe 100644
--- a/src/parser/transform/statement/transform_create_schema.cpp
+++ b/src/parser/transform/statement/transform_create_schema.cpp
@@ -1,5 +1,5 @@
-#include "parser/statement/create_schema_statement.hpp"
-#include "parser/transformer.hpp"
+#include "duckdb/parser/statement/create_schema_statement.hpp"
+#include "duckdb/parser/transformer.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/parser/transform/statement/transform_create_sequence.cpp b/src/parser/transform/statement/transform_create_sequence.cpp
index ea24c7e4c2d..80917beca07 100644
--- a/src/parser/transform/statement/transform_create_sequence.cpp
+++ b/src/parser/transform/statement/transform_create_sequence.cpp
@@ -1,6 +1,6 @@
-#include "parser/statement/create_sequence_statement.hpp"
-#include "parser/tableref/basetableref.hpp"
-#include "parser/transformer.hpp"
+#include "duckdb/parser/statement/create_sequence_statement.hpp"
+#include "duckdb/parser/tableref/basetableref.hpp"
+#include "duckdb/parser/transformer.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/parser/transform/statement/transform_create_table.cpp b/src/parser/transform/statement/transform_create_table.cpp
index bf1361b16f3..5c5f897e438 100644
--- a/src/parser/transform/statement/transform_create_table.cpp
+++ b/src/parser/transform/statement/transform_create_table.cpp
@@ -1,6 +1,6 @@
-#include "parser/statement/create_table_statement.hpp"
-#include "parser/transformer.hpp"
-#include "parser/constraint.hpp"
+#include "duckdb/parser/statement/create_table_statement.hpp"
+#include "duckdb/parser/transformer.hpp"
+#include "duckdb/parser/constraint.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/parser/transform/statement/transform_create_table_as.cpp b/src/parser/transform/statement/transform_create_table_as.cpp
index 7757bdd0217..60b5faecf6d 100644
--- a/src/parser/transform/statement/transform_create_table_as.cpp
+++ b/src/parser/transform/statement/transform_create_table_as.cpp
@@ -1,6 +1,6 @@
-#include "parser/statement/create_table_statement.hpp"
-#include "parser/tableref/basetableref.hpp"
-#include "parser/transformer.hpp"
+#include "duckdb/parser/statement/create_table_statement.hpp"
+#include "duckdb/parser/tableref/basetableref.hpp"
+#include "duckdb/parser/transformer.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/parser/transform/statement/transform_create_view.cpp b/src/parser/transform/statement/transform_create_view.cpp
index 560457a2b1f..2010dfa6e8d 100644
--- a/src/parser/transform/statement/transform_create_view.cpp
+++ b/src/parser/transform/statement/transform_create_view.cpp
@@ -1,7 +1,7 @@
-#include "parser/expression/star_expression.hpp"
-#include "parser/statement/create_view_statement.hpp"
-#include "parser/tableref/subqueryref.hpp"
-#include "parser/transformer.hpp"
+#include "duckdb/parser/expression/star_expression.hpp"
+#include "duckdb/parser/statement/create_view_statement.hpp"
+#include "duckdb/parser/tableref/subqueryref.hpp"
+#include "duckdb/parser/transformer.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/parser/transform/statement/transform_delete.cpp b/src/parser/transform/statement/transform_delete.cpp
index 4ed44cbea6f..8189ad4d84c 100644
--- a/src/parser/transform/statement/transform_delete.cpp
+++ b/src/parser/transform/statement/transform_delete.cpp
@@ -1,5 +1,5 @@
-#include "parser/statement/delete_statement.hpp"
-#include "parser/transformer.hpp"
+#include "duckdb/parser/statement/delete_statement.hpp"
+#include "duckdb/parser/transformer.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/parser/transform/statement/transform_drop.cpp b/src/parser/transform/statement/transform_drop.cpp
index 780a4a55da0..a859223ae3a 100644
--- a/src/parser/transform/statement/transform_drop.cpp
+++ b/src/parser/transform/statement/transform_drop.cpp
@@ -1,5 +1,5 @@
-#include "parser/statement/drop_statement.hpp"
-#include "parser/transformer.hpp"
+#include "duckdb/parser/statement/drop_statement.hpp"
+#include "duckdb/parser/transformer.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/parser/transform/statement/transform_insert.cpp b/src/parser/transform/statement/transform_insert.cpp
index 0a27a7b366c..4d85eeea23a 100644
--- a/src/parser/transform/statement/transform_insert.cpp
+++ b/src/parser/transform/statement/transform_insert.cpp
@@ -1,6 +1,6 @@
-#include "parser/statement/insert_statement.hpp"
-#include "parser/tableref/basetableref.hpp"
-#include "parser/transformer.hpp"
+#include "duckdb/parser/statement/insert_statement.hpp"
+#include "duckdb/parser/tableref/basetableref.hpp"
+#include "duckdb/parser/transformer.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/parser/transform/statement/transform_prepare.cpp b/src/parser/transform/statement/transform_prepare.cpp
index b5ba6f7bcb8..78f9ac82039 100644
--- a/src/parser/transform/statement/transform_prepare.cpp
+++ b/src/parser/transform/statement/transform_prepare.cpp
@@ -1,7 +1,7 @@
-#include "parser/statement/deallocate_statement.hpp"
-#include "parser/statement/execute_statement.hpp"
-#include "parser/statement/prepare_statement.hpp"
-#include "parser/transformer.hpp"
+#include "duckdb/parser/statement/deallocate_statement.hpp"
+#include "duckdb/parser/statement/execute_statement.hpp"
+#include "duckdb/parser/statement/prepare_statement.hpp"
+#include "duckdb/parser/transformer.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/parser/transform/statement/transform_rename.cpp b/src/parser/transform/statement/transform_rename.cpp
index 1de5dc5f94f..66d049b4406 100644
--- a/src/parser/transform/statement/transform_rename.cpp
+++ b/src/parser/transform/statement/transform_rename.cpp
@@ -1,5 +1,5 @@
-#include "parser/statement/alter_table_statement.hpp"
-#include "parser/transformer.hpp"
+#include "duckdb/parser/statement/alter_table_statement.hpp"
+#include "duckdb/parser/transformer.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/parser/transform/statement/transform_select.cpp b/src/parser/transform/statement/transform_select.cpp
index 7779ee7409f..9fdf775b21c 100644
--- a/src/parser/transform/statement/transform_select.cpp
+++ b/src/parser/transform/statement/transform_select.cpp
@@ -1,6 +1,6 @@
-#include "parser/statement/select_statement.hpp"
-#include "parser/transformer.hpp"
-#include "common/string_util.hpp"
+#include "duckdb/parser/statement/select_statement.hpp"
+#include "duckdb/parser/transformer.hpp"
+#include "duckdb/common/string_util.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/parser/transform/statement/transform_select_node.cpp b/src/parser/transform/statement/transform_select_node.cpp
index 7add4e568d7..159fd135260 100644
--- a/src/parser/transform/statement/transform_select_node.cpp
+++ b/src/parser/transform/statement/transform_select_node.cpp
@@ -1,8 +1,8 @@
-#include "common/exception.hpp"
-#include "parser/query_node/select_node.hpp"
-#include "parser/query_node/set_operation_node.hpp"
-#include "parser/statement/select_statement.hpp"
-#include "parser/transformer.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/parser/query_node/select_node.hpp"
+#include "duckdb/parser/query_node/set_operation_node.hpp"
+#include "duckdb/parser/statement/select_statement.hpp"
+#include "duckdb/parser/transformer.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/parser/transform/statement/transform_transaction.cpp b/src/parser/transform/statement/transform_transaction.cpp
index ea570e4eea8..08e04ef2e6d 100644
--- a/src/parser/transform/statement/transform_transaction.cpp
+++ b/src/parser/transform/statement/transform_transaction.cpp
@@ -1,5 +1,5 @@
-#include "parser/statement/transaction_statement.hpp"
-#include "parser/transformer.hpp"
+#include "duckdb/parser/statement/transaction_statement.hpp"
+#include "duckdb/parser/transformer.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/parser/transform/statement/transform_update.cpp b/src/parser/transform/statement/transform_update.cpp
index 7d1c37eedd6..1b235a7954c 100644
--- a/src/parser/transform/statement/transform_update.cpp
+++ b/src/parser/transform/statement/transform_update.cpp
@@ -1,5 +1,5 @@
-#include "parser/statement/update_statement.hpp"
-#include "parser/transformer.hpp"
+#include "duckdb/parser/statement/update_statement.hpp"
+#include "duckdb/parser/transformer.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/parser/transform/tableref/transform_base_tableref.cpp b/src/parser/transform/tableref/transform_base_tableref.cpp
index 20fda11be8c..858a05e23d0 100644
--- a/src/parser/transform/tableref/transform_base_tableref.cpp
+++ b/src/parser/transform/tableref/transform_base_tableref.cpp
@@ -1,5 +1,5 @@
-#include "parser/tableref/basetableref.hpp"
-#include "parser/transformer.hpp"
+#include "duckdb/parser/tableref/basetableref.hpp"
+#include "duckdb/parser/transformer.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/parser/transform/tableref/transform_from.cpp b/src/parser/transform/tableref/transform_from.cpp
index 2a421ff5f5d..953b5b3f08d 100644
--- a/src/parser/transform/tableref/transform_from.cpp
+++ b/src/parser/transform/tableref/transform_from.cpp
@@ -1,6 +1,6 @@
-#include "parser/tableref/crossproductref.hpp"
-#include "parser/tableref/emptytableref.hpp"
-#include "parser/transformer.hpp"
+#include "duckdb/parser/tableref/crossproductref.hpp"
+#include "duckdb/parser/tableref/emptytableref.hpp"
+#include "duckdb/parser/transformer.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/parser/transform/tableref/transform_join.cpp b/src/parser/transform/tableref/transform_join.cpp
index 4d5ec7f5a0d..3278d955d75 100644
--- a/src/parser/transform/tableref/transform_join.cpp
+++ b/src/parser/transform/tableref/transform_join.cpp
@@ -1,11 +1,11 @@
-#include "common/exception.hpp"
-#include "parser/expression/columnref_expression.hpp"
-#include "parser/expression/comparison_expression.hpp"
-#include "parser/expression/conjunction_expression.hpp"
-#include "parser/tableref/basetableref.hpp"
-#include "parser/tableref/crossproductref.hpp"
-#include "parser/tableref/joinref.hpp"
-#include "parser/transformer.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/parser/expression/columnref_expression.hpp"
+#include "duckdb/parser/expression/comparison_expression.hpp"
+#include "duckdb/parser/expression/conjunction_expression.hpp"
+#include "duckdb/parser/tableref/basetableref.hpp"
+#include "duckdb/parser/tableref/crossproductref.hpp"
+#include "duckdb/parser/tableref/joinref.hpp"
+#include "duckdb/parser/transformer.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/parser/transform/tableref/transform_subquery.cpp b/src/parser/transform/tableref/transform_subquery.cpp
index b65447d9115..362d4eab31c 100644
--- a/src/parser/transform/tableref/transform_subquery.cpp
+++ b/src/parser/transform/tableref/transform_subquery.cpp
@@ -1,5 +1,5 @@
-#include "parser/tableref/subqueryref.hpp"
-#include "parser/transformer.hpp"
+#include "duckdb/parser/tableref/subqueryref.hpp"
+#include "duckdb/parser/transformer.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/parser/transform/tableref/transform_table_function.cpp b/src/parser/transform/tableref/transform_table_function.cpp
index 9fd8a2a3b74..4bd986b323a 100644
--- a/src/parser/transform/tableref/transform_table_function.cpp
+++ b/src/parser/transform/tableref/transform_table_function.cpp
@@ -1,6 +1,6 @@
-#include "common/exception.hpp"
-#include "parser/tableref/table_function_ref.hpp"
-#include "parser/transformer.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/parser/tableref/table_function_ref.hpp"
+#include "duckdb/parser/transformer.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/parser/transform/tableref/transform_tableref.cpp b/src/parser/transform/tableref/transform_tableref.cpp
index a0cb23cc375..9276fcea7ee 100644
--- a/src/parser/transform/tableref/transform_tableref.cpp
+++ b/src/parser/transform/tableref/transform_tableref.cpp
@@ -1,6 +1,6 @@
-#include "common/exception.hpp"
-#include "parser/tableref.hpp"
-#include "parser/transformer.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/parser/tableref.hpp"
+#include "duckdb/parser/transformer.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/parser/transformer.cpp b/src/parser/transformer.cpp
index 61c084d98e4..5a08a89345a 100644
--- a/src/parser/transformer.cpp
+++ b/src/parser/transformer.cpp
@@ -1,7 +1,7 @@
-#include "parser/transformer.hpp"
+#include "duckdb/parser/transformer.hpp"
 
-#include "parser/expression/list.hpp"
-#include "parser/statement/list.hpp"
+#include "duckdb/parser/expression/list.hpp"
+#include "duckdb/parser/statement/list.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/bind_context.cpp b/src/planner/bind_context.cpp
index d60b387871b..b63f54da072 100644
--- a/src/planner/bind_context.cpp
+++ b/src/planner/bind_context.cpp
@@ -1,9 +1,9 @@
-#include "planner/bind_context.hpp"
+#include "duckdb/planner/bind_context.hpp"
 
-#include "parser/expression/columnref_expression.hpp"
-#include "parser/tableref/subqueryref.hpp"
-#include "planner/expression/bound_columnref_expression.hpp"
-#include "planner/tableref/bound_basetableref.hpp"
+#include "duckdb/parser/expression/columnref_expression.hpp"
+#include "duckdb/parser/tableref/subqueryref.hpp"
+#include "duckdb/planner/expression/bound_columnref_expression.hpp"
+#include "duckdb/planner/tableref/bound_basetableref.hpp"
 
 #include <algorithm>
 
diff --git a/src/planner/binder.cpp b/src/planner/binder.cpp
index 2a5e7eda79f..bc72b242e73 100644
--- a/src/planner/binder.cpp
+++ b/src/planner/binder.cpp
@@ -1,12 +1,12 @@
-#include "planner/binder.hpp"
-
-#include "execution/expression_executor.hpp"
-#include "parser/statement/list.hpp"
-#include "planner/bound_query_node.hpp"
-#include "planner/bound_sql_statement.hpp"
-#include "planner/bound_tableref.hpp"
-#include "planner/expression.hpp"
-#include "planner/expression_binder/constant_binder.hpp"
+#include "duckdb/planner/binder.hpp"
+
+#include "duckdb/execution/expression_executor.hpp"
+#include "duckdb/parser/statement/list.hpp"
+#include "duckdb/planner/bound_query_node.hpp"
+#include "duckdb/planner/bound_sql_statement.hpp"
+#include "duckdb/planner/bound_tableref.hpp"
+#include "duckdb/planner/expression.hpp"
+#include "duckdb/planner/expression_binder/constant_binder.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/binder/expression/bind_aggregate_expression.cpp b/src/planner/binder/expression/bind_aggregate_expression.cpp
index d3ba899b8d4..15f565518f7 100644
--- a/src/planner/binder/expression/bind_aggregate_expression.cpp
+++ b/src/planner/binder/expression/bind_aggregate_expression.cpp
@@ -1,11 +1,11 @@
-#include "catalog/catalog_entry/aggregate_function_catalog_entry.hpp"
-#include "main/client_context.hpp"
-#include "parser/expression/function_expression.hpp"
-#include "planner/expression/bound_aggregate_expression.hpp"
-#include "planner/expression/bound_columnref_expression.hpp"
-#include "planner/expression_binder/aggregate_binder.hpp"
-#include "planner/expression_binder/select_binder.hpp"
-#include "planner/query_node/bound_select_node.hpp"
+#include "duckdb/catalog/catalog_entry/aggregate_function_catalog_entry.hpp"
+#include "duckdb/main/client_context.hpp"
+#include "duckdb/parser/expression/function_expression.hpp"
+#include "duckdb/planner/expression/bound_aggregate_expression.hpp"
+#include "duckdb/planner/expression/bound_columnref_expression.hpp"
+#include "duckdb/planner/expression_binder/aggregate_binder.hpp"
+#include "duckdb/planner/expression_binder/select_binder.hpp"
+#include "duckdb/planner/query_node/bound_select_node.hpp"
 
 using namespace duckdb;
 using namespace std;
@@ -59,7 +59,7 @@ BindResult SelectBinder::BindAggregate(FunctionExpression &aggr, AggregateFuncti
 	aggregate->children = move(children);
 	// now create a column reference referring to this aggregate
 	auto colref = make_unique<BoundColumnRefExpression>(
-	    func->name, aggregate->return_type, ColumnBinding(node.aggregate_index, node.aggregates.size()), depth);
+	    aggr.alias.empty() ? aggregate->ToString() : aggr.alias, aggregate->return_type, ColumnBinding(node.aggregate_index, node.aggregates.size()), depth);
 	// move the aggregate expression into the set of bound aggregates
 	node.aggregates.push_back(move(aggregate));
 	return BindResult(move(colref), return_type);
diff --git a/src/planner/binder/expression/bind_case_expression.cpp b/src/planner/binder/expression/bind_case_expression.cpp
index 99b9eeb9c3d..e799bd3aad9 100644
--- a/src/planner/binder/expression/bind_case_expression.cpp
+++ b/src/planner/binder/expression/bind_case_expression.cpp
@@ -1,6 +1,6 @@
-#include "parser/expression/case_expression.hpp"
-#include "planner/expression/bound_case_expression.hpp"
-#include "planner/expression_binder.hpp"
+#include "duckdb/parser/expression/case_expression.hpp"
+#include "duckdb/planner/expression/bound_case_expression.hpp"
+#include "duckdb/planner/expression_binder.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/binder/expression/bind_cast_expression.cpp b/src/planner/binder/expression/bind_cast_expression.cpp
index 31fb038c66f..e42b63bd616 100644
--- a/src/planner/binder/expression/bind_cast_expression.cpp
+++ b/src/planner/binder/expression/bind_cast_expression.cpp
@@ -1,6 +1,6 @@
-#include "parser/expression/cast_expression.hpp"
-#include "planner/expression/bound_parameter_expression.hpp"
-#include "planner/expression_binder.hpp"
+#include "duckdb/parser/expression/cast_expression.hpp"
+#include "duckdb/planner/expression/bound_parameter_expression.hpp"
+#include "duckdb/planner/expression_binder.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/binder/expression/bind_columnref_expression.cpp b/src/planner/binder/expression/bind_columnref_expression.cpp
index 35daba5cbd6..7f703513a4a 100644
--- a/src/planner/binder/expression/bind_columnref_expression.cpp
+++ b/src/planner/binder/expression/bind_columnref_expression.cpp
@@ -1,8 +1,8 @@
-#include "parser/expression/columnref_expression.hpp"
-#include "planner/binder.hpp"
-#include "planner/expression/bound_columnref_expression.hpp"
-#include "planner/expression_binder.hpp"
-#include "common/string_util.hpp"
+#include "duckdb/parser/expression/columnref_expression.hpp"
+#include "duckdb/planner/binder.hpp"
+#include "duckdb/planner/expression/bound_columnref_expression.hpp"
+#include "duckdb/planner/expression_binder.hpp"
+#include "duckdb/common/string_util.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/binder/expression/bind_comparison_expression.cpp b/src/planner/binder/expression/bind_comparison_expression.cpp
index f08f26f2f6d..c5d0b55c9d6 100644
--- a/src/planner/binder/expression/bind_comparison_expression.cpp
+++ b/src/planner/binder/expression/bind_comparison_expression.cpp
@@ -1,6 +1,6 @@
-#include "parser/expression/comparison_expression.hpp"
-#include "planner/expression/bound_comparison_expression.hpp"
-#include "planner/expression_binder.hpp"
+#include "duckdb/parser/expression/comparison_expression.hpp"
+#include "duckdb/planner/expression/bound_comparison_expression.hpp"
+#include "duckdb/planner/expression_binder.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/binder/expression/bind_conjunction_expression.cpp b/src/planner/binder/expression/bind_conjunction_expression.cpp
index 08cdff392bc..e6a0fd1c89f 100644
--- a/src/planner/binder/expression/bind_conjunction_expression.cpp
+++ b/src/planner/binder/expression/bind_conjunction_expression.cpp
@@ -1,6 +1,6 @@
-#include "parser/expression/conjunction_expression.hpp"
-#include "planner/expression/bound_conjunction_expression.hpp"
-#include "planner/expression_binder.hpp"
+#include "duckdb/parser/expression/conjunction_expression.hpp"
+#include "duckdb/planner/expression/bound_conjunction_expression.hpp"
+#include "duckdb/planner/expression_binder.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/binder/expression/bind_constant_expression.cpp b/src/planner/binder/expression/bind_constant_expression.cpp
index 8eaed469d6b..baad41998a5 100644
--- a/src/planner/binder/expression/bind_constant_expression.cpp
+++ b/src/planner/binder/expression/bind_constant_expression.cpp
@@ -1,6 +1,6 @@
-#include "parser/expression/constant_expression.hpp"
-#include "planner/expression/bound_constant_expression.hpp"
-#include "planner/expression_binder.hpp"
+#include "duckdb/parser/expression/constant_expression.hpp"
+#include "duckdb/planner/expression/bound_constant_expression.hpp"
+#include "duckdb/planner/expression_binder.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/binder/expression/bind_function_expression.cpp b/src/planner/binder/expression/bind_function_expression.cpp
index 5b34eee62fa..490ee38079f 100644
--- a/src/planner/binder/expression/bind_function_expression.cpp
+++ b/src/planner/binder/expression/bind_function_expression.cpp
@@ -1,10 +1,10 @@
-#include "catalog/catalog_entry/scalar_function_catalog_entry.hpp"
-#include "main/client_context.hpp"
-#include "main/database.hpp"
-#include "parser/expression/function_expression.hpp"
-#include "planner/expression/bound_cast_expression.hpp"
-#include "planner/expression/bound_function_expression.hpp"
-#include "planner/expression_binder.hpp"
+#include "duckdb/catalog/catalog_entry/scalar_function_catalog_entry.hpp"
+#include "duckdb/main/client_context.hpp"
+#include "duckdb/main/database.hpp"
+#include "duckdb/parser/expression/function_expression.hpp"
+#include "duckdb/planner/expression/bound_cast_expression.hpp"
+#include "duckdb/planner/expression/bound_function_expression.hpp"
+#include "duckdb/planner/expression_binder.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/binder/expression/bind_operator_expression.cpp b/src/planner/binder/expression/bind_operator_expression.cpp
index a2527afdd6d..e4735e1f4ec 100644
--- a/src/planner/binder/expression/bind_operator_expression.cpp
+++ b/src/planner/binder/expression/bind_operator_expression.cpp
@@ -1,6 +1,6 @@
-#include "parser/expression/operator_expression.hpp"
-#include "planner/expression/bound_operator_expression.hpp"
-#include "planner/expression_binder.hpp"
+#include "duckdb/parser/expression/operator_expression.hpp"
+#include "duckdb/planner/expression/bound_operator_expression.hpp"
+#include "duckdb/planner/expression_binder.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/binder/expression/bind_parameter_expression.cpp b/src/planner/binder/expression/bind_parameter_expression.cpp
index bcac416964f..c5f96335408 100644
--- a/src/planner/binder/expression/bind_parameter_expression.cpp
+++ b/src/planner/binder/expression/bind_parameter_expression.cpp
@@ -1,7 +1,7 @@
-#include "parser/expression/parameter_expression.hpp"
-#include "planner/binder.hpp"
-#include "planner/expression/bound_parameter_expression.hpp"
-#include "planner/expression_binder.hpp"
+#include "duckdb/parser/expression/parameter_expression.hpp"
+#include "duckdb/planner/binder.hpp"
+#include "duckdb/planner/expression/bound_parameter_expression.hpp"
+#include "duckdb/planner/expression_binder.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/binder/expression/bind_subquery_expression.cpp b/src/planner/binder/expression/bind_subquery_expression.cpp
index 7fa50338817..eb730944a86 100644
--- a/src/planner/binder/expression/bind_subquery_expression.cpp
+++ b/src/planner/binder/expression/bind_subquery_expression.cpp
@@ -1,7 +1,7 @@
-#include "parser/expression/subquery_expression.hpp"
-#include "planner/binder.hpp"
-#include "planner/expression/bound_subquery_expression.hpp"
-#include "planner/expression_binder.hpp"
+#include "duckdb/parser/expression/subquery_expression.hpp"
+#include "duckdb/planner/binder.hpp"
+#include "duckdb/planner/expression/bound_subquery_expression.hpp"
+#include "duckdb/planner/expression_binder.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/binder/expression/bind_window_expression.cpp b/src/planner/binder/expression/bind_window_expression.cpp
index ce6fca96958..4b1b2ca3cf7 100644
--- a/src/planner/binder/expression/bind_window_expression.cpp
+++ b/src/planner/binder/expression/bind_window_expression.cpp
@@ -1,8 +1,8 @@
-#include "parser/expression/window_expression.hpp"
-#include "planner/expression/bound_columnref_expression.hpp"
-#include "planner/expression/bound_window_expression.hpp"
-#include "planner/expression_binder/select_binder.hpp"
-#include "planner/query_node/bound_select_node.hpp"
+#include "duckdb/parser/expression/window_expression.hpp"
+#include "duckdb/planner/expression/bound_columnref_expression.hpp"
+#include "duckdb/planner/expression/bound_window_expression.hpp"
+#include "duckdb/planner/expression_binder/select_binder.hpp"
+#include "duckdb/planner/query_node/bound_select_node.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/binder/query_node/bind_select_node.cpp b/src/planner/binder/query_node/bind_select_node.cpp
index 37f7a4fd47e..00036a208d1 100644
--- a/src/planner/binder/query_node/bind_select_node.cpp
+++ b/src/planner/binder/query_node/bind_select_node.cpp
@@ -1,14 +1,14 @@
-#include "parser/expression/columnref_expression.hpp"
-#include "parser/expression/constant_expression.hpp"
-#include "parser/query_node/select_node.hpp"
-#include "parser/tableref/joinref.hpp"
-#include "planner/binder.hpp"
-#include "planner/expression_binder/group_binder.hpp"
-#include "planner/expression_binder/having_binder.hpp"
-#include "planner/expression_binder/order_binder.hpp"
-#include "planner/expression_binder/select_binder.hpp"
-#include "planner/expression_binder/where_binder.hpp"
-#include "planner/query_node/bound_select_node.hpp"
+#include "duckdb/parser/expression/columnref_expression.hpp"
+#include "duckdb/parser/expression/constant_expression.hpp"
+#include "duckdb/parser/query_node/select_node.hpp"
+#include "duckdb/parser/tableref/joinref.hpp"
+#include "duckdb/planner/binder.hpp"
+#include "duckdb/planner/expression_binder/group_binder.hpp"
+#include "duckdb/planner/expression_binder/having_binder.hpp"
+#include "duckdb/planner/expression_binder/order_binder.hpp"
+#include "duckdb/planner/expression_binder/select_binder.hpp"
+#include "duckdb/planner/expression_binder/where_binder.hpp"
+#include "duckdb/planner/query_node/bound_select_node.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/binder/query_node/bind_setop_node.cpp b/src/planner/binder/query_node/bind_setop_node.cpp
index dee7d493c82..3923852b9c2 100644
--- a/src/planner/binder/query_node/bind_setop_node.cpp
+++ b/src/planner/binder/query_node/bind_setop_node.cpp
@@ -1,11 +1,11 @@
-#include "parser/expression/columnref_expression.hpp"
-#include "parser/expression/constant_expression.hpp"
-#include "parser/expression_map.hpp"
-#include "parser/query_node/select_node.hpp"
-#include "parser/query_node/set_operation_node.hpp"
-#include "planner/binder.hpp"
-#include "planner/expression/bound_columnref_expression.hpp"
-#include "planner/query_node/bound_set_operation_node.hpp"
+#include "duckdb/parser/expression/columnref_expression.hpp"
+#include "duckdb/parser/expression/constant_expression.hpp"
+#include "duckdb/parser/expression_map.hpp"
+#include "duckdb/parser/query_node/select_node.hpp"
+#include "duckdb/parser/query_node/set_operation_node.hpp"
+#include "duckdb/planner/binder.hpp"
+#include "duckdb/planner/expression/bound_columnref_expression.hpp"
+#include "duckdb/planner/query_node/bound_set_operation_node.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/binder/statement/bind_copy.cpp b/src/planner/binder/statement/bind_copy.cpp
index 63e5a26ab5c..2ec21370afd 100644
--- a/src/planner/binder/statement/bind_copy.cpp
+++ b/src/planner/binder/statement/bind_copy.cpp
@@ -1,8 +1,8 @@
-#include "main/client_context.hpp"
-#include "parser/statement/copy_statement.hpp"
-#include "planner/binder.hpp"
-#include "parser/statement/insert_statement.hpp"
-#include "planner/statement/bound_copy_statement.hpp"
+#include "duckdb/main/client_context.hpp"
+#include "duckdb/parser/statement/copy_statement.hpp"
+#include "duckdb/planner/binder.hpp"
+#include "duckdb/parser/statement/insert_statement.hpp"
+#include "duckdb/planner/statement/bound_copy_statement.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/binder/statement/bind_create_index.cpp b/src/planner/binder/statement/bind_create_index.cpp
index ac39e2eea6a..2e8560cbd09 100644
--- a/src/planner/binder/statement/bind_create_index.cpp
+++ b/src/planner/binder/statement/bind_create_index.cpp
@@ -1,8 +1,8 @@
-#include "parser/statement/create_index_statement.hpp"
-#include "planner/binder.hpp"
-#include "planner/expression_binder/index_binder.hpp"
-#include "planner/statement/bound_create_index_statement.hpp"
-#include "planner/tableref/bound_basetableref.hpp"
+#include "duckdb/parser/statement/create_index_statement.hpp"
+#include "duckdb/planner/binder.hpp"
+#include "duckdb/planner/expression_binder/index_binder.hpp"
+#include "duckdb/planner/statement/bound_create_index_statement.hpp"
+#include "duckdb/planner/tableref/bound_basetableref.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/binder/statement/bind_create_table.cpp b/src/planner/binder/statement/bind_create_table.cpp
index 57301612ebb..1d4b8c0a888 100644
--- a/src/planner/binder/statement/bind_create_table.cpp
+++ b/src/planner/binder/statement/bind_create_table.cpp
@@ -1,14 +1,14 @@
-#include "main/client_context.hpp"
-#include "main/database.hpp"
-#include "parser/constraints/list.hpp"
-#include "parser/expression/cast_expression.hpp"
-#include "parser/statement/create_table_statement.hpp"
-#include "planner/binder.hpp"
-#include "planner/constraints/list.hpp"
-#include "planner/expression/bound_constant_expression.hpp"
-#include "planner/expression_binder/check_binder.hpp"
-#include "planner/expression_binder/constant_binder.hpp"
-#include "planner/statement/bound_create_table_statement.hpp"
+#include "duckdb/main/client_context.hpp"
+#include "duckdb/main/database.hpp"
+#include "duckdb/parser/constraints/list.hpp"
+#include "duckdb/parser/expression/cast_expression.hpp"
+#include "duckdb/parser/statement/create_table_statement.hpp"
+#include "duckdb/planner/binder.hpp"
+#include "duckdb/planner/constraints/list.hpp"
+#include "duckdb/planner/expression/bound_constant_expression.hpp"
+#include "duckdb/planner/expression_binder/check_binder.hpp"
+#include "duckdb/planner/expression_binder/constant_binder.hpp"
+#include "duckdb/planner/statement/bound_create_table_statement.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/binder/statement/bind_delete.cpp b/src/planner/binder/statement/bind_delete.cpp
index 4f01328c19d..cbe02c005e7 100644
--- a/src/planner/binder/statement/bind_delete.cpp
+++ b/src/planner/binder/statement/bind_delete.cpp
@@ -1,7 +1,7 @@
-#include "parser/statement/delete_statement.hpp"
-#include "planner/binder.hpp"
-#include "planner/expression_binder/where_binder.hpp"
-#include "planner/statement/bound_delete_statement.hpp"
+#include "duckdb/parser/statement/delete_statement.hpp"
+#include "duckdb/planner/binder.hpp"
+#include "duckdb/planner/expression_binder/where_binder.hpp"
+#include "duckdb/planner/statement/bound_delete_statement.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/binder/statement/bind_execute.cpp b/src/planner/binder/statement/bind_execute.cpp
index 1ccd7eed554..27dc735c2f4 100644
--- a/src/planner/binder/statement/bind_execute.cpp
+++ b/src/planner/binder/statement/bind_execute.cpp
@@ -1,10 +1,10 @@
-#include "execution/expression_executor.hpp"
-#include "main/client_context.hpp"
-#include "parser/expression/constant_expression.hpp"
-#include "parser/statement/execute_statement.hpp"
-#include "planner/binder.hpp"
-#include "planner/expression_binder/constant_binder.hpp"
-#include "planner/statement/bound_execute_statement.hpp"
+#include "duckdb/execution/expression_executor.hpp"
+#include "duckdb/main/client_context.hpp"
+#include "duckdb/parser/expression/constant_expression.hpp"
+#include "duckdb/parser/statement/execute_statement.hpp"
+#include "duckdb/planner/binder.hpp"
+#include "duckdb/planner/expression_binder/constant_binder.hpp"
+#include "duckdb/planner/statement/bound_execute_statement.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/binder/statement/bind_insert.cpp b/src/planner/binder/statement/bind_insert.cpp
index 3d2890627f3..9efc8e73126 100644
--- a/src/planner/binder/statement/bind_insert.cpp
+++ b/src/planner/binder/statement/bind_insert.cpp
@@ -1,9 +1,9 @@
-#include "main/client_context.hpp"
-#include "main/database.hpp"
-#include "parser/statement/insert_statement.hpp"
-#include "planner/binder.hpp"
-#include "planner/expression_binder/insert_binder.hpp"
-#include "planner/statement/bound_insert_statement.hpp"
+#include "duckdb/main/client_context.hpp"
+#include "duckdb/main/database.hpp"
+#include "duckdb/parser/statement/insert_statement.hpp"
+#include "duckdb/planner/binder.hpp"
+#include "duckdb/planner/expression_binder/insert_binder.hpp"
+#include "duckdb/planner/statement/bound_insert_statement.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/binder/statement/bind_select.cpp b/src/planner/binder/statement/bind_select.cpp
index a44ea98b75c..41e1c9223f4 100644
--- a/src/planner/binder/statement/bind_select.cpp
+++ b/src/planner/binder/statement/bind_select.cpp
@@ -1,6 +1,6 @@
-#include "parser/statement/select_statement.hpp"
-#include "planner/binder.hpp"
-#include "planner/statement/bound_select_statement.hpp"
+#include "duckdb/parser/statement/select_statement.hpp"
+#include "duckdb/planner/binder.hpp"
+#include "duckdb/planner/statement/bound_select_statement.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/binder/statement/bind_update.cpp b/src/planner/binder/statement/bind_update.cpp
index 320d02d44ee..1a0638fef28 100644
--- a/src/planner/binder/statement/bind_update.cpp
+++ b/src/planner/binder/statement/bind_update.cpp
@@ -1,13 +1,13 @@
-#include "parser/statement/update_statement.hpp"
-#include "planner/binder.hpp"
-#include "planner/expression/bound_default_expression.hpp"
-#include "planner/expression_binder/update_binder.hpp"
-#include "planner/expression_binder/where_binder.hpp"
-#include "planner/statement/bound_update_statement.hpp"
-#include "planner/tableref/bound_basetableref.hpp"
-#include "planner/constraints/bound_check_constraint.hpp"
-#include "parser/expression/columnref_expression.hpp"
-#include "storage/data_table.hpp"
+#include "duckdb/parser/statement/update_statement.hpp"
+#include "duckdb/planner/binder.hpp"
+#include "duckdb/planner/expression/bound_default_expression.hpp"
+#include "duckdb/planner/expression_binder/update_binder.hpp"
+#include "duckdb/planner/expression_binder/where_binder.hpp"
+#include "duckdb/planner/statement/bound_update_statement.hpp"
+#include "duckdb/planner/tableref/bound_basetableref.hpp"
+#include "duckdb/planner/constraints/bound_check_constraint.hpp"
+#include "duckdb/parser/expression/columnref_expression.hpp"
+#include "duckdb/storage/data_table.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/binder/tableref/bind_basetableref.cpp b/src/planner/binder/tableref/bind_basetableref.cpp
index b6277a6bb4a..2fe34c40587 100644
--- a/src/planner/binder/tableref/bind_basetableref.cpp
+++ b/src/planner/binder/tableref/bind_basetableref.cpp
@@ -1,11 +1,11 @@
-#include "catalog/catalog_entry/view_catalog_entry.hpp"
-#include "main/client_context.hpp"
-#include "main/database.hpp"
-#include "parser/tableref/basetableref.hpp"
-#include "parser/tableref/subqueryref.hpp"
-#include "planner/binder.hpp"
-#include "planner/tableref/bound_basetableref.hpp"
-#include "planner/tableref/bound_subqueryref.hpp"
+#include "duckdb/catalog/catalog_entry/view_catalog_entry.hpp"
+#include "duckdb/main/client_context.hpp"
+#include "duckdb/main/database.hpp"
+#include "duckdb/parser/tableref/basetableref.hpp"
+#include "duckdb/parser/tableref/subqueryref.hpp"
+#include "duckdb/planner/binder.hpp"
+#include "duckdb/planner/tableref/bound_basetableref.hpp"
+#include "duckdb/planner/tableref/bound_subqueryref.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/binder/tableref/bind_crossproductref.cpp b/src/planner/binder/tableref/bind_crossproductref.cpp
index 831c7186e3e..5a968f1e5b2 100644
--- a/src/planner/binder/tableref/bind_crossproductref.cpp
+++ b/src/planner/binder/tableref/bind_crossproductref.cpp
@@ -1,6 +1,6 @@
-#include "parser/tableref/crossproductref.hpp"
-#include "planner/binder.hpp"
-#include "planner/tableref/bound_crossproductref.hpp"
+#include "duckdb/parser/tableref/crossproductref.hpp"
+#include "duckdb/planner/binder.hpp"
+#include "duckdb/planner/tableref/bound_crossproductref.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/binder/tableref/bind_emptytableref.cpp b/src/planner/binder/tableref/bind_emptytableref.cpp
index ab9431de9fe..b086af25177 100644
--- a/src/planner/binder/tableref/bind_emptytableref.cpp
+++ b/src/planner/binder/tableref/bind_emptytableref.cpp
@@ -1,6 +1,6 @@
-#include "parser/tableref/emptytableref.hpp"
-#include "planner/binder.hpp"
-#include "planner/tableref/bound_dummytableref.hpp"
+#include "duckdb/parser/tableref/emptytableref.hpp"
+#include "duckdb/planner/binder.hpp"
+#include "duckdb/planner/tableref/bound_dummytableref.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/binder/tableref/bind_joinref.cpp b/src/planner/binder/tableref/bind_joinref.cpp
index d2b0b1d9081..66b974e541f 100644
--- a/src/planner/binder/tableref/bind_joinref.cpp
+++ b/src/planner/binder/tableref/bind_joinref.cpp
@@ -1,7 +1,7 @@
-#include "parser/tableref/joinref.hpp"
-#include "planner/binder.hpp"
-#include "planner/expression_binder/where_binder.hpp"
-#include "planner/tableref/bound_joinref.hpp"
+#include "duckdb/parser/tableref/joinref.hpp"
+#include "duckdb/planner/binder.hpp"
+#include "duckdb/planner/expression_binder/where_binder.hpp"
+#include "duckdb/planner/tableref/bound_joinref.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/binder/tableref/bind_subqueryref.cpp b/src/planner/binder/tableref/bind_subqueryref.cpp
index ebe54f404a6..adff8470f90 100644
--- a/src/planner/binder/tableref/bind_subqueryref.cpp
+++ b/src/planner/binder/tableref/bind_subqueryref.cpp
@@ -1,6 +1,6 @@
-#include "parser/tableref/subqueryref.hpp"
-#include "planner/binder.hpp"
-#include "planner/tableref/bound_subqueryref.hpp"
+#include "duckdb/parser/tableref/subqueryref.hpp"
+#include "duckdb/planner/binder.hpp"
+#include "duckdb/planner/tableref/bound_subqueryref.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/binder/tableref/bind_table_function.cpp b/src/planner/binder/tableref/bind_table_function.cpp
index bec2981f3a8..50b546715a1 100644
--- a/src/planner/binder/tableref/bind_table_function.cpp
+++ b/src/planner/binder/tableref/bind_table_function.cpp
@@ -1,10 +1,10 @@
-#include "main/client_context.hpp"
-#include "main/database.hpp"
-#include "parser/expression/function_expression.hpp"
-#include "parser/tableref/table_function_ref.hpp"
-#include "planner/binder.hpp"
-#include "planner/expression_binder/constant_binder.hpp"
-#include "planner/tableref/bound_table_function.hpp"
+#include "duckdb/main/client_context.hpp"
+#include "duckdb/main/database.hpp"
+#include "duckdb/parser/expression/function_expression.hpp"
+#include "duckdb/parser/tableref/table_function_ref.hpp"
+#include "duckdb/planner/binder.hpp"
+#include "duckdb/planner/expression_binder/constant_binder.hpp"
+#include "duckdb/planner/tableref/bound_table_function.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/expression.cpp b/src/planner/expression.cpp
index 402ef3ff87f..90268a1d95f 100644
--- a/src/planner/expression.cpp
+++ b/src/planner/expression.cpp
@@ -1,8 +1,8 @@
-#include "planner/expression.hpp"
+#include "duckdb/planner/expression.hpp"
 
-#include "common/exception.hpp"
-#include "common/types/hash.hpp"
-#include "planner/expression_iterator.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/common/types/hash.hpp"
+#include "duckdb/planner/expression_iterator.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/expression/bound_aggregate_expression.cpp b/src/planner/expression/bound_aggregate_expression.cpp
index f8d53d08d0f..9fe82609f05 100644
--- a/src/planner/expression/bound_aggregate_expression.cpp
+++ b/src/planner/expression/bound_aggregate_expression.cpp
@@ -1,5 +1,5 @@
-#include "planner/expression/bound_aggregate_expression.hpp"
-#include "catalog/catalog_entry/aggregate_function_catalog_entry.hpp"
+#include "duckdb/planner/expression/bound_aggregate_expression.hpp"
+#include "duckdb/catalog/catalog_entry/aggregate_function_catalog_entry.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/expression/bound_case_expression.cpp b/src/planner/expression/bound_case_expression.cpp
index 67fc193fcaa..05c2a01bc71 100644
--- a/src/planner/expression/bound_case_expression.cpp
+++ b/src/planner/expression/bound_case_expression.cpp
@@ -1,4 +1,4 @@
-#include "planner/expression/bound_case_expression.hpp"
+#include "duckdb/planner/expression/bound_case_expression.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/expression/bound_cast_expression.cpp b/src/planner/expression/bound_cast_expression.cpp
index 137052997da..24056464572 100644
--- a/src/planner/expression/bound_cast_expression.cpp
+++ b/src/planner/expression/bound_cast_expression.cpp
@@ -1,4 +1,4 @@
-#include "planner/expression/bound_cast_expression.hpp"
+#include "duckdb/planner/expression/bound_cast_expression.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/expression/bound_columnref_expression.cpp b/src/planner/expression/bound_columnref_expression.cpp
index a1b0b5a9f62..5a50ca04c06 100644
--- a/src/planner/expression/bound_columnref_expression.cpp
+++ b/src/planner/expression/bound_columnref_expression.cpp
@@ -1,6 +1,6 @@
-#include "planner/expression/bound_columnref_expression.hpp"
+#include "duckdb/planner/expression/bound_columnref_expression.hpp"
 
-#include "common/types/hash.hpp"
+#include "duckdb/common/types/hash.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/expression/bound_comparison_expression.cpp b/src/planner/expression/bound_comparison_expression.cpp
index d6d1a4ed10e..7cf4fee0ec4 100644
--- a/src/planner/expression/bound_comparison_expression.cpp
+++ b/src/planner/expression/bound_comparison_expression.cpp
@@ -1,4 +1,4 @@
-#include "planner/expression/bound_comparison_expression.hpp"
+#include "duckdb/planner/expression/bound_comparison_expression.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/expression/bound_conjunction_expression.cpp b/src/planner/expression/bound_conjunction_expression.cpp
index bce3ff0af86..070708ba04a 100644
--- a/src/planner/expression/bound_conjunction_expression.cpp
+++ b/src/planner/expression/bound_conjunction_expression.cpp
@@ -1,4 +1,4 @@
-#include "planner/expression/bound_conjunction_expression.hpp"
+#include "duckdb/planner/expression/bound_conjunction_expression.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/expression/bound_constant_expression.cpp b/src/planner/expression/bound_constant_expression.cpp
index e98b1e43c6b..7a4d6d5ef93 100644
--- a/src/planner/expression/bound_constant_expression.cpp
+++ b/src/planner/expression/bound_constant_expression.cpp
@@ -1,7 +1,7 @@
-#include "planner/expression/bound_constant_expression.hpp"
+#include "duckdb/planner/expression/bound_constant_expression.hpp"
 
-#include "common/types/hash.hpp"
-#include "common/value_operations/value_operations.hpp"
+#include "duckdb/common/types/hash.hpp"
+#include "duckdb/common/value_operations/value_operations.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/expression/bound_function_expression.cpp b/src/planner/expression/bound_function_expression.cpp
index 3336be91ad7..3f12aa9ac5a 100644
--- a/src/planner/expression/bound_function_expression.cpp
+++ b/src/planner/expression/bound_function_expression.cpp
@@ -1,7 +1,7 @@
-#include "planner/expression/bound_function_expression.hpp"
+#include "duckdb/planner/expression/bound_function_expression.hpp"
 
-#include "catalog/catalog_entry/scalar_function_catalog_entry.hpp"
-#include "common/types/hash.hpp"
+#include "duckdb/catalog/catalog_entry/scalar_function_catalog_entry.hpp"
+#include "duckdb/common/types/hash.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/expression/bound_operator_expression.cpp b/src/planner/expression/bound_operator_expression.cpp
index 69469a0b05a..fdfccdda1de 100644
--- a/src/planner/expression/bound_operator_expression.cpp
+++ b/src/planner/expression/bound_operator_expression.cpp
@@ -1,4 +1,4 @@
-#include "planner/expression/bound_operator_expression.hpp"
+#include "duckdb/planner/expression/bound_operator_expression.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/expression/bound_parameter_expression.cpp b/src/planner/expression/bound_parameter_expression.cpp
index 9e488dd65a3..999732b93bf 100644
--- a/src/planner/expression/bound_parameter_expression.cpp
+++ b/src/planner/expression/bound_parameter_expression.cpp
@@ -1,4 +1,4 @@
-#include "planner/expression/bound_parameter_expression.hpp"
+#include "duckdb/planner/expression/bound_parameter_expression.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/expression/bound_reference_expression.cpp b/src/planner/expression/bound_reference_expression.cpp
index 9312a66a202..79be1709f94 100644
--- a/src/planner/expression/bound_reference_expression.cpp
+++ b/src/planner/expression/bound_reference_expression.cpp
@@ -1,7 +1,7 @@
-#include "planner/expression/bound_reference_expression.hpp"
+#include "duckdb/planner/expression/bound_reference_expression.hpp"
 
-#include "common/serializer.hpp"
-#include "common/types/hash.hpp"
+#include "duckdb/common/serializer.hpp"
+#include "duckdb/common/types/hash.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/expression/bound_subquery_expression.cpp b/src/planner/expression/bound_subquery_expression.cpp
index 4ca7c1335b1..d0ee8510869 100644
--- a/src/planner/expression/bound_subquery_expression.cpp
+++ b/src/planner/expression/bound_subquery_expression.cpp
@@ -1,6 +1,6 @@
-#include "planner/expression/bound_subquery_expression.hpp"
+#include "duckdb/planner/expression/bound_subquery_expression.hpp"
 
-#include "common/exception.hpp"
+#include "duckdb/common/exception.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/expression/bound_window_expression.cpp b/src/planner/expression/bound_window_expression.cpp
index bb56118bd2c..5fde96782ba 100644
--- a/src/planner/expression/bound_window_expression.cpp
+++ b/src/planner/expression/bound_window_expression.cpp
@@ -1,4 +1,4 @@
-#include "planner/expression/bound_window_expression.hpp"
+#include "duckdb/planner/expression/bound_window_expression.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/expression/common_subexpression.cpp b/src/planner/expression/common_subexpression.cpp
index ba6cc73132d..6f1edc6ba02 100644
--- a/src/planner/expression/common_subexpression.cpp
+++ b/src/planner/expression/common_subexpression.cpp
@@ -1,6 +1,6 @@
-#include "planner/expression/common_subexpression.hpp"
+#include "duckdb/planner/expression/common_subexpression.hpp"
 
-#include "common/exception.hpp"
+#include "duckdb/common/exception.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/expression_binder.cpp b/src/planner/expression_binder.cpp
index 9967625e1f3..d8498733e4c 100644
--- a/src/planner/expression_binder.cpp
+++ b/src/planner/expression_binder.cpp
@@ -1,16 +1,16 @@
-#include "planner/expression_binder.hpp"
+#include "duckdb/planner/expression_binder.hpp"
 
-#include "main/client_context.hpp"
-#include "main/database.hpp"
-#include "parser/expression/columnref_expression.hpp"
-#include "parser/expression/subquery_expression.hpp"
-#include "parser/parsed_expression_iterator.hpp"
-#include "planner/binder.hpp"
-#include "planner/expression/bound_cast_expression.hpp"
-#include "planner/expression/bound_default_expression.hpp"
-#include "planner/expression/bound_parameter_expression.hpp"
-#include "planner/expression/bound_subquery_expression.hpp"
-#include "planner/expression_iterator.hpp"
+#include "duckdb/main/client_context.hpp"
+#include "duckdb/main/database.hpp"
+#include "duckdb/parser/expression/columnref_expression.hpp"
+#include "duckdb/parser/expression/subquery_expression.hpp"
+#include "duckdb/parser/parsed_expression_iterator.hpp"
+#include "duckdb/planner/binder.hpp"
+#include "duckdb/planner/expression/bound_cast_expression.hpp"
+#include "duckdb/planner/expression/bound_default_expression.hpp"
+#include "duckdb/planner/expression/bound_parameter_expression.hpp"
+#include "duckdb/planner/expression/bound_subquery_expression.hpp"
+#include "duckdb/planner/expression_iterator.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/expression_binder/aggregate_binder.cpp b/src/planner/expression_binder/aggregate_binder.cpp
index a68ce42e17f..0485f735173 100644
--- a/src/planner/expression_binder/aggregate_binder.cpp
+++ b/src/planner/expression_binder/aggregate_binder.cpp
@@ -1,6 +1,6 @@
-#include "planner/expression_binder/aggregate_binder.hpp"
+#include "duckdb/planner/expression_binder/aggregate_binder.hpp"
 
-#include "planner/binder.hpp"
+#include "duckdb/planner/binder.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/expression_binder/check_binder.cpp b/src/planner/expression_binder/check_binder.cpp
index 9bd91672e08..7ba2a93359b 100644
--- a/src/planner/expression_binder/check_binder.cpp
+++ b/src/planner/expression_binder/check_binder.cpp
@@ -1,7 +1,7 @@
-#include "planner/expression_binder/check_binder.hpp"
+#include "duckdb/planner/expression_binder/check_binder.hpp"
 
-#include "parser/expression/columnref_expression.hpp"
-#include "planner/expression/bound_reference_expression.hpp"
+#include "duckdb/parser/expression/columnref_expression.hpp"
+#include "duckdb/planner/expression/bound_reference_expression.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/expression_binder/constant_binder.cpp b/src/planner/expression_binder/constant_binder.cpp
index be3490fb7d8..df62828dff3 100644
--- a/src/planner/expression_binder/constant_binder.cpp
+++ b/src/planner/expression_binder/constant_binder.cpp
@@ -1,4 +1,4 @@
-#include "planner/expression_binder/constant_binder.hpp"
+#include "duckdb/planner/expression_binder/constant_binder.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/expression_binder/group_binder.cpp b/src/planner/expression_binder/group_binder.cpp
index b5eaac52165..33e1c36a239 100644
--- a/src/planner/expression_binder/group_binder.cpp
+++ b/src/planner/expression_binder/group_binder.cpp
@@ -1,9 +1,9 @@
-#include "planner/expression_binder/group_binder.hpp"
+#include "duckdb/planner/expression_binder/group_binder.hpp"
 
-#include "parser/expression/columnref_expression.hpp"
-#include "parser/expression/constant_expression.hpp"
-#include "parser/query_node/select_node.hpp"
-#include "planner/expression/bound_constant_expression.hpp"
+#include "duckdb/parser/expression/columnref_expression.hpp"
+#include "duckdb/parser/expression/constant_expression.hpp"
+#include "duckdb/parser/query_node/select_node.hpp"
+#include "duckdb/planner/expression/bound_constant_expression.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/expression_binder/having_binder.cpp b/src/planner/expression_binder/having_binder.cpp
index 347efe82a73..faf88d4ff3d 100644
--- a/src/planner/expression_binder/having_binder.cpp
+++ b/src/planner/expression_binder/having_binder.cpp
@@ -1,9 +1,9 @@
-#include "planner/expression_binder/having_binder.hpp"
+#include "duckdb/planner/expression_binder/having_binder.hpp"
 
-#include "parser/expression/columnref_expression.hpp"
-#include "planner/binder.hpp"
-#include "planner/expression_binder/aggregate_binder.hpp"
-#include "common/string_util.hpp"
+#include "duckdb/parser/expression/columnref_expression.hpp"
+#include "duckdb/planner/binder.hpp"
+#include "duckdb/planner/expression_binder/aggregate_binder.hpp"
+#include "duckdb/common/string_util.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/expression_binder/index_binder.cpp b/src/planner/expression_binder/index_binder.cpp
index 589265c15e0..21d18e269f4 100644
--- a/src/planner/expression_binder/index_binder.cpp
+++ b/src/planner/expression_binder/index_binder.cpp
@@ -1,4 +1,4 @@
-#include "planner/expression_binder/index_binder.hpp"
+#include "duckdb/planner/expression_binder/index_binder.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/expression_binder/insert_binder.cpp b/src/planner/expression_binder/insert_binder.cpp
index b34e56f90a9..634060800bf 100644
--- a/src/planner/expression_binder/insert_binder.cpp
+++ b/src/planner/expression_binder/insert_binder.cpp
@@ -1,6 +1,6 @@
-#include "planner/expression_binder/insert_binder.hpp"
+#include "duckdb/planner/expression_binder/insert_binder.hpp"
 
-#include "planner/expression/bound_default_expression.hpp"
+#include "duckdb/planner/expression/bound_default_expression.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/expression_binder/order_binder.cpp b/src/planner/expression_binder/order_binder.cpp
index ca82d02a501..c701a760be4 100644
--- a/src/planner/expression_binder/order_binder.cpp
+++ b/src/planner/expression_binder/order_binder.cpp
@@ -1,8 +1,8 @@
-#include "planner/expression_binder/order_binder.hpp"
+#include "duckdb/planner/expression_binder/order_binder.hpp"
 
-#include "parser/expression/columnref_expression.hpp"
-#include "parser/expression/constant_expression.hpp"
-#include "parser/query_node/select_node.hpp"
+#include "duckdb/parser/expression/columnref_expression.hpp"
+#include "duckdb/parser/expression/constant_expression.hpp"
+#include "duckdb/parser/query_node/select_node.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/expression_binder/select_binder.cpp b/src/planner/expression_binder/select_binder.cpp
index c9b3c9880e8..24966d0d651 100644
--- a/src/planner/expression_binder/select_binder.cpp
+++ b/src/planner/expression_binder/select_binder.cpp
@@ -1,12 +1,12 @@
-#include "planner/expression_binder/select_binder.hpp"
+#include "duckdb/planner/expression_binder/select_binder.hpp"
 
-#include "parser/expression/columnref_expression.hpp"
-#include "parser/expression/window_expression.hpp"
-#include "parser/parsed_expression_iterator.hpp"
-#include "planner/expression/bound_columnref_expression.hpp"
-#include "planner/expression/bound_window_expression.hpp"
-#include "planner/expression_binder/aggregate_binder.hpp"
-#include "planner/query_node/bound_select_node.hpp"
+#include "duckdb/parser/expression/columnref_expression.hpp"
+#include "duckdb/parser/expression/window_expression.hpp"
+#include "duckdb/parser/parsed_expression_iterator.hpp"
+#include "duckdb/planner/expression/bound_columnref_expression.hpp"
+#include "duckdb/planner/expression/bound_window_expression.hpp"
+#include "duckdb/planner/expression_binder/aggregate_binder.hpp"
+#include "duckdb/planner/query_node/bound_select_node.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/expression_binder/update_binder.cpp b/src/planner/expression_binder/update_binder.cpp
index b5f6a3fae5e..5dcc9e95839 100644
--- a/src/planner/expression_binder/update_binder.cpp
+++ b/src/planner/expression_binder/update_binder.cpp
@@ -1,4 +1,4 @@
-#include "planner/expression_binder/update_binder.hpp"
+#include "duckdb/planner/expression_binder/update_binder.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/expression_binder/where_binder.cpp b/src/planner/expression_binder/where_binder.cpp
index a4ad1703689..87ef6ed2783 100644
--- a/src/planner/expression_binder/where_binder.cpp
+++ b/src/planner/expression_binder/where_binder.cpp
@@ -1,4 +1,4 @@
-#include "planner/expression_binder/where_binder.hpp"
+#include "duckdb/planner/expression_binder/where_binder.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/expression_iterator.cpp b/src/planner/expression_iterator.cpp
index 679710110f2..9e4b36b72df 100644
--- a/src/planner/expression_iterator.cpp
+++ b/src/planner/expression_iterator.cpp
@@ -1,10 +1,10 @@
-#include "planner/expression_iterator.hpp"
+#include "duckdb/planner/expression_iterator.hpp"
 
-#include "planner/bound_query_node.hpp"
-#include "planner/expression/list.hpp"
-#include "planner/query_node/bound_select_node.hpp"
-#include "planner/query_node/bound_set_operation_node.hpp"
-#include "planner/tableref/list.hpp"
+#include "duckdb/planner/bound_query_node.hpp"
+#include "duckdb/planner/expression/list.hpp"
+#include "duckdb/planner/query_node/bound_select_node.hpp"
+#include "duckdb/planner/query_node/bound_set_operation_node.hpp"
+#include "duckdb/planner/tableref/list.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/joinside.cpp b/src/planner/joinside.cpp
index d5166c81c73..3dceecb1c0a 100644
--- a/src/planner/joinside.cpp
+++ b/src/planner/joinside.cpp
@@ -1,9 +1,9 @@
-#include "planner/joinside.hpp"
+#include "duckdb/planner/joinside.hpp"
 
-#include "planner/expression/bound_columnref_expression.hpp"
-#include "planner/expression/bound_comparison_expression.hpp"
-#include "planner/expression/bound_subquery_expression.hpp"
-#include "planner/expression_iterator.hpp"
+#include "duckdb/planner/expression/bound_columnref_expression.hpp"
+#include "duckdb/planner/expression/bound_comparison_expression.hpp"
+#include "duckdb/planner/expression/bound_subquery_expression.hpp"
+#include "duckdb/planner/expression_iterator.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/logical_operator.cpp b/src/planner/logical_operator.cpp
index 2363eab328c..385847c09ac 100644
--- a/src/planner/logical_operator.cpp
+++ b/src/planner/logical_operator.cpp
@@ -1,6 +1,6 @@
-#include "planner/logical_operator.hpp"
+#include "duckdb/planner/logical_operator.hpp"
 
-#include "common/printer.hpp"
+#include "duckdb/common/printer.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/logical_operator_visitor.cpp b/src/planner/logical_operator_visitor.cpp
index 0dc40427909..1169c6d0698 100644
--- a/src/planner/logical_operator_visitor.cpp
+++ b/src/planner/logical_operator_visitor.cpp
@@ -1,8 +1,8 @@
-#include "planner/logical_operator_visitor.hpp"
+#include "duckdb/planner/logical_operator_visitor.hpp"
 
-#include "planner/expression/list.hpp"
-#include "planner/expression_iterator.hpp"
-#include "planner/operator/list.hpp"
+#include "duckdb/planner/expression/list.hpp"
+#include "duckdb/planner/expression_iterator.hpp"
+#include "duckdb/planner/operator/list.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/logical_plan/plan_subquery.cpp b/src/planner/logical_plan/plan_subquery.cpp
index 8b1718d7588..a06fc63b266 100644
--- a/src/planner/logical_plan/plan_subquery.cpp
+++ b/src/planner/logical_plan/plan_subquery.cpp
@@ -1,17 +1,17 @@
-#include "planner/binder.hpp"
-#include "planner/expression/bound_aggregate_expression.hpp"
-#include "planner/expression/bound_cast_expression.hpp"
-#include "planner/expression/bound_columnref_expression.hpp"
-#include "planner/expression/bound_comparison_expression.hpp"
-#include "planner/expression/bound_constant_expression.hpp"
-#include "planner/expression/bound_reference_expression.hpp"
-#include "planner/expression/bound_subquery_expression.hpp"
-#include "planner/expression_iterator.hpp"
-#include "planner/logical_plan_generator.hpp"
-#include "planner/operator/list.hpp"
-#include "planner/subquery/flatten_dependent_join.hpp"
-#include "main/client_context.hpp"
-#include "function/aggregate/distributive_functions.hpp"
+#include "duckdb/planner/binder.hpp"
+#include "duckdb/planner/expression/bound_aggregate_expression.hpp"
+#include "duckdb/planner/expression/bound_cast_expression.hpp"
+#include "duckdb/planner/expression/bound_columnref_expression.hpp"
+#include "duckdb/planner/expression/bound_comparison_expression.hpp"
+#include "duckdb/planner/expression/bound_constant_expression.hpp"
+#include "duckdb/planner/expression/bound_reference_expression.hpp"
+#include "duckdb/planner/expression/bound_subquery_expression.hpp"
+#include "duckdb/planner/expression_iterator.hpp"
+#include "duckdb/planner/logical_plan_generator.hpp"
+#include "duckdb/planner/operator/list.hpp"
+#include "duckdb/planner/subquery/flatten_dependent_join.hpp"
+#include "duckdb/main/client_context.hpp"
+#include "duckdb/function/aggregate/distributive_functions.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/logical_plan/query_node/plan_query_node.cpp b/src/planner/logical_plan/query_node/plan_query_node.cpp
index f5eb8949987..47f71a2de01 100644
--- a/src/planner/logical_plan/query_node/plan_query_node.cpp
+++ b/src/planner/logical_plan/query_node/plan_query_node.cpp
@@ -1,8 +1,8 @@
-#include "parser/query_node.hpp"
-#include "planner/logical_plan_generator.hpp"
-#include "planner/operator/logical_distinct.hpp"
-#include "planner/operator/logical_limit.hpp"
-#include "planner/operator/logical_order.hpp"
+#include "duckdb/parser/query_node.hpp"
+#include "duckdb/planner/logical_plan_generator.hpp"
+#include "duckdb/planner/operator/logical_distinct.hpp"
+#include "duckdb/planner/operator/logical_limit.hpp"
+#include "duckdb/planner/operator/logical_order.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/logical_plan/query_node/plan_select_node.cpp b/src/planner/logical_plan/query_node/plan_select_node.cpp
index 21f44fe9dc6..40a4519ab88 100644
--- a/src/planner/logical_plan/query_node/plan_select_node.cpp
+++ b/src/planner/logical_plan/query_node/plan_select_node.cpp
@@ -1,7 +1,7 @@
-#include "planner/logical_plan_generator.hpp"
-#include "planner/operator/list.hpp"
-#include "planner/query_node/bound_select_node.hpp"
-#include "planner/operator/logical_expression_get.hpp"
+#include "duckdb/planner/logical_plan_generator.hpp"
+#include "duckdb/planner/operator/list.hpp"
+#include "duckdb/planner/query_node/bound_select_node.hpp"
+#include "duckdb/planner/operator/logical_expression_get.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/logical_plan/query_node/plan_setop.cpp b/src/planner/logical_plan/query_node/plan_setop.cpp
index 281ecdd6175..9e1cb9a4525 100644
--- a/src/planner/logical_plan/query_node/plan_setop.cpp
+++ b/src/planner/logical_plan/query_node/plan_setop.cpp
@@ -1,10 +1,10 @@
-#include "planner/expression/bound_cast_expression.hpp"
-#include "planner/expression/bound_columnref_expression.hpp"
-#include "planner/logical_plan_generator.hpp"
-#include "planner/operator/logical_projection.hpp"
-#include "planner/operator/logical_set_operation.hpp"
-#include "planner/operator/logical_subquery.hpp"
-#include "planner/query_node/bound_set_operation_node.hpp"
+#include "duckdb/planner/expression/bound_cast_expression.hpp"
+#include "duckdb/planner/expression/bound_columnref_expression.hpp"
+#include "duckdb/planner/logical_plan_generator.hpp"
+#include "duckdb/planner/operator/logical_projection.hpp"
+#include "duckdb/planner/operator/logical_set_operation.hpp"
+#include "duckdb/planner/operator/logical_subquery.hpp"
+#include "duckdb/planner/query_node/bound_set_operation_node.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/logical_plan/statement/plan_copy.cpp b/src/planner/logical_plan/statement/plan_copy.cpp
index be7b515f639..c0c8f7fa460 100644
--- a/src/planner/logical_plan/statement/plan_copy.cpp
+++ b/src/planner/logical_plan/statement/plan_copy.cpp
@@ -1,7 +1,7 @@
-#include "planner/logical_plan_generator.hpp"
-#include "planner/operator/logical_copy_from_file.hpp"
-#include "planner/operator/logical_copy_to_file.hpp"
-#include "planner/statement/bound_copy_statement.hpp"
+#include "duckdb/planner/logical_plan_generator.hpp"
+#include "duckdb/planner/operator/logical_copy_from_file.hpp"
+#include "duckdb/planner/operator/logical_copy_to_file.hpp"
+#include "duckdb/planner/statement/bound_copy_statement.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/logical_plan/statement/plan_create_index.cpp b/src/planner/logical_plan/statement/plan_create_index.cpp
index e4a71c22a57..6a35115a26b 100644
--- a/src/planner/logical_plan/statement/plan_create_index.cpp
+++ b/src/planner/logical_plan/statement/plan_create_index.cpp
@@ -1,7 +1,7 @@
-#include "planner/logical_plan_generator.hpp"
-#include "planner/operator/logical_create_index.hpp"
-#include "planner/operator/logical_get.hpp"
-#include "planner/statement/bound_create_index_statement.hpp"
+#include "duckdb/planner/logical_plan_generator.hpp"
+#include "duckdb/planner/operator/logical_create_index.hpp"
+#include "duckdb/planner/operator/logical_get.hpp"
+#include "duckdb/planner/statement/bound_create_index_statement.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/logical_plan/statement/plan_create_table.cpp b/src/planner/logical_plan/statement/plan_create_table.cpp
index e0c8ce2c548..af7f2e0ada1 100644
--- a/src/planner/logical_plan/statement/plan_create_table.cpp
+++ b/src/planner/logical_plan/statement/plan_create_table.cpp
@@ -1,6 +1,6 @@
-#include "planner/logical_plan_generator.hpp"
-#include "planner/operator/logical_create_table.hpp"
-#include "planner/statement/bound_create_table_statement.hpp"
+#include "duckdb/planner/logical_plan_generator.hpp"
+#include "duckdb/planner/operator/logical_create_table.hpp"
+#include "duckdb/planner/statement/bound_create_table_statement.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/logical_plan/statement/plan_delete.cpp b/src/planner/logical_plan/statement/plan_delete.cpp
index ff26bf4251c..411117f0201 100644
--- a/src/planner/logical_plan/statement/plan_delete.cpp
+++ b/src/planner/logical_plan/statement/plan_delete.cpp
@@ -1,9 +1,9 @@
-#include "planner/expression/bound_columnref_expression.hpp"
-#include "planner/logical_plan_generator.hpp"
-#include "planner/operator/logical_delete.hpp"
-#include "planner/operator/logical_filter.hpp"
-#include "planner/operator/logical_get.hpp"
-#include "planner/statement/bound_delete_statement.hpp"
+#include "duckdb/planner/expression/bound_columnref_expression.hpp"
+#include "duckdb/planner/logical_plan_generator.hpp"
+#include "duckdb/planner/operator/logical_delete.hpp"
+#include "duckdb/planner/operator/logical_filter.hpp"
+#include "duckdb/planner/operator/logical_get.hpp"
+#include "duckdb/planner/statement/bound_delete_statement.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/logical_plan/statement/plan_execute.cpp b/src/planner/logical_plan/statement/plan_execute.cpp
index 834cbc60f65..028f54dc66d 100644
--- a/src/planner/logical_plan/statement/plan_execute.cpp
+++ b/src/planner/logical_plan/statement/plan_execute.cpp
@@ -1,7 +1,7 @@
-#include "planner/expression/bound_parameter_expression.hpp"
-#include "planner/logical_plan_generator.hpp"
-#include "planner/operator/logical_execute.hpp"
-#include "planner/statement/bound_execute_statement.hpp"
+#include "duckdb/planner/expression/bound_parameter_expression.hpp"
+#include "duckdb/planner/logical_plan_generator.hpp"
+#include "duckdb/planner/operator/logical_execute.hpp"
+#include "duckdb/planner/statement/bound_execute_statement.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/logical_plan/statement/plan_insert.cpp b/src/planner/logical_plan/statement/plan_insert.cpp
index d343f02f498..a9fe7ca8ca7 100644
--- a/src/planner/logical_plan/statement/plan_insert.cpp
+++ b/src/planner/logical_plan/statement/plan_insert.cpp
@@ -1,6 +1,6 @@
-#include "planner/logical_plan_generator.hpp"
-#include "planner/operator/logical_insert.hpp"
-#include "planner/statement/bound_insert_statement.hpp"
+#include "duckdb/planner/logical_plan_generator.hpp"
+#include "duckdb/planner/operator/logical_insert.hpp"
+#include "duckdb/planner/statement/bound_insert_statement.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/logical_plan/statement/plan_select.cpp b/src/planner/logical_plan/statement/plan_select.cpp
index c4c9d168dfe..3a36c46f873 100644
--- a/src/planner/logical_plan/statement/plan_select.cpp
+++ b/src/planner/logical_plan/statement/plan_select.cpp
@@ -1,5 +1,5 @@
-#include "planner/logical_plan_generator.hpp"
-#include "planner/statement/bound_select_statement.hpp"
+#include "duckdb/planner/logical_plan_generator.hpp"
+#include "duckdb/planner/statement/bound_select_statement.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/logical_plan/statement/plan_update.cpp b/src/planner/logical_plan/statement/plan_update.cpp
index d0122ed55da..8c6d9df3428 100644
--- a/src/planner/logical_plan/statement/plan_update.cpp
+++ b/src/planner/logical_plan/statement/plan_update.cpp
@@ -1,10 +1,10 @@
-#include "planner/expression/bound_columnref_expression.hpp"
-#include "planner/logical_plan_generator.hpp"
-#include "planner/operator/logical_filter.hpp"
-#include "planner/operator/logical_get.hpp"
-#include "planner/operator/logical_projection.hpp"
-#include "planner/operator/logical_update.hpp"
-#include "planner/statement/bound_update_statement.hpp"
+#include "duckdb/planner/expression/bound_columnref_expression.hpp"
+#include "duckdb/planner/logical_plan_generator.hpp"
+#include "duckdb/planner/operator/logical_filter.hpp"
+#include "duckdb/planner/operator/logical_get.hpp"
+#include "duckdb/planner/operator/logical_projection.hpp"
+#include "duckdb/planner/operator/logical_update.hpp"
+#include "duckdb/planner/statement/bound_update_statement.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/logical_plan/tableref/plan_basetableref.cpp b/src/planner/logical_plan/tableref/plan_basetableref.cpp
index 98d0a782506..014188644c6 100644
--- a/src/planner/logical_plan/tableref/plan_basetableref.cpp
+++ b/src/planner/logical_plan/tableref/plan_basetableref.cpp
@@ -1,6 +1,6 @@
-#include "planner/logical_plan_generator.hpp"
-#include "planner/operator/logical_get.hpp"
-#include "planner/tableref/bound_basetableref.hpp"
+#include "duckdb/planner/logical_plan_generator.hpp"
+#include "duckdb/planner/operator/logical_get.hpp"
+#include "duckdb/planner/tableref/bound_basetableref.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/logical_plan/tableref/plan_crossproductref.cpp b/src/planner/logical_plan/tableref/plan_crossproductref.cpp
index fea5881f4ff..4b3cabf9c0e 100644
--- a/src/planner/logical_plan/tableref/plan_crossproductref.cpp
+++ b/src/planner/logical_plan/tableref/plan_crossproductref.cpp
@@ -1,6 +1,6 @@
-#include "planner/logical_plan_generator.hpp"
-#include "planner/operator/logical_cross_product.hpp"
-#include "planner/tableref/bound_crossproductref.hpp"
+#include "duckdb/planner/logical_plan_generator.hpp"
+#include "duckdb/planner/operator/logical_cross_product.hpp"
+#include "duckdb/planner/tableref/bound_crossproductref.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/logical_plan/tableref/plan_dummytableref.cpp b/src/planner/logical_plan/tableref/plan_dummytableref.cpp
index fc970a9d9b8..ecb2b99b46f 100644
--- a/src/planner/logical_plan/tableref/plan_dummytableref.cpp
+++ b/src/planner/logical_plan/tableref/plan_dummytableref.cpp
@@ -1,6 +1,6 @@
-#include "planner/logical_plan_generator.hpp"
-#include "planner/operator/logical_get.hpp"
-#include "planner/tableref/bound_dummytableref.hpp"
+#include "duckdb/planner/logical_plan_generator.hpp"
+#include "duckdb/planner/operator/logical_get.hpp"
+#include "duckdb/planner/tableref/bound_dummytableref.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/logical_plan/tableref/plan_joinref.cpp b/src/planner/logical_plan/tableref/plan_joinref.cpp
index f670a4af0b8..f3db6d54ddc 100644
--- a/src/planner/logical_plan/tableref/plan_joinref.cpp
+++ b/src/planner/logical_plan/tableref/plan_joinref.cpp
@@ -1,16 +1,16 @@
-#include "planner/expression/bound_columnref_expression.hpp"
-#include "planner/expression/bound_comparison_expression.hpp"
-#include "planner/expression/bound_conjunction_expression.hpp"
-#include "planner/expression/bound_constant_expression.hpp"
-#include "planner/expression/bound_operator_expression.hpp"
-#include "planner/expression/bound_subquery_expression.hpp"
-#include "planner/expression_iterator.hpp"
-#include "planner/logical_plan_generator.hpp"
-#include "planner/operator/logical_any_join.hpp"
-#include "planner/operator/logical_comparison_join.hpp"
-#include "planner/operator/logical_cross_product.hpp"
-#include "planner/operator/logical_filter.hpp"
-#include "planner/tableref/bound_joinref.hpp"
+#include "duckdb/planner/expression/bound_columnref_expression.hpp"
+#include "duckdb/planner/expression/bound_comparison_expression.hpp"
+#include "duckdb/planner/expression/bound_conjunction_expression.hpp"
+#include "duckdb/planner/expression/bound_constant_expression.hpp"
+#include "duckdb/planner/expression/bound_operator_expression.hpp"
+#include "duckdb/planner/expression/bound_subquery_expression.hpp"
+#include "duckdb/planner/expression_iterator.hpp"
+#include "duckdb/planner/logical_plan_generator.hpp"
+#include "duckdb/planner/operator/logical_any_join.hpp"
+#include "duckdb/planner/operator/logical_comparison_join.hpp"
+#include "duckdb/planner/operator/logical_cross_product.hpp"
+#include "duckdb/planner/operator/logical_filter.hpp"
+#include "duckdb/planner/tableref/bound_joinref.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/logical_plan/tableref/plan_subqueryref.cpp b/src/planner/logical_plan/tableref/plan_subqueryref.cpp
index 5ad3443f93e..b886aad8caf 100644
--- a/src/planner/logical_plan/tableref/plan_subqueryref.cpp
+++ b/src/planner/logical_plan/tableref/plan_subqueryref.cpp
@@ -1,6 +1,6 @@
-#include "planner/logical_plan_generator.hpp"
-#include "planner/operator/logical_subquery.hpp"
-#include "planner/tableref/bound_subqueryref.hpp"
+#include "duckdb/planner/logical_plan_generator.hpp"
+#include "duckdb/planner/operator/logical_subquery.hpp"
+#include "duckdb/planner/tableref/bound_subqueryref.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/logical_plan/tableref/plan_table_function.cpp b/src/planner/logical_plan/tableref/plan_table_function.cpp
index a0586ba96b7..168ffd1de68 100644
--- a/src/planner/logical_plan/tableref/plan_table_function.cpp
+++ b/src/planner/logical_plan/tableref/plan_table_function.cpp
@@ -1,6 +1,6 @@
-#include "planner/logical_plan_generator.hpp"
-#include "planner/operator/logical_table_function.hpp"
-#include "planner/tableref/bound_table_function.hpp"
+#include "duckdb/planner/logical_plan_generator.hpp"
+#include "duckdb/planner/operator/logical_table_function.hpp"
+#include "duckdb/planner/tableref/bound_table_function.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/logical_plan_generator.cpp b/src/planner/logical_plan_generator.cpp
index 25cdbfd91fb..265c42c8770 100644
--- a/src/planner/logical_plan_generator.cpp
+++ b/src/planner/logical_plan_generator.cpp
@@ -1,8 +1,8 @@
-#include "planner/logical_plan_generator.hpp"
+#include "duckdb/planner/logical_plan_generator.hpp"
 
-#include "planner/bound_query_node.hpp"
-#include "planner/bound_sql_statement.hpp"
-#include "planner/bound_tableref.hpp"
+#include "duckdb/planner/bound_query_node.hpp"
+#include "duckdb/planner/bound_sql_statement.hpp"
+#include "duckdb/planner/bound_tableref.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/operator/logical_aggregate.cpp b/src/planner/operator/logical_aggregate.cpp
index 26a54167c4f..1ad76302500 100644
--- a/src/planner/operator/logical_aggregate.cpp
+++ b/src/planner/operator/logical_aggregate.cpp
@@ -1,4 +1,4 @@
-#include "planner/operator/logical_aggregate.hpp"
+#include "duckdb/planner/operator/logical_aggregate.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/operator/logical_any_join.cpp b/src/planner/operator/logical_any_join.cpp
index 3da74c49c71..8d507b137d1 100644
--- a/src/planner/operator/logical_any_join.cpp
+++ b/src/planner/operator/logical_any_join.cpp
@@ -1,4 +1,4 @@
-#include "planner/operator/logical_any_join.hpp"
+#include "duckdb/planner/operator/logical_any_join.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/operator/logical_comparison_join.cpp b/src/planner/operator/logical_comparison_join.cpp
index af976e499f9..a33161031e6 100644
--- a/src/planner/operator/logical_comparison_join.cpp
+++ b/src/planner/operator/logical_comparison_join.cpp
@@ -1,4 +1,4 @@
-#include "planner/operator/logical_comparison_join.hpp"
+#include "duckdb/planner/operator/logical_comparison_join.hpp"
 
 using namespace duckdb;
 using namespace std;
@@ -8,9 +8,9 @@ LogicalComparisonJoin::LogicalComparisonJoin(JoinType type, LogicalOperatorType
 }
 
 string LogicalComparisonJoin::ParamsToString() const {
-	string result = "";
+	string result = "[" + JoinTypeToString(type);
 	if (conditions.size() > 0) {
-		result += "[";
+		result += " ";
 		for (index_t i = 0; i < conditions.size(); i++) {
 			auto &cond = conditions[i];
 			result += ExpressionTypeToString(cond.comparison) + "(" + cond.left->GetName() + ", " +
diff --git a/src/planner/operator/logical_cross_product.cpp b/src/planner/operator/logical_cross_product.cpp
index 8df8f9d955e..7a7cdf36fff 100644
--- a/src/planner/operator/logical_cross_product.cpp
+++ b/src/planner/operator/logical_cross_product.cpp
@@ -1,4 +1,4 @@
-#include "planner/operator/logical_cross_product.hpp"
+#include "duckdb/planner/operator/logical_cross_product.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/operator/logical_distinct.cpp b/src/planner/operator/logical_distinct.cpp
index 9a23a7957a2..e74e471eb49 100644
--- a/src/planner/operator/logical_distinct.cpp
+++ b/src/planner/operator/logical_distinct.cpp
@@ -1,4 +1,4 @@
-#include "planner/operator/logical_distinct.hpp"
+#include "duckdb/planner/operator/logical_distinct.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/operator/logical_empty_result.cpp b/src/planner/operator/logical_empty_result.cpp
index 8eab20ff841..2fa136a1739 100644
--- a/src/planner/operator/logical_empty_result.cpp
+++ b/src/planner/operator/logical_empty_result.cpp
@@ -1,6 +1,6 @@
-#include "planner/operator/logical_empty_result.hpp"
+#include "duckdb/planner/operator/logical_empty_result.hpp"
 
-#include "planner/table_binding_resolver.hpp"
+#include "duckdb/planner/table_binding_resolver.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/operator/logical_filter.cpp b/src/planner/operator/logical_filter.cpp
index e0d1da68b2c..1d0aabcf3b5 100644
--- a/src/planner/operator/logical_filter.cpp
+++ b/src/planner/operator/logical_filter.cpp
@@ -1,6 +1,6 @@
-#include "planner/operator/logical_filter.hpp"
+#include "duckdb/planner/operator/logical_filter.hpp"
 
-#include "planner/expression/bound_conjunction_expression.hpp"
+#include "duckdb/planner/expression/bound_conjunction_expression.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/operator/logical_get.cpp b/src/planner/operator/logical_get.cpp
index 503cf2d037f..0bd4761712f 100644
--- a/src/planner/operator/logical_get.cpp
+++ b/src/planner/operator/logical_get.cpp
@@ -1,7 +1,7 @@
-#include "planner/operator/logical_get.hpp"
+#include "duckdb/planner/operator/logical_get.hpp"
 
-#include "catalog/catalog_entry/table_catalog_entry.hpp"
-#include "storage/data_table.hpp"
+#include "duckdb/catalog/catalog_entry/table_catalog_entry.hpp"
+#include "duckdb/storage/data_table.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/operator/logical_join.cpp b/src/planner/operator/logical_join.cpp
index f5071abfed2..eff9088f7f5 100644
--- a/src/planner/operator/logical_join.cpp
+++ b/src/planner/operator/logical_join.cpp
@@ -1,8 +1,8 @@
-#include "planner/operator/logical_join.hpp"
+#include "duckdb/planner/operator/logical_join.hpp"
 
-#include "planner/expression/bound_columnref_expression.hpp"
-#include "planner/expression_iterator.hpp"
-#include "planner/table_binding_resolver.hpp"
+#include "duckdb/planner/expression/bound_columnref_expression.hpp"
+#include "duckdb/planner/expression_iterator.hpp"
+#include "duckdb/planner/table_binding_resolver.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/operator/logical_prepare.cpp b/src/planner/operator/logical_prepare.cpp
index 4341426d7f2..2b8519f63a4 100644
--- a/src/planner/operator/logical_prepare.cpp
+++ b/src/planner/operator/logical_prepare.cpp
@@ -1,7 +1,7 @@
-#include "planner/operator/logical_prepare.hpp"
+#include "duckdb/planner/operator/logical_prepare.hpp"
 
-#include "planner/operator/logical_get.hpp"
-#include "planner/operator/logical_insert.hpp"
+#include "duckdb/planner/operator/logical_get.hpp"
+#include "duckdb/planner/operator/logical_insert.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/operator/logical_projection.cpp b/src/planner/operator/logical_projection.cpp
index c7b94971266..6874f1e061d 100644
--- a/src/planner/operator/logical_projection.cpp
+++ b/src/planner/operator/logical_projection.cpp
@@ -1,4 +1,4 @@
-#include "planner/operator/logical_projection.hpp"
+#include "duckdb/planner/operator/logical_projection.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/operator/logical_prune_columns.cpp b/src/planner/operator/logical_prune_columns.cpp
index fb948d3655c..a79bc6f8e4c 100644
--- a/src/planner/operator/logical_prune_columns.cpp
+++ b/src/planner/operator/logical_prune_columns.cpp
@@ -1,4 +1,4 @@
-#include "planner/operator/logical_prune_columns.hpp"
+#include "duckdb/planner/operator/logical_prune_columns.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/operator/logical_subquery.cpp b/src/planner/operator/logical_subquery.cpp
index 7e5150a77ed..6bc2a5e703d 100644
--- a/src/planner/operator/logical_subquery.cpp
+++ b/src/planner/operator/logical_subquery.cpp
@@ -1,6 +1,6 @@
-#include "planner/operator/logical_subquery.hpp"
+#include "duckdb/planner/operator/logical_subquery.hpp"
 
-#include "planner/table_binding_resolver.hpp"
+#include "duckdb/planner/table_binding_resolver.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/operator/logical_table_function.cpp b/src/planner/operator/logical_table_function.cpp
index e601fefac05..bfb0cb25aea 100644
--- a/src/planner/operator/logical_table_function.cpp
+++ b/src/planner/operator/logical_table_function.cpp
@@ -1,6 +1,6 @@
-#include "planner/operator/logical_table_function.hpp"
+#include "duckdb/planner/operator/logical_table_function.hpp"
 
-#include "catalog/catalog_entry/table_function_catalog_entry.hpp"
+#include "duckdb/catalog/catalog_entry/table_function_catalog_entry.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/operator/logical_window.cpp b/src/planner/operator/logical_window.cpp
index 974edbdea56..c0d108a1213 100644
--- a/src/planner/operator/logical_window.cpp
+++ b/src/planner/operator/logical_window.cpp
@@ -1,4 +1,4 @@
-#include "planner/operator/logical_window.hpp"
+#include "duckdb/planner/operator/logical_window.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/planner.cpp b/src/planner/planner.cpp
index 460e3988b7d..e351d459df0 100644
--- a/src/planner/planner.cpp
+++ b/src/planner/planner.cpp
@@ -1,18 +1,18 @@
-#include "planner/planner.hpp"
+#include "duckdb/planner/planner.hpp"
 
-#include "common/serializer.hpp"
-#include "main/client_context.hpp"
-#include "main/database.hpp"
-#include "parser/statement/list.hpp"
-#include "planner/binder.hpp"
-#include "planner/bound_sql_statement.hpp"
-#include "planner/expression/bound_parameter_expression.hpp"
-#include "planner/logical_plan_generator.hpp"
-#include "planner/operator/logical_explain.hpp"
-#include "planner/operator/logical_prepare.hpp"
-#include "planner/statement/bound_select_statement.hpp"
-#include "planner/query_node/bound_select_node.hpp"
-#include "planner/query_node/bound_set_operation_node.hpp"
+#include "duckdb/common/serializer.hpp"
+#include "duckdb/main/client_context.hpp"
+#include "duckdb/main/database.hpp"
+#include "duckdb/parser/statement/list.hpp"
+#include "duckdb/planner/binder.hpp"
+#include "duckdb/planner/bound_sql_statement.hpp"
+#include "duckdb/planner/expression/bound_parameter_expression.hpp"
+#include "duckdb/planner/logical_plan_generator.hpp"
+#include "duckdb/planner/operator/logical_explain.hpp"
+#include "duckdb/planner/operator/logical_prepare.hpp"
+#include "duckdb/planner/statement/bound_select_statement.hpp"
+#include "duckdb/planner/query_node/bound_select_node.hpp"
+#include "duckdb/planner/query_node/bound_set_operation_node.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/subquery/flatten_dependent_join.cpp b/src/planner/subquery/flatten_dependent_join.cpp
index 7adf742683c..d0303affa3e 100644
--- a/src/planner/subquery/flatten_dependent_join.cpp
+++ b/src/planner/subquery/flatten_dependent_join.cpp
@@ -1,15 +1,15 @@
-#include "planner/subquery/flatten_dependent_join.hpp"
+#include "duckdb/planner/subquery/flatten_dependent_join.hpp"
 
-#include "planner/binder.hpp"
-#include "planner/expression/list.hpp"
-#include "planner/logical_operator_visitor.hpp"
-#include "planner/logical_plan_generator.hpp"
-#include "planner/operator/list.hpp"
-#include "planner/subquery/has_correlated_expressions.hpp"
-#include "planner/subquery/rewrite_correlated_expressions.hpp"
-#include "planner/expression/bound_aggregate_expression.hpp"
-#include "catalog/catalog_entry/aggregate_function_catalog_entry.hpp"
-#include "function/aggregate/distributive_functions.hpp"
+#include "duckdb/planner/binder.hpp"
+#include "duckdb/planner/expression/list.hpp"
+#include "duckdb/planner/logical_operator_visitor.hpp"
+#include "duckdb/planner/logical_plan_generator.hpp"
+#include "duckdb/planner/operator/list.hpp"
+#include "duckdb/planner/subquery/has_correlated_expressions.hpp"
+#include "duckdb/planner/subquery/rewrite_correlated_expressions.hpp"
+#include "duckdb/planner/expression/bound_aggregate_expression.hpp"
+#include "duckdb/catalog/catalog_entry/aggregate_function_catalog_entry.hpp"
+#include "duckdb/function/aggregate/distributive_functions.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/subquery/has_correlated_expressions.cpp b/src/planner/subquery/has_correlated_expressions.cpp
index 2325155faae..1f4fb183568 100644
--- a/src/planner/subquery/has_correlated_expressions.cpp
+++ b/src/planner/subquery/has_correlated_expressions.cpp
@@ -1,7 +1,7 @@
-#include "planner/subquery/has_correlated_expressions.hpp"
+#include "duckdb/planner/subquery/has_correlated_expressions.hpp"
 
-#include "planner/expression/bound_columnref_expression.hpp"
-#include "planner/expression/bound_subquery_expression.hpp"
+#include "duckdb/planner/expression/bound_columnref_expression.hpp"
+#include "duckdb/planner/expression/bound_subquery_expression.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/subquery/rewrite_correlated_expressions.cpp b/src/planner/subquery/rewrite_correlated_expressions.cpp
index c63e968e7b5..452d1d19040 100644
--- a/src/planner/subquery/rewrite_correlated_expressions.cpp
+++ b/src/planner/subquery/rewrite_correlated_expressions.cpp
@@ -1,11 +1,11 @@
-#include "planner/subquery/rewrite_correlated_expressions.hpp"
+#include "duckdb/planner/subquery/rewrite_correlated_expressions.hpp"
 
-#include "planner/expression/bound_case_expression.hpp"
-#include "planner/expression/bound_columnref_expression.hpp"
-#include "planner/expression/bound_constant_expression.hpp"
-#include "planner/expression/bound_operator_expression.hpp"
-#include "planner/expression/bound_subquery_expression.hpp"
-#include "planner/expression_iterator.hpp"
+#include "duckdb/planner/expression/bound_case_expression.hpp"
+#include "duckdb/planner/expression/bound_columnref_expression.hpp"
+#include "duckdb/planner/expression/bound_constant_expression.hpp"
+#include "duckdb/planner/expression/bound_operator_expression.hpp"
+#include "duckdb/planner/expression/bound_subquery_expression.hpp"
+#include "duckdb/planner/expression_iterator.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/table_binding.cpp b/src/planner/table_binding.cpp
index a1592f9a648..5b18110f1d6 100644
--- a/src/planner/table_binding.cpp
+++ b/src/planner/table_binding.cpp
@@ -1,14 +1,14 @@
-#include "planner/table_binding.hpp"
-
-#include "common/string_util.hpp"
-#include "catalog/catalog_entry/table_catalog_entry.hpp"
-#include "catalog/catalog_entry/table_function_catalog_entry.hpp"
-#include "parser/expression/columnref_expression.hpp"
-#include "parser/tableref/subqueryref.hpp"
-#include "planner/bind_context.hpp"
-#include "planner/bound_query_node.hpp"
-#include "planner/expression/bound_columnref_expression.hpp"
-#include "planner/tableref/bound_basetableref.hpp"
+#include "duckdb/planner/table_binding.hpp"
+
+#include "duckdb/common/string_util.hpp"
+#include "duckdb/catalog/catalog_entry/table_catalog_entry.hpp"
+#include "duckdb/catalog/catalog_entry/table_function_catalog_entry.hpp"
+#include "duckdb/parser/expression/columnref_expression.hpp"
+#include "duckdb/parser/tableref/subqueryref.hpp"
+#include "duckdb/planner/bind_context.hpp"
+#include "duckdb/planner/bound_query_node.hpp"
+#include "duckdb/planner/expression/bound_columnref_expression.hpp"
+#include "duckdb/planner/tableref/bound_basetableref.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/planner/table_binding_resolver.cpp b/src/planner/table_binding_resolver.cpp
index 0b129d5d78c..84afcba121b 100644
--- a/src/planner/table_binding_resolver.cpp
+++ b/src/planner/table_binding_resolver.cpp
@@ -1,8 +1,8 @@
-#include "planner/table_binding_resolver.hpp"
+#include "duckdb/planner/table_binding_resolver.hpp"
 
-#include "catalog/catalog_entry/table_catalog_entry.hpp"
-#include "catalog/catalog_entry/table_function_catalog_entry.hpp"
-#include "planner/operator/list.hpp"
+#include "duckdb/catalog/catalog_entry/table_catalog_entry.hpp"
+#include "duckdb/catalog/catalog_entry/table_function_catalog_entry.hpp"
+#include "duckdb/planner/operator/list.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/storage/block.cpp b/src/storage/block.cpp
index 299791e7394..8723d7dc8c5 100644
--- a/src/storage/block.cpp
+++ b/src/storage/block.cpp
@@ -1,4 +1,4 @@
-#include "storage/block.hpp"
+#include "duckdb/storage/block.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/storage/buffer/buffer_handle.cpp b/src/storage/buffer/buffer_handle.cpp
index 7b986ac4ebf..7d4beb66e45 100644
--- a/src/storage/buffer/buffer_handle.cpp
+++ b/src/storage/buffer/buffer_handle.cpp
@@ -1,5 +1,5 @@
-#include "storage/buffer/buffer_handle.hpp"
-#include "storage/buffer_manager.hpp"
+#include "duckdb/storage/buffer/buffer_handle.hpp"
+#include "duckdb/storage/buffer_manager.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/storage/buffer/buffer_list.cpp b/src/storage/buffer/buffer_list.cpp
index befe0793066..00a461c0118 100644
--- a/src/storage/buffer/buffer_list.cpp
+++ b/src/storage/buffer/buffer_list.cpp
@@ -1,6 +1,6 @@
-#include "storage/buffer/buffer_list.hpp"
+#include "duckdb/storage/buffer/buffer_list.hpp"
 
-#include "common/exception.hpp"
+#include "duckdb/common/exception.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/storage/buffer/managed_buffer.cpp b/src/storage/buffer/managed_buffer.cpp
index 8fa57a5c157..1cf22603cb8 100644
--- a/src/storage/buffer/managed_buffer.cpp
+++ b/src/storage/buffer/managed_buffer.cpp
@@ -1,5 +1,5 @@
-#include "storage/buffer/managed_buffer.hpp"
-#include "common/exception.hpp"
+#include "duckdb/storage/buffer/managed_buffer.hpp"
+#include "duckdb/common/exception.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/storage/buffer_manager.cpp b/src/storage/buffer_manager.cpp
index 804ac5836b5..7f395fe17e5 100644
--- a/src/storage/buffer_manager.cpp
+++ b/src/storage/buffer_manager.cpp
@@ -1,6 +1,6 @@
-#include "storage/buffer_manager.hpp"
+#include "duckdb/storage/buffer_manager.hpp"
 
-#include "common/exception.hpp"
+#include "duckdb/common/exception.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/storage/checkpoint/table_data_reader.cpp b/src/storage/checkpoint/table_data_reader.cpp
index 01245b56814..da87111be3a 100644
--- a/src/storage/checkpoint/table_data_reader.cpp
+++ b/src/storage/checkpoint/table_data_reader.cpp
@@ -1,15 +1,15 @@
-#include "storage/checkpoint/table_data_reader.hpp"
-#include "storage/checkpoint/table_data_writer.hpp"
-#include "storage/meta_block_reader.hpp"
+#include "duckdb/storage/checkpoint/table_data_reader.hpp"
+#include "duckdb/storage/checkpoint/table_data_writer.hpp"
+#include "duckdb/storage/meta_block_reader.hpp"
 
-#include "storage/meta_block_reader.hpp"
+#include "duckdb/storage/meta_block_reader.hpp"
 
-#include "common/vector_operations/vector_operations.hpp"
-#include "common/types/null_value.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
+#include "duckdb/common/types/null_value.hpp"
 
-#include "catalog/catalog_entry/table_catalog_entry.hpp"
+#include "duckdb/catalog/catalog_entry/table_catalog_entry.hpp"
 
-#include "planner/parsed_data/bound_create_table_info.hpp"
+#include "duckdb/planner/parsed_data/bound_create_table_info.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/storage/checkpoint/table_data_writer.cpp b/src/storage/checkpoint/table_data_writer.cpp
index 86f12294b7a..6b3dbda1850 100644
--- a/src/storage/checkpoint/table_data_writer.cpp
+++ b/src/storage/checkpoint/table_data_writer.cpp
@@ -1,14 +1,14 @@
-#include "storage/checkpoint/table_data_writer.hpp"
+#include "duckdb/storage/checkpoint/table_data_writer.hpp"
 
-#include "common/vector_operations/vector_operations.hpp"
-#include "common/types/null_value.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
+#include "duckdb/common/types/null_value.hpp"
 
-#include "catalog/catalog_entry/table_catalog_entry.hpp"
-#include "common/serializer/buffered_serializer.hpp"
+#include "duckdb/catalog/catalog_entry/table_catalog_entry.hpp"
+#include "duckdb/common/serializer/buffered_serializer.hpp"
 
-#include "storage/numeric_segment.hpp"
-#include "storage/string_segment.hpp"
-#include "storage/table/column_segment.hpp"
+#include "duckdb/storage/numeric_segment.hpp"
+#include "duckdb/storage/string_segment.hpp"
+#include "duckdb/storage/table/column_segment.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/storage/checkpoint_manager.cpp b/src/storage/checkpoint_manager.cpp
index 2568a176089..d71a2237e8c 100644
--- a/src/storage/checkpoint_manager.cpp
+++ b/src/storage/checkpoint_manager.cpp
@@ -1,31 +1,31 @@
-#include "storage/checkpoint_manager.hpp"
-#include "storage/block_manager.hpp"
-#include "storage/meta_block_reader.hpp"
+#include "duckdb/storage/checkpoint_manager.hpp"
+#include "duckdb/storage/block_manager.hpp"
+#include "duckdb/storage/meta_block_reader.hpp"
 
-#include "common/serializer.hpp"
-#include "common/vector_operations/vector_operations.hpp"
-#include "common/types/null_value.hpp"
+#include "duckdb/common/serializer.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
+#include "duckdb/common/types/null_value.hpp"
 
-#include "catalog/catalog.hpp"
-#include "catalog/catalog_entry/schema_catalog_entry.hpp"
-#include "catalog/catalog_entry/sequence_catalog_entry.hpp"
-#include "catalog/catalog_entry/table_catalog_entry.hpp"
-#include "catalog/catalog_entry/view_catalog_entry.hpp"
+#include "duckdb/catalog/catalog.hpp"
+#include "duckdb/catalog/catalog_entry/schema_catalog_entry.hpp"
+#include "duckdb/catalog/catalog_entry/sequence_catalog_entry.hpp"
+#include "duckdb/catalog/catalog_entry/table_catalog_entry.hpp"
+#include "duckdb/catalog/catalog_entry/view_catalog_entry.hpp"
 
-#include "parser/parsed_data/create_schema_info.hpp"
-#include "parser/parsed_data/create_table_info.hpp"
-#include "parser/parsed_data/create_view_info.hpp"
+#include "duckdb/parser/parsed_data/create_schema_info.hpp"
+#include "duckdb/parser/parsed_data/create_table_info.hpp"
+#include "duckdb/parser/parsed_data/create_view_info.hpp"
 
-#include "planner/binder.hpp"
-#include "planner/parsed_data/bound_create_table_info.hpp"
+#include "duckdb/planner/binder.hpp"
+#include "duckdb/planner/parsed_data/bound_create_table_info.hpp"
 
-#include "main/client_context.hpp"
-#include "main/database.hpp"
+#include "duckdb/main/client_context.hpp"
+#include "duckdb/main/database.hpp"
 
-#include "transaction/transaction_manager.hpp"
+#include "duckdb/transaction/transaction_manager.hpp"
 
-#include "storage/checkpoint/table_data_writer.hpp"
-#include "storage/checkpoint/table_data_reader.hpp"
+#include "duckdb/storage/checkpoint/table_data_writer.hpp"
+#include "duckdb/storage/checkpoint/table_data_reader.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/storage/column_data.cpp b/src/storage/column_data.cpp
index d627cfc4ae8..71ff19cce64 100644
--- a/src/storage/column_data.cpp
+++ b/src/storage/column_data.cpp
@@ -1,7 +1,7 @@
-#include "storage/column_data.hpp"
-#include "storage/table/persistent_segment.hpp"
-#include "storage/table/transient_segment.hpp"
-#include "storage/data_table.hpp"
+#include "duckdb/storage/column_data.hpp"
+#include "duckdb/storage/table/persistent_segment.hpp"
+#include "duckdb/storage/table/transient_segment.hpp"
+#include "duckdb/storage/data_table.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/storage/data_table.cpp b/src/storage/data_table.cpp
index ce01c2c4bee..dba3b29f33c 100644
--- a/src/storage/data_table.cpp
+++ b/src/storage/data_table.cpp
@@ -1,16 +1,16 @@
-#include "storage/data_table.hpp"
-
-#include "catalog/catalog_entry/table_catalog_entry.hpp"
-#include "common/exception.hpp"
-#include "common/helper.hpp"
-#include "common/vector_operations/vector_operations.hpp"
-#include "common/types/static_vector.hpp"
-#include "execution/expression_executor.hpp"
-#include "main/client_context.hpp"
-#include "planner/constraints/list.hpp"
-#include "transaction/transaction.hpp"
-#include "transaction/transaction_manager.hpp"
-#include "storage/table/transient_segment.hpp"
+#include "duckdb/storage/data_table.hpp"
+
+#include "duckdb/catalog/catalog_entry/table_catalog_entry.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/common/helper.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
+#include "duckdb/common/types/static_vector.hpp"
+#include "duckdb/execution/expression_executor.hpp"
+#include "duckdb/main/client_context.hpp"
+#include "duckdb/planner/constraints/list.hpp"
+#include "duckdb/transaction/transaction.hpp"
+#include "duckdb/transaction/transaction_manager.hpp"
+#include "duckdb/storage/table/transient_segment.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/storage/index.cpp b/src/storage/index.cpp
index 4529f91829e..9642f1e4dc1 100644
--- a/src/storage/index.cpp
+++ b/src/storage/index.cpp
@@ -1,9 +1,9 @@
-#include "storage/index.hpp"
-#include "execution/expression_executor.hpp"
-#include "planner/expression_iterator.hpp"
-#include "planner/expression/bound_columnref_expression.hpp"
-#include "planner/expression/bound_reference_expression.hpp"
-#include "storage/table/append_state.hpp"
+#include "duckdb/storage/index.hpp"
+#include "duckdb/execution/expression_executor.hpp"
+#include "duckdb/planner/expression_iterator.hpp"
+#include "duckdb/planner/expression/bound_columnref_expression.hpp"
+#include "duckdb/planner/expression/bound_reference_expression.hpp"
+#include "duckdb/storage/table/append_state.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/storage/local_storage.cpp b/src/storage/local_storage.cpp
index 9913b110950..d459832ddc1 100644
--- a/src/storage/local_storage.cpp
+++ b/src/storage/local_storage.cpp
@@ -1,7 +1,7 @@
-#include "transaction/local_storage.hpp"
-#include "execution/index/art/art.hpp"
-#include "storage/table/append_state.hpp"
-#include "storage/write_ahead_log.hpp"
+#include "duckdb/transaction/local_storage.hpp"
+#include "duckdb/execution/index/art/art.hpp"
+#include "duckdb/storage/table/append_state.hpp"
+#include "duckdb/storage/write_ahead_log.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/storage/meta_block_reader.cpp b/src/storage/meta_block_reader.cpp
index 74b4de2753e..7073d47f674 100644
--- a/src/storage/meta_block_reader.cpp
+++ b/src/storage/meta_block_reader.cpp
@@ -1,4 +1,4 @@
-#include "storage/meta_block_reader.hpp"
+#include "duckdb/storage/meta_block_reader.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/storage/meta_block_writer.cpp b/src/storage/meta_block_writer.cpp
index a0dc7cee489..e0c21c4c49a 100644
--- a/src/storage/meta_block_writer.cpp
+++ b/src/storage/meta_block_writer.cpp
@@ -1,4 +1,4 @@
-#include "storage/meta_block_writer.hpp"
+#include "duckdb/storage/meta_block_writer.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/storage/numeric_segment.cpp b/src/storage/numeric_segment.cpp
index 32d8befd435..942b3373e4e 100644
--- a/src/storage/numeric_segment.cpp
+++ b/src/storage/numeric_segment.cpp
@@ -1,9 +1,9 @@
-#include "storage/numeric_segment.hpp"
-#include "storage/buffer_manager.hpp"
-#include "common/types/vector.hpp"
-#include "storage/table/append_state.hpp"
-#include "transaction/update_info.hpp"
-#include "transaction/transaction.hpp"
+#include "duckdb/storage/numeric_segment.hpp"
+#include "duckdb/storage/buffer_manager.hpp"
+#include "duckdb/common/types/vector.hpp"
+#include "duckdb/storage/table/append_state.hpp"
+#include "duckdb/transaction/update_info.hpp"
+#include "duckdb/transaction/transaction.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/storage/single_file_block_manager.cpp b/src/storage/single_file_block_manager.cpp
index 0aa889388f9..10e2e004369 100644
--- a/src/storage/single_file_block_manager.cpp
+++ b/src/storage/single_file_block_manager.cpp
@@ -1,7 +1,7 @@
-#include "storage/single_file_block_manager.hpp"
-#include "storage/meta_block_writer.hpp"
-#include "storage/meta_block_reader.hpp"
-#include "common/exception.hpp"
+#include "duckdb/storage/single_file_block_manager.hpp"
+#include "duckdb/storage/meta_block_writer.hpp"
+#include "duckdb/storage/meta_block_reader.hpp"
+#include "duckdb/common/exception.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/storage/storage_info.cpp b/src/storage/storage_info.cpp
index 6242d90b4df..6f46123c29e 100644
--- a/src/storage/storage_info.cpp
+++ b/src/storage/storage_info.cpp
@@ -1,4 +1,4 @@
-#include "storage/storage_info.hpp"
+#include "duckdb/storage/storage_info.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/storage/storage_lock.cpp b/src/storage/storage_lock.cpp
index 4c62294db32..8e78225ae4c 100644
--- a/src/storage/storage_lock.cpp
+++ b/src/storage/storage_lock.cpp
@@ -1,4 +1,4 @@
-#include "storage/storage_lock.hpp"
+#include "duckdb/storage/storage_lock.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/storage/storage_manager.cpp b/src/storage/storage_manager.cpp
index 9cea1e8096d..41cc17347c0 100644
--- a/src/storage/storage_manager.cpp
+++ b/src/storage/storage_manager.cpp
@@ -1,17 +1,17 @@
-#include "storage/storage_manager.hpp"
-#include "storage/checkpoint_manager.hpp"
-#include "storage/in_memory_block_manager.hpp"
-#include "storage/single_file_block_manager.hpp"
+#include "duckdb/storage/storage_manager.hpp"
+#include "duckdb/storage/checkpoint_manager.hpp"
+#include "duckdb/storage/in_memory_block_manager.hpp"
+#include "duckdb/storage/single_file_block_manager.hpp"
 
-#include "catalog/catalog.hpp"
-#include "common/file_system.hpp"
-#include "main/database.hpp"
-#include "main/client_context.hpp"
-#include "function/function.hpp"
-#include "parser/parsed_data/create_schema_info.hpp"
-#include "transaction/transaction_manager.hpp"
-#include "planner/binder.hpp"
-#include "common/serializer/buffered_file_reader.hpp"
+#include "duckdb/catalog/catalog.hpp"
+#include "duckdb/common/file_system.hpp"
+#include "duckdb/main/database.hpp"
+#include "duckdb/main/client_context.hpp"
+#include "duckdb/function/function.hpp"
+#include "duckdb/parser/parsed_data/create_schema_info.hpp"
+#include "duckdb/transaction/transaction_manager.hpp"
+#include "duckdb/planner/binder.hpp"
+#include "duckdb/common/serializer/buffered_file_reader.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/storage/string_segment.cpp b/src/storage/string_segment.cpp
index 3a66e29c64b..56e703ded4e 100644
--- a/src/storage/string_segment.cpp
+++ b/src/storage/string_segment.cpp
@@ -1,9 +1,9 @@
-#include "storage/string_segment.hpp"
-#include "storage/buffer_manager.hpp"
-// #include "common/types/vector.hpp"
-// #include "storage/table/append_state.hpp"
-#include "transaction/update_info.hpp"
-// #include "transaction/transaction.hpp"
+#include "duckdb/storage/string_segment.hpp"
+#include "duckdb/storage/buffer_manager.hpp"
+// #include "duckdb/common/types/vector.hpp"
+// #include "duckdb/storage/table/append_state.hpp"
+#include "duckdb/transaction/update_info.hpp"
+// #include "duckdb/transaction/transaction.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/storage/table/chunk_info.cpp b/src/storage/table/chunk_info.cpp
index af01a35c650..91c0040b599 100644
--- a/src/storage/table/chunk_info.cpp
+++ b/src/storage/table/chunk_info.cpp
@@ -1,5 +1,5 @@
-#include "storage/table/chunk_info.hpp"
-#include "transaction/transaction.hpp"
+#include "duckdb/storage/table/chunk_info.hpp"
+#include "duckdb/transaction/transaction.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/storage/table/column_segment.cpp b/src/storage/table/column_segment.cpp
index f7071669ab7..fe27c57de1f 100644
--- a/src/storage/table/column_segment.cpp
+++ b/src/storage/table/column_segment.cpp
@@ -1,4 +1,4 @@
-#include "storage/table/column_segment.hpp"
+#include "duckdb/storage/table/column_segment.hpp"
 #include <cstring>
 
 using namespace duckdb;
diff --git a/src/storage/table/persistent_segment.cpp b/src/storage/table/persistent_segment.cpp
index 432903ff672..d7a235f136c 100644
--- a/src/storage/table/persistent_segment.cpp
+++ b/src/storage/table/persistent_segment.cpp
@@ -1,13 +1,13 @@
-#include "storage/table/persistent_segment.hpp"
-#include "common/exception.hpp"
-#include "common/types/vector.hpp"
-#include "common/vector_operations/vector_operations.hpp"
-#include "common/types/null_value.hpp"
-#include "storage/checkpoint/table_data_writer.hpp"
-#include "storage/meta_block_reader.hpp"
-
-#include "storage/numeric_segment.hpp"
-#include "storage/string_segment.hpp"
+#include "duckdb/storage/table/persistent_segment.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/common/types/vector.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
+#include "duckdb/common/types/null_value.hpp"
+#include "duckdb/storage/checkpoint/table_data_writer.hpp"
+#include "duckdb/storage/meta_block_reader.hpp"
+
+#include "duckdb/storage/numeric_segment.hpp"
+#include "duckdb/storage/string_segment.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/storage/table/segment_tree.cpp b/src/storage/table/segment_tree.cpp
index 72ffb31f4a6..2db8d4177ea 100644
--- a/src/storage/table/segment_tree.cpp
+++ b/src/storage/table/segment_tree.cpp
@@ -1,6 +1,6 @@
-#include "storage/table/segment_tree.hpp"
-#include "common/exception.hpp"
-#include "common/string_util.hpp"
+#include "duckdb/storage/table/segment_tree.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/common/string_util.hpp"
 using namespace duckdb;
 using namespace std;
 
diff --git a/src/storage/table/transient_segment.cpp b/src/storage/table/transient_segment.cpp
index 0aaec32109d..8927315bd44 100644
--- a/src/storage/table/transient_segment.cpp
+++ b/src/storage/table/transient_segment.cpp
@@ -1,9 +1,9 @@
-#include "storage/table/transient_segment.hpp"
-#include "common/types/null_value.hpp"
-#include "common/types/vector.hpp"
-#include "common/vector_operations/vector_operations.hpp"
-#include "storage/numeric_segment.hpp"
-#include "storage/string_segment.hpp"
+#include "duckdb/storage/table/transient_segment.hpp"
+#include "duckdb/common/types/null_value.hpp"
+#include "duckdb/common/types/vector.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
+#include "duckdb/storage/numeric_segment.hpp"
+#include "duckdb/storage/string_segment.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/storage/table/version_manager.cpp b/src/storage/table/version_manager.cpp
index 26a45d25de0..c4880b595ac 100644
--- a/src/storage/table/version_manager.cpp
+++ b/src/storage/table/version_manager.cpp
@@ -1,6 +1,6 @@
-#include "storage/table/version_manager.hpp"
-#include "transaction/transaction.hpp"
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/storage/table/version_manager.hpp"
+#include "duckdb/transaction/transaction.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/storage/uncompressed_segment.cpp b/src/storage/uncompressed_segment.cpp
index 6ac83541456..e37e928edac 100644
--- a/src/storage/uncompressed_segment.cpp
+++ b/src/storage/uncompressed_segment.cpp
@@ -1,6 +1,6 @@
-#include "storage/uncompressed_segment.hpp"
-#include "common/exception.hpp"
-#include "common/types/vector.hpp"
+#include "duckdb/storage/uncompressed_segment.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/common/types/vector.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/storage/wal_replay.cpp b/src/storage/wal_replay.cpp
index b77d1ebc4ba..9cc378867fa 100644
--- a/src/storage/wal_replay.cpp
+++ b/src/storage/wal_replay.cpp
@@ -1,7 +1,7 @@
-#include "storage/write_ahead_log.hpp"
-#include "common/serializer/buffered_file_reader.hpp"
+#include "duckdb/storage/write_ahead_log.hpp"
+#include "duckdb/common/serializer/buffered_file_reader.hpp"
 
-#include "parser/parsed_data/drop_info.hpp"
+#include "duckdb/parser/parsed_data/drop_info.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/storage/write_ahead_log.cpp b/src/storage/write_ahead_log.cpp
index 1b3ec33f6bd..906c5667e18 100644
--- a/src/storage/write_ahead_log.cpp
+++ b/src/storage/write_ahead_log.cpp
@@ -1,4 +1,4 @@
-#include "storage/write_ahead_log.hpp"
+#include "duckdb/storage/write_ahead_log.hpp"
 
 #include <cstring>
 
diff --git a/src/transaction/cleanup_state.cpp b/src/transaction/cleanup_state.cpp
index ab3162ef366..5ad586d23fe 100644
--- a/src/transaction/cleanup_state.cpp
+++ b/src/transaction/cleanup_state.cpp
@@ -1,7 +1,7 @@
-#include "transaction/cleanup_state.hpp"
-#include "transaction/delete_info.hpp"
-#include "transaction/update_info.hpp"
-#include "storage/uncompressed_segment.hpp"
+#include "duckdb/transaction/cleanup_state.hpp"
+#include "duckdb/transaction/delete_info.hpp"
+#include "duckdb/transaction/update_info.hpp"
+#include "duckdb/storage/uncompressed_segment.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/transaction/commit_state.cpp b/src/transaction/commit_state.cpp
index c5f2eaa3761..f087f0214cc 100644
--- a/src/transaction/commit_state.cpp
+++ b/src/transaction/commit_state.cpp
@@ -1,8 +1,8 @@
-#include "transaction/commit_state.hpp"
+#include "duckdb/transaction/commit_state.hpp"
 
-#include "storage/data_table.hpp"
-#include "storage/write_ahead_log.hpp"
-#include "storage/uncompressed_segment.hpp"
+#include "duckdb/storage/data_table.hpp"
+#include "duckdb/storage/write_ahead_log.hpp"
+#include "duckdb/storage/uncompressed_segment.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/transaction/delete_info.cpp b/src/transaction/delete_info.cpp
index 3aa0c406c1d..3ba3a013221 100644
--- a/src/transaction/delete_info.cpp
+++ b/src/transaction/delete_info.cpp
@@ -1,6 +1,6 @@
-#include "transaction/delete_info.hpp"
-#include "storage/table/chunk_info.hpp"
-#include "storage/table/version_manager.hpp"
+#include "duckdb/transaction/delete_info.hpp"
+#include "duckdb/storage/table/chunk_info.hpp"
+#include "duckdb/storage/table/version_manager.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/transaction/rollback_state.cpp b/src/transaction/rollback_state.cpp
index 0bfe2aee1ad..0d0f5713aeb 100644
--- a/src/transaction/rollback_state.cpp
+++ b/src/transaction/rollback_state.cpp
@@ -1,5 +1,5 @@
-#include "transaction/rollback_state.hpp"
-#include "storage/uncompressed_segment.hpp"
+#include "duckdb/transaction/rollback_state.hpp"
+#include "duckdb/storage/uncompressed_segment.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/transaction/transaction.cpp b/src/transaction/transaction.cpp
index c3e7b191eb6..45c0c7b29ce 100644
--- a/src/transaction/transaction.cpp
+++ b/src/transaction/transaction.cpp
@@ -1,13 +1,13 @@
-#include "transaction/transaction.hpp"
+#include "duckdb/transaction/transaction.hpp"
 
-#include "catalog/catalog_entry/table_catalog_entry.hpp"
-#include "common/exception.hpp"
-#include "parser/column_definition.hpp"
-#include "storage/data_table.hpp"
-#include "storage/write_ahead_log.hpp"
+#include "duckdb/catalog/catalog_entry/table_catalog_entry.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/parser/column_definition.hpp"
+#include "duckdb/storage/data_table.hpp"
+#include "duckdb/storage/write_ahead_log.hpp"
 
-#include "transaction/delete_info.hpp"
-#include "transaction/update_info.hpp"
+#include "duckdb/transaction/delete_info.hpp"
+#include "duckdb/transaction/update_info.hpp"
 
 #include <cstring>
 
diff --git a/src/transaction/transaction_context.cpp b/src/transaction/transaction_context.cpp
index ec053742157..745e2d0b0ab 100644
--- a/src/transaction/transaction_context.cpp
+++ b/src/transaction/transaction_context.cpp
@@ -1,8 +1,8 @@
-#include "transaction/transaction_context.hpp"
+#include "duckdb/transaction/transaction_context.hpp"
 
-#include "common/exception.hpp"
-#include "transaction/transaction.hpp"
-#include "transaction/transaction_manager.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/transaction/transaction.hpp"
+#include "duckdb/transaction/transaction_manager.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/transaction/transaction_manager.cpp b/src/transaction/transaction_manager.cpp
index 96962153b7b..b2c3fcc5086 100644
--- a/src/transaction/transaction_manager.cpp
+++ b/src/transaction/transaction_manager.cpp
@@ -1,13 +1,13 @@
-#include "transaction/transaction_manager.hpp"
-
-#include "catalog/catalog_set.hpp"
-#include "common/exception.hpp"
-#include "common/helper.hpp"
-#include "common/types/timestamp.hpp"
-#include "main/client_context.hpp"
-#include "main/database.hpp"
-#include "storage/storage_manager.hpp"
-#include "transaction/transaction.hpp"
+#include "duckdb/transaction/transaction_manager.hpp"
+
+#include "duckdb/catalog/catalog_set.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/common/helper.hpp"
+#include "duckdb/common/types/timestamp.hpp"
+#include "duckdb/main/client_context.hpp"
+#include "duckdb/main/database.hpp"
+#include "duckdb/storage/storage_manager.hpp"
+#include "duckdb/transaction/transaction.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/src/transaction/undo_buffer.cpp b/src/transaction/undo_buffer.cpp
index 0fcaa577a24..ae55db281bb 100644
--- a/src/transaction/undo_buffer.cpp
+++ b/src/transaction/undo_buffer.cpp
@@ -1,14 +1,14 @@
-#include "transaction/undo_buffer.hpp"
+#include "duckdb/transaction/undo_buffer.hpp"
 
-#include "catalog/catalog_entry.hpp"
-#include "catalog/catalog_entry/list.hpp"
-#include "catalog/catalog_set.hpp"
-#include "common/exception.hpp"
-#include "storage/data_table.hpp"
-#include "storage/write_ahead_log.hpp"
-#include "transaction/cleanup_state.hpp"
-#include "transaction/commit_state.hpp"
-#include "transaction/rollback_state.hpp"
+#include "duckdb/catalog/catalog_entry.hpp"
+#include "duckdb/catalog/catalog_entry/list.hpp"
+#include "duckdb/catalog/catalog_set.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/storage/data_table.hpp"
+#include "duckdb/storage/write_ahead_log.hpp"
+#include "duckdb/transaction/cleanup_state.hpp"
+#include "duckdb/transaction/commit_state.hpp"
+#include "duckdb/transaction/rollback_state.hpp"
 
 #include <unordered_map>
 
diff --git a/src/transaction/version_info.cpp b/src/transaction/version_info.cpp
index ee35d7200bc..1062fa16f9b 100644
--- a/src/transaction/version_info.cpp
+++ b/src/transaction/version_info.cpp
@@ -1,7 +1,7 @@
-#include "transaction/version_info.hpp"
-#include "transaction/transaction.hpp"
-#include "storage/table/version_chunk_info.hpp"
-#include "storage/table/version_chunk.hpp"
+#include "duckdb/transaction/version_info.hpp"
+#include "duckdb/transaction/transaction.hpp"
+#include "duckdb/storage/table/version_chunk_info.hpp"
+#include "duckdb/storage/table/version_chunk.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/test/api/test_read_only.cpp b/test/api/test_read_only.cpp
index c77c932f86d..1db73843a36 100644
--- a/test/api/test_read_only.cpp
+++ b/test/api/test_read_only.cpp
@@ -1,5 +1,5 @@
 #include "catch.hpp"
-#include "common/file_system.hpp"
+#include "duckdb/common/file_system.hpp"
 #include "test_helpers.hpp"
 
 using namespace duckdb;
diff --git a/test/appender/test_appender.cpp b/test/appender/test_appender.cpp
index f09995d0642..7a1cf0fac25 100644
--- a/test/appender/test_appender.cpp
+++ b/test/appender/test_appender.cpp
@@ -1,5 +1,5 @@
 #include "catch.hpp"
-#include "main/appender.hpp"
+#include "duckdb/main/appender.hpp"
 #include "test_helpers.hpp"
 
 #include <vector>
diff --git a/test/appender/test_concurrent_append.cpp b/test/appender/test_concurrent_append.cpp
index 059d7de70d1..f43c14e186a 100644
--- a/test/appender/test_concurrent_append.cpp
+++ b/test/appender/test_concurrent_append.cpp
@@ -1,5 +1,5 @@
 #include "catch.hpp"
-#include "main/appender.hpp"
+#include "duckdb/main/appender.hpp"
 #include "test_helpers.hpp"
 
 #include <atomic>
diff --git a/test/common/test_cast.cpp b/test/common/test_cast.cpp
index debdc93996f..4b48dc7a4fb 100644
--- a/test/common/test_cast.cpp
+++ b/test/common/test_cast.cpp
@@ -1,8 +1,8 @@
 #include "catch.hpp"
-#include "common/operator/cast_operators.hpp"
-#include "common/string_util.hpp"
-#include "common/limits.hpp"
-#include "common/types.hpp"
+#include "duckdb/common/operator/cast_operators.hpp"
+#include "duckdb/common/string_util.hpp"
+#include "duckdb/common/limits.hpp"
+#include "duckdb/common/types.hpp"
 #include <vector>
 
 using namespace duckdb;
diff --git a/test/common/test_checksum.cpp b/test/common/test_checksum.cpp
index 336172aeaab..5882d811b6b 100644
--- a/test/common/test_checksum.cpp
+++ b/test/common/test_checksum.cpp
@@ -1,5 +1,5 @@
 #include "catch.hpp"
-#include "common/checksum.hpp"
+#include "duckdb/common/checksum.hpp"
 
 #include <vector>
 
diff --git a/test/common/test_date.cpp b/test/common/test_date.cpp
index f8ae1083c75..cd920659c18 100644
--- a/test/common/test_date.cpp
+++ b/test/common/test_date.cpp
@@ -1,6 +1,6 @@
 #include "catch.hpp"
-#include "common/types/date.hpp"
-#include "common/types/time.hpp"
+#include "duckdb/common/types/date.hpp"
+#include "duckdb/common/types/time.hpp"
 
 #include <vector>
 
diff --git a/test/common/test_file_system.cpp b/test/common/test_file_system.cpp
index 4ebaa2c4de9..baecebd3d93 100644
--- a/test/common/test_file_system.cpp
+++ b/test/common/test_file_system.cpp
@@ -1,7 +1,7 @@
 #include "catch.hpp"
-#include "common/file_buffer.hpp"
-#include "common/file_system.hpp"
-#include "common/fstream.hpp"
+#include "duckdb/common/file_buffer.hpp"
+#include "duckdb/common/file_system.hpp"
+#include "duckdb/common/fstream.hpp"
 #include "test_helpers.hpp"
 
 using namespace duckdb;
diff --git a/test/common/test_gzip_stream.cpp b/test/common/test_gzip_stream.cpp
index 2e21b8a1fc1..22a30e6051f 100644
--- a/test/common/test_gzip_stream.cpp
+++ b/test/common/test_gzip_stream.cpp
@@ -1,7 +1,7 @@
 #include "catch.hpp"
-#include "common/file_system.hpp"
-#include "common/fstream_util.hpp"
-#include "common/gzip_stream.hpp"
+#include "duckdb/common/file_system.hpp"
+#include "duckdb/common/fstream_util.hpp"
+#include "duckdb/common/gzip_stream.hpp"
 #include "test_gzip_stream_header.hpp"
 #include "test_helpers.hpp"
 
diff --git a/test/common/test_hyperloglog.cpp b/test/common/test_hyperloglog.cpp
index 9294bb65d13..3bf1bff226b 100644
--- a/test/common/test_hyperloglog.cpp
+++ b/test/common/test_hyperloglog.cpp
@@ -1,5 +1,5 @@
 #include "catch.hpp"
-#include "common/types/hyperloglog.hpp"
+#include "duckdb/common/types/hyperloglog.hpp"
 
 #include <vector>
 
diff --git a/test/common/test_ops.cpp b/test/common/test_ops.cpp
index f0334a0d2be..4596f4a52c7 100644
--- a/test/common/test_ops.cpp
+++ b/test/common/test_ops.cpp
@@ -1,7 +1,7 @@
 #include "catch.hpp"
-#include "common/operator/comparison_operators.hpp"
-#include "common/types/vector.hpp"
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/common/operator/comparison_operators.hpp"
+#include "duckdb/common/types/vector.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 
 #include <vector>
 
diff --git a/test/common/test_serializer.cpp b/test/common/test_serializer.cpp
index 6526c04970b..e3fc0c17014 100644
--- a/test/common/test_serializer.cpp
+++ b/test/common/test_serializer.cpp
@@ -1,8 +1,8 @@
 #include "catch.hpp"
-#include "common/serializer/buffered_deserializer.hpp"
-#include "common/serializer/buffered_serializer.hpp"
-#include "common/types/data_chunk.hpp"
-#include "common/value_operations/value_operations.hpp"
+#include "duckdb/common/serializer/buffered_deserializer.hpp"
+#include "duckdb/common/serializer/buffered_serializer.hpp"
+#include "duckdb/common/types/data_chunk.hpp"
+#include "duckdb/common/value_operations/value_operations.hpp"
 #include "expression_helper.hpp"
 
 using namespace duckdb;
diff --git a/test/common/test_sort.cpp b/test/common/test_sort.cpp
index 82b0a8e1661..89d291461ae 100644
--- a/test/common/test_sort.cpp
+++ b/test/common/test_sort.cpp
@@ -1,6 +1,6 @@
 #include "catch.hpp"
-#include "common/operator/comparison_operators.hpp"
-#include "common/vector_operations/vector_operations.hpp"
+#include "duckdb/common/operator/comparison_operators.hpp"
+#include "duckdb/common/vector_operations/vector_operations.hpp"
 
 #include <vector>
 
diff --git a/test/common/test_timestamp.cpp b/test/common/test_timestamp.cpp
index f3dc8bbe8a1..596d71c9e4d 100644
--- a/test/common/test_timestamp.cpp
+++ b/test/common/test_timestamp.cpp
@@ -1,5 +1,5 @@
 #include "catch.hpp"
-#include "common/types/timestamp.hpp"
+#include "duckdb/common/types/timestamp.hpp"
 
 #include <vector>
 
diff --git a/test/common/test_utf.cpp b/test/common/test_utf.cpp
index 56038216d76..0630015e154 100644
--- a/test/common/test_utf.cpp
+++ b/test/common/test_utf.cpp
@@ -1,5 +1,5 @@
 #include "catch.hpp"
-#include "common/types/vector.hpp"
+#include "duckdb/common/types/vector.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/test/dbtransfer/test_dbtransfer.cpp b/test/dbtransfer/test_dbtransfer.cpp
index 96440727c38..581f14c3d1a 100644
--- a/test/dbtransfer/test_dbtransfer.cpp
+++ b/test/dbtransfer/test_dbtransfer.cpp
@@ -1,5 +1,5 @@
 #include "sqlite_transfer.hpp"
-#include "common/types.hpp"
+#include "duckdb/common/types.hpp"
 #include "duckdb.hpp"
 #include "sqlite3.h"
 #include "catch.hpp"
diff --git a/test/helpers/expression_helper.cpp b/test/helpers/expression_helper.cpp
index 481bc16675f..72a935b6f18 100644
--- a/test/helpers/expression_helper.cpp
+++ b/test/helpers/expression_helper.cpp
@@ -1,15 +1,15 @@
 #include "expression_helper.hpp"
 
 #include "duckdb.hpp"
-#include "optimizer/rule/constant_folding.hpp"
-#include "parser/parser.hpp"
-#include "planner/binder.hpp"
-#include "planner/bound_query_node.hpp"
-#include "planner/expression_iterator.hpp"
-#include "planner/operator/logical_projection.hpp"
-#include "planner/planner.hpp"
-#include "planner/statement/bound_select_statement.hpp"
-#include "planner/query_node/bound_select_node.hpp"
+#include "duckdb/optimizer/rule/constant_folding.hpp"
+#include "duckdb/parser/parser.hpp"
+#include "duckdb/planner/binder.hpp"
+#include "duckdb/planner/bound_query_node.hpp"
+#include "duckdb/planner/expression_iterator.hpp"
+#include "duckdb/planner/operator/logical_projection.hpp"
+#include "duckdb/planner/planner.hpp"
+#include "duckdb/planner/statement/bound_select_statement.hpp"
+#include "duckdb/planner/query_node/bound_select_node.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/test/helpers/test_helpers.cpp b/test/helpers/test_helpers.cpp
index 599dfcd620f..571fa9ad498 100644
--- a/test/helpers/test_helpers.cpp
+++ b/test/helpers/test_helpers.cpp
@@ -1,13 +1,13 @@
 // #define CATCH_CONFIG_RUNNER
 #include "catch.hpp"
 
-#include "execution/operator/persistent/buffered_csv_reader.hpp"
-#include "common/file_system.hpp"
-#include "common/value_operations/value_operations.hpp"
+#include "duckdb/execution/operator/persistent/buffered_csv_reader.hpp"
+#include "duckdb/common/file_system.hpp"
+#include "duckdb/common/value_operations/value_operations.hpp"
 #include "compare_result.hpp"
-#include "main/query_result.hpp"
+#include "duckdb/main/query_result.hpp"
 #include "test_helpers.hpp"
-#include "parser/parsed_data/copy_info.hpp"
+#include "duckdb/parser/parsed_data/copy_info.hpp"
 
 #include <cmath>
 
diff --git a/test/include/compare_result.hpp b/test/include/compare_result.hpp
index 7336b66a0ca..4e665d23015 100644
--- a/test/include/compare_result.hpp
+++ b/test/include/compare_result.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/string_util.hpp"
+#include "duckdb/common/string_util.hpp"
 #include "duckdb.hpp"
 
 namespace duckdb {
diff --git a/test/include/expression_helper.hpp b/test/include/expression_helper.hpp
index 6def3a29a67..27d1e3142fc 100644
--- a/test/include/expression_helper.hpp
+++ b/test/include/expression_helper.hpp
@@ -2,10 +2,10 @@
 
 #include "catch.hpp"
 #include "duckdb.hpp"
-#include "optimizer/expression_rewriter.hpp"
-#include "parser/parsed_expression.hpp"
-#include "planner/expression.hpp"
-#include "planner/planner.hpp"
+#include "duckdb/optimizer/expression_rewriter.hpp"
+#include "duckdb/parser/parsed_expression.hpp"
+#include "duckdb/planner/expression.hpp"
+#include "duckdb/planner/planner.hpp"
 
 namespace duckdb {
 
diff --git a/test/include/test_helpers.hpp b/test/include/test_helpers.hpp
index 6272f40d259..53c067edc49 100644
--- a/test/include/test_helpers.hpp
+++ b/test/include/test_helpers.hpp
@@ -11,8 +11,8 @@
 #undef RemoveDirectory
 #endif
 
-#include "common/string_util.hpp"
-#include "common/types.hpp"
+#include "duckdb/common/string_util.hpp"
+#include "duckdb/common/types.hpp"
 #include "compare_result.hpp"
 #include "duckdb.hpp"
 
diff --git a/test/monetdb/test_boolean_logic.cpp b/test/monetdb/test_boolean_logic.cpp
index 1b07378e55a..d41301757d0 100644
--- a/test/monetdb/test_boolean_logic.cpp
+++ b/test/monetdb/test_boolean_logic.cpp
@@ -1,5 +1,5 @@
 #include "catch.hpp"
-#include "common/file_system.hpp"
+#include "duckdb/common/file_system.hpp"
 #include "dbgen.hpp"
 #include "test_helpers.hpp"
 
diff --git a/test/monetdb/test_leftjoin_bug.cpp b/test/monetdb/test_leftjoin_bug.cpp
index 86c91d17783..b2931ab5f49 100644
--- a/test/monetdb/test_leftjoin_bug.cpp
+++ b/test/monetdb/test_leftjoin_bug.cpp
@@ -1,5 +1,5 @@
 #include "catch.hpp"
-#include "common/file_system.hpp"
+#include "duckdb/common/file_system.hpp"
 #include "dbgen.hpp"
 #include "test_helpers.hpp"
 
diff --git a/test/monetdb/test_many_views.cpp b/test/monetdb/test_many_views.cpp
index 615cc2f7606..e9827f0c75c 100644
--- a/test/monetdb/test_many_views.cpp
+++ b/test/monetdb/test_many_views.cpp
@@ -1,5 +1,5 @@
 #include "catch.hpp"
-#include "common/file_system.hpp"
+#include "duckdb/common/file_system.hpp"
 #include "dbgen.hpp"
 #include "test_helpers.hpp"
 
diff --git a/test/monetdb/test_round_bug.cpp b/test/monetdb/test_round_bug.cpp
index 6db65a16d8b..d2c6df0424e 100644
--- a/test/monetdb/test_round_bug.cpp
+++ b/test/monetdb/test_round_bug.cpp
@@ -1,5 +1,5 @@
 #include "catch.hpp"
-#include "common/file_system.hpp"
+#include "duckdb/common/file_system.hpp"
 #include "dbgen.hpp"
 #include "test_helpers.hpp"
 
diff --git a/test/monetdb/test_updates_with_correlated_subselect.cpp b/test/monetdb/test_updates_with_correlated_subselect.cpp
index f0ca7e53536..f382bee0381 100644
--- a/test/monetdb/test_updates_with_correlated_subselect.cpp
+++ b/test/monetdb/test_updates_with_correlated_subselect.cpp
@@ -1,5 +1,5 @@
 #include "catch.hpp"
-#include "common/file_system.hpp"
+#include "duckdb/common/file_system.hpp"
 #include "dbgen.hpp"
 #include "test_helpers.hpp"
 
diff --git a/test/optimizer/test_arithmetic_simplification.cpp b/test/optimizer/test_arithmetic_simplification.cpp
index fe30463cd68..4d8770bdca9 100644
--- a/test/optimizer/test_arithmetic_simplification.cpp
+++ b/test/optimizer/test_arithmetic_simplification.cpp
@@ -1,7 +1,7 @@
 #include "catch.hpp"
-#include "common/helper.hpp"
+#include "duckdb/common/helper.hpp"
 #include "expression_helper.hpp"
-#include "optimizer/rule/arithmetic_simplification.hpp"
+#include "duckdb/optimizer/rule/arithmetic_simplification.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/test/optimizer/test_ca_optimizer.cpp b/test/optimizer/test_ca_optimizer.cpp
index 024159087bc..e357c1c09e1 100644
--- a/test/optimizer/test_ca_optimizer.cpp
+++ b/test/optimizer/test_ca_optimizer.cpp
@@ -1,11 +1,11 @@
 #include "catch.hpp"
 #include "expression_helper.hpp"
-#include "optimizer/ca_optimizer.hpp"
-#include "planner/expression/bound_cast_expression.hpp"
-#include "planner/expression/bound_comparison_expression.hpp"
-#include "planner/expression/bound_function_expression.hpp"
-#include "planner/expression/bound_window_expression.hpp"
-#include "planner/operator/logical_window.hpp"
+#include "duckdb/optimizer/ca_optimizer.hpp"
+#include "duckdb/planner/expression/bound_cast_expression.hpp"
+#include "duckdb/planner/expression/bound_comparison_expression.hpp"
+#include "duckdb/planner/expression/bound_function_expression.hpp"
+#include "duckdb/planner/expression/bound_window_expression.hpp"
+#include "duckdb/planner/operator/logical_window.hpp"
 #include "test_helpers.hpp"
 
 using namespace duckdb;
diff --git a/test/optimizer/test_case_simplification.cpp b/test/optimizer/test_case_simplification.cpp
index 88f6ac3a045..60b79dd7c78 100644
--- a/test/optimizer/test_case_simplification.cpp
+++ b/test/optimizer/test_case_simplification.cpp
@@ -1,6 +1,6 @@
-#include "common/helper.hpp"
+#include "duckdb/common/helper.hpp"
 #include "expression_helper.hpp"
-#include "optimizer/rule/case_simplification.hpp"
+#include "duckdb/optimizer/rule/case_simplification.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/test/optimizer/test_comparison_simplification.cpp b/test/optimizer/test_comparison_simplification.cpp
index c0a4019539e..cd90f1d1acf 100644
--- a/test/optimizer/test_comparison_simplification.cpp
+++ b/test/optimizer/test_comparison_simplification.cpp
@@ -1,7 +1,7 @@
 #include "catch.hpp"
-#include "common/helper.hpp"
+#include "duckdb/common/helper.hpp"
 #include "expression_helper.hpp"
-#include "optimizer/rule/comparison_simplification.hpp"
+#include "duckdb/optimizer/rule/comparison_simplification.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/test/optimizer/test_conjunction_simplification.cpp b/test/optimizer/test_conjunction_simplification.cpp
index b9dd97981f2..659a17a40e1 100644
--- a/test/optimizer/test_conjunction_simplification.cpp
+++ b/test/optimizer/test_conjunction_simplification.cpp
@@ -1,7 +1,7 @@
 #include "catch.hpp"
-#include "common/helper.hpp"
+#include "duckdb/common/helper.hpp"
 #include "expression_helper.hpp"
-#include "optimizer/rule/conjunction_simplification.hpp"
+#include "duckdb/optimizer/rule/conjunction_simplification.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/test/optimizer/test_constant_folding.cpp b/test/optimizer/test_constant_folding.cpp
index ccd3ce5f528..d19415bfa05 100644
--- a/test/optimizer/test_constant_folding.cpp
+++ b/test/optimizer/test_constant_folding.cpp
@@ -1,7 +1,7 @@
 #include "catch.hpp"
-#include "common/helper.hpp"
+#include "duckdb/common/helper.hpp"
 #include "expression_helper.hpp"
-#include "optimizer/rule/constant_folding.hpp"
+#include "duckdb/optimizer/rule/constant_folding.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/test/optimizer/test_cse_optimizer.cpp b/test/optimizer/test_cse_optimizer.cpp
index 7a1088bce76..96015d17b3f 100644
--- a/test/optimizer/test_cse_optimizer.cpp
+++ b/test/optimizer/test_cse_optimizer.cpp
@@ -1,10 +1,10 @@
 #include "catch.hpp"
-#include "common/helper.hpp"
+#include "duckdb/common/helper.hpp"
 #include "expression_helper.hpp"
-#include "optimizer/cse_optimizer.hpp"
-#include "planner/expression/bound_comparison_expression.hpp"
-#include "planner/expression/bound_function_expression.hpp"
-#include "planner/expression/common_subexpression.hpp"
+#include "duckdb/optimizer/cse_optimizer.hpp"
+#include "duckdb/planner/expression/bound_comparison_expression.hpp"
+#include "duckdb/planner/expression/bound_function_expression.hpp"
+#include "duckdb/planner/expression/common_subexpression.hpp"
 #include "test_helpers.hpp"
 
 using namespace duckdb;
diff --git a/test/optimizer/test_distributivity_rule.cpp b/test/optimizer/test_distributivity_rule.cpp
index dd4aedabe51..a8717778925 100644
--- a/test/optimizer/test_distributivity_rule.cpp
+++ b/test/optimizer/test_distributivity_rule.cpp
@@ -1,6 +1,6 @@
-#include "common/helper.hpp"
+#include "duckdb/common/helper.hpp"
 #include "expression_helper.hpp"
-#include "optimizer/rule/distributivity.hpp"
+#include "duckdb/optimizer/rule/distributivity.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/test/optimizer/test_index_scan_optimizer.cpp b/test/optimizer/test_index_scan_optimizer.cpp
index a8965b47e1c..f4755819927 100644
--- a/test/optimizer/test_index_scan_optimizer.cpp
+++ b/test/optimizer/test_index_scan_optimizer.cpp
@@ -1,10 +1,10 @@
 #include "catch.hpp"
-#include "common/helper.hpp"
+#include "duckdb/common/helper.hpp"
 #include "expression_helper.hpp"
-#include "optimizer/index_scan.hpp"
-#include "planner/expression/bound_comparison_expression.hpp"
-#include "planner/expression/bound_operator_expression.hpp"
-#include "planner/expression/common_subexpression.hpp"
+#include "duckdb/optimizer/index_scan.hpp"
+#include "duckdb/planner/expression/bound_comparison_expression.hpp"
+#include "duckdb/planner/expression/bound_operator_expression.hpp"
+#include "duckdb/planner/expression/common_subexpression.hpp"
 #include "test_helpers.hpp"
 
 using namespace duckdb;
diff --git a/test/optimizer/test_move_constants.cpp b/test/optimizer/test_move_constants.cpp
index 1dca09f4a27..819a004f5c5 100644
--- a/test/optimizer/test_move_constants.cpp
+++ b/test/optimizer/test_move_constants.cpp
@@ -1,7 +1,7 @@
-#include "common/helper.hpp"
+#include "duckdb/common/helper.hpp"
 #include "expression_helper.hpp"
-#include "optimizer/rule/constant_folding.hpp"
-#include "optimizer/rule/move_constants.hpp"
+#include "duckdb/optimizer/rule/constant_folding.hpp"
+#include "duckdb/optimizer/rule/move_constants.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/test/optimizer/test_topn_optimizer.cpp b/test/optimizer/test_topn_optimizer.cpp
index 97f0e28e63e..026776907e3 100644
--- a/test/optimizer/test_topn_optimizer.cpp
+++ b/test/optimizer/test_topn_optimizer.cpp
@@ -1,7 +1,7 @@
 #include "catch.hpp"
 #include "expression_helper.hpp"
-#include "planner/operator/logical_top_n.hpp"
-#include "optimizer/topn_optimizer.hpp"
+#include "duckdb/planner/operator/logical_top_n.hpp"
+#include "duckdb/optimizer/topn_optimizer.hpp"
 #include "test_helpers.hpp"
 
 using namespace duckdb;
diff --git a/test/persistence/test_locking.cpp b/test/persistence/test_locking.cpp
index 0fe00873b51..0bfec4f2550 100644
--- a/test/persistence/test_locking.cpp
+++ b/test/persistence/test_locking.cpp
@@ -1,7 +1,7 @@
 #include "catch.hpp"
-#include "common/file_system.hpp"
+#include "duckdb/common/file_system.hpp"
 #include "duckdb.hpp"
-#include "main/appender.hpp"
+#include "duckdb/main/appender.hpp"
 #include "test_helpers.hpp"
 
 #include <signal.h>
diff --git a/test/persistence/test_persistence.cpp b/test/persistence/test_persistence.cpp
index ff5ebf96dba..3d4f5269aeb 100644
--- a/test/persistence/test_persistence.cpp
+++ b/test/persistence/test_persistence.cpp
@@ -1,7 +1,7 @@
 #include "catch.hpp"
-#include "common/file_system.hpp"
+#include "duckdb/common/file_system.hpp"
 #include "duckdb.hpp"
-#include "main/appender.hpp"
+#include "duckdb/main/appender.hpp"
 #include "test_helpers.hpp"
 
 #include <signal.h>
diff --git a/test/persistence/test_sequence_crash.cpp b/test/persistence/test_sequence_crash.cpp
index 7627dcddabe..43c735c0be8 100644
--- a/test/persistence/test_sequence_crash.cpp
+++ b/test/persistence/test_sequence_crash.cpp
@@ -1,7 +1,7 @@
 #include "catch.hpp"
-#include "common/file_system.hpp"
+#include "duckdb/common/file_system.hpp"
 #include "duckdb.hpp"
-#include "main/appender.hpp"
+#include "duckdb/main/appender.hpp"
 #include "test_helpers.hpp"
 
 #include <signal.h>
diff --git a/test/sakila/test_sakila.cpp b/test/sakila/test_sakila.cpp
index 91114e53ebf..19dee1a6444 100644
--- a/test/sakila/test_sakila.cpp
+++ b/test/sakila/test_sakila.cpp
@@ -1,6 +1,6 @@
 #include "catch.hpp"
-#include "common/fstream_util.hpp"
-#include "common/gzip_stream.hpp"
+#include "duckdb/common/fstream_util.hpp"
+#include "duckdb/common/gzip_stream.hpp"
 #include "test_helpers.hpp"
 
 #include <fstream>
diff --git a/test/sql/append/test_big_append.cpp b/test/sql/append/test_big_append.cpp
index ad36c90ff21..3689edd2778 100644
--- a/test/sql/append/test_big_append.cpp
+++ b/test/sql/append/test_big_append.cpp
@@ -1,6 +1,6 @@
 #include "catch.hpp"
 #include "test_helpers.hpp"
-#include "storage/storage_info.hpp"
+#include "duckdb/storage/storage_info.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/test/sql/capi/test_capi.cpp b/test/sql/capi/test_capi.cpp
index 23160d24550..b6403ce55f3 100644
--- a/test/sql/capi/test_capi.cpp
+++ b/test/sql/capi/test_capi.cpp
@@ -1,7 +1,7 @@
 #include "catch.hpp"
 #include "duckdb.h"
 #include "test_helpers.hpp"
-#include "common/exception.hpp"
+#include "duckdb/common/exception.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/test/sql/copy/test_copy.cpp b/test/sql/copy/test_copy.cpp
index 5d090e052b4..14ec5b19fc1 100644
--- a/test/sql/copy/test_copy.cpp
+++ b/test/sql/copy/test_copy.cpp
@@ -1,6 +1,6 @@
 #include "catch.hpp"
-#include "common/file_system.hpp"
-#include "common/types/date.hpp"
+#include "duckdb/common/file_system.hpp"
+#include "duckdb/common/types/date.hpp"
 #include "test_csv_header.hpp"
 #include "test_helpers.hpp"
 
diff --git a/test/sql/date/test_date.cpp b/test/sql/date/test_date.cpp
index 20f1193607a..02b8a89b600 100644
--- a/test/sql/date/test_date.cpp
+++ b/test/sql/date/test_date.cpp
@@ -1,5 +1,5 @@
 #include "catch.hpp"
-#include "common/types/date.hpp"
+#include "duckdb/common/types/date.hpp"
 #include "test_helpers.hpp"
 
 using namespace duckdb;
diff --git a/test/sql/date/test_timestamp.cpp b/test/sql/date/test_timestamp.cpp
index 80472fc5430..b2066aa1141 100644
--- a/test/sql/date/test_timestamp.cpp
+++ b/test/sql/date/test_timestamp.cpp
@@ -1,7 +1,7 @@
 #include "catch.hpp"
-#include "common/types/timestamp.hpp"
+#include "duckdb/common/types/timestamp.hpp"
 #include "test_helpers.hpp"
-#include "common/types/time.hpp"
+#include "duckdb/common/types/time.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/test/sql/filter_pushdown/test_filter_pushdown.cpp b/test/sql/filter_pushdown/test_filter_pushdown.cpp
index 1b66a03fe0d..9de0118c84a 100644
--- a/test/sql/filter_pushdown/test_filter_pushdown.cpp
+++ b/test/sql/filter_pushdown/test_filter_pushdown.cpp
@@ -1,5 +1,5 @@
 #include "catch.hpp"
-#include "common/file_system.hpp"
+#include "duckdb/common/file_system.hpp"
 #include "test_helpers.hpp"
 
 #include <iostream>
diff --git a/test/sql/index/test_art_index.cpp b/test/sql/index/test_art_index.cpp
index 448b77ce7d2..47d55ab9463 100644
--- a/test/sql/index/test_art_index.cpp
+++ b/test/sql/index/test_art_index.cpp
@@ -1,5 +1,5 @@
 #include "catch.hpp"
-#include "common/file_system.hpp"
+#include "duckdb/common/file_system.hpp"
 #include "dbgen.hpp"
 #include "test_helpers.hpp"
 
diff --git a/test/sql/index/test_art_keys.cpp b/test/sql/index/test_art_keys.cpp
index 3d24ef3f925..16139cb748e 100644
--- a/test/sql/index/test_art_keys.cpp
+++ b/test/sql/index/test_art_keys.cpp
@@ -1,5 +1,5 @@
 #include "catch.hpp"
-#include "execution/index/art/art_key.hpp"
+#include "duckdb/execution/index/art/art_key.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/test/sql/index/test_concurrent_index.cpp b/test/sql/index/test_concurrent_index.cpp
index ea85cb1f69b..84e978c8810 100644
--- a/test/sql/index/test_concurrent_index.cpp
+++ b/test/sql/index/test_concurrent_index.cpp
@@ -1,5 +1,5 @@
 #include "catch.hpp"
-#include "main/appender.hpp"
+#include "duckdb/main/appender.hpp"
 #include "test_helpers.hpp"
 
 #include <atomic>
diff --git a/test/sql/join/test_join_on_aggregates.cpp b/test/sql/join/test_join_on_aggregates.cpp
index 08065d972f5..c166f4ae652 100644
--- a/test/sql/join/test_join_on_aggregates.cpp
+++ b/test/sql/join/test_join_on_aggregates.cpp
@@ -1,5 +1,5 @@
 #include "catch.hpp"
-#include "common/file_system.hpp"
+#include "duckdb/common/file_system.hpp"
 #include "dbgen.hpp"
 #include "test_helpers.hpp"
 
diff --git a/test/sql/join/test_left_outer_join.cpp b/test/sql/join/test_left_outer_join.cpp
index 95769d6c375..bee2bbd51f8 100644
--- a/test/sql/join/test_left_outer_join.cpp
+++ b/test/sql/join/test_left_outer_join.cpp
@@ -1,5 +1,5 @@
 #include "catch.hpp"
-#include "common/file_system.hpp"
+#include "duckdb/common/file_system.hpp"
 #include "dbgen.hpp"
 #include "test_helpers.hpp"
 
diff --git a/test/sql/join/test_unequal_join.cpp b/test/sql/join/test_unequal_join.cpp
index 0933452d573..7f4b987b763 100644
--- a/test/sql/join/test_unequal_join.cpp
+++ b/test/sql/join/test_unequal_join.cpp
@@ -1,5 +1,5 @@
 #include "catch.hpp"
-#include "common/file_system.hpp"
+#include "duckdb/common/file_system.hpp"
 #include "dbgen.hpp"
 #include "test_helpers.hpp"
 
diff --git a/test/sql/join/test_varchar_join.cpp b/test/sql/join/test_varchar_join.cpp
index 119b4eedc84..6fac0d55799 100644
--- a/test/sql/join/test_varchar_join.cpp
+++ b/test/sql/join/test_varchar_join.cpp
@@ -1,5 +1,5 @@
 #include "catch.hpp"
-#include "common/file_system.hpp"
+#include "duckdb/common/file_system.hpp"
 #include "dbgen.hpp"
 #include "test_helpers.hpp"
 
diff --git a/test/sql/prepared/test_prepared.cpp b/test/sql/prepared/test_prepared.cpp
index 023893a8ece..1db78b936a6 100644
--- a/test/sql/prepared/test_prepared.cpp
+++ b/test/sql/prepared/test_prepared.cpp
@@ -1,6 +1,6 @@
 #include "catch.hpp"
-#include "common/file_system.hpp"
-#include "common/types/date.hpp"
+#include "duckdb/common/file_system.hpp"
+#include "duckdb/common/types/date.hpp"
 #include "test_helpers.hpp"
 
 using namespace duckdb;
diff --git a/test/sql/schema/test_quoted_column_name.cpp b/test/sql/schema/test_quoted_column_name.cpp
index 7b3542f8d5e..a8defcd9a48 100644
--- a/test/sql/schema/test_quoted_column_name.cpp
+++ b/test/sql/schema/test_quoted_column_name.cpp
@@ -1,5 +1,5 @@
 #include "catch.hpp"
-#include "common/file_system.hpp"
+#include "duckdb/common/file_system.hpp"
 #include "dbgen.hpp"
 #include "test_helpers.hpp"
 
diff --git a/test/sql/storage/test_big_storage.cpp b/test/sql/storage/test_big_storage.cpp
index 42a480961ac..71b97935bc3 100644
--- a/test/sql/storage/test_big_storage.cpp
+++ b/test/sql/storage/test_big_storage.cpp
@@ -1,7 +1,7 @@
 #include "catch.hpp"
-#include "common/file_system.hpp"
+#include "duckdb/common/file_system.hpp"
 #include "test_helpers.hpp"
-#include "storage/storage_info.hpp"
+#include "duckdb/storage/storage_info.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/test/sql/storage/test_buffer_manager.cpp b/test/sql/storage/test_buffer_manager.cpp
index 6d7d5e657e8..d1a79d45e7b 100644
--- a/test/sql/storage/test_buffer_manager.cpp
+++ b/test/sql/storage/test_buffer_manager.cpp
@@ -1,7 +1,7 @@
 #include "catch.hpp"
-#include "common/file_system.hpp"
+#include "duckdb/common/file_system.hpp"
 #include "test_helpers.hpp"
-#include "storage/storage_info.hpp"
+#include "duckdb/storage/storage_info.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/test/sql/storage/test_checksum.cpp b/test/sql/storage/test_checksum.cpp
index fd9cb94e019..bfd52b2f70c 100644
--- a/test/sql/storage/test_checksum.cpp
+++ b/test/sql/storage/test_checksum.cpp
@@ -1,5 +1,5 @@
 #include "catch.hpp"
-#include "common/file_system.hpp"
+#include "duckdb/common/file_system.hpp"
 #include "test_helpers.hpp"
 
 using namespace duckdb;
diff --git a/test/sql/storage/test_constraints.cpp b/test/sql/storage/test_constraints.cpp
index abb35ab429c..3c127b9fb76 100644
--- a/test/sql/storage/test_constraints.cpp
+++ b/test/sql/storage/test_constraints.cpp
@@ -1,5 +1,5 @@
 #include "catch.hpp"
-#include "common/file_system.hpp"
+#include "duckdb/common/file_system.hpp"
 #include "test_helpers.hpp"
 
 using namespace duckdb;
diff --git a/test/sql/storage/test_database_size.cpp b/test/sql/storage/test_database_size.cpp
index d6120d545fc..ec0f7b73eef 100644
--- a/test/sql/storage/test_database_size.cpp
+++ b/test/sql/storage/test_database_size.cpp
@@ -1,5 +1,5 @@
 #include "catch.hpp"
-#include "common/file_system.hpp"
+#include "duckdb/common/file_system.hpp"
 #include "test_helpers.hpp"
 
 using namespace duckdb;
diff --git a/test/sql/storage/test_droptable.cpp b/test/sql/storage/test_droptable.cpp
index 30ffe05878a..d68639240aa 100644
--- a/test/sql/storage/test_droptable.cpp
+++ b/test/sql/storage/test_droptable.cpp
@@ -1,5 +1,5 @@
 #include "catch.hpp"
-#include "common/file_system.hpp"
+#include "duckdb/common/file_system.hpp"
 #include "test_helpers.hpp"
 
 using namespace duckdb;
diff --git a/test/sql/storage/test_readonly.cpp b/test/sql/storage/test_readonly.cpp
index 63519c7087a..3aeb895b184 100644
--- a/test/sql/storage/test_readonly.cpp
+++ b/test/sql/storage/test_readonly.cpp
@@ -1,5 +1,5 @@
 #include "catch.hpp"
-#include "common/file_system.hpp"
+#include "duckdb/common/file_system.hpp"
 #include "test_helpers.hpp"
 
 using namespace duckdb;
diff --git a/test/sql/storage/test_shutdown.cpp b/test/sql/storage/test_shutdown.cpp
index 73baad3f935..7e4b4a815fc 100644
--- a/test/sql/storage/test_shutdown.cpp
+++ b/test/sql/storage/test_shutdown.cpp
@@ -1,5 +1,5 @@
 #include "catch.hpp"
-#include "common/file_system.hpp"
+#include "duckdb/common/file_system.hpp"
 #include "test_helpers.hpp"
 
 using namespace duckdb;
diff --git a/test/sql/storage/test_storage.cpp b/test/sql/storage/test_storage.cpp
index 619ced2fbbc..258a3ddb4d9 100644
--- a/test/sql/storage/test_storage.cpp
+++ b/test/sql/storage/test_storage.cpp
@@ -1,7 +1,7 @@
 #include "catch.hpp"
-#include "common/file_system.hpp"
+#include "duckdb/common/file_system.hpp"
 #include "test_helpers.hpp"
-#include "main/appender.hpp"
+#include "duckdb/main/appender.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/test/sql/storage/test_storage_defaults.cpp b/test/sql/storage/test_storage_defaults.cpp
index 082fe1fb6c2..3b5b79b1b0a 100644
--- a/test/sql/storage/test_storage_defaults.cpp
+++ b/test/sql/storage/test_storage_defaults.cpp
@@ -1,5 +1,5 @@
 #include "catch.hpp"
-#include "common/file_system.hpp"
+#include "duckdb/common/file_system.hpp"
 #include "test_helpers.hpp"
 
 using namespace duckdb;
diff --git a/test/sql/storage/test_storage_scan.cpp b/test/sql/storage/test_storage_scan.cpp
index 1fd255c2229..28753d49a65 100644
--- a/test/sql/storage/test_storage_scan.cpp
+++ b/test/sql/storage/test_storage_scan.cpp
@@ -1,7 +1,7 @@
 #include "catch.hpp"
-#include "common/file_system.hpp"
+#include "duckdb/common/file_system.hpp"
 #include "test_helpers.hpp"
-#include "main/appender.hpp"
+#include "duckdb/main/appender.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/test/sql/storage/test_storage_sequences.cpp b/test/sql/storage/test_storage_sequences.cpp
index bcbc8677df2..1eec8ff7957 100644
--- a/test/sql/storage/test_storage_sequences.cpp
+++ b/test/sql/storage/test_storage_sequences.cpp
@@ -1,5 +1,5 @@
 #include "catch.hpp"
-#include "common/file_system.hpp"
+#include "duckdb/common/file_system.hpp"
 #include "test_helpers.hpp"
 
 using namespace duckdb;
diff --git a/test/sql/storage/test_storage_tpch.cpp b/test/sql/storage/test_storage_tpch.cpp
index ac7837dcb4a..4dd252a3f89 100644
--- a/test/sql/storage/test_storage_tpch.cpp
+++ b/test/sql/storage/test_storage_tpch.cpp
@@ -1,5 +1,5 @@
 #include "catch.hpp"
-#include "common/file_system.hpp"
+#include "duckdb/common/file_system.hpp"
 #include "dbgen.hpp"
 #include "test_helpers.hpp"
 
diff --git a/test/sql/storage/test_store_alter.cpp b/test/sql/storage/test_store_alter.cpp
index 28e070fbeba..f67a935a08f 100644
--- a/test/sql/storage/test_store_alter.cpp
+++ b/test/sql/storage/test_store_alter.cpp
@@ -1,5 +1,5 @@
 #include "catch.hpp"
-#include "common/file_system.hpp"
+#include "duckdb/common/file_system.hpp"
 #include "test_helpers.hpp"
 
 using namespace duckdb;
diff --git a/test/sql/storage/test_views.cpp b/test/sql/storage/test_views.cpp
index 66fabdb1214..d4f8a87b03d 100644
--- a/test/sql/storage/test_views.cpp
+++ b/test/sql/storage/test_views.cpp
@@ -1,5 +1,5 @@
 #include "catch.hpp"
-#include "common/file_system.hpp"
+#include "duckdb/common/file_system.hpp"
 #include "test_helpers.hpp"
 
 using namespace duckdb;
diff --git a/test/sql/subquery/test_any_all.cpp b/test/sql/subquery/test_any_all.cpp
index 5088f41a8f3..3fa96a57f0c 100644
--- a/test/sql/subquery/test_any_all.cpp
+++ b/test/sql/subquery/test_any_all.cpp
@@ -1,5 +1,5 @@
 #include "catch.hpp"
-#include "common/file_system.hpp"
+#include "duckdb/common/file_system.hpp"
 #include "dbgen.hpp"
 #include "test_helpers.hpp"
 
diff --git a/test/sql/subquery/test_correlated_subquery.cpp b/test/sql/subquery/test_correlated_subquery.cpp
index 15a75dc62a9..b485cb52fbd 100644
--- a/test/sql/subquery/test_correlated_subquery.cpp
+++ b/test/sql/subquery/test_correlated_subquery.cpp
@@ -1,5 +1,5 @@
 #include "catch.hpp"
-#include "common/file_system.hpp"
+#include "duckdb/common/file_system.hpp"
 #include "dbgen.hpp"
 #include "test_helpers.hpp"
 
diff --git a/test/sql/subquery/test_lateral.cpp b/test/sql/subquery/test_lateral.cpp
index aa43eb286d0..7abd497611f 100644
--- a/test/sql/subquery/test_lateral.cpp
+++ b/test/sql/subquery/test_lateral.cpp
@@ -1,5 +1,5 @@
 #include "catch.hpp"
-#include "common/file_system.hpp"
+#include "duckdb/common/file_system.hpp"
 #include "dbgen.hpp"
 #include "test_helpers.hpp"
 
diff --git a/test/sql/subquery/test_scalar_subquery.cpp b/test/sql/subquery/test_scalar_subquery.cpp
index 0c90cd5cddf..c54ef84a40c 100644
--- a/test/sql/subquery/test_scalar_subquery.cpp
+++ b/test/sql/subquery/test_scalar_subquery.cpp
@@ -1,5 +1,5 @@
 #include "catch.hpp"
-#include "common/file_system.hpp"
+#include "duckdb/common/file_system.hpp"
 #include "dbgen.hpp"
 #include "test_helpers.hpp"
 
diff --git a/test/sql/subquery/test_subquery.cpp b/test/sql/subquery/test_subquery.cpp
index 0b0632a9b5c..54766b69cc4 100644
--- a/test/sql/subquery/test_subquery.cpp
+++ b/test/sql/subquery/test_subquery.cpp
@@ -1,5 +1,5 @@
 #include "catch.hpp"
-#include "common/file_system.hpp"
+#include "duckdb/common/file_system.hpp"
 #include "dbgen.hpp"
 #include "test_helpers.hpp"
 
diff --git a/test/sql/subquery/test_update_subquery.cpp b/test/sql/subquery/test_update_subquery.cpp
index 3d914b492d7..5a3e12a85ec 100644
--- a/test/sql/subquery/test_update_subquery.cpp
+++ b/test/sql/subquery/test_update_subquery.cpp
@@ -1,5 +1,5 @@
 #include "catch.hpp"
-#include "common/file_system.hpp"
+#include "duckdb/common/file_system.hpp"
 #include "dbgen.hpp"
 #include "test_helpers.hpp"
 
diff --git a/test/sql/transactions/test_concurrentappend.cpp b/test/sql/transactions/test_concurrentappend.cpp
index 639e1170313..2f85ae1394c 100644
--- a/test/sql/transactions/test_concurrentappend.cpp
+++ b/test/sql/transactions/test_concurrentappend.cpp
@@ -1,5 +1,5 @@
 #include "catch.hpp"
-#include "common/value_operations/value_operations.hpp"
+#include "duckdb/common/value_operations/value_operations.hpp"
 #include "test_helpers.hpp"
 
 #include <atomic>
diff --git a/test/sql/transactions/test_concurrentdelete.cpp b/test/sql/transactions/test_concurrentdelete.cpp
index d4a711c76b3..3569d34404b 100644
--- a/test/sql/transactions/test_concurrentdelete.cpp
+++ b/test/sql/transactions/test_concurrentdelete.cpp
@@ -1,5 +1,5 @@
 #include "catch.hpp"
-#include "common/value_operations/value_operations.hpp"
+#include "duckdb/common/value_operations/value_operations.hpp"
 #include "test_helpers.hpp"
 
 #include <atomic>
diff --git a/test/sql/transactions/test_concurrentupdate.cpp b/test/sql/transactions/test_concurrentupdate.cpp
index 6164e5c06ca..925f7225cf6 100644
--- a/test/sql/transactions/test_concurrentupdate.cpp
+++ b/test/sql/transactions/test_concurrentupdate.cpp
@@ -1,5 +1,5 @@
 #include "catch.hpp"
-#include "common/value_operations/value_operations.hpp"
+#include "duckdb/common/value_operations/value_operations.hpp"
 #include "test_helpers.hpp"
 
 #include <atomic>
diff --git a/test/sql/transactions/test_multiple_versions.cpp b/test/sql/transactions/test_multiple_versions.cpp
index 5d04b3cfc71..5d792802a4b 100644
--- a/test/sql/transactions/test_multiple_versions.cpp
+++ b/test/sql/transactions/test_multiple_versions.cpp
@@ -1,6 +1,6 @@
 #include "catch.hpp"
 #include "test_helpers.hpp"
-#include "storage/storage_info.hpp"
+#include "duckdb/storage/storage_info.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/test/sql/update/test_big_update.cpp b/test/sql/update/test_big_update.cpp
index 657e6c12cca..10adf5efae6 100644
--- a/test/sql/update/test_big_update.cpp
+++ b/test/sql/update/test_big_update.cpp
@@ -1,6 +1,6 @@
 #include "catch.hpp"
 #include "test_helpers.hpp"
-#include "storage/storage_info.hpp"
+#include "duckdb/storage/storage_info.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/test/sql/update/test_string_update.cpp b/test/sql/update/test_string_update.cpp
index c5fd4f50cb7..ef82d46d5fc 100644
--- a/test/sql/update/test_string_update.cpp
+++ b/test/sql/update/test_string_update.cpp
@@ -1,6 +1,6 @@
 #include "catch.hpp"
 #include "test_helpers.hpp"
-#include "storage/storage_info.hpp"
+#include "duckdb/storage/storage_info.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/test/sqlsmith/test_sqlsmith.cpp b/test/sqlsmith/test_sqlsmith.cpp
index 5571ea9b8bd..a17ad99bd94 100644
--- a/test/sqlsmith/test_sqlsmith.cpp
+++ b/test/sqlsmith/test_sqlsmith.cpp
@@ -1,5 +1,5 @@
 #include "catch.hpp"
-#include "common/file_system.hpp"
+#include "duckdb/common/file_system.hpp"
 #include "dbgen.hpp"
 #include "test_helpers.hpp"
 
diff --git a/test/unittest.cpp b/test/unittest.cpp
index 0441cf69faa..bfe4019925c 100644
--- a/test/unittest.cpp
+++ b/test/unittest.cpp
@@ -1,7 +1,7 @@
 #define CATCH_CONFIG_RUNNER
 #include "catch.hpp"
 
-#include "common/file_system.hpp"
+#include "duckdb/common/file_system.hpp"
 #include "test_helpers.hpp"
 
 using namespace duckdb;
diff --git a/third_party/dbgen/dbgen.cpp b/third_party/dbgen/dbgen.cpp
index 1d807e89a04..c3ed401c991 100644
--- a/third_party/dbgen/dbgen.cpp
+++ b/third_party/dbgen/dbgen.cpp
@@ -1,12 +1,12 @@
 #include "dbgen.hpp"
 
-#include "catalog/catalog_entry/table_catalog_entry.hpp"
-#include "common/exception.hpp"
-#include "common/types/date.hpp"
+#include "duckdb/catalog/catalog_entry/table_catalog_entry.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/common/types/date.hpp"
 #include "dbgen_gunk.hpp"
-#include "main/client_context.hpp"
-#include "parser/column_definition.hpp"
-#include "storage/data_table.hpp"
+#include "duckdb/main/client_context.hpp"
+#include "duckdb/parser/column_definition.hpp"
+#include "duckdb/storage/data_table.hpp"
 #include "tpch_constants.hpp"
 
 #define DECLARER /* EXTERN references get defined here */
diff --git a/third_party/dbgen/include/dbgen.hpp b/third_party/dbgen/include/dbgen.hpp
index 21b260212e5..8eb1379de71 100644
--- a/third_party/dbgen/include/dbgen.hpp
+++ b/third_party/dbgen/include/dbgen.hpp
@@ -10,8 +10,8 @@
 
 #pragma once
 
-#include "catalog/catalog.hpp"
-#include "common/types/data_chunk.hpp"
+#include "duckdb/catalog/catalog.hpp"
+#include "duckdb/common/types/data_chunk.hpp"
 #include "duckdb.hpp"
 
 namespace tpch {
diff --git a/third_party/dsdgen/append_info-c.cpp b/third_party/dsdgen/append_info-c.cpp
index f1d8badaa72..9c319b7c561 100644
--- a/third_party/dsdgen/append_info-c.cpp
+++ b/third_party/dsdgen/append_info-c.cpp
@@ -5,9 +5,9 @@
 #include "nulls.h"
 #include "date.h"
 
-#include "common/types/date.hpp"
-#include "common/exception.hpp"
-#include "storage/data_table.hpp"
+#include "duckdb/common/types/date.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/storage/data_table.hpp"
 #include <cstring>
 #include <memory>
 
diff --git a/third_party/dsdgen/dsdgen.cpp b/third_party/dsdgen/dsdgen.cpp
index d68e11225d6..200c1bc8908 100644
--- a/third_party/dsdgen/dsdgen.cpp
+++ b/third_party/dsdgen/dsdgen.cpp
@@ -1,8 +1,8 @@
 #include "dsdgen.hpp"
-#include "common/exception.hpp"
-#include "main/client_context.hpp"
-#include "common/types/data_chunk.hpp"
-#include "storage/data_table.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/main/client_context.hpp"
+#include "duckdb/common/types/data_chunk.hpp"
+#include "duckdb/storage/data_table.hpp"
 #include "tpcds_constants.hpp"
 #include "append_info.hpp"
 #include "dsdgen_helpers.hpp"
diff --git a/third_party/dsdgen/include/append_info.hpp b/third_party/dsdgen/include/append_info.hpp
index 497bb5334af..42101caf3ba 100644
--- a/third_party/dsdgen/include/append_info.hpp
+++ b/third_party/dsdgen/include/append_info.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "main/appender.hpp"
-#include "main/connection.hpp"
+#include "duckdb/main/appender.hpp"
+#include "duckdb/main/connection.hpp"
 
 #include <memory>
 
diff --git a/third_party/dsdgen/include/dsdgen.hpp b/third_party/dsdgen/include/dsdgen.hpp
index d844e6bf292..e8ca49661c4 100644
--- a/third_party/dsdgen/include/dsdgen.hpp
+++ b/third_party/dsdgen/include/dsdgen.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "catalog/catalog.hpp"
+#include "duckdb/catalog/catalog.hpp"
 #include "duckdb.hpp"
 
 namespace tpcds {
diff --git a/third_party/imdb/imdb.cpp b/third_party/imdb/imdb.cpp
index 74d7c70eb42..02387880126 100644
--- a/third_party/imdb/imdb.cpp
+++ b/third_party/imdb/imdb.cpp
@@ -1,6 +1,6 @@
 #include "include/imdb.hpp"
 #include "imdb_constants.hpp"
-#include "common/file_system.hpp"
+#include "duckdb/common/file_system.hpp"
 
 
 using namespace duckdb;
diff --git a/third_party/imdb/include/imdb.hpp b/third_party/imdb/include/imdb.hpp
index d603220d605..0a18553b874 100644
--- a/third_party/imdb/include/imdb.hpp
+++ b/third_party/imdb/include/imdb.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "catalog/catalog.hpp"
+#include "duckdb/catalog/catalog.hpp"
 #include "duckdb.hpp"
 
 namespace imdb {
diff --git a/third_party/tpce-tool/gentpcecode.py b/third_party/tpce-tool/gentpcecode.py
index f8346dd6b7c..4337e14fdd6 100644
--- a/third_party/tpce-tool/gentpcecode.py
+++ b/third_party/tpce-tool/gentpcecode.py
@@ -20,12 +20,12 @@
 """)
 
 header.write("""
-#include "catalog/catalog.hpp"
-#include "main/client_context.hpp"
-#include "main/connection.hpp"
-#include "main/database.hpp"
-#include "storage/data_table.hpp"
-#include "catalog/catalog_entry/table_catalog_entry.hpp"
+#include "duckdb/catalog/catalog.hpp"
+#include "duckdb/main/client_context.hpp"
+#include "duckdb/main/connection.hpp"
+#include "duckdb/main/database.hpp"
+#include "duckdb/storage/data_table.hpp"
+#include "duckdb/catalog/catalog_entry/table_catalog_entry.hpp"
 
 #include "main/BaseLoader.h"
 #include "main/BaseLoaderFactory.h"
diff --git a/third_party/tpce-tool/include/main/TxnHarnessDBInterface.h b/third_party/tpce-tool/include/main/TxnHarnessDBInterface.h
index e9d7ed304ce..b71fba04386 100644
--- a/third_party/tpce-tool/include/main/TxnHarnessDBInterface.h
+++ b/third_party/tpce-tool/include/main/TxnHarnessDBInterface.h
@@ -48,7 +48,7 @@
 #include "TxnHarnessSendToMarketInterface.h"
 #include "utilities/error.h"
 
-#include "main/connection.hpp"
+#include "duckdb/main/connection.hpp"
 
 using namespace std;
 
diff --git a/third_party/tpce-tool/include/tpce.hpp b/third_party/tpce-tool/include/tpce.hpp
index 8bc3cd86316..3df7ae7bf5f 100644
--- a/third_party/tpce-tool/include/tpce.hpp
+++ b/third_party/tpce-tool/include/tpce.hpp
@@ -10,8 +10,8 @@
 
 #pragma once
 
-#include "catalog/catalog.hpp"
-#include "common/types/data_chunk.hpp"
+#include "duckdb/catalog/catalog.hpp"
+#include "duckdb/common/types/data_chunk.hpp"
 #include "duckdb.hpp"
 
 namespace tpce {
diff --git a/third_party/tpce-tool/include/tpce_generated.hpp b/third_party/tpce-tool/include/tpce_generated.hpp
index c20f30324a1..8274ff70afd 100644
--- a/third_party/tpce-tool/include/tpce_generated.hpp
+++ b/third_party/tpce-tool/include/tpce_generated.hpp
@@ -6,12 +6,12 @@
 ////////////////////////////////////////////////////////////////////
 
 
-#include "catalog/catalog.hpp"
-#include "main/client_context.hpp"
-#include "main/connection.hpp"
-#include "main/database.hpp"
-#include "storage/data_table.hpp"
-#include "catalog/catalog_entry/table_catalog_entry.hpp"
+#include "duckdb/catalog/catalog.hpp"
+#include "duckdb/main/client_context.hpp"
+#include "duckdb/main/connection.hpp"
+#include "duckdb/main/database.hpp"
+#include "duckdb/storage/data_table.hpp"
+#include "duckdb/catalog/catalog_entry/table_catalog_entry.hpp"
 
 #include "main/BaseLoader.h"
 #include "main/BaseLoaderFactory.h"
diff --git a/third_party/tpce-tool/tpce.cpp b/third_party/tpce-tool/tpce.cpp
index 2efb714edb8..80cd40d1d5e 100644
--- a/third_party/tpce-tool/tpce.cpp
+++ b/third_party/tpce-tool/tpce.cpp
@@ -1,6 +1,6 @@
-#include "common/exception.hpp"
-#include "main/connection.hpp"
-#include "storage/data_table.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/main/connection.hpp"
+#include "duckdb/storage/data_table.hpp"
 
 #include "tpce_generated.hpp"
 #include "tpce.hpp"
diff --git a/tools/dbtransfer/sqlite_transfer.cpp b/tools/dbtransfer/sqlite_transfer.cpp
index aa89936967c..617ee36ee00 100644
--- a/tools/dbtransfer/sqlite_transfer.cpp
+++ b/tools/dbtransfer/sqlite_transfer.cpp
@@ -1,6 +1,6 @@
 #include "sqlite_transfer.hpp"
 
-#include "common/types/date.hpp"
+#include "duckdb/common/types/date.hpp"
 
 using namespace duckdb;
 using namespace std;
diff --git a/tools/pythonpkg/cursor.cpp b/tools/pythonpkg/cursor.cpp
index 1d9550bca6b..f0f9a31acf2 100644
--- a/tools/pythonpkg/cursor.cpp
+++ b/tools/pythonpkg/cursor.cpp
@@ -1,6 +1,6 @@
 #include "cursor.h"
 #include <vector>
-#include "common/types/timestamp.hpp"
+#include "duckdb/common/types/timestamp.hpp"
 #include "module.h"
 
 #define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION // motherfucker