diff --git a/reactos/ntoskrnl/ntkrnlmp.rbuild b/reactos/ntoskrnl/ntkrnlmp.rbuild
new file mode 100644
index 00000000000..1d23932e496
--- /dev/null
+++ b/reactos/ntoskrnl/ntkrnlmp.rbuild
@@ -0,0 +1,436 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ .
+ include
+
+ include
+ include/internal
+ include/reactos/drivers
+ csq
+ hal
+ pseh
+ cmlib
+ rtl
+ rossym
+ libcntpr
+ kdcom
+ bootvid
+ wdmguid
+ ppcmmu
+
+ ntoskrnl.h
+
+
+
+
+ boot.S
+ abios.c
+ cpu.c
+ ctxswitch.S
+ exp.c
+ irqobj.c
+ kiinit.c
+ ldt.c
+ mtrr.c
+ patpge.c
+ systimer.S
+ thrdini.c
+ trap.s
+ usercall_asm.S
+ usercall.c
+ v86vdm.c
+ v86m_sup.S
+
+
+
+
+ main_asm.S
+ cpu.c
+ exp.c
+ kiinit.c
+ ppc_irq.c
+ stubs.c
+ systimer.c
+ thrdini.c
+ ctxswitch.c
+ ctxhelp.S
+
+
+ apc.c
+ balmgr.c
+ bug.c
+ clock.c
+ config.c
+ devqueue.c
+ dpc.c
+ eventobj.c
+ except.c
+ freeldr.c
+ gate.c
+ gmutex.c
+ ipi.c
+ krnlinit.c
+ mutex.c
+ procobj.c
+ profobj.c
+ queue.c
+ semphobj.c
+ spinlock.c
+ thrdschd.c
+ thrdobj.c
+ timerobj.c
+ wait.c
+
+
+ cacheman.c
+ copy.c
+ fs.c
+ mdl.c
+ pin.c
+ view.c
+
+
+
+
+ cmhardwr.c
+
+
+
+
+ cmhardwr.c
+
+
+ cmalloc.c
+ cmapi.c
+ cmboot.c
+ cmcheck.c
+ cmcontrl.c
+ cmconfig.c
+ cmdata.c
+ cmdelay.c
+ cmindex.c
+ cminit.c
+ cmhook.c
+ cmkcbncb.c
+ cmkeydel.c
+ cmlazy.c
+ cmmapvw.c
+ cmname.c
+ cmparse.c
+ cmse.c
+ cmsecach.c
+ cmsysini.c
+ cmvalue.c
+ cmvalche.c
+ cmwraprs.c
+ ntapi.c
+
+
+ ntfunc.c
+ regfile.c
+ registry.c
+ regobj.c
+
+
+ dbgkutil.c
+ dbgkobj.c
+
+
+ zw.S
+
+
+
+
+ interlck_asm.S
+ fastinterlck_asm.S
+ ioport.S
+
+
+
+
+ ioport.s
+ fastinterlck.c
+
+
+ atom.c
+ callback.c
+ dbgctrl.c
+ efi.c
+ event.c
+ evtpair.c
+ fmutex.c
+ handle.c
+ harderr.c
+ hdlsterm.c
+ init.c
+ keyedevt.c
+ locale.c
+ lookas.c
+ mutant.c
+ pushlock.c
+ profile.c
+ resource.c
+ rundown.c
+ sem.c
+ shutdown.c
+ sysinfo.c
+ time.c
+ timer.c
+ uuid.c
+ win32k.c
+ work.c
+ xipdisp.c
+ zone.c
+
+
+ dbcsname.c
+ fastio.c
+ faulttol.c
+ filelock.c
+ filter.c
+ filtrctx.c
+ fsfilter.c
+ fsrtlpc.c
+ largemcb.c
+ name.c
+ notify.c
+ oplock.c
+ pnp.c
+ stackovf.c
+ tunnel.c
+ unc.c
+
+
+ disksup.c
+ fstubex.c
+ halstub.c
+
+
+ inbv.c
+
+
+
+ adapter.c
+ arcname.c
+ bootlog.c
+ controller.c
+ device.c
+ deviface.c
+ driver.c
+ drvrlist.c
+ error.c
+ file.c
+ iocomp.c
+ ioevent.c
+ iofunc.c
+ iomdl.c
+ iomgr.c
+ iorsrce.c
+ iotimer.c
+ iowork.c
+ irp.c
+ irq.c
+ rawfs.c
+ remlock.c
+ util.c
+ symlink.c
+ volume.c
+
+
+ plugplay.c
+ pnpdma.c
+ pnpmgr.c
+ pnpnotify.c
+ pnpreport.c
+ pnproot.c
+
+
+
+
+
+
+
+
+ i386-dis.c
+ kdb_help.S
+ longjmp.S
+ setjmp.S
+
+
+
+
+
+ kdb.c
+ kdb_cli.c
+ kdb_expr.c
+ kdb_keyboard.c
+ kdb_serial.c
+ kdb_string.c
+
+
+ kdb_symbols.c
+
+
+
+
+ bochs.c
+
+ gdbstub.c
+
+
+ gdbstub_powerpc.c
+
+ kdbg.c
+
+ kdinit.c
+ kdio.c
+ kdmain.c
+
+
+
+
+ kdapi.c
+ kdbreak.c
+ kddata.c
+ kdinit.c
+ kdlock.c
+ kdprint.c
+ kdtrap.c
+
+
+
+ close.c
+ complete.c
+ connect.c
+ create.c
+ listen.c
+ port.c
+ reply.c
+ send.c
+
+
+
+
+ page.c
+
+
+
+
+ pfault.c
+ page.c
+
+
+ anonmem.c
+ aspace.c
+ balance.c
+ cont.c
+ drvlck.c
+ freelist.c
+ iospace.c
+ kmap.c
+ marea.c
+ mdlsup.c
+ mm.c
+ mminit.c
+ mpw.c
+ ncache.c
+ npool.c
+ pagefile.c
+ pageop.c
+ pager.c
+ pagfault.c
+ paging.c
+ pe.c
+ physical.c
+ pool.c
+ ppool.c
+ procsup.c
+ region.c
+ rmap.c
+ section.c
+ sysldr.c
+ verifier.c
+ virtual.c
+ wset.c
+ elf32.c
+ elf64.c
+
+
+ obdir.c
+ obinit.c
+ obhandle.c
+ obname.c
+ oblife.c
+ obref.c
+ sdcache.c
+ obsecure.c
+ oblink.c
+ obwait.c
+
+
+ power.c
+ events.c
+
+
+ debug.c
+ job.c
+ kill.c
+ psnotify.c
+ process.c
+ psmgr.c
+ query.c
+ quota.c
+ security.c
+ state.c
+ thread.c
+ win32.c
+
+
+ libsupp.c
+ misc.c
+ strtok.c
+
+
+ access.c
+ acl.c
+ audit.c
+ lsa.c
+ luid.c
+ priv.c
+ sd.c
+ semgr.c
+ sid.c
+ token.c
+
+
+
+ vdmmain.c
+ vdmexec.c
+
+
+
+ wmi.c
+
+ ntoskrnl.rc
+ -nostartfiles
+ -nostdlib
+ -lgcc
+ ntoskrnl_$(ARCH).lnk
+
diff --git a/reactos/ntoskrnl/ntoskrnl.rbuild b/reactos/ntoskrnl/ntoskrnl.rbuild
index fff2890a0c3..6048c5637b2 100644
--- a/reactos/ntoskrnl/ntoskrnl.rbuild
+++ b/reactos/ntoskrnl/ntoskrnl.rbuild
@@ -65,8 +65,8 @@
stubs.c
systimer.c
thrdini.c
- ctxswitch.c
- ctxhelp.S
+ ctxswitch.c
+ ctxhelp.S
apc.c