diff --git a/include/arm/sa11x0/gpclk.h b/include/arm/sa11x0/gpclk.h
index f8fb5fa8..8e527958 100644
--- a/include/arm/sa11x0/gpclk.h
+++ b/include/arm/sa11x0/gpclk.h
@@ -34,6 +34,10 @@
 
 #include <common.h>
 
+#if LANGUAGE == C
+#include <stdint.h>
+#endif
+
 /* GPCLK Registers (Serial Port 1) */
 
 #define	GPCLK_BASE	0x80020060
diff --git a/include/arm/sa11x0/gpio.h b/include/arm/sa11x0/gpio.h
index 8940146a..8d057ff5 100644
--- a/include/arm/sa11x0/gpio.h
+++ b/include/arm/sa11x0/gpio.h
@@ -34,6 +34,10 @@
 
 #include <common.h>
 
+#if LANGUAGE == C
+#include <stdint.h>
+#endif
+
 /* GPIO Registers */
 
 #define	GPIO_BASE	0x90040000
diff --git a/include/arm/sa11x0/uart.h b/include/arm/sa11x0/uart.h
index 93c250c7..278c0e6c 100644
--- a/include/arm/sa11x0/uart.h
+++ b/include/arm/sa11x0/uart.h
@@ -33,7 +33,10 @@
 #define	SA11X0_UART_H
 
 #include <common.h>
+
+#if LANGUAGE == C
 #include <stdint.h>
+#endif
 
 /* UART Registers (Serial Port 1, 2 and 3) */