$NetBSD$

--- src/core/common.h.orig	2008-10-02 15:44:20.000000000 +0200
+++ src/core/common.h
@@ -71,28 +71,6 @@
 #include <stl_config.h>
 #endif
 
-// Basic types definitions
-typedef signed char         s8;
-typedef signed short        s16;
-typedef signed int          s32;
-#ifdef _WIN32
-typedef __int64             s64;
-#else
-typedef signed long long    s64;
-#endif
-
-typedef unsigned char       u8;
-typedef unsigned short      u16;
-typedef unsigned int        u32;
-#ifdef _WIN32
-typedef unsigned __int64    u64;
-#else
-typedef unsigned long long  u64;
-#endif
-
-// Byte type
-typedef u8                  byte;
- 
 // Handles
 typedef void*               handle;
 
@@ -131,6 +109,9 @@ typedef unsigned long       count;
 #   endif
 #endif
 
+// Byte type
+typedef u8                  byte;
+ 
 #if defined( WIN32)
 typedef int                    ssize_t;
 #endif
