diff --git a/crypto/aes/.cvsignore b/crypto/aes/.cvsignore
new file mode 100644
index 000000000..c6d03a9db
--- /dev/null
+++ b/crypto/aes/.cvsignore
@@ -0,0 +1,2 @@
+lib
+Makefile.save
diff --git a/crypto/aes/aes_locl.h b/crypto/aes/aes_locl.h
index 5d3c367ec..d49e82993 100644
--- a/crypto/aes/aes_locl.h
+++ b/crypto/aes/aes_locl.h
@@ -52,10 +52,19 @@
 #ifndef HEADER_AES_LOCL_H
 #define HEADER_AES_LOCL_H
 
+#include <openssl/e_os2.h>
+
 #ifdef OPENSSL_NO_AES
 #error AES is disabled.
 #endif
 
+#include <stdio.h>
+#include <stdlib.h>
+
+#if defined(__STDC__) || defined(OPENSSL_SYS_VMS) || defined(M_XENIX) || defined(OPENSSL_SYS_MSDOS)
+#include <string.h>
+#endif
+
 typedef unsigned long u32;
 typedef unsigned short u16;
 typedef unsigned char u8;