Index: uspace/lib/c/include/iso646.h
===================================================================
--- uspace/lib/c/include/iso646.h	(revision 1ae9c07ebd6809ba2f823b92d1cec45c208e2d48)
+++ uspace/lib/c/include/iso646.h	(revision 1ae9c07ebd6809ba2f823b92d1cec45c208e2d48)
@@ -0,0 +1,53 @@
+/*
+ * 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 libc
+ * @{
+ */
+/** @file Alternative spellings.
+ */
+
+#ifndef LIBC_ISO646_H_
+#define LIBC_ISO646_H_
+
+#define and &&
+#define and_eq &=
+#define bitand &
+#define bitor |
+#define compl ˜
+#define not !
+#define not_eq !=
+#define or ||
+#define or_eq |=
+#define xor ^
+#define xor_eq ^=
+
+#endif /* LIBC_ISO646_H_ */
+
+/** @}
+ */
Index: uspace/lib/posix/include/posix/inttypes.h
===================================================================
--- uspace/lib/posix/include/posix/inttypes.h	(revision e6bab27bb26fea43a9f90015a0d2429f8b6757db)
+++ uspace/lib/posix/include/posix/inttypes.h	(revision 1ae9c07ebd6809ba2f823b92d1cec45c208e2d48)
@@ -36,5 +36,7 @@
 #define POSIX_INTTYPES_H_
 
-#include "stdint.h"
+/*
+ * Just a pass-through to libc inttypes.
+ */
 #include "libc/inttypes.h"
 
Index: uspace/lib/posix/include/posix/iso646.h
===================================================================
--- uspace/lib/posix/include/posix/iso646.h	(revision e6bab27bb26fea43a9f90015a0d2429f8b6757db)
+++ uspace/lib/posix/include/posix/iso646.h	(revision 1ae9c07ebd6809ba2f823b92d1cec45c208e2d48)
@@ -1,4 +1,4 @@
 /*
- * Copyright (c) 2011 Jiri Zarevucky
+ * Copyright (c) 2018 Jiri Svoboda
  * All rights reserved.
  *
@@ -30,23 +30,14 @@
  * @{
  */
-/** @file Alternative spellings.
- */
 
 #ifndef POSIX_ISO646_H_
 #define POSIX_ISO646_H_
 
-#define and &&
-#define and_eq &=
-#define bitand &
-#define bitor |
-#define compl ˜
-#define not !
-#define not_eq !=
-#define or ||
-#define or_eq |=
-#define xor ^
-#define xor_eq ^=
+/*
+ * Just a pass-through to libc iso646.
+ */
+#include "libc/iso646.h"
 
-#endif /* POSIX_ISO646_H_ */
+#endif
 
 /** @}
Index: uspace/lib/posix/include/posix/limits.h
===================================================================
--- uspace/lib/posix/include/posix/limits.h	(revision e6bab27bb26fea43a9f90015a0d2429f8b6757db)
+++ uspace/lib/posix/include/posix/limits.h	(revision 1ae9c07ebd6809ba2f823b92d1cec45c208e2d48)
@@ -36,5 +36,4 @@
 #define POSIX_LIMITS_H_
 
-#include "posix/stdint.h"
 #include "libc/limits.h"
 
Index: uspace/lib/posix/include/posix/stdint.h
===================================================================
--- uspace/lib/posix/include/posix/stdint.h	(revision e6bab27bb26fea43a9f90015a0d2429f8b6757db)
+++ uspace/lib/posix/include/posix/stdint.h	(revision 1ae9c07ebd6809ba2f823b92d1cec45c208e2d48)
@@ -1,4 +1,4 @@
 /*
- * Copyright (c) 2011 Petr Koupy
+ * Copyright (c) 2018 Jiri Svoboda
  * All rights reserved.
  *
@@ -30,23 +30,14 @@
  * @{
  */
-/** @file Integer types.
- */
 
 #ifndef POSIX_STDINT_H_
 #define POSIX_STDINT_H_
 
+/*
+ * Just a pass-through to libc stdint.
+ */
 #include "libc/stdint.h"
 
-#undef OFF64_MAX
-#undef OFF64_MIN
-#define OFF64_MAX  INT64_MAX
-#define OFF64_MIN  INT64_MIN
-
-#undef AOFF64_MAX
-#undef AOFF64_MIN
-#define AOFF64_MAX  UINT64_MAX
-#define AOFF64_MIN  UINT64_MIN
-
-#endif /* POSIX_STDINT_H_ */
+#endif
 
 /** @}