diff --git a/kernel/trunk/core/Tupfile.lua b/kernel/trunk/core/Tupfile.lua
new file mode 100644
index 0000000000..7e1761c88d
--- /dev/null
+++ b/kernel/trunk/core/Tupfile.lua
@@ -0,0 +1,3 @@
+if tup.getconfig("NO_FASM") ~= "" then return end
+tup.rule("mtrrtest.asm", "fasm %f %o", "mtrrtest.exe")
+tup.rule("test_malloc.asm", "fasm %f %o", "test_malloc")
diff --git a/kernel/trunk/core/mtrrtest.asm b/kernel/trunk/core/mtrrtest.asm
index 44de7d33e6..d1c8884f39 100644
--- a/kernel/trunk/core/mtrrtest.asm
+++ b/kernel/trunk/core/mtrrtest.asm
@@ -5,6 +5,10 @@ format PE console
 macro $Revision [args]
 {
 }
+macro ignore_empty_revision_keyword {
+  macro $Revi#sion$ \{\}
+}
+ignore_empty_revision_keyword
 include '../proc32.inc'
 include '../struct.inc'
 entry start
diff --git a/kernel/trunk/core/test_malloc.asm b/kernel/trunk/core/test_malloc.asm
index 6c9f09b5a3..ac42df8c79 100644
--- a/kernel/trunk/core/test_malloc.asm
+++ b/kernel/trunk/core/test_malloc.asm
@@ -225,6 +225,7 @@ error_with_code:
         jmp     $-1     ; just in case
 
 ; Include main heap code
+include '../macros.inc'
 include '../proc32.inc'
 include '../struct.inc'
 include '../const.inc'