5 files changed, 15 insertions, 12 deletions

diff --git a/lib/libmd/md2c.c b/lib/libmd/md2c.c
index d31175882d21b..6659f1bb3dc20 100644
--- a/lib/libmd/md2c.c
+++ b/lib/libmd/md2c.c
@@ -22,11 +22,12 @@
 
 #include "md2.h"
 #include <string.h>
+#include <sys/types.h>
 
 
 typedef unsigned char *POINTER;
-typedef unsigned short int UINT2;
-typedef unsigned long int UINT4;
+typedef u_int16_t UINT2;
+typedef u_int32_t UINT4;
 
 #define PROTO_LIST(list) list
 
diff --git a/lib/libmd/md4.h b/lib/libmd/md4.h
index ea4ec8a7c8177..237ecc811a326 100644
--- a/lib/libmd/md4.h
+++ b/lib/libmd/md4.h
@@ -27,8 +27,8 @@
 #define _MD4_H_
 /* MD4 context. */
 typedef struct MD4Context {
-  unsigned long state[4];	/* state (ABCD) */
-  unsigned long count[2];	/* number of bits, modulo 2^64 (lsb first) */
+  u_int32_t state[4];	/* state (ABCD) */
+  u_int32_t count[2];	/* number of bits, modulo 2^64 (lsb first) */
   unsigned char buffer[64];	/* input buffer */
 } MD4_CTX;
 
diff --git a/lib/libmd/md4c.c b/lib/libmd/md4c.c
index 7e90ec3bd6bf0..c13d07394aaf3 100644
--- a/lib/libmd/md4c.c
+++ b/lib/libmd/md4c.c
@@ -23,12 +23,13 @@
    documentation and/or software.
  */
 
-#include "md4.h"
+#include <sys/types.h>
 #include <string.h>
+#include "md4.h"
 
 typedef unsigned char *POINTER;
-typedef unsigned short int UINT2;
-typedef unsigned long int UINT4;
+typedef u_int16_t UINT2;
+typedef u_int32_t UINT4;
 
 #define PROTO_LIST(list) list
 
diff --git a/lib/libmd/md5.h b/lib/libmd/md5.h
index da0c116c2e0af..422cd7b00210a 100644
--- a/lib/libmd/md5.h
+++ b/lib/libmd/md5.h
@@ -28,8 +28,8 @@ documentation and/or software.
 #define _MD5_H_
 /* MD5 context. */
 typedef struct MD5Context {
-  unsigned long state[4];	/* state (ABCD) */
-  unsigned long count[2];	/* number of bits, modulo 2^64 (lsb first) */
+  u_int32_t state[4];	/* state (ABCD) */
+  u_int32_t count[2];	/* number of bits, modulo 2^64 (lsb first) */
   unsigned char buffer[64];	/* input buffer */
 } MD5_CTX;
 
diff --git a/lib/libmd/md5c.c b/lib/libmd/md5c.c
index 5c35b5b58d0c5..ed4a7b6e6f04a 100644
--- a/lib/libmd/md5c.c
+++ b/lib/libmd/md5c.c
@@ -24,12 +24,13 @@ These notices must be retained in any copies of any part of this
 documentation and/or software.
  */
 
-#include "md5.h"
+#include <sys/types.h>
 #include <string.h>
+#include "md5.h"
 
 typedef unsigned char *POINTER;
-typedef unsigned short int UINT2;
-typedef unsigned long int UINT4;
+typedef u_int16_t UINT2;
+typedef u_int32_t UINT4;
 
 #define PROTO_LIST(list) list