Index: uspace/lib/c/arch/arm32/include/libarch/atomic.h
===================================================================
--- uspace/lib/c/arch/arm32/include/libarch/atomic.h	(revision aebcd426582babfeec12c88cbcb68dc1cd23763f)
+++ uspace/lib/c/arch/arm32/include/libarch/atomic.h	(revision d2d5329e4b1afac22d5b4e82e280e6acb29db280)
@@ -41,5 +41,5 @@
 
 #include <atomicdflt.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <sys/types.h>
 
Index: uspace/lib/c/arch/arm32/include/libarch/cp15.h
===================================================================
--- uspace/lib/c/arch/arm32/include/libarch/cp15.h	(revision d2d5329e4b1afac22d5b4e82e280e6acb29db280)
+++ uspace/lib/c/arch/arm32/include/libarch/cp15.h	(revision d2d5329e4b1afac22d5b4e82e280e6acb29db280)
@@ -0,0 +1,1 @@
+../../../../../../../kernel/arch/arm32/include/arch/cp15.h
Index: uspace/lib/c/arch/arm32/include/libarch/ddi.h
===================================================================
--- uspace/lib/c/arch/arm32/include/libarch/ddi.h	(revision aebcd426582babfeec12c88cbcb68dc1cd23763f)
+++ uspace/lib/c/arch/arm32/include/libarch/ddi.h	(revision d2d5329e4b1afac22d5b4e82e280e6acb29db280)
@@ -37,30 +37,30 @@
 #include <libarch/types.h>
 
-static inline void pio_write_8(ioport8_t *port, uint8_t v)
+static inline void arch_pio_write_8(ioport8_t *port, uint8_t v)
 {
 	*port = v;
 }
 
-static inline void pio_write_16(ioport16_t *port, uint16_t v)
+static inline void arch_pio_write_16(ioport16_t *port, uint16_t v)
 {
 	*port = v;
 }
 
-static inline void pio_write_32(ioport32_t *port, uint32_t v)
+static inline void arch_pio_write_32(ioport32_t *port, uint32_t v)
 {
 	*port = v;
 }
 
-static inline uint8_t pio_read_8(ioport8_t *port)
+static inline uint8_t arch_pio_read_8(const ioport8_t *port)
 {
 	return *port;
 }
 
-static inline uint16_t pio_read_16(ioport16_t *port)
+static inline uint16_t arch_pio_read_16(const ioport16_t *port)
 {
 	return *port;
 }
 
-static inline uint32_t pio_read_32(ioport32_t *port)
+static inline uint32_t arch_pio_read_32(const ioport32_t *port)
 {
 	return *port;