diff --git a/src/entity.zig b/src/entity.zig
index 9a7d12d..17ed1c3 100644
--- a/src/entity.zig
+++ b/src/entity.zig
@@ -1,11 +1,10 @@
 const std = @import("std");
 const Allocator = std.mem.Allocator;
 
-const meta = @import("./meta.zig");
+const c = @import("./c.zig");
 const errors = @import("./errors.zig");
-const flecszigble = @import("./main.zig");
-const Path = flecszigble.Path;
-const c = flecszigble.c;
+const meta = @import("./meta.zig");
+const Path = @import("./path.zig");
 
 pub const EntityError = error{
     /// Id is `0`.
@@ -345,6 +344,7 @@ pub fn Entity(comptime ctx: anytype) type {
 }
 
 const expect = @import("./test/expect.zig");
+const flecszigble = @import("./main.zig");
 
 test "Entity get and set" {
     flecszigble.init(std.testing.allocator);
diff --git a/src/id.zig b/src/id.zig
index deaff32..e1c67b5 100644
--- a/src/id.zig
+++ b/src/id.zig
@@ -1,5 +1,4 @@
-const flecszigble = @import("./main.zig");
-const c = flecszigble.c;
+const c = @import("./c.zig");
 
 pub const IdError = error{
     /// Id is `0`.
diff --git a/src/iter.zig b/src/iter.zig
index 0cd3462..d7edcd0 100644
--- a/src/iter.zig
+++ b/src/iter.zig
@@ -1,5 +1,5 @@
+const c = @import("./c.zig");
 const flecszigble = @import("./main.zig");
-const c = flecszigble.c;
 
 pub fn Iter(comptime ctx: anytype) type {
     return struct {
diff --git a/src/pair.zig b/src/pair.zig
index 93b7dc9..29d4061 100644
--- a/src/pair.zig
+++ b/src/pair.zig
@@ -1,5 +1,4 @@
-const flecszigble = @import("./main.zig");
-const c = flecszigble.c;
+const c = @import("./c.zig");
 
 pub const PairError = error{
     /// Id is `0`.
diff --git a/src/world.zig b/src/world.zig
index 20026e2..a848447 100644
--- a/src/world.zig
+++ b/src/world.zig
@@ -1,11 +1,11 @@
 const std = @import("std");
 const Allocator = std.mem.Allocator;
 
-const meta = @import("./meta.zig");
-const errors = @import("./errors.zig");
 const flecszigble = @import("./main.zig");
-const Path = flecszigble.Path;
-const c = flecszigble.c;
+const c = @import("./c.zig");
+const errors = @import("./errors.zig");
+const meta = @import("./meta.zig");
+const Path = @import("./path.zig");
 
 pub fn World(comptime ctx: anytype) type {
     return struct {