Index: boot/arch/arm32/src/main.c
===================================================================
--- boot/arch/arm32/src/main.c	(revision 10d65d70906a865fb116576edc88e47ab61a5fb4)
+++ boot/arch/arm32/src/main.c	(revision dbcaa2d2431cd6c5df4a3aae6ef36a8262c9000f)
@@ -35,4 +35,5 @@
 
 #include <arch/main.h>
+#include <arch/types.h>
 #include <arch/asm.h>
 #include <arch/mm.h>
Index: boot/arch/arm32/src/mm.c
===================================================================
--- boot/arch/arm32/src/mm.c	(revision 10d65d70906a865fb116576edc88e47ab61a5fb4)
+++ boot/arch/arm32/src/mm.c	(revision dbcaa2d2431cd6c5df4a3aae6ef36a8262c9000f)
@@ -38,4 +38,5 @@
 #include <arch/mm.h>
 #include <arch/cp15.h>
+#include <arch/types.h>
 
 #ifdef PROCESSOR_ARCH_armv7_a
Index: boot/arch/mips32/src/main.c
===================================================================
--- boot/arch/mips32/src/main.c	(revision 10d65d70906a865fb116576edc88e47ab61a5fb4)
+++ boot/arch/mips32/src/main.c	(revision dbcaa2d2431cd6c5df4a3aae6ef36a8262c9000f)
@@ -30,4 +30,5 @@
 #include <arch/arch.h>
 #include <arch/asm.h>
+#include <arch/types.h>
 #include <halt.h>
 #include <printf.h>
Index: boot/arch/ppc32/include/arch/main.h
===================================================================
--- boot/arch/ppc32/include/arch/main.h	(revision 10d65d70906a865fb116576edc88e47ab61a5fb4)
+++ boot/arch/ppc32/include/arch/main.h	(revision dbcaa2d2431cd6c5df4a3aae6ef36a8262c9000f)
@@ -33,4 +33,5 @@
 #include <balloc.h>
 #include <genarch/ofw_tree.h>
+#include <arch/types.h>
 
 typedef struct {
Index: boot/arch/ppc32/src/main.c
===================================================================
--- boot/arch/ppc32/src/main.c	(revision 10d65d70906a865fb116576edc88e47ab61a5fb4)
+++ boot/arch/ppc32/src/main.c	(revision dbcaa2d2431cd6c5df4a3aae6ef36a8262c9000f)
@@ -30,4 +30,5 @@
 #include <arch/arch.h>
 #include <arch/asm.h>
+#include <arch/types.h>
 #include <genarch/ofw.h>
 #include <genarch/ofw_tree.h>
Index: boot/arch/riscv64/src/main.c
===================================================================
--- boot/arch/riscv64/src/main.c	(revision 10d65d70906a865fb116576edc88e47ab61a5fb4)
+++ boot/arch/riscv64/src/main.c	(revision dbcaa2d2431cd6c5df4a3aae6ef36a8262c9000f)
@@ -32,4 +32,5 @@
 #include <arch/ucb.h>
 #include <arch/mm.h>
+#include <arch/types.h>
 #include <version.h>
 #include <stddef.h>
@@ -64,5 +65,5 @@
 	bootinfo.memmap.zones[0].size = PHYSMEM_SIZE;
 
-	printf("\nMemory statistics (total %llu MB, starting at %p)\n\n",
+	printf("\nMemory statistics (total %" PRIu64 " MB, starting at %p)\n\n",
 	    bootinfo.memmap.total >> 20, (void *) bootinfo.physmem_start);
 	printf(" %p: boot info structure\n", &bootinfo);
Index: boot/arch/sparc64/include/arch/main.h
===================================================================
--- boot/arch/sparc64/include/arch/main.h	(revision 10d65d70906a865fb116576edc88e47ab61a5fb4)
+++ boot/arch/sparc64/include/arch/main.h	(revision dbcaa2d2431cd6c5df4a3aae6ef36a8262c9000f)
@@ -33,4 +33,5 @@
 #include <balloc.h>
 #include <genarch/ofw_tree.h>
+#include <arch/types.h>
 
 typedef struct {
Index: boot/genarch/include/genarch/ofw.h
===================================================================
--- boot/genarch/include/genarch/ofw.h	(revision 10d65d70906a865fb116576edc88e47ab61a5fb4)
+++ boot/genarch/include/genarch/ofw.h	(revision dbcaa2d2431cd6c5df4a3aae6ef36a8262c9000f)
@@ -33,4 +33,5 @@
 #include <stddef.h>
 #include <stdint.h>
+#include <_bits/native.h>
 
 #define MEMMAP_MAX_RECORDS  32
Index: boot/generic/include/stdint.h
===================================================================
--- boot/generic/include/stdint.h	(revision 10d65d70906a865fb116576edc88e47ab61a5fb4)
+++ 	(revision )
@@ -1,40 +1,0 @@
-/*
- * Copyright (c) 2006 Josef Cejka
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * - Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * - The name of the author may not be used to endorse or promote products
- *   derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/** @file
- */
-
-#ifndef BOOT_STDINT_H_
-#define BOOT_STDINT_H_
-
-#include <arch/types.h>
-
-#endif
-
-/** @}
- */