Index: uspace/lib/libc/include/limits.h
===================================================================
--- uspace/lib/libc/include/limits.h	(revision e2ae2fcdf054f0d01d0003941810f8b4544fb596)
+++ uspace/lib/libc/include/limits.h	(revision e0cb57badd1e270ba0e7fa9bcf85db48d10ee037)
@@ -46,9 +46,9 @@
 
 #ifdef __CHAR_UNSIGNED__
-# define CHAR_MIN UCHAR_MIN
-# define CHAR_MAX UCHAR_MAX
+	#define CHAR_MIN UCHAR_MIN
+	#define CHAR_MAX UCHAR_MAX
 #else
-# define CHAR_MIN SCHAR_MIN
-# define CHAR_MAX SCHAR_MAX
+	#define CHAR_MIN SCHAR_MIN
+	#define CHAR_MAX SCHAR_MAX
 #endif
 
@@ -59,4 +59,5 @@
 #define USHRT_MAX MAX_UINT16
 
+/* int */
 #define INT_MIN MIN_INT32
 #define INT_MAX MAX_INT32
@@ -64,4 +65,5 @@
 #define UINT_MAX MAX_UINT32
 
+/* long long int */
 #define LLONG_MIN MIN_INT64
 #define LLONG_MAX MAX_INT64
@@ -69,4 +71,12 @@
 #define ULLONG_MAX MAX_UINT64
 
+/* off64_t */
+#define OFF64_MIN MIN_INT64
+#define OFF64_MAX MAX_INT64
+
+/* aoff64_t */
+#define AOFF64_MIN MIN_UINT64
+#define AOFF64_MAX MAX_UINT64
+
 #endif
 
Index: uspace/lib/libc/include/stdio.h
===================================================================
--- uspace/lib/libc/include/stdio.h	(revision e2ae2fcdf054f0d01d0003941810f8b4544fb596)
+++ uspace/lib/libc/include/stdio.h	(revision e0cb57badd1e270ba0e7fa9bcf85db48d10ee037)
@@ -46,5 +46,5 @@
 #define BUFSIZ  4096
 
-#define DEBUG(fmt, ...) \
+#define DEBUG(fmt, ...)se\
 	{ \
 		char _buf[256]; \
@@ -56,5 +56,11 @@
 #ifndef SEEK_SET
 	#define SEEK_SET  0
+#endif
+
+#ifndef SEEK_CUR
 	#define SEEK_CUR  1
+#endif
+
+#ifndef SEEK_END
 	#define SEEK_END  2
 #endif
@@ -135,7 +141,7 @@
 extern size_t fwrite(const void *, size_t, size_t, FILE *);
 
-extern int fseek(FILE *, long, int);
+extern int fseek(FILE *, off64_t, int);
 extern void rewind(FILE *);
-extern int ftell(FILE *);
+extern off64_t ftell(FILE *);
 extern int feof(FILE *);
 
Index: uspace/lib/libc/include/sys/mman.h
===================================================================
--- uspace/lib/libc/include/sys/mman.h	(revision e2ae2fcdf054f0d01d0003941810f8b4544fb596)
+++ uspace/lib/libc/include/sys/mman.h	(revision e0cb57badd1e270ba0e7fa9bcf85db48d10ee037)
@@ -41,8 +41,8 @@
 #define MAP_FAILED  ((void *) -1)
 
-#define MAP_SHARED       (1 << 0)
-#define MAP_PRIVATE      (1 << 1)
-#define MAP_FIXED        (1 << 2)
-#define MAP_ANONYMOUS    (1 << 3)
+#define MAP_SHARED     (1 << 0)
+#define MAP_PRIVATE    (1 << 1)
+#define MAP_FIXED      (1 << 2)
+#define MAP_ANONYMOUS  (1 << 3)
 
 #define PROTO_READ   AS_AREA_READ
@@ -50,6 +50,6 @@
 #define PROTO_EXEC   AS_AREA_EXEC
 
-extern void *mmap(void  *start, size_t length, int prot, int flags, int fd,
-    off_t offset);
+extern void *mmap(void *start, size_t length, int prot, int flags, int fd,
+    aoff64_t offset);
 extern int munmap(void *start, size_t length);
 
Index: uspace/lib/libc/include/sys/stat.h
===================================================================
--- uspace/lib/libc/include/sys/stat.h	(revision e2ae2fcdf054f0d01d0003941810f8b4544fb596)
+++ uspace/lib/libc/include/sys/stat.h	(revision e0cb57badd1e270ba0e7fa9bcf85db48d10ee037)
@@ -31,5 +31,5 @@
  */
 /** @file
- */ 
+ */
 
 #ifndef LIBC_SYS_STAT_H_
@@ -48,5 +48,5 @@
 	bool is_file;
 	bool is_directory;
-	off_t size;
+	aoff64_t size;
 	dev_handle_t device;
 };
Index: uspace/lib/libc/include/sys/typefmt.h
===================================================================
--- uspace/lib/libc/include/sys/typefmt.h	(revision e2ae2fcdf054f0d01d0003941810f8b4544fb596)
+++ uspace/lib/libc/include/sys/typefmt.h	(revision e0cb57badd1e270ba0e7fa9bcf85db48d10ee037)
@@ -39,15 +39,9 @@
 #include <inttypes.h>
 
-/* off_t */
-#define PRIdOFF "ld"
-#define PRIuOFF "lu"
-#define PRIxOFF "lx"
-#define PRIXOFF "lX"
-
-/* bn_t */
-#define PRIdBN PRId64
-#define PRIuBN PRIu64
-#define PRIxBN PRIx64
-#define PRIXBN PRIX64
+/* off64_t */
+#define PRIdOFF64 PRId64
+#define PRIuOFF64 PRIu64
+#define PRIxOFF64 PRIx64
+#define PRIXOFF64 PRIX64
 
 /* (s)size_t */
Index: uspace/lib/libc/include/sys/types.h
===================================================================
--- uspace/lib/libc/include/sys/types.h	(revision e2ae2fcdf054f0d01d0003941810f8b4544fb596)
+++ uspace/lib/libc/include/sys/types.h	(revision e0cb57badd1e270ba0e7fa9bcf85db48d10ee037)
@@ -38,8 +38,13 @@
 #include <libarch/types.h>
 
-typedef long off_t;
-typedef int mode_t;
-typedef uint64_t bn_t;	/**< Block number type. */
+typedef unsigned int mode_t;
 
+/** Relative offset */
+typedef int64_t off64_t;
+
+/** Absolute offset */
+typedef uint64_t aoff64_t;
+
+/** Unicode code point */
 typedef int32_t wchar_t;
 
Index: uspace/lib/libc/include/unistd.h
===================================================================
--- uspace/lib/libc/include/unistd.h	(revision e2ae2fcdf054f0d01d0003941810f8b4544fb596)
+++ uspace/lib/libc/include/unistd.h	(revision e0cb57badd1e270ba0e7fa9bcf85db48d10ee037)
@@ -47,5 +47,11 @@
 #ifndef SEEK_SET
 	#define SEEK_SET  0
+#endif
+
+#ifndef SEEK_CUR
 	#define SEEK_CUR  1
+#endif
+
+#ifndef SEEK_END
 	#define SEEK_END  2
 #endif
@@ -58,6 +64,6 @@
 extern ssize_t read(int, void *, size_t);
 
-extern off_t lseek(int, off_t, int);
-extern int ftruncate(int, off_t);
+extern off64_t lseek(int, off64_t, int);
+extern int ftruncate(int, aoff64_t);
 
 extern int close(int);
@@ -69,7 +75,7 @@
 extern int chdir(const char *);
 
-extern void _exit(int status) __attribute__ ((noreturn));
-extern int usleep(useconds_t uses);
-extern unsigned int sleep(unsigned int se);
+extern void _exit(int) __attribute__((noreturn));
+extern int usleep(useconds_t);
+extern unsigned int sleep(unsigned int);
 
 #endif