diff --git a/apps/apps.h b/apps/apps.h
index 0fbb3a891..f3f8882b2 100644
--- a/apps/apps.h
+++ b/apps/apps.h
@@ -141,12 +141,6 @@ long app_RAND_load_files(char *file); /* `file' is a list of files to read,
 int WIN32_rename(char *oldname,char *newname);
 #endif
 
-/* VMS below version 7.0 doesn't have strcasecmp() */
-#ifdef OPENSSL_SYS_VMS
-#define strcasecmp(str1,str2) VMS_strcasecmp((str1),(str2))
-int VMS_strcasecmp(const char *str1, const char *str2);
-#endif
-
 #ifndef MONOLITH
 
 #define MAIN(a,v)	main(a,v)
diff --git a/crypto/o_str.c b/crypto/o_str.c
index 0bdfb4007..5cdfc4f9a 100644
--- a/crypto/o_str.c
+++ b/crypto/o_str.c
@@ -56,11 +56,12 @@
  *
  */
 
-#include <ctype.h>
-#include <strings.h>
-#include "o_str.h"
+#include <o_str.h>
 #include <openssl/e_os2.h>
 
+#undef strncasecmp
+#undef strcasecmp
+
 int OPENSSL_strncasecmp(const char *str1, const char *str2, size_t n)
 	{
 #if defined(OPENSSL_SYS_VMS)