Index: src/utils/types.h
===================================================================
--- src/utils/types.h.orig	2011-06-20 15:52:09.000000000 +0200
+++ src/utils/types.h	2011-06-21 16:48:39.324325773 +0200
@@ -9,8 +9,8 @@
 #define BOTAN_TYPES_H__
 
 #include <botan/build.h>
-#include <stddef.h>
-
+#include <cstddef>
+#include <stdint.h>
 /**
 * The primary namespace for the botan library
 */
@@ -19,22 +19,22 @@ namespace Botan {
 /**
 * Typedef representing an unsigned 8-bit quantity
 */
-typedef unsigned char byte;
+typedef uint8_t byte;
 
 /**
 * Typedef representing an unsigned 16-bit quantity
 */
-typedef unsigned short u16bit;
+typedef uint16_t u16bit;
 
 /**
 * Typedef representing an unsigned 32-bit quantity
 */
-typedef unsigned int u32bit;
+typedef uint32_t u32bit;
 
 /**
 * Typedef representing a signed 32-bit quantity
 */
-typedef signed int s32bit;
+typedef int32_t s32bit;
 
 /**
 * Typedef representing an unsigned 64-bit quantity
@@ -44,7 +44,7 @@ typedef signed int s32bit;
 #elif defined(__KCC)
    typedef unsigned __long_long u64bit;
 #elif defined(__GNUG__)
-   __extension__ typedef unsigned long long u64bit;
+   __extension__ typedef uint64_t u64bit;
 #else
    typedef unsigned long long u64bit;
 #endif