Index: kernel/generic/include/debug.h
===================================================================
--- kernel/generic/include/debug.h	(revision c6e314a78bffc7c64e7095fea28ffc280b031237)
+++ kernel/generic/include/debug.h	(revision aecf79fdaee472e18edbe8432718b356d591c455)
@@ -27,5 +27,5 @@
  */
 
- /** @addtogroup genericdebug
+/** @addtogroup genericdebug
  * @{
  */
@@ -61,10 +61,6 @@
 #endif
 
-#define STRING(arg) STRING_ARG(arg)
-#define STRING_ARG(arg) #arg
-
 #endif
 
- /** @}
+/** @}
  */
-
Index: kernel/generic/include/macros.h
===================================================================
--- kernel/generic/include/macros.h	(revision c6e314a78bffc7c64e7095fea28ffc280b031237)
+++ kernel/generic/include/macros.h	(revision aecf79fdaee472e18edbe8432718b356d591c455)
@@ -27,5 +27,5 @@
  */
 
- /** @addtogroup generic	
+/** @addtogroup generic	
  * @{
  */
@@ -36,28 +36,33 @@
 #define __MACROS_H__
 
-#define is_digit(d)	(((d) >= '0') && ((d)<='9'))
-#define is_lower(c)	(((c) >= 'a') && ((c) <= 'z'))
-#define is_upper(c)	(((c) >= 'A') && ((c) <= 'Z'))
-#define is_alpha(c)	(is_lower(c) || is_upper(c))
+#include <arch/types.h>
+#include <typedefs.h>
+
+#define is_digit(d)		(((d) >= '0') && ((d) <= '9'))
+#define is_lower(c)		(((c) >= 'a') && ((c) <= 'z'))
+#define is_upper(c)		(((c) >= 'A') && ((c) <= 'Z'))
+#define is_alpha(c)		(is_lower(c) || is_upper(c))
 #define is_alphanum(c)	(is_alpha(c) || is_digit(c))
-#define is_white(c)	(((c) == ' ') || ((c) == '\t') || ((c) == '\n') || ((c) == '\r'))
+#define is_white(c)		(((c) == ' ') || ((c) == '\t') || ((c) == '\n') || ((c) == '\r'))
 
-#define min(a,b)	((a)<(b)?(a):(b))
-#define max(a,b)	((a)>(b)?(a):(b))
+#define min(a,b)	((a) < (b) ? (a) : (b))
+#define max(a,b)	((a) > (b) ? (a) : (b))
 
 /** Return true if the interlvals overlap. */
 static inline int overlaps(uintptr_t s1, size_t sz1, uintptr_t s2, size_t sz2)
 {
-	uintptr_t e1 = s1+sz1;
-	uintptr_t e2 = s2+sz2;
+	uintptr_t e1 = s1 + sz1;
+	uintptr_t e2 = s2 + sz2;
 
-	return s1 < e2 && s2 < e1;
+	return (s1 < e2) && (s2 < e1);
 }
 /* Compute overlapping of physical addresses */
-#define PA_overlaps(x,szx,y,szy)  overlaps(KA2PA(x),szx,KA2PA(y), szy)
+#define PA_overlaps(x, szx, y, szy)	overlaps(KA2PA(x), szx, KA2PA(y), szy)
+
+#define STRING(arg) STRING_ARG(arg)
+#define STRING_ARG(arg) #arg
 
 #endif
 
- /** @}
+/** @}
  */
-