14 files changed, 13 insertions, 14 deletions
diff --git a/source/command_line_interface.elna b/source/command_line_interface.elna
index 1318e67..4c3c1a6 100644
--- a/source/command_line_interface.elna
+++ b/source/command_line_interface.elna
@@ -5,7 +5,7 @@
   Command line handling.
 *)
 module
-import cstdlib, cstring, common
+import sys.posix.cstdlib, sys.posix.cstring, common
 
 type
   CommandLine* = record
diff --git a/source/common.elna b/source/common.elna
index 65b0a65..93b4363 100644
--- a/source/common.elna
+++ b/source/common.elna
@@ -2,7 +2,7 @@
   v. 2.0. If a copy of the MPL was not distributed with this file, You can
   obtain one at https://mozilla.org/MPL/2.0/. *)
 module
-import cstring, cstdio, cstdlib
+import sys.posix.cstring, sys.posix.cstdio, sys.posix.cstdlib
 
 type
   ElnaLocation* = record
@@ -86,4 +86,3 @@ begin
 return nil
 
 end.
-
diff --git a/source/diagnostic.elna b/source/diagnostic.elna
index 771ce38..2356544 100644
--- a/source/diagnostic.elna
+++ b/source/diagnostic.elna
@@ -2,7 +2,7 @@
   v. 2.0. If a copy of the MPL was not distributed with this file, You can
   obtain one at https://mozilla.org/MPL/2.0/. *)
 module
