Index: uspace/lib/block/block.c
===================================================================
--- uspace/lib/block/block.c	(revision e299dbea7222619405338e2251a7e729a9b1e37a)
+++ uspace/lib/block/block.c	(revision 63e27efdf2fe6d3fa02bbb5ee1da00df5cc07e9d)
@@ -51,6 +51,7 @@
 #include <malloc.h>
 #include <stdio.h>
-#include <sys/typefmt.h>
 #include <stacktrace.h>
+#include <offset.h>
+#include <inttypes.h>
 #include "block.h"
 
Index: uspace/lib/c/include/offset.h
===================================================================
--- uspace/lib/c/include/offset.h	(revision e299dbea7222619405338e2251a7e729a9b1e37a)
+++ uspace/lib/c/include/offset.h	(revision 63e27efdf2fe6d3fa02bbb5ee1da00df5cc07e9d)
@@ -36,5 +36,4 @@
 #define LIBC_OFFSET_H_
 
-#include <libarch/types.h>
 #include <stdint.h>
 
@@ -47,4 +46,9 @@
 #define AOFF64_MAX  UINT64_MAX
 
+/* off64_t, aoff64_t */
+#define PRIdOFF64 PRId64
+#define PRIuOFF64 PRIu64
+#define PRIxOFF64 PRIx64
+#define PRIXOFF64 PRIX64
 
 /** Relative offset */
Index: uspace/lib/c/include/sys/typefmt.h
===================================================================
--- uspace/lib/c/include/sys/typefmt.h	(revision e299dbea7222619405338e2251a7e729a9b1e37a)
+++ 	(revision )
@@ -1,50 +1,0 @@
-/*
- * Copyright (c) 2010 Jiri Svoboda
- * 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 Formatting macros for types from sys/types.h and some other
- * system types.
- */
-
-#ifndef LIBC_SYS_TYPEFMT_H_
-#define LIBC_SYS_TYPEFMT_H_
-
-#include <inttypes.h>
-
-/* off64_t, aoff64_t */
-#define PRIdOFF64 PRId64
-#define PRIuOFF64 PRIu64
-#define PRIxOFF64 PRIx64
-#define PRIXOFF64 PRIX64
-
-#endif
-
-/** @}
- */
Index: uspace/lib/posix/include/posix/sys/types.h
===================================================================
--- uspace/lib/posix/include/posix/sys/types.h	(revision e299dbea7222619405338e2251a7e729a9b1e37a)
+++ uspace/lib/posix/include/posix/sys/types.h	(revision 63e27efdf2fe6d3fa02bbb5ee1da00df5cc07e9d)
@@ -44,4 +44,6 @@
 #include "libc/sys/time.h"
 
+#include <libarch/types.h>
+
 typedef unsigned int __POSIX_DEF__(ino_t);
 typedef unsigned int __POSIX_DEF__(nlink_t);