all: Changed include to fit core header location

12 files changed, 17 insertions, 17 deletions

diff --git a/modules/async/async.cpp b/modules/async/async.cpp
index 360e455..e10ee16 100644
--- a/modules/async/async.cpp
+++ b/modules/async/async.cpp
@@ -1,6 +1,6 @@
 #include "async.h"
-#include <forstio/core/common.h>
-#include <forstio/core/error.h>
+#include <forstio/common.h>
+#include <forstio/error.h>
 
 #include <algorithm>
 #include <cassert>
diff --git a/modules/async/async.tmpl.h b/modules/async/async.tmpl.h
index 9569f60..8fcb59c 100644
--- a/modules/async/async.tmpl.h
+++ b/modules/async/async.tmpl.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <forstio/core/common.h>
-#include <forstio/core/error.h>
+#include <forstio/common.h>
+#include <forstio/error.h>
 
 #include <cassert>
 // Template inlining
diff --git a/modules/codec-json/json.h b/modules/codec-json/json.h
index 56cadc0..bc60ee9 100644
--- a/modules/codec-json/json.h
+++ b/modules/codec-json/json.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <forstio/core/buffer.h>
-#include <forstio/core/common.h>
+#include <forstio/buffer.h>
+#include <forstio/common.h>
 #include <forstio/codec/data.h>
 
 #include <algorithm>
diff --git a/modules/codec-minecraft/minecraft.h b/modules/codec-minecraft/minecraft.h
index 670b019..c54549e 100644
--- a/modules/codec-minecraft/minecraft.h
+++ b/modules/codec-minecraft/minecraft.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <forstio/core/error.h>
+#include <forstio/error.h>
 #include <forstio/codec/data.h>
 #include <forstio/codec/stream_value.h>
 
diff --git a/modules/codec-minecraft/var_int_data.h b/modules/codec-minecraft/var_int_data.h
index 807c930..4fbdd57 100644
--- a/modules/codec-minecraft/var_int_data.h
+++ b/modules/codec-minecraft/var_int_data.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <forstio/core/data.h>
+#include <forstio/data.h>
 
 namespace saw {
 template<>
diff --git a/modules/codec-netcdf/netcdf.h b/modules/codec-netcdf/netcdf.h
index cc9aedb..52ad494 100644
--- a/modules/codec-netcdf/netcdf.h
+++ b/modules/codec-netcdf/netcdf.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <forstio/core/string_literal.h>
-#include <forstio/core/error.h>
+#include <forstio/string_literal.h>
+#include <forstio/error.h>
 #include <forstio/codec/data.h>
 
 #include <netcdf.h>
diff --git a/modules/io-tls/tls.h b/modules/io-tls/tls.h
index 74b39ff..b7d575b 100644
--- a/modules/io-tls/tls.h
+++ b/modules/io-tls/tls.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <forstio/core/common.h>
+#include <forstio/common.h>
 #include <forstio/io/io.h>
 
 #include <optional>
diff --git a/modules/io/io.h b/modules/io/io.h
index 7653ace..b58394e 100644
--- a/modules/io/io.h
+++ b/modules/io/io.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <forstio/async/async.h>
-#include <forstio/core/common.h>
+#include <forstio/common.h>
 #include "io_helpers.h"
 
 #include <string>
diff --git a/modules/io/io_helpers.h b/modules/io/io_helpers.h
index 94e37f4..761ee35 100644
--- a/modules/io/io_helpers.h
+++ b/modules/io/io_helpers.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <forstio/async/async.h>
-#include <forstio/core/common.h>
+#include <forstio/common.h>
 
 #include <cstdint>
 #include <optional>
diff --git a/modules/tools/c_gen_iface.hpp b/modules/tools/c_gen_iface.hpp
index e79e27f..241108d 100644
--- a/modules/tools/c_gen_iface.hpp
+++ b/modules/tools/c_gen_iface.hpp
@@ -1,5 +1,5 @@
-#include <forstio/core/error.h>
-#include <forstio/core/templates.h>
+#include <forstio/error.h>
+#include <forstio/templates.h>
 #include <forstio/codec/schema.h>
 
 #include <string>
diff --git a/modules/window/device.h b/modules/window/device.h
index 7d3cdb1..6a28cd5 100644
--- a/modules/window/device.h
+++ b/modules/window/device.h
@@ -3,7 +3,7 @@
 #include "window.h"
 
 #include <forstio/async/async.h>
-#include <forstio/core/common.h>
+#include <forstio/common.h>
 #include <forstio/codec/data.h>
 #include <forstio/io/io.h>
 
diff --git a/modules/window/window.h b/modules/window/window.h
index 36786de..0e8d051 100644
--- a/modules/window/window.h
+++ b/modules/window/window.h
@@ -3,7 +3,7 @@
 #include "video_mode.h"
 
 #include <forstio/async/async.h>
-#include <forstio/core/common.h>
+#include <forstio/common.h>
 #include <forstio/codec/schema.h>
 
 #include <string_view>