-import common, cstdio, cstdlib, lexer, ast
+import common, sys.posix.cstdio, sys.posix.cstdlib, lexer, ast
 
 type
 	ElnaErrorKind* = (
diff --git a/source/lexer.elna b/source/lexer.elna
index 9ba593f..71e76a7 100644
--- a/source/lexer.elna
+++ b/source/lexer.elna
@@ -2,7 +2,7 @@
   v. 2.0. If a copy of the MPL was not distributed with this file, You can
   obtain one at https://mozilla.org/MPL/2.0/. *)
 module
-import cstdio, common, cstdlib
+import sys.posix.cstdio, common, sys.posix.cstdlib
 
 type
   ElnaLexerState* = (
@@ -762,8 +762,8 @@ begin
 	cursor^.start := code_pointer;
 	cursor^.finish := code_pointer;
 	cursor^.token := nil;
-	cursor^.position.start_location := ElnaLocation{ line: 1u, column: 1u };
-	cursor^.position.end_location := ElnaLocation{ line: 1u, column: 1u }
+	cursor^.position.start_location := { ElnaLocation; line: 1u, column: 1u };
+	cursor^.position.end_location := { ElnaLocation; line: 1u, column: 1u }
 return
 
 (**
diff --git a/source/main.elna b/source/main.elna
index 6049362..3b78651 100644
--- a/source/main.elna
+++ b/source/main.elna
@@ -4,7 +4,7 @@
 
 program(parameters)
 import
-  cstdio, cstdlib, cstring, common, command_line_interface,
+  sys.posix.cstdio, sys.posix.cstdlib, sys.posix.cstring, common, command_line_interface,
   lexer, ast, diagnostic, symbol, parser, name_analysis, type_check, tac, qbe
 
 proc read_file_to_buffer(filename: ^Word8) -> []const Word8
diff --git a/source/name_analysis.elna b/source/name_analysis.elna
index 75d6dbd..cbb27c0 100644
--- a/source/name_analysis.elna
+++ b/source/name_analysis.elna
@@ -2,7 +2,7 @@
   v. 2.0. If a copy of the MPL was not distributed with this file, You can
   obtain one at https://mozilla.org/MPL/2.0/. *)
 module
-import common, cstdlib, lexer, ast, symbol, diagnostic
+import common, sys.posix.cstdlib, lexer, ast, symbol, diagnostic
 
 proc elna_name_type_expression*(parser_node: ^ElnaTreeTypeExpression; error_list: ^ElnaList) -> ^ElnaType
 var
diff --git a/source/parser.elna b/source/parser.elna
index 30f79f8..3912b65 100644
--- a/source/parser.elna
+++ b/source/parser.elna
@@ -2,7 +2,7 @@
   v. 2.0. If a copy of the MPL was not distributed with this file, You can
   obtain one at https://mozilla.org/MPL/2.0/. *)
 module
-import common, cstdlib, lexer, ast, diagnostic
+import common, sys.posix.cstdlib, lexer, ast, diagnostic
 
 proc elna_parser_expect*(cursor: ^ElnaLexerCursor; expected: ElnaLexerKind; error_list: ^ElnaList) -> ^ElnaLexerToken
 var
@@ -1129,7 +1129,7 @@ var
 begin
 	result := malloc#[ElnaTreeModuleDeclaration](#size(ElnaTreeModuleDeclaration));
 	result^.kind := ElnaTreeKind.module_declaration;
-	result^.position.start_location := ElnaLocation{ line: 1u, column: 1u };
+	result^.position.start_location := { ElnaLocation; line: 1u, column: 1u };
 	result^.position.end_location := result^.position.start_location;
 
 	result^.types := elna_parser_type_part(cursor, error_list);
diff --git a/source/qbe.elna b/source/qbe.elna
index 0a5a45b..47eac88 100644
--- a/source/qbe.elna
+++ b/source/qbe.elna
@@ -2,7 +2,7 @@
   v. 2.0. If a copy of the MPL was not distributed with this file, You can
   obtain one at https://mozilla.org/MPL/2.0/. *)
 module
-import common, cstdlib, cstdio, cstring, lexer, ast, symbol, tac
+import common, sys.posix.cstdlib, sys.posix.cstdio, sys.posix.cstring, lexer, ast, symbol, tac
 
 var
 	qbe_unique_id: Word := 0u
diff --git a/source/symbol.elna b/source/symbol.elna
index 531f58c..a07a9f3 100644
--- a/source/symbol.elna
+++ b/source/symbol.elna
@@ -2,7 +2,7 @@
   v. 2.0. If a copy of the MPL was not distributed with this file, You can
   obtain one at https://mozilla.org/MPL/2.0/. *)
 module
-import cstdlib, common, ast
+import sys.posix.cstdlib, common, ast
 
 type
 	ElnaSymbolInfoKind* = (type_info, temporary_info, procedure_info)
diff --git a/source/cctype.elna b/source/sys/posix/cctype.elna
index 19c3491..19c3491 100644
--- a/source/cctype.elna
+++ b/source/sys/posix/cctype.elna
diff --git a/source/cstdio.elna b/source/sys/posix/cstdio.elna
index 928c7e1..928c7e1 100644
--- a/source/cstdio.elna
+++ b/source/sys/posix/cstdio.elna
diff --git a/source/cstdlib.elna b/source/sys/posix/cstdlib.elna
index 10a4d80..10a4d80 100644
--- a/source/cstdlib.elna
+++ b/source/sys/posix/cstdlib.elna
diff --git a/source/cstring.elna b/source/sys/posix/cstring.elna
index 3973573..3973573 100644
--- a/source/cstring.elna
+++ b/source/sys/posix/cstring.elna
diff --git a/source/tac.elna b/source/tac.elna
index 7b05ab2..3d65e42 100644
--- a/source/tac.elna
+++ b/source/tac.elna
@@ -2,7 +2,7 @@
   v. 2.0. If a copy of the MPL was not distributed with this file, You can
   obtain one at https://mozilla.org/MPL/2.0/. *)
 module
-import common, cstdlib, cstdio, cstring, lexer, ast, symbol, diagnostic
+import common, sys.posix.cstdlib, sys.posix.cstdio, sys.posix.cstring, lexer, ast, symbol, diagnostic
 
 type
 	ElnaTacOperator* = (