diff --git a/include/freetype/ftimage.h b/include/freetype/ftimage.h
index cd7700906..e90537426 100644
--- a/include/freetype/ftimage.h
+++ b/include/freetype/ftimage.h
@@ -266,14 +266,14 @@ FT_BEGIN_HEADER
    */
   typedef struct  FT_Bitmap_
   {
-    unsigned int    rows;
-    unsigned int    width;
-    int             pitch;
-    unsigned char*  buffer;
-    unsigned short  num_grays;
-    unsigned char   pixel_mode;
-    unsigned char   palette_mode;
-    void*           palette;
+    uint32_t    rows;
+    uint32_t    width;
+    int32_t     pitch;
+    uint8_t*    buffer;
+    uint16_t    num_grays;
+    uint8_t     pixel_mode;
+    uint8_t     palette_mode;
+    void*       palette;
 
   } FT_Bitmap;
 
diff --git a/include/freetype/fttypes.h b/include/freetype/fttypes.h
index f1cc09191..033a79fdd 100644
--- a/include/freetype/fttypes.h
+++ b/include/freetype/fttypes.h
@@ -109,7 +109,7 @@ FT_BEGIN_HEADER
    *   A typedef of unsigned char, used for simple booleans.  As usual,
    *   values 1 and~0 represent true and false, respectively.
    */
-  typedef unsigned char  FT_Bool;
+  typedef uint8_t  FT_Bool;
 
 
   /**************************************************************************
@@ -121,7 +121,7 @@ FT_BEGIN_HEADER
    *   A signed 16-bit integer used to store a distance in original font
    *   units.
    */
-  typedef signed short  FT_FWord;   /* distance in FUnits */
+  typedef int16_t  FT_FWord;   /* distance in FUnits */
 
 
   /**************************************************************************
@@ -133,7 +133,7 @@ FT_BEGIN_HEADER
    *   An unsigned 16-bit integer used to store a distance in original font
    *   units.
    */
-  typedef unsigned short  FT_UFWord;  /* unsigned distance */
+  typedef uint16_t  FT_UFWord;  /* unsigned distance */
 
 
   /**************************************************************************
@@ -144,7 +144,7 @@ FT_BEGIN_HEADER
    * @description:
    *   A simple typedef for the _signed_ char type.
    */
-  typedef signed char  FT_Char;
+  typedef int8_t  FT_Char;
 
 
   /**************************************************************************
@@ -155,7 +155,7 @@ FT_BEGIN_HEADER
    * @description:
    *   A simple typedef for the _unsigned_ char type.
    */
-  typedef unsigned char  FT_Byte;
+  typedef uint8_t  FT_Byte;
 
 
   /**************************************************************************
@@ -199,7 +199,7 @@ FT_BEGIN_HEADER
    * @description:
    *   A typedef for signed short.
    */
-  typedef signed short  FT_Short;
+  typedef int16_t  FT_Short;
 
 
   /**************************************************************************
@@ -210,7 +210,7 @@ FT_BEGIN_HEADER
    * @description:
    *   A typedef for unsigned short.
    */
-  typedef unsigned short  FT_UShort;
+  typedef uint16_t  FT_UShort;
 
 
   /**************************************************************************
@@ -221,7 +221,7 @@ FT_BEGIN_HEADER
    * @description:
    *   A typedef for the int type.
    */
-  typedef signed int  FT_Int;
+  typedef int32_t  FT_Int;
 
 
   /**************************************************************************
@@ -232,7 +232,7 @@ FT_BEGIN_HEADER
    * @description:
    *   A typedef for the unsigned int type.
    */
-  typedef unsigned int  FT_UInt;
+  typedef uint32_t  FT_UInt;
 
 
   /**************************************************************************
@@ -300,7 +300,7 @@ FT_BEGIN_HEADER
    *   The FreeType error code type.  A value of~0 is always interpreted as a
    *   successful operation.
    */
-  typedef int  FT_Error;
+  typedef int32_t  FT_Error;
 
 
   /**************************************************************************