diff --git a/include/arm/pxa2x0/uart.h b/include/arm/pxa2x0/uart.h
index 4643a4b6..164d5393 100644
--- a/include/arm/pxa2x0/uart.h
+++ b/include/arm/pxa2x0/uart.h
@@ -32,9 +32,12 @@
 #ifndef	PXA2X0_UART_H
 #define	PXA2X0_UART_H
 
-#include <stdint.h>
 #include <common.h>
 
+#if LANGUAGE == C
+#include <stdint.h>
+#endif
+
 /* Common UART (FFUART/BTUART/STUART) Declarations */
 
 #define	FFUART_BASE	0x40100000
@@ -64,13 +67,9 @@ typedef volatile struct UART_registers {
 	uint32_t isr;
 } UART_registers;
 
-#ifndef FFUART_pointer
+#ifdef PXA2X0_UNMAPPED
 #define	FFUART_pointer	((UART_registers *) FFUART_BASE)
-#endif
-#ifndef BTUART_pointer
 #define	BTUART_pointer	((UART_registers *) BTUART_BASE)
-#endif
-#ifndef STUART_pointer
 #define	STUART_pointer	((UART_registers *) STUART_BASE)
 #endif