diff --git a/cdjpeg.h b/cdjpeg.h
index c633f3f8..8461ee33 100644
--- a/cdjpeg.h
+++ b/cdjpeg.h
@@ -129,29 +129,16 @@ EXTERN(FILE *) write_stdout (void);
 #define READ_BINARY     "r"
 #define WRITE_BINARY    "w"
 #else
-#ifdef VMS                      /* VMS is very nonstandard */
-#define READ_BINARY     "rb", "ctx=stm"
-#define WRITE_BINARY    "wb", "ctx=stm"
-#else                           /* standard ANSI-compliant case */
 #define READ_BINARY     "rb"
 #define WRITE_BINARY    "wb"
 #endif
-#endif
 
 #ifndef EXIT_FAILURE            /* define exit() codes if not provided */
 #define EXIT_FAILURE  1
 #endif
 #ifndef EXIT_SUCCESS
-#ifdef VMS
-#define EXIT_SUCCESS  1         /* VMS is very nonstandard */
-#else
 #define EXIT_SUCCESS  0
 #endif
-#endif
 #ifndef EXIT_WARNING
-#ifdef VMS
-#define EXIT_WARNING  1         /* VMS is very nonstandard */
-#else
 #define EXIT_WARNING  2
 #endif
-#endif
diff --git a/rdjpgcom.c b/rdjpgcom.c
index 02ce90f2..2f0115df 100644
--- a/rdjpgcom.c
+++ b/rdjpgcom.c
@@ -1,9 +1,11 @@
 /*
  * rdjpgcom.c
  *
+ * This file was part of the Independent JPEG Group's software:
  * Copyright (C) 1994-1997, Thomas G. Lane.
  * Modified 2009 by Bill Allombert, Guido Vollbeding.
- * This file is part of the Independent JPEG Group's software.
+ * It was modified by The libjpeg-turbo Project to include only code relevant
+ * to libjpeg-turbo.
  * For conditions of distribution and use, see the accompanying README file.
  *
  * This file contains a very simple stand-alone application that displays
@@ -38,23 +40,15 @@
 #ifdef DONT_USE_B_MODE          /* define mode parameters for fopen() */
 #define READ_BINARY     "r"
 #else
-#ifdef VMS                      /* VMS is very nonstandard */
-#define READ_BINARY     "rb", "ctx=stm"
-#else                           /* standard ANSI-compliant case */
 #define READ_BINARY     "rb"
 #endif
-#endif
 
 #ifndef EXIT_FAILURE            /* define exit() codes if not provided */
 #define EXIT_FAILURE  1
 #endif
 #ifndef EXIT_SUCCESS
-#ifdef VMS
-#define EXIT_SUCCESS  1         /* VMS is very nonstandard */
-#else
 #define EXIT_SUCCESS  0
 #endif
-#endif
 
 
 /*
diff --git a/wrjpgcom.c b/wrjpgcom.c
index 1055d862..ecebd8cc 100644
--- a/wrjpgcom.c
+++ b/wrjpgcom.c
@@ -1,8 +1,10 @@
 /*
  * wrjpgcom.c
  *
+ * This file was part of the Independent JPEG Group's software:
  * Copyright (C) 1994-1997, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
+ * It was modified by The libjpeg-turbo Project to include only code relevant
+ * to libjpeg-turbo.
  * For conditions of distribution and use, see the accompanying README file.
  *
  * This file contains a very simple stand-alone application that inserts
@@ -38,25 +40,16 @@ extern void * malloc ();
 #define READ_BINARY     "r"
 #define WRITE_BINARY    "w"
 #else
-#ifdef VMS                      /* VMS is very nonstandard */
-#define READ_BINARY     "rb", "ctx=stm"
-#define WRITE_BINARY    "wb", "ctx=stm"
-#else                           /* standard ANSI-compliant case */
 #define READ_BINARY     "rb"
 #define WRITE_BINARY    "wb"
 #endif
-#endif
 
 #ifndef EXIT_FAILURE            /* define exit() codes if not provided */
 #define EXIT_FAILURE  1
 #endif
 #ifndef EXIT_SUCCESS
-#ifdef VMS
-#define EXIT_SUCCESS  1         /* VMS is very nonstandard */
-#else
 #define EXIT_SUCCESS  0
 #endif
-#endif
 
 /* Reduce this value if your malloc() can't allocate blocks up to 64K.
  * On DOS, compiling in large model is usually a better solution.