diff --git a/dde_ipxe/lib/mk/dde_ipxe_nic.mk b/dde_ipxe/lib/mk/dde_ipxe_nic.inc
similarity index 89%
rename from dde_ipxe/lib/mk/dde_ipxe_nic.mk
rename to dde_ipxe/lib/mk/dde_ipxe_nic.inc
index b941dbef7..b3a92772d 100644
--- a/dde_ipxe/lib/mk/dde_ipxe_nic.mk
+++ b/dde_ipxe/lib/mk/dde_ipxe_nic.inc
@@ -16,9 +16,7 @@ SRC_C += $(addprefix drivers/net/, pcnet32.c intel.c eepro100.c realtek.c mii.c)
 
 INC_DIR += $(LIB_DIR)/include \
            $(CONTRIB_DIR)/include $(CONTRIB_DIR) \
-           $(CONTRIB_DIR)/arch/x86/include \
-           $(CONTRIB_DIR)/arch/i386/include \
-           $(CONTRIB_DIR)/arch/i386/include/pcbios
+           $(CONTRIB_DIR)/arch/x86/include
 
 CC_WARN = -Wall -Wno-address
 CC_OPT += $(addprefix -fno-builtin-, putchar toupper tolower)
@@ -38,3 +36,5 @@ vpath dde.c     $(LIB_DIR)
 vpath dummies.c $(LIB_DIR)
 
 vpath %.c       $(CONTRIB_DIR)
+
+# vi: set ft=make :
diff --git a/dde_ipxe/lib/mk/x86_32/dde_ipxe_nic.mk b/dde_ipxe/lib/mk/x86_32/dde_ipxe_nic.mk
new file mode 100644
index 000000000..f11b27aef
--- /dev/null
+++ b/dde_ipxe/lib/mk/x86_32/dde_ipxe_nic.mk
@@ -0,0 +1,4 @@
+include $(REP_DIR)/lib/mk/dde_ipxe_nic.inc
+
+INC_DIR += $(CONTRIB_DIR)/arch/i386/include \
+           $(CONTRIB_DIR)/arch/i386/include/pcbios
diff --git a/dde_ipxe/lib/mk/x86_64/dde_ipxe_nic.mk b/dde_ipxe/lib/mk/x86_64/dde_ipxe_nic.mk
new file mode 100644
index 000000000..c0ccd0dac
--- /dev/null
+++ b/dde_ipxe/lib/mk/x86_64/dde_ipxe_nic.mk
@@ -0,0 +1,7 @@
+include $(REP_DIR)/lib/mk/dde_ipxe_nic.inc
+
+INC_DIR += $(CONTRIB_DIR)/arch/x86_64/include \
+           $(CONTRIB_DIR)/arch/x86_64/include/efi
+
+# take remaining parts from i386
+INC_DIR += $(CONTRIB_DIR)/arch/i386/include
diff --git a/dde_ipxe/src/lib/dde_ipxe/dde.c b/dde_ipxe/src/lib/dde_ipxe/dde.c
index 81c68bf24..4c780b095 100644
--- a/dde_ipxe/src/lib/dde_ipxe/dde.c
+++ b/dde_ipxe/src/lib/dde_ipxe/dde.c
@@ -58,7 +58,7 @@ static inline void *alloc_from_slab(size_t size)
 	else if (alloc_size <= 20480)
 		p = dde_kit_slab_alloc(slabs[SLAB_20480]);
 	else
-		LOG("allocation of size %d too big", size);
+		LOG("allocation of size %zd too big", size);
 
 	if (p) {
 		*p = alloc_size;
@@ -202,7 +202,7 @@ void iounmap(volatile const void *io_addr)
 
 void * ioremap(unsigned long bus_addr, size_t len)
 {
-	LOG("bus_addr = %p len = %x", (void *)bus_addr, len);
+	LOG("bus_addr = %p len = %zx", (void *)bus_addr, len);
 	dde_kit_addr_t vaddr;
 
 	int ret = dde_kit_request_mem(bus_addr, len, 0, &vaddr);