This patch add the proper .if/.else/.endif to the Makefiles, and cleans a bit some includes. The patch containing all changes required by Minix is nbsd_include/minix-port.patch