Index: kernel/generic/include/print.h
===================================================================
--- kernel/generic/include/print.h	(revision bae6169d4f9b88ee5aeb699d590e0d32155057ac)
+++ kernel/generic/include/print.h	(revision 0772afff96f45fb8d8c7c726230cd0b01c65681f)
@@ -37,5 +37,5 @@
 
 #include <arch/types.h>
-#include <arch/arg.h>
+#include <stdarg.h>
 
 #define EOF (-1)
Index: kernel/generic/include/printf/printf_core.h
===================================================================
--- kernel/generic/include/printf/printf_core.h	(revision bae6169d4f9b88ee5aeb699d590e0d32155057ac)
+++ kernel/generic/include/printf/printf_core.h	(revision 0772afff96f45fb8d8c7c726230cd0b01c65681f)
@@ -37,5 +37,5 @@
 
 #include <typedefs.h>
-#include <arch/arg.h>
+#include <stdarg.h>
 
 /** Structure for specifying output methods for different printf clones. */
Index: kernel/generic/include/stackarg.h
===================================================================
--- kernel/generic/include/stackarg.h	(revision bae6169d4f9b88ee5aeb699d590e0d32155057ac)
+++ 	(revision )
@@ -1,64 +1,0 @@
-/*
- * Copyright (c) 2005 Jakub Jermar
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * - Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * - The name of the author may not be used to endorse or promote products
- *   derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/** @addtogroup generic	
- * @{
- */
-/** @file
- */
-
-/*
- * Variable argument list manipulation macros
- * for architectures using stack to pass arguments.
- */
- 
-#ifndef KERN_STACKARG_H_
-#define KERN_STACKARG_H_
-
-#include <arch/types.h>
-
-typedef struct va_list {
-	int pos;
-	uint8_t *last;
-} va_list;
-
-#define va_start(ap, lst) 		\
-	(ap).pos = sizeof(lst); 			\
-	(ap).last = (uint8_t *) &(lst)
-
-#define va_arg(ap, type) 		\
-	(*((type *)((ap).last + ((ap).pos += sizeof(type)) - sizeof(type))))
-
-#define va_copy(dst, src) dst = src
-#define va_end(ap)
-
-
-#endif
-
-/** @}
- */
Index: kernel/generic/include/stdarg.h
===================================================================
--- kernel/generic/include/stdarg.h	(revision bae6169d4f9b88ee5aeb699d590e0d32155057ac)
+++ kernel/generic/include/stdarg.h	(revision 0772afff96f45fb8d8c7c726230cd0b01c65681f)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup generic	
+/** @addtogroup generic
  * @{
  */
@@ -37,5 +37,5 @@
  * for all architectures with compiler support for __builtin_va_*.
  */
- 
+
 #ifndef KERN_STDARG_H_
 #define KERN_STDARG_H_
@@ -43,8 +43,8 @@
 typedef __builtin_va_list va_list;
 
-#define va_start(ap, last) 		__builtin_va_start(ap, last)
-#define va_arg(ap, type) 		__builtin_va_arg(ap, type)
-#define va_end(ap)			__builtin_va_end(ap)
-#define va_copy(dst, src)		__builtin_va_copy(dst, src)
+#define va_start(ap, last)  __builtin_va_start(ap, last)
+#define va_arg(ap, type)    __builtin_va_arg(ap, type)
+#define va_end(ap)          __builtin_va_end(ap)
+#define va_copy(dst, src)   __builtin_va_copy(dst, src)
 
 #endif