--- des.h.orig	Fri Mar 25 14:01:48 1994
+++ des.h	Tue Feb 17 13:47:52 1998
@@ -4,6 +4,8 @@
 #ifndef _DES_H_
 #define _DES_H_ 1
 
+#include <rsaref/global.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
--- global.h.orig	Fri Mar 25 14:01:46 1994
+++ global.h	Tue Feb 17 13:47:31 1998
@@ -7,23 +7,17 @@
 #ifndef _GLOBAL_H_
 #define _GLOBAL_H_ 1
 
-/* PROTOTYPES should be set to one if and only if the compiler supports
-     function argument prototyping.
-   The following makes PROTOTYPES default to 1 if it has not already been
-     defined as 0 with C compiler flags.
- */
-#ifndef PROTOTYPES
-#define PROTOTYPES 1
-#endif
+#include <sys/types.h>
+#include <sys/cdefs.h>
 
 /* POINTER defines a generic pointer type */
-typedef unsigned char *POINTER;
+typedef caddr_t POINTER;
 
 /* UINT2 defines a two byte word */
-typedef unsigned short int UINT2;
+typedef u_int16_t UINT2;
 
 /* UINT4 defines a four byte word */
-typedef unsigned long int UINT4;
+typedef u_int32_t UINT4;
 
 #ifndef NULL_PTR
 #define NULL_PTR ((POINTER)0)
@@ -33,14 +27,6 @@
 #define UNUSED_ARG(x) x = *(&x);
 #endif
 
-/* PROTO_LIST is defined depending on how PROTOTYPES is defined above.
-   If using PROTOTYPES, then PROTO_LIST returns the list, otherwise it
-     returns an empty list.  
- */
-#if PROTOTYPES
-#define PROTO_LIST(list) list
-#else
-#define PROTO_LIST(list) ()
-#endif
+#define PROTO_LIST(x) __P(x)
 
 #endif /* end _GLOBAL_H_ */
--- md2.h.orig	Fri Mar 25 14:01:49 1994
+++ md2.h	Tue Feb 17 13:48:43 1998
@@ -22,6 +22,8 @@
 #ifndef _MD2_H_
 #define _MD2_H_ 1
 
+#include <rsaref/global.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
--- r_random.c.orig	Fri Mar 25 14:01:47 1994
+++ r_random.c	Tue Feb 17 13:50:33 1998
@@ -8,7 +8,7 @@
 #include "global.h"
 #include "rsaref.h"
 #include "r_random.h"
-#include "md5.h"
+#include <rsaref/md5.h>
 
 #define RANDOM_BYTES_NEEDED 256
 
--- rsa.h.orig	Fri Mar 25 14:01:45 1994
+++ rsa.h	Tue Feb 17 13:49:54 1998
@@ -5,6 +5,11 @@
      Inc., created 1991. All rights reserved.
  */
 
+#ifndef _RSA_H_
+#define _RSA_H_ 1
+
+#include <rsaref/global.h>
+
 int RSAPublicEncrypt PROTO_LIST 
   ((unsigned char *, unsigned int *, unsigned char *, unsigned int,
     R_RSA_PUBLIC_KEY *, R_RANDOM_STRUCT *));
@@ -17,3 +22,5 @@
 int RSAPrivateDecrypt PROTO_LIST
   ((unsigned char *, unsigned int *, unsigned char *, unsigned int,
     R_RSA_PRIVATE_KEY *));
+
+#endif
--- rsaref.h.orig	Fri Mar 25 14:01:49 1994
+++ rsaref.h	Tue Feb 17 13:48:26 1998
@@ -8,9 +8,9 @@
 #ifndef _RSAREF_H_
 #define _RSAREF_H_ 1
 
-#include "md2.h"
-#include "md5.h"
-#include "des.h"
+#include <rsaref/md2.h>
+#include <rsaref/md5.h>
+#include <rsaref/des.h>
 
 #ifdef __cplusplus
 extern "C" {