Index: uspace/lib/posix/common.h
===================================================================
--- uspace/lib/posix/common.h	(revision 14aa03aefa0b16c9ab45004d2aae1856af366cb4)
+++ 	(revision )
@@ -1,48 +1,0 @@
-/*
- * Copyright (c) 2011 Jiri Zarevucky
- * 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 libposix
- * @{
- */
-/** @file
- */
-
-#ifndef LIBPOSIX_COMMON_H_
-#define LIBPOSIX_COMMON_H_
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#define not_implemented() (fprintf(stderr, \
-    "Function %s() in file %s at line %d is not implemented\n", \
-    __func__, __FILE__, __LINE__), abort())
-
-#endif /* LIBPOSIX_COMMON_H_ */
-
-/** @}
- */
Index: uspace/lib/posix/fcntl.c
===================================================================
--- uspace/lib/posix/fcntl.c	(revision 14aa03aefa0b16c9ab45004d2aae1856af366cb4)
+++ uspace/lib/posix/fcntl.c	(revision 9b1503e62234718859da7bc16e612911d3b0d07e)
@@ -35,5 +35,5 @@
 #define LIBPOSIX_INTERNAL
 
-#include "common.h"
+#include "internal/common.h"
 #include "fcntl.h"
 
Index: uspace/lib/posix/fnmatch.c
===================================================================
--- uspace/lib/posix/fnmatch.c	(revision 14aa03aefa0b16c9ab45004d2aae1856af366cb4)
+++ uspace/lib/posix/fnmatch.c	(revision 9b1503e62234718859da7bc16e612911d3b0d07e)
@@ -35,5 +35,5 @@
 #define LIBPOSIX_INTERNAL
 
-#include "common.h"
+#include "internal/common.h"
 #include "fnmatch.h"
 
Index: uspace/lib/posix/getopt.c
===================================================================
--- uspace/lib/posix/getopt.c	(revision 14aa03aefa0b16c9ab45004d2aae1856af366cb4)
+++ uspace/lib/posix/getopt.c	(revision 9b1503e62234718859da7bc16e612911d3b0d07e)
@@ -35,5 +35,5 @@
 #define LIBPOSIX_INTERNAL
 
-#include "common.h"
+#include "internal/common.h"
 #include "getopt.h"
 
Index: uspace/lib/posix/internal/common.h
===================================================================
--- uspace/lib/posix/internal/common.h	(revision 9b1503e62234718859da7bc16e612911d3b0d07e)
+++ uspace/lib/posix/internal/common.h	(revision 9b1503e62234718859da7bc16e612911d3b0d07e)
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2011 Jiri Zarevucky
+ * 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 libposix
+ * @{
+ */
+/** @file
+ */
+
+#ifndef LIBPOSIX_COMMON_H_
+#define LIBPOSIX_COMMON_H_
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#define not_implemented() (fprintf(stderr, \
+    "Function %s() in file %s at line %d is not implemented\n", \
+    __func__, __FILE__, __LINE__), abort())
+
+#endif /* LIBPOSIX_COMMON_H_ */
+
+/** @}
+ */
Index: uspace/lib/posix/stdio.c
===================================================================
--- uspace/lib/posix/stdio.c	(revision 14aa03aefa0b16c9ab45004d2aae1856af366cb4)
+++ uspace/lib/posix/stdio.c	(revision 9b1503e62234718859da7bc16e612911d3b0d07e)
@@ -39,5 +39,5 @@
 #include <errno.h>
 
-#include "common.h"
+#include "internal/common.h"
 #include "stdio.h"
 #include "string.h"
Index: uspace/lib/posix/stdlib.c
===================================================================
--- uspace/lib/posix/stdlib.c	(revision 14aa03aefa0b16c9ab45004d2aae1856af366cb4)
+++ uspace/lib/posix/stdlib.c	(revision 9b1503e62234718859da7bc16e612911d3b0d07e)
@@ -37,5 +37,5 @@
 
 #include "stdlib.h"
-#include "common.h"
+#include "internal/common.h"
 
 /**
Index: uspace/lib/posix/strings.c
===================================================================
--- uspace/lib/posix/strings.c	(revision 14aa03aefa0b16c9ab45004d2aae1856af366cb4)
+++ uspace/lib/posix/strings.c	(revision 9b1503e62234718859da7bc16e612911d3b0d07e)
@@ -36,5 +36,5 @@
 #define LIBPOSIX_INTERNAL
 
-#include "common.h"
+#include "internal/common.h"
 #include "strings.h"
 #include "string.h"
Index: uspace/lib/posix/sys/stat.c
===================================================================
--- uspace/lib/posix/sys/stat.c	(revision 14aa03aefa0b16c9ab45004d2aae1856af366cb4)
+++ uspace/lib/posix/sys/stat.c	(revision 9b1503e62234718859da7bc16e612911d3b0d07e)
@@ -37,5 +37,5 @@
 
 #include "stat.h"
-#include "../common.h"
+#include "../internal/common.h"
 #include <mem.h>
 
Index: uspace/lib/posix/time.c
===================================================================
--- uspace/lib/posix/time.c	(revision 14aa03aefa0b16c9ab45004d2aae1856af366cb4)
+++ uspace/lib/posix/time.c	(revision 9b1503e62234718859da7bc16e612911d3b0d07e)
@@ -36,5 +36,5 @@
 #define LIBPOSIX_INTERNAL
 
-#include "common.h"
+#include "internal/common.h"
 #include "time.h"
 
Index: uspace/lib/posix/unistd.c
===================================================================
--- uspace/lib/posix/unistd.c	(revision 14aa03aefa0b16c9ab45004d2aae1856af366cb4)
+++ uspace/lib/posix/unistd.c	(revision 9b1503e62234718859da7bc16e612911d3b0d07e)
@@ -36,5 +36,5 @@
 #define LIBPOSIX_INTERNAL
 
-#include "common.h"
+#include "internal/common.h"
 #include "unistd.h"