diff --git a/data/Tupfile.lua b/data/Tupfile.lua
index edcf7d7c9..490d1dfe7 100644
--- a/data/Tupfile.lua
+++ b/data/Tupfile.lua
@@ -179,7 +179,7 @@ extra_files = {
  {"kolibrios/develop/oberon07/tools/", PROGS .. "/develop/oberon07/tools/*"},
  {"kolibrios/develop/tcc/", PROGS ..  "/develop/ktcc/trunk/*"},
  {"kolibrios/develop/tcc/", PROGS ..  "/develop/ktcc/trunk/bin/tcc"},
- {"kolibrios/develop/tcc/lib/", PROGS ..  "/develop/ktcc/trunk/bin/lib/*"},
+ {"kolibrios/develop/tcc/lib/", PROGS ..  "/develop/ktcc/trunk/bin/lib/*", group = PROGS ..  "/develop/ktcc/trunk/bin/lib/<ktcc_libs>"},
  {"kolibrios/develop/tcc/include/", PROGS ..  "/develop/ktcc/trunk/libc/include/*"},
  {"kolibrios/develop/tcc/include/kos/", PROGS ..  "/develop/ktcc/trunk/libc/include/kos/*"},
  {"kolibrios/develop/tcc/include/clayer/", PROGS ..  "/develop/ktcc/trunk/libc/include/clayer/*"},
diff --git a/programs/develop/ktcc/trunk/lib/libcryptal/Tupfile.lua b/programs/develop/ktcc/trunk/lib/libcryptal/Tupfile.lua
new file mode 100644
index 000000000..5164af257
--- /dev/null
+++ b/programs/develop/ktcc/trunk/lib/libcryptal/Tupfile.lua
@@ -0,0 +1,10 @@
+if tup.getconfig("NO_GCC") ~= "" or tup.getconfig("NO_NASM") ~= "" then return end
+tup.include("../../../../../use_gcc.lua")
+tup.include("../../../../../use_newlib.lua")
+INCLUDES = INCLUDES .. " -I../../libc/include"
+--CFLAGS = CFLAGS .. ' -DENABLE_AUDIO -UDISABLE_AUDIO -DDISABLE_JOYSTICK'
+
+compile_gcc("*.c", "%B.o")
+
+--tup.rule(OBJS, "kos32-ar rcs %o %f", {"../../bin/lib/libcryptal.a"})
+tup.rule(OBJS, "kos32-ar rcs %o %f", {"../../bin/lib/libcryptal.a", "../../bin/lib/<ktcc_libs>"})
diff --git a/programs/develop/ktcc/trunk/lib/libcryptal/aes.c b/programs/develop/ktcc/trunk/lib/libcryptal/aes.c
index 41caff0ee..ebb49db8f 100644
--- a/programs/develop/ktcc/trunk/lib/libcryptal/aes.c
+++ b/programs/develop/ktcc/trunk/lib/libcryptal/aes.c
@@ -17,7 +17,7 @@
 
 /*************************** HEADER FILES ***************************/
 #include <stdlib.h>
-#include <memory.h>
+#include <string.h>
 #include <cryptal/aes.h>
 
 #include <stdio.h>
diff --git a/programs/develop/ktcc/trunk/lib/proc_lib/Tupfile.lua b/programs/develop/ktcc/trunk/lib/proc_lib/Tupfile.lua
new file mode 100644
index 000000000..a16516fef
--- /dev/null
+++ b/programs/develop/ktcc/trunk/lib/proc_lib/Tupfile.lua
@@ -0,0 +1,4 @@
+if tup.getconfig("NO_GCC") ~= "" or tup.getconfig("NO_FASM") ~= "" then return end
+tup.include("../../../../../use_gcc.lua")
+tup.rule("*.asm", "fasm %f %o", "%B.obj")
+tup.rule("*.obj", "kos32-ar rcs %o %f", {"../../bin/lib/libdialog.a", "../../bin/lib/<ktcc_libs>"})
diff --git a/programs/develop/ktcc/trunk/lib/proc_lib/loadproclib.asm b/programs/develop/ktcc/trunk/lib/proc_lib/loadproclib.asm
index d60a8c784..45e70b075 100644
--- a/programs/develop/ktcc/trunk/lib/proc_lib/loadproclib.asm
+++ b/programs/develop/ktcc/trunk/lib/proc_lib/loadproclib.asm
@@ -1,5 +1,5 @@
+format MS COFF
 
-format elf
 use32                                   ; Tell compiler to use 32 bit instructions
 
 section '.text' executable			; Keep this line before includes or GCC messes up call addresses
@@ -11,6 +11,7 @@ purge section,mov,add,sub
 include '../../../../../dll.inc'
 	
 public init_proclib as 'kolibri_dialog_init'
+public init_proclib as '_kolibri_dialog_init'
 ;;; Returns 0 on success. -1 on failure.
 
 proc init_proclib
@@ -33,7 +34,9 @@ import lib_boxlib, \
 	ColorDialog_start, 'ColorDialog_start'
 	
 public OpenDialog_init as 'OpenDialog_init'
+public OpenDialog_init as '_OpenDialog_init'
 public OpenDialog_start as 'OpenDialog_start'
+public OpenDialog_start as '_OpenDialog_start'
 
 public ColorDialog_init as 'ColorDialog_init'
 public ColorDialog_start as 'ColorDialog_start'
diff --git a/programs/develop/ktcc/trunk/libc/include/clayer/dialog.h b/programs/develop/ktcc/trunk/libc/include/clayer/dialog.h
index 3cb7759e0..e5cfdb722 100644
--- a/programs/develop/ktcc/trunk/libc/include/clayer/dialog.h
+++ b/programs/develop/ktcc/trunk/libc/include/clayer/dialog.h
@@ -117,10 +117,10 @@ color_dialog* kolibri_new_color_dialog(unsigned int type, unsigned short tlx, un
 
 extern void kolibri_dialog_init();
 
-extern void (*OpenDialog_init __attribute__((__stdcall__)))(open_dialog *);
-extern void (*OpenDialog_start __attribute__((__stdcall__)))(open_dialog *);
+extern void (*OpenDialog_init)(open_dialog *) __attribute__((__stdcall__));
+extern void (*OpenDialog_start)(open_dialog *) __attribute__((__stdcall__));
 
-extern void (*ColorDialog_init __attribute__((__stdcall__)))(color_dialog *);
-extern void (*ColorDialog_start __attribute__((__stdcall__)))(color_dialog *);
+extern void (*ColorDialog_init)(color_dialog *) __attribute__((__stdcall__));
+extern void (*ColorDialog_start)(color_dialog *) __attribute__((__stdcall__));
 
 #endif
diff --git a/programs/other/TinyHashView/Tupfile.lua b/programs/other/TinyHashView/Tupfile.lua
new file mode 100755
index 000000000..68ee3daba
--- /dev/null
+++ b/programs/other/TinyHashView/Tupfile.lua
@@ -0,0 +1,17 @@
+if tup.getconfig("NO_GCC") ~= "" then return end
+HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR")
+tup.include(HELPERDIR .. "/use_gcc.lua")
+tup.include(HELPERDIR .. "/use_newlib.lua")
+
+-- C_Layer
+CFLAGS = CFLAGS .. " -std=c99 -Wall -Wextra -Dasm=__asm__"
+INCLUDES = INCLUDES .. " -I ../../develop/ktcc/trunk/libc/include"
+LDFLAGS = LDFLAGS .. " -L ../../develop/ktcc/trunk/bin/lib"
+table.insert(LIBDEPS, "../../develop/ktcc/trunk/bin/lib/<ktcc_libs>")
+LIBS = LIBS .. " -lck -lcryptal -ldialog"
+
+-- Subsystem native
+--LDFLAGS = LDFLAGS .. " --subsystem native"
+
+compile_gcc{"thashview.c"}
+link_gcc("thashview")