diff --git a/contrib/kolibri-libc/loader/Makefile b/contrib/kolibri-libc/loader/Makefile
deleted file mode 100644
index 49a0b0a90f..0000000000
--- a/contrib/kolibri-libc/loader/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-FASM = fasm
-MKLIB = ../linuxtools/mklib
-
-SRCS=$(wildcard *.asm)
-OBJS=$(SRCS:.asm=.o)
-
-%.o : %.asm
-	$(FASM) $<
-
-all: asm_gen $(OBJS)
-	ar -rsc ../lib/libc.obj.a *.o
-
-asm_gen:
-	cat symbols.txt | $(MKLIB) 
-
-clean:
-	rm -f *.o
diff --git a/contrib/kolibri-libc/loader/abs.asm b/contrib/kolibri-libc/loader/abs.asm
deleted file mode 100644
index 6652d40678..0000000000
--- a/contrib/kolibri-libc/loader/abs.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@abs
-fun_str  equ 'abs'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/acos.asm b/contrib/kolibri-libc/loader/acos.asm
deleted file mode 100644
index 608d6c064c..0000000000
--- a/contrib/kolibri-libc/loader/acos.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@acos
-fun_str  equ 'acos'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/acosh.asm b/contrib/kolibri-libc/loader/acosh.asm
deleted file mode 100644
index 6e4f376404..0000000000
--- a/contrib/kolibri-libc/loader/acosh.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@acosh
-fun_str  equ 'acosh'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/asin.asm b/contrib/kolibri-libc/loader/asin.asm
deleted file mode 100644
index 67e34b60a5..0000000000
--- a/contrib/kolibri-libc/loader/asin.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@asin
-fun_str  equ 'asin'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/asinh.asm b/contrib/kolibri-libc/loader/asinh.asm
deleted file mode 100644
index 52b422e394..0000000000
--- a/contrib/kolibri-libc/loader/asinh.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@asinh
-fun_str  equ 'asinh'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/atan.asm b/contrib/kolibri-libc/loader/atan.asm
deleted file mode 100644
index 3f7c4267d9..0000000000
--- a/contrib/kolibri-libc/loader/atan.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@atan
-fun_str  equ 'atan'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/atan2.asm b/contrib/kolibri-libc/loader/atan2.asm
deleted file mode 100644
index ffa1d20822..0000000000
--- a/contrib/kolibri-libc/loader/atan2.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@atan2
-fun_str  equ 'atan2'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/atanh.asm b/contrib/kolibri-libc/loader/atanh.asm
deleted file mode 100644
index 85bef35219..0000000000
--- a/contrib/kolibri-libc/loader/atanh.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@atanh
-fun_str  equ 'atanh'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/atoi.asm b/contrib/kolibri-libc/loader/atoi.asm
deleted file mode 100644
index c45c87a1f0..0000000000
--- a/contrib/kolibri-libc/loader/atoi.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@atoi
-fun_str  equ 'atoi'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/atol.asm b/contrib/kolibri-libc/loader/atol.asm
deleted file mode 100644
index 87d8eda023..0000000000
--- a/contrib/kolibri-libc/loader/atol.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@atol
-fun_str  equ 'atol'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/atoll.asm b/contrib/kolibri-libc/loader/atoll.asm
deleted file mode 100644
index bc1abfc03f..0000000000
--- a/contrib/kolibri-libc/loader/atoll.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@atoll
-fun_str  equ 'atoll'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/calloc.asm b/contrib/kolibri-libc/loader/calloc.asm
deleted file mode 100644
index 9e1826af5f..0000000000
--- a/contrib/kolibri-libc/loader/calloc.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@calloc
-fun_str  equ 'calloc'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/ceil.asm b/contrib/kolibri-libc/loader/ceil.asm
deleted file mode 100644
index 515b679ad6..0000000000
--- a/contrib/kolibri-libc/loader/ceil.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@ceil
-fun_str  equ 'ceil'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/clearerr.asm b/contrib/kolibri-libc/loader/clearerr.asm
deleted file mode 100644
index 44338ad0c6..0000000000
--- a/contrib/kolibri-libc/loader/clearerr.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@clearerr
-fun_str  equ 'clearerr'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/closedir.asm b/contrib/kolibri-libc/loader/closedir.asm
deleted file mode 100644
index b164afb7e7..0000000000
--- a/contrib/kolibri-libc/loader/closedir.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@closedir
-fun_str  equ 'closedir'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/cos.asm b/contrib/kolibri-libc/loader/cos.asm
deleted file mode 100644
index 3e8a2bb69c..0000000000
--- a/contrib/kolibri-libc/loader/cos.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@cos
-fun_str  equ 'cos'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/cosh.asm b/contrib/kolibri-libc/loader/cosh.asm
deleted file mode 100644
index 88aba9f89a..0000000000
--- a/contrib/kolibri-libc/loader/cosh.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@cosh
-fun_str  equ 'cosh'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/debug_printf.asm b/contrib/kolibri-libc/loader/debug_printf.asm
deleted file mode 100644
index fe5d3d3f6b..0000000000
--- a/contrib/kolibri-libc/loader/debug_printf.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@debug_printf
-fun_str  equ 'debug_printf'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/difftime.asm b/contrib/kolibri-libc/loader/difftime.asm
deleted file mode 100644
index 1dd5aea6f4..0000000000
--- a/contrib/kolibri-libc/loader/difftime.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@difftime
-fun_str  equ 'difftime'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/div.asm b/contrib/kolibri-libc/loader/div.asm
deleted file mode 100644
index 0e1729ba11..0000000000
--- a/contrib/kolibri-libc/loader/div.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@div
-fun_str  equ 'div'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/exit.asm b/contrib/kolibri-libc/loader/exit.asm
deleted file mode 100644
index fd80168b12..0000000000
--- a/contrib/kolibri-libc/loader/exit.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@exit
-fun_str  equ 'exit'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/exp.asm b/contrib/kolibri-libc/loader/exp.asm
deleted file mode 100644
index e9a050737b..0000000000
--- a/contrib/kolibri-libc/loader/exp.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@exp
-fun_str  equ 'exp'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/fabs.asm b/contrib/kolibri-libc/loader/fabs.asm
deleted file mode 100644
index 5625c5e97a..0000000000
--- a/contrib/kolibri-libc/loader/fabs.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@fabs
-fun_str  equ 'fabs'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/fclose.asm b/contrib/kolibri-libc/loader/fclose.asm
deleted file mode 100644
index d0f35c459c..0000000000
--- a/contrib/kolibri-libc/loader/fclose.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@fclose
-fun_str  equ 'fclose'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/feof.asm b/contrib/kolibri-libc/loader/feof.asm
deleted file mode 100644
index a5a51084c6..0000000000
--- a/contrib/kolibri-libc/loader/feof.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@feof
-fun_str  equ 'feof'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/ferror.asm b/contrib/kolibri-libc/loader/ferror.asm
deleted file mode 100644
index 24d9946f04..0000000000
--- a/contrib/kolibri-libc/loader/ferror.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@ferror
-fun_str  equ 'ferror'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/fflush.asm b/contrib/kolibri-libc/loader/fflush.asm
deleted file mode 100644
index d2b6d3b7e6..0000000000
--- a/contrib/kolibri-libc/loader/fflush.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@fflush
-fun_str  equ 'fflush'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/fgetc.asm b/contrib/kolibri-libc/loader/fgetc.asm
deleted file mode 100644
index f8d60bf02b..0000000000
--- a/contrib/kolibri-libc/loader/fgetc.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@fgetc
-fun_str  equ 'fgetc'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/fgetpos.asm b/contrib/kolibri-libc/loader/fgetpos.asm
deleted file mode 100644
index 6b731ded42..0000000000
--- a/contrib/kolibri-libc/loader/fgetpos.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@fgetpos
-fun_str  equ 'fgetpos'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/fgets.asm b/contrib/kolibri-libc/loader/fgets.asm
deleted file mode 100644
index 79138684dc..0000000000
--- a/contrib/kolibri-libc/loader/fgets.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@fgets
-fun_str  equ 'fgets'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/floor.asm b/contrib/kolibri-libc/loader/floor.asm
deleted file mode 100644
index 59e11a74cf..0000000000
--- a/contrib/kolibri-libc/loader/floor.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@floor
-fun_str  equ 'floor'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/fmod.asm b/contrib/kolibri-libc/loader/fmod.asm
deleted file mode 100644
index a90a19a9c3..0000000000
--- a/contrib/kolibri-libc/loader/fmod.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@fmod
-fun_str  equ 'fmod'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/fopen.asm b/contrib/kolibri-libc/loader/fopen.asm
deleted file mode 100644
index ebb5697c19..0000000000
--- a/contrib/kolibri-libc/loader/fopen.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@fopen
-fun_str  equ 'fopen'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/fputc.asm b/contrib/kolibri-libc/loader/fputc.asm
deleted file mode 100644
index c1056aa7ec..0000000000
--- a/contrib/kolibri-libc/loader/fputc.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@fputc
-fun_str  equ 'fputc'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/fputs.asm b/contrib/kolibri-libc/loader/fputs.asm
deleted file mode 100644
index 99d96816bf..0000000000
--- a/contrib/kolibri-libc/loader/fputs.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@fputs
-fun_str  equ 'fputs'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/fread.asm b/contrib/kolibri-libc/loader/fread.asm
deleted file mode 100644
index 1dfcc76409..0000000000
--- a/contrib/kolibri-libc/loader/fread.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@fread
-fun_str  equ 'fread'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/free.asm b/contrib/kolibri-libc/loader/free.asm
deleted file mode 100644
index 16b82b58e9..0000000000
--- a/contrib/kolibri-libc/loader/free.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@free
-fun_str  equ 'free'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/freopen.asm b/contrib/kolibri-libc/loader/freopen.asm
deleted file mode 100644
index f6257767d0..0000000000
--- a/contrib/kolibri-libc/loader/freopen.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@freopen
-fun_str  equ 'freopen'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/frexp.asm b/contrib/kolibri-libc/loader/frexp.asm
deleted file mode 100644
index c8a86880d5..0000000000
--- a/contrib/kolibri-libc/loader/frexp.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@frexp
-fun_str  equ 'frexp'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/fseek.asm b/contrib/kolibri-libc/loader/fseek.asm
deleted file mode 100644
index 4705b20f00..0000000000
--- a/contrib/kolibri-libc/loader/fseek.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@fseek
-fun_str  equ 'fseek'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/fsetpos.asm b/contrib/kolibri-libc/loader/fsetpos.asm
deleted file mode 100644
index bcbc3d6529..0000000000
--- a/contrib/kolibri-libc/loader/fsetpos.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@fsetpos
-fun_str  equ 'fsetpos'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/ftell.asm b/contrib/kolibri-libc/loader/ftell.asm
deleted file mode 100644
index 83340e91b4..0000000000
--- a/contrib/kolibri-libc/loader/ftell.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@ftell
-fun_str  equ 'ftell'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/fwrite.asm b/contrib/kolibri-libc/loader/fwrite.asm
deleted file mode 100644
index 464fe904e6..0000000000
--- a/contrib/kolibri-libc/loader/fwrite.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@fwrite
-fun_str  equ 'fwrite'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/getchar.asm b/contrib/kolibri-libc/loader/getchar.asm
deleted file mode 100644
index dbb5f91eab..0000000000
--- a/contrib/kolibri-libc/loader/getchar.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@getchar
-fun_str  equ 'getchar'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/gets.asm b/contrib/kolibri-libc/loader/gets.asm
deleted file mode 100644
index 95cdecde41..0000000000
--- a/contrib/kolibri-libc/loader/gets.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@gets
-fun_str  equ 'gets'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/hypot.asm b/contrib/kolibri-libc/loader/hypot.asm
deleted file mode 100644
index ee546b99cf..0000000000
--- a/contrib/kolibri-libc/loader/hypot.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@hypot
-fun_str  equ 'hypot'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/labs.asm b/contrib/kolibri-libc/loader/labs.asm
deleted file mode 100644
index cb702b2acb..0000000000
--- a/contrib/kolibri-libc/loader/labs.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@labs
-fun_str  equ 'labs'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/ldexp.asm b/contrib/kolibri-libc/loader/ldexp.asm
deleted file mode 100644
index 7ca6d95f9c..0000000000
--- a/contrib/kolibri-libc/loader/ldexp.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@ldexp
-fun_str  equ 'ldexp'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/ldiv.asm b/contrib/kolibri-libc/loader/ldiv.asm
deleted file mode 100644
index 7ae68e7b5a..0000000000
--- a/contrib/kolibri-libc/loader/ldiv.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@ldiv
-fun_str  equ 'ldiv'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/llabs.asm b/contrib/kolibri-libc/loader/llabs.asm
deleted file mode 100644
index 5401be44d2..0000000000
--- a/contrib/kolibri-libc/loader/llabs.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@llabs
-fun_str  equ 'llabs'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/lldiv.asm b/contrib/kolibri-libc/loader/lldiv.asm
deleted file mode 100644
index 1f453d50f6..0000000000
--- a/contrib/kolibri-libc/loader/lldiv.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@lldiv
-fun_str  equ 'lldiv'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/localtime.asm b/contrib/kolibri-libc/loader/localtime.asm
deleted file mode 100644
index 5d0c3a6663..0000000000
--- a/contrib/kolibri-libc/loader/localtime.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@localtime
-fun_str  equ 'localtime'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/log.asm b/contrib/kolibri-libc/loader/log.asm
deleted file mode 100644
index bb31cfb6ed..0000000000
--- a/contrib/kolibri-libc/loader/log.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@log
-fun_str  equ 'log'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/make.bat b/contrib/kolibri-libc/loader/make.bat
deleted file mode 100644
index 53fea5ff2a..0000000000
--- a/contrib/kolibri-libc/loader/make.bat
+++ /dev/null
@@ -1,114 +0,0 @@
-fasm __lib__.asm
-fasm abs.asm
-fasm acos.asm
-fasm acosh.asm
-fasm asin.asm
-fasm asinh.asm
-fasm atan.asm
-fasm atan2.asm
-fasm atanh.asm
-fasm atoi.asm
-fasm atol.asm
-fasm atoll.asm
-fasm calloc.asm
-fasm ceil.asm
-fasm clearerr.asm
-fasm closedir.asm
-fasm cos.asm
-fasm cosh.asm
-fasm debug_printf.asm
-fasm difftime.asm
-fasm div.asm
-fasm exit.asm
-fasm exp.asm
-fasm fabs.asm
-fasm fclose.asm
-fasm feof.asm
-fasm ferror.asm
-fasm fflush.asm
-fasm fgetc.asm
-fasm fgetpos.asm
-fasm fgets.asm
-fasm floor.asm
-fasm fmod.asm
-fasm fopen.asm
-fasm fputc.asm
-fasm fputs.asm
-fasm fread.asm
-fasm free.asm
-fasm freopen.asm
-fasm frexp.asm
-fasm fseek.asm
-fasm fsetpos.asm
-fasm ftell.asm
-fasm fwrite.asm
-fasm getchar.asm
-fasm gets.asm
-fasm hypot.asm
-fasm labs.asm
-fasm ldexp.asm
-fasm ldiv.asm
-fasm llabs.asm
-fasm lldiv.asm
-fasm localtime.asm
-fasm log.asm
-fasm malloc.asm
-fasm memccpy.asm
-fasm memchr.asm
-fasm memcmp.asm
-fasm memcpy.asm
-fasm memmove.asm
-fasm memset.asm
-fasm mktime.asm
-fasm modf.asm
-fasm modfl.asm
-fasm opendir.asm
-fasm perror.asm
-fasm pow.asm
-fasm pow10.asm
-fasm pow2.asm
-fasm printf.asm
-fasm puts.asm
-fasm readdir.asm
-fasm realloc.asm
-fasm remove.asm
-fasm rename.asm
-fasm rewind.asm
-fasm rewinddir.asm
-fasm seekdir.asm
-fasm setbuf.asm
-fasm setvbuf.asm
-fasm sin.asm
-fasm sinh.asm
-fasm snprintf.asm
-fasm sprintf.asm
-fasm sqrt.asm
-fasm strcat.asm
-fasm strchr.asm
-fasm strcmp.asm
-fasm strcoll.asm
-fasm strcpy.asm
-fasm strcspn.asm
-fasm strerror.asm
-fasm strlen.asm
-fasm strncat.asm
-fasm strncmp.asm
-fasm strncpy.asm
-fasm strpbrk.asm
-fasm strrchr.asm
-fasm strrev.asm
-fasm strspn.asm
-fasm strstr.asm
-fasm strtok.asm
-fasm strxfrm.asm
-fasm tan.asm
-fasm tanh.asm
-fasm telldir.asm
-fasm time.asm
-fasm tmpfile.asm
-fasm tmpnam.asm
-fasm vprintf.asm
-fasm vsnprintf.asm
-kos32-ar -ru liblibc.obj.a *.o
-del *.o
-pause
\ No newline at end of file
diff --git a/contrib/kolibri-libc/loader/malloc.asm b/contrib/kolibri-libc/loader/malloc.asm
deleted file mode 100644
index 4e39c421d5..0000000000
--- a/contrib/kolibri-libc/loader/malloc.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@malloc
-fun_str  equ 'malloc'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/memccpy.asm b/contrib/kolibri-libc/loader/memccpy.asm
deleted file mode 100644
index 8bdf689401..0000000000
--- a/contrib/kolibri-libc/loader/memccpy.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@memccpy
-fun_str  equ 'memccpy'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/memchr.asm b/contrib/kolibri-libc/loader/memchr.asm
deleted file mode 100644
index 9596e7a5e2..0000000000
--- a/contrib/kolibri-libc/loader/memchr.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@memchr
-fun_str  equ 'memchr'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/memcmp.asm b/contrib/kolibri-libc/loader/memcmp.asm
deleted file mode 100644
index 76a61f2560..0000000000
--- a/contrib/kolibri-libc/loader/memcmp.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@memcmp
-fun_str  equ 'memcmp'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/memcpy.asm b/contrib/kolibri-libc/loader/memcpy.asm
deleted file mode 100644
index 234c09e76e..0000000000
--- a/contrib/kolibri-libc/loader/memcpy.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@memcpy
-fun_str  equ 'memcpy'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/memmove.asm b/contrib/kolibri-libc/loader/memmove.asm
deleted file mode 100644
index 99ccdc7bad..0000000000
--- a/contrib/kolibri-libc/loader/memmove.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@memmove
-fun_str  equ 'memmove'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/memset.asm b/contrib/kolibri-libc/loader/memset.asm
deleted file mode 100644
index 6992f78dd4..0000000000
--- a/contrib/kolibri-libc/loader/memset.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@memset
-fun_str  equ 'memset'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/mktime.asm b/contrib/kolibri-libc/loader/mktime.asm
deleted file mode 100644
index c501adc8a9..0000000000
--- a/contrib/kolibri-libc/loader/mktime.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@mktime
-fun_str  equ 'mktime'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/modf.asm b/contrib/kolibri-libc/loader/modf.asm
deleted file mode 100644
index 54cef3dd9a..0000000000
--- a/contrib/kolibri-libc/loader/modf.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@modf
-fun_str  equ 'modf'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/modfl.asm b/contrib/kolibri-libc/loader/modfl.asm
deleted file mode 100644
index c0adc4efce..0000000000
--- a/contrib/kolibri-libc/loader/modfl.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@modfl
-fun_str  equ 'modfl'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/opendir.asm b/contrib/kolibri-libc/loader/opendir.asm
deleted file mode 100644
index bd3b123e4a..0000000000
--- a/contrib/kolibri-libc/loader/opendir.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@opendir
-fun_str  equ 'opendir'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/perror.asm b/contrib/kolibri-libc/loader/perror.asm
deleted file mode 100644
index f9301061c1..0000000000
--- a/contrib/kolibri-libc/loader/perror.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@perror
-fun_str  equ 'perror'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/pow.asm b/contrib/kolibri-libc/loader/pow.asm
deleted file mode 100644
index a4f11f164d..0000000000
--- a/contrib/kolibri-libc/loader/pow.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@pow
-fun_str  equ 'pow'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/pow10.asm b/contrib/kolibri-libc/loader/pow10.asm
deleted file mode 100644
index 49d7c9cb19..0000000000
--- a/contrib/kolibri-libc/loader/pow10.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@pow10
-fun_str  equ 'pow10'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/pow2.asm b/contrib/kolibri-libc/loader/pow2.asm
deleted file mode 100644
index 3b4aaffaa8..0000000000
--- a/contrib/kolibri-libc/loader/pow2.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@pow2
-fun_str  equ 'pow2'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/printf.asm b/contrib/kolibri-libc/loader/printf.asm
deleted file mode 100644
index e070803a4d..0000000000
--- a/contrib/kolibri-libc/loader/printf.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@printf
-fun_str  equ 'printf'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/puts.asm b/contrib/kolibri-libc/loader/puts.asm
deleted file mode 100644
index 95d0042cd7..0000000000
--- a/contrib/kolibri-libc/loader/puts.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@puts
-fun_str  equ 'puts'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/readdir.asm b/contrib/kolibri-libc/loader/readdir.asm
deleted file mode 100644
index c2c51126ae..0000000000
--- a/contrib/kolibri-libc/loader/readdir.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@readdir
-fun_str  equ 'readdir'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/realloc.asm b/contrib/kolibri-libc/loader/realloc.asm
deleted file mode 100644
index b10b1c0009..0000000000
--- a/contrib/kolibri-libc/loader/realloc.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@realloc
-fun_str  equ 'realloc'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/remove.asm b/contrib/kolibri-libc/loader/remove.asm
deleted file mode 100644
index 5a564f3e57..0000000000
--- a/contrib/kolibri-libc/loader/remove.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@remove
-fun_str  equ 'remove'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/rename.asm b/contrib/kolibri-libc/loader/rename.asm
deleted file mode 100644
index 6bd698cf6c..0000000000
--- a/contrib/kolibri-libc/loader/rename.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@rename
-fun_str  equ 'rename'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/rewind.asm b/contrib/kolibri-libc/loader/rewind.asm
deleted file mode 100644
index 6bcbfcd1da..0000000000
--- a/contrib/kolibri-libc/loader/rewind.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@rewind
-fun_str  equ 'rewind'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/rewinddir.asm b/contrib/kolibri-libc/loader/rewinddir.asm
deleted file mode 100644
index 7e5cfe78d3..0000000000
--- a/contrib/kolibri-libc/loader/rewinddir.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@rewinddir
-fun_str  equ 'rewinddir'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/seekdir.asm b/contrib/kolibri-libc/loader/seekdir.asm
deleted file mode 100644
index 5c13945343..0000000000
--- a/contrib/kolibri-libc/loader/seekdir.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@seekdir
-fun_str  equ 'seekdir'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/setbuf.asm b/contrib/kolibri-libc/loader/setbuf.asm
deleted file mode 100644
index c4746c5ccd..0000000000
--- a/contrib/kolibri-libc/loader/setbuf.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@setbuf
-fun_str  equ 'setbuf'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/setvbuf.asm b/contrib/kolibri-libc/loader/setvbuf.asm
deleted file mode 100644
index 41a0a08b4e..0000000000
--- a/contrib/kolibri-libc/loader/setvbuf.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@setvbuf
-fun_str  equ 'setvbuf'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/sin.asm b/contrib/kolibri-libc/loader/sin.asm
deleted file mode 100644
index 292771ab6e..0000000000
--- a/contrib/kolibri-libc/loader/sin.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@sin
-fun_str  equ 'sin'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/sinh.asm b/contrib/kolibri-libc/loader/sinh.asm
deleted file mode 100644
index 2eb6a58d88..0000000000
--- a/contrib/kolibri-libc/loader/sinh.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@sinh
-fun_str  equ 'sinh'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/snprintf.asm b/contrib/kolibri-libc/loader/snprintf.asm
deleted file mode 100644
index 8bc5442b46..0000000000
--- a/contrib/kolibri-libc/loader/snprintf.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@snprintf
-fun_str  equ 'snprintf'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/sprintf.asm b/contrib/kolibri-libc/loader/sprintf.asm
deleted file mode 100644
index 8908e0609b..0000000000
--- a/contrib/kolibri-libc/loader/sprintf.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@sprintf
-fun_str  equ 'sprintf'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/sqrt.asm b/contrib/kolibri-libc/loader/sqrt.asm
deleted file mode 100644
index b2002a4a15..0000000000
--- a/contrib/kolibri-libc/loader/sqrt.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@sqrt
-fun_str  equ 'sqrt'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/strcat.asm b/contrib/kolibri-libc/loader/strcat.asm
deleted file mode 100644
index 9d3aaa3ef5..0000000000
--- a/contrib/kolibri-libc/loader/strcat.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@strcat
-fun_str  equ 'strcat'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/strchr.asm b/contrib/kolibri-libc/loader/strchr.asm
deleted file mode 100644
index d1cdc8d6d6..0000000000
--- a/contrib/kolibri-libc/loader/strchr.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@strchr
-fun_str  equ 'strchr'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/strcmp.asm b/contrib/kolibri-libc/loader/strcmp.asm
deleted file mode 100644
index 94e2928187..0000000000
--- a/contrib/kolibri-libc/loader/strcmp.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@strcmp
-fun_str  equ 'strcmp'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/strcoll.asm b/contrib/kolibri-libc/loader/strcoll.asm
deleted file mode 100644
index abe79ca46b..0000000000
--- a/contrib/kolibri-libc/loader/strcoll.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@strcoll
-fun_str  equ 'strcoll'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/strcpy.asm b/contrib/kolibri-libc/loader/strcpy.asm
deleted file mode 100644
index 6bd9da8377..0000000000
--- a/contrib/kolibri-libc/loader/strcpy.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@strcpy
-fun_str  equ 'strcpy'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/strcspn.asm b/contrib/kolibri-libc/loader/strcspn.asm
deleted file mode 100644
index 6cff4b9420..0000000000
--- a/contrib/kolibri-libc/loader/strcspn.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@strcspn
-fun_str  equ 'strcspn'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/strerror.asm b/contrib/kolibri-libc/loader/strerror.asm
deleted file mode 100644
index f62d91270e..0000000000
--- a/contrib/kolibri-libc/loader/strerror.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@strerror
-fun_str  equ 'strerror'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/strlen.asm b/contrib/kolibri-libc/loader/strlen.asm
deleted file mode 100644
index 5fe7c9ef6d..0000000000
--- a/contrib/kolibri-libc/loader/strlen.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@strlen
-fun_str  equ 'strlen'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/strncat.asm b/contrib/kolibri-libc/loader/strncat.asm
deleted file mode 100644
index abd4271802..0000000000
--- a/contrib/kolibri-libc/loader/strncat.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@strncat
-fun_str  equ 'strncat'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/strncmp.asm b/contrib/kolibri-libc/loader/strncmp.asm
deleted file mode 100644
index 881e25048b..0000000000
--- a/contrib/kolibri-libc/loader/strncmp.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@strncmp
-fun_str  equ 'strncmp'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/strncpy.asm b/contrib/kolibri-libc/loader/strncpy.asm
deleted file mode 100644
index 2235afd293..0000000000
--- a/contrib/kolibri-libc/loader/strncpy.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@strncpy
-fun_str  equ 'strncpy'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/strpbrk.asm b/contrib/kolibri-libc/loader/strpbrk.asm
deleted file mode 100644
index 322ac4de15..0000000000
--- a/contrib/kolibri-libc/loader/strpbrk.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@strpbrk
-fun_str  equ 'strpbrk'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/strrchr.asm b/contrib/kolibri-libc/loader/strrchr.asm
deleted file mode 100644
index b1eb92e5fe..0000000000
--- a/contrib/kolibri-libc/loader/strrchr.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@strrchr
-fun_str  equ 'strrchr'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/strrev.asm b/contrib/kolibri-libc/loader/strrev.asm
deleted file mode 100644
index 21eaf526cd..0000000000
--- a/contrib/kolibri-libc/loader/strrev.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@strrev
-fun_str  equ 'strrev'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/strspn.asm b/contrib/kolibri-libc/loader/strspn.asm
deleted file mode 100644
index 9e005cb5ed..0000000000
--- a/contrib/kolibri-libc/loader/strspn.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@strspn
-fun_str  equ 'strspn'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/strstr.asm b/contrib/kolibri-libc/loader/strstr.asm
deleted file mode 100644
index efc15bb972..0000000000
--- a/contrib/kolibri-libc/loader/strstr.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@strstr
-fun_str  equ 'strstr'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/strtok.asm b/contrib/kolibri-libc/loader/strtok.asm
deleted file mode 100644
index 5f578074cf..0000000000
--- a/contrib/kolibri-libc/loader/strtok.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@strtok
-fun_str  equ 'strtok'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/strxfrm.asm b/contrib/kolibri-libc/loader/strxfrm.asm
deleted file mode 100644
index d1a8ea3fbb..0000000000
--- a/contrib/kolibri-libc/loader/strxfrm.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@strxfrm
-fun_str  equ 'strxfrm'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/symbols.txt b/contrib/kolibri-libc/loader/symbols.txt
index a53ea8df1c..8b51d2361b 100644
--- a/contrib/kolibri-libc/loader/symbols.txt
+++ b/contrib/kolibri-libc/loader/symbols.txt
@@ -44,6 +44,7 @@ fwrite
 getchar
 gets
 hypot
+itoa
 labs
 ldexp
 ldiv
@@ -75,6 +76,13 @@ rename
 rewind
 rewinddir
 seekdir
+shell_printf
+shell_puts
+shell_putc
+shell_getc
+shell_gets
+shell_cls
+shell_exit
 setbuf
 setvbuf
 sin
diff --git a/contrib/kolibri-libc/loader/tan.asm b/contrib/kolibri-libc/loader/tan.asm
deleted file mode 100644
index c7d91566af..0000000000
--- a/contrib/kolibri-libc/loader/tan.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@tan
-fun_str  equ 'tan'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/tanh.asm b/contrib/kolibri-libc/loader/tanh.asm
deleted file mode 100644
index 8ffcdd95df..0000000000
--- a/contrib/kolibri-libc/loader/tanh.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@tanh
-fun_str  equ 'tanh'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/telldir.asm b/contrib/kolibri-libc/loader/telldir.asm
deleted file mode 100644
index aa49a076d7..0000000000
--- a/contrib/kolibri-libc/loader/telldir.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@telldir
-fun_str  equ 'telldir'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/time.asm b/contrib/kolibri-libc/loader/time.asm
deleted file mode 100644
index 242e888c59..0000000000
--- a/contrib/kolibri-libc/loader/time.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@time
-fun_str  equ 'time'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/tmpfile.asm b/contrib/kolibri-libc/loader/tmpfile.asm
deleted file mode 100644
index a8ca309ae4..0000000000
--- a/contrib/kolibri-libc/loader/tmpfile.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@tmpfile
-fun_str  equ 'tmpfile'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/tmpnam.asm b/contrib/kolibri-libc/loader/tmpnam.asm
deleted file mode 100644
index c9303e89db..0000000000
--- a/contrib/kolibri-libc/loader/tmpnam.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@tmpnam
-fun_str  equ 'tmpnam'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/vprintf.asm b/contrib/kolibri-libc/loader/vprintf.asm
deleted file mode 100644
index 56221caa4e..0000000000
--- a/contrib/kolibri-libc/loader/vprintf.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@vprintf
-fun_str  equ 'vprintf'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/loader/vsnprintf.asm b/contrib/kolibri-libc/loader/vsnprintf.asm
deleted file mode 100644
index bce9eb6998..0000000000
--- a/contrib/kolibri-libc/loader/vsnprintf.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-format ELF
-include "__lib__.inc"
-fun      equ __func@vsnprintf
-fun_str  equ 'vsnprintf'
-section '.text'
-fun_name db fun_str, 0
-section '.data'
-extrn lib_name
-public fun as fun_str
-fun dd fun_name
-lib dd lib_name
diff --git a/contrib/kolibri-libc/samples/Makefile b/contrib/kolibri-libc/samples/Makefile
index 045f029d7d..a01e6b8c53 100644
--- a/contrib/kolibri-libc/samples/Makefile
+++ b/contrib/kolibri-libc/samples/Makefile
@@ -17,6 +17,11 @@ static_tcc:
 	$(KTCC) $(KTCC_FLAGS) $(NAME).c -o $(NAME) -lc
 	$(KPACK) $(NAME)
 
+dynamic_kgcc:
+	$(KGCC) -D_DYNAMIC $(NAME).c
+	$(KLD) $(NAME).o -o $(NAME) -lc.obj
+	$(KPACK) $(NAME)
+
 dynamic_tcc:
 	$(KTCC) $(KTCC_FLAGS) -D_DYNAMIC $(NAME).c -o $(NAME)_dyn  -lc.obj
 	$(KPACK) $(NAME)_dyn
diff --git a/contrib/kolibri-libc/samples/shell_io.c b/contrib/kolibri-libc/samples/shell_io.c
index f19295772b..6e9c428903 100644
--- a/contrib/kolibri-libc/samples/shell_io.c
+++ b/contrib/kolibri-libc/samples/shell_io.c
@@ -2,10 +2,14 @@
 #include <ksys.h>
 #include <stdio.h>
 
-int main()
+int main(int argc, char**argv)
 {   
     char string[256];
     shell_cls();
+    shell_printf("Number of arguments %d\n",argc);
+    for(int i=0; i<argc; i++){
+        shell_printf("argv[%d]=%s\n", i, argv[i]);
+    }
     shell_puts("This is a test console application for Shell\n\r");
     shell_puts("Type a string (255 symbols max): ");
     shell_gets(string);
diff --git a/contrib/kolibri-libc/source/Makefile b/contrib/kolibri-libc/source/Makefile
index cb910d62db..66ad741407 100644
--- a/contrib/kolibri-libc/source/Makefile
+++ b/contrib/kolibri-libc/source/Makefile
@@ -47,7 +47,7 @@ clean:
 
 shared: $(cfiles) $(asmfiles)
 	$(CLINK) $^
-	#$(KPACK) a.out.obj
+	$(KPACK) a.out.obj
 	mv a.out.obj $(LIBC.OBJ)
 
 test:
diff --git a/contrib/kolibri-libc/source/Makefile.shared b/contrib/kolibri-libc/source/Makefile.shared
index e558733c2e..0722ceed82 100644
--- a/contrib/kolibri-libc/source/Makefile.shared
+++ b/contrib/kolibri-libc/source/Makefile.shared
@@ -1,3 +1,3 @@
 all:
 	$(MAKE) clean
-	env CC=kos32-gcc CPP=kos32-cpp AS=kos32-as $(MAKE) shared
\ No newline at end of file
+	env CC=i686-w64-mingw32-gcc CPP=i686-w64-mingw32-cpp AS=i686-w64-mingw32-as $(MAKE) shared
\ No newline at end of file
diff --git a/contrib/kolibri-libc/source/exports/exports.c b/contrib/kolibri-libc/source/exports/exports.c
index c8740d0e54..4b5579da7a 100644
--- a/contrib/kolibri-libc/source/exports/exports.c
+++ b/contrib/kolibri-libc/source/exports/exports.c
@@ -5,6 +5,7 @@
 #include <time.h>
 #include <sys/dirent.h>
 #include <ksys.h>
+#include <shell_api.h>
 
 ksys_coff_etable_t EXPORTS[] = {
     {"abs", abs},
@@ -53,6 +54,7 @@ ksys_coff_etable_t EXPORTS[] = {
     {"getchar", getchar},
     {"gets", gets},
     {"hypot", hypot},
+    {"itoa", itoa},
     {"labs", labs},
     {"ldexp", ldexp},
     {"ldiv", ldiv},
@@ -84,6 +86,13 @@ ksys_coff_etable_t EXPORTS[] = {
     {"rewind", rewind},
     {"rewinddir", rewinddir},
     {"seekdir", seekdir},
+    {"shell_printf", shell_printf},
+    {"shell_puts", shell_puts},
+    {"shell_putc", shell_putc},
+    {"shell_getc", shell_getc},
+    {"shell_gets", shell_gets},
+    {"shell_cls", shell_cls},
+    {"shell_exit", shell_exit},
     {"setbuf", setbuf},
     {"setvbuf", setvbuf},
     {"sin", sin},
diff --git a/contrib/kolibri-libc/source/include/shell_api.h b/contrib/kolibri-libc/source/include/shell_api.h
index 9e46f58a2b..8bb00c34e8 100644
--- a/contrib/kolibri-libc/source/include/shell_api.h
+++ b/contrib/kolibri-libc/source/include/shell_api.h
@@ -3,6 +3,7 @@
 
 #include <stddef.h>
 
+extern void _FUNC(shell_printf)(const char* format, ...); 
 extern void _FUNC(shell_puts)(const char *s);
 extern void _FUNC(shell_putc)(char c);
 extern char _FUNC(shell_getc)();
diff --git a/contrib/kolibri-libc/source/shell_api/shell.h b/contrib/kolibri-libc/source/shell_api/shell.h
index 9e2fd0e456..d613670714 100644
--- a/contrib/kolibri-libc/source/shell_api/shell.h
+++ b/contrib/kolibri-libc/source/shell_api/shell.h
@@ -9,11 +9,12 @@
 #define SHELL_GETS		5
 #define SHELL_CLS		6
 
+#define SHELL_SHM_MAX  1024*16
+
 extern char __shell_shm_name[32]; 
 extern char *__shell_shm;
 extern int __shell_is_init;
 extern int __shell_init();
-extern void __shell_wait();
 
 #define SHELL_WAIT() while (*__shell_shm) _ksys_delay(5)
 
diff --git a/contrib/kolibri-libc/source/shell_api/shell_init.c b/contrib/kolibri-libc/source/shell_api/shell_init.c
index c0e5b8d0d2..4075dd47ec 100644
--- a/contrib/kolibri-libc/source/shell_api/shell_init.c
+++ b/contrib/kolibri-libc/source/shell_api/shell_init.c
@@ -1,6 +1,7 @@
 #include <ksys.h>
 #include <string.h>
 #include <stdlib.h>
+#include "shell.h"
 
 char __shell_shm_name[32]; 
 char*__shell_shm=NULL;
@@ -21,7 +22,7 @@ int __shell_shm_init()
 
     itoa(PID, __shell_shm_name);
     strcat(__shell_shm_name, "-SHELL");
-    return _ksys_shm_open(__shell_shm_name,  KSYS_SHM_OPEN_ALWAYS | KSYS_SHM_WRITE, 1024*16, &__shell_shm);
+    return _ksys_shm_open(__shell_shm_name,  KSYS_SHM_OPEN_ALWAYS | KSYS_SHM_WRITE, SHELL_SHM_MAX, &__shell_shm);
 }
 
 int __shell_init()
diff --git a/contrib/kolibri-libc/source/shell_api/shell_printf.c b/contrib/kolibri-libc/source/shell_api/shell_printf.c
new file mode 100644
index 0000000000..66f5594e2c
--- /dev/null
+++ b/contrib/kolibri-libc/source/shell_api/shell_printf.c
@@ -0,0 +1,12 @@
+#include "shell.h"
+#include <stdio.h>
+
+void shell_printf(const char *format,...)
+{
+    va_list ap;
+    va_start (ap, format);
+    *__shell_shm=SHELL_PUTS;
+    vsnprintf(__shell_shm+1, SHELL_SHM_MAX, format, ap);
+    va_end(ap);
+    SHELL_WAIT();
+}