diff --git a/lib/udelay.c b/lib/udelay.c
index 58135cf..ba13d32 100755
--- a/lib/udelay.c
+++ b/lib/udelay.c
@@ -18,6 +18,7 @@ Simple timer based delay routine.
 =============================================================================*/
 
 #ifdef __arm__
+#include <stdint.h>
 #else
 #include "common.h"
 #endif
diff --git a/lib/xprintf.c b/lib/xprintf.c
index 06d8179..7f9b7db 100755
--- a/lib/xprintf.c
+++ b/lib/xprintf.c
@@ -182,7 +182,7 @@ void put_dump (
 	case DW_LONG:
 		lp = buff;
 		do								/* Hexdecimal dump */
-			xprintf(" %08LX", *lp++);
+			xprintf(" %08X", *lp++);
 		while (--len);
 		break;
 	}
diff --git a/lib/xprintf.h b/lib/xprintf.h
index 3ac32e0..32863c7 100755
--- a/lib/xprintf.h
+++ b/lib/xprintf.h
@@ -15,6 +15,10 @@
 #define _USE_XFUNC_OUT	1	/* 1: Use output functions */
 #define	_CR_CRLF		1	/* 1: Convert \n ==> \r\n in the output char */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 void xputc (char c);
 void xputs (const char* str);
 void xfputs (void (*func)(unsigned char), const char* str);
@@ -33,4 +37,8 @@ void xvprintf (
 #define DW_SHORT	sizeof(short)
 #define DW_LONG		sizeof(long)
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif