diff --git a/programs/bench.c b/programs/bench.c
index 9b7f98884..5d142529f 100644
--- a/programs/bench.c
+++ b/programs/bench.c
@@ -13,7 +13,6 @@
 *  Compiler Warnings
 ****************************************/
 #ifdef _MSC_VER
-#  define _CRT_SECURE_NO_WARNINGS                /* fopen */
 #  pragma warning(disable : 4127)                /* disable: C4127: conditional expression is constant */
 #endif
 
@@ -21,7 +20,6 @@
 /* *************************************
 *  Includes
 ***************************************/
-#include "platform.h"    /* Large Files support */
 #include "util.h"        /* UTIL_getFileSize, UTIL_sleep */
 #include <stdlib.h>      /* malloc, free */
 #include <string.h>      /* memset */
diff --git a/programs/datagen.c b/programs/datagen.c
index 06b5ab977..d0116b972 100644
--- a/programs/datagen.c
+++ b/programs/datagen.c
@@ -9,14 +9,6 @@
 
 
 
-/* *************************************
-*  Compiler Options
-***************************************/
-#if defined(_MSC_VER)
-#  define _CRT_SECURE_NO_WARNINGS    /* removes Visual warning on strerror() */
-#  define _CRT_SECURE_NO_DEPRECATE   /* removes VS2005 warning on strerror() */
-#endif
-
 /*-************************************
 *  Dependencies
 **************************************/
diff --git a/programs/dibio.c b/programs/dibio.c
index b99e717c2..743d3ef93 100644
--- a/programs/dibio.c
+++ b/programs/dibio.c
@@ -13,7 +13,6 @@
 *  Compiler Warnings
 ****************************************/
 #ifdef _MSC_VER
-#  define _CRT_SECURE_NO_WARNINGS                /* fopen */
 #  pragma warning(disable : 4127)                /* disable: C4127: conditional expression is constant */
 #endif
 
@@ -21,7 +20,6 @@
 /*-*************************************
 *  Includes
 ***************************************/
-#include "platform.h"       /* Large Files support */
 #include "util.h"           /* UTIL_getFileSize, UTIL_getTotalFileSize */
 #include <stdlib.h>         /* malloc, free */
 #include <string.h>         /* memset */
diff --git a/programs/fileio.c b/programs/fileio.c
index e2a90a678..5544fe30a 100644
--- a/programs/fileio.c
+++ b/programs/fileio.c
@@ -11,7 +11,7 @@
 *  Compiler Options
 ***************************************/
 #ifdef _MSC_VER   /* Visual */
-#  define _CRT_SECURE_NO_WARNINGS  /* removes Visual warning on strerror() */
+#  pragma warning(disable : 4127)  /* disable: C4127: conditional expression is constant */
 #  pragma warning(disable : 4204)  /* non-constant aggregate initializer */
 #endif
 #if defined(__MINGW32__) && !defined(_POSIX_SOURCE)
@@ -22,7 +22,6 @@
 /*-*************************************
 *  Includes
 ***************************************/
-#include "platform.h"   /* Large Files support, SET_BINARY_MODE */
 #include "util.h"       /* UTIL_getFileSize */
 #include <stdio.h>      /* fprintf, fopen, fread, _fileno, stdin, stdout */
 #include <stdlib.h>     /* malloc, free */
diff --git a/programs/util.h b/programs/util.h
index 8b480b226..5779fa772 100644
--- a/programs/util.h
+++ b/programs/util.h
@@ -29,6 +29,8 @@ extern "C" {
 *  Compiler Options
 ****************************************/
 #if defined(_MSC_VER)
+#  define _CRT_SECURE_NO_WARNINGS   /* Disable Visual Studio warning messages for fopen, strncpy, strerror */
+#  define _CRT_SECURE_NO_DEPRECATE  /* VS2005 */ 
 #  if (_MSC_VER <= 1800)            /* (1800 = Visual Studio 2013) */
 #    define snprintf sprintf_s      /* snprintf unsupported by Visual <= 2013 */
 #  endif
diff --git a/programs/zstdcli.c b/programs/zstdcli.c
index 978ffcfe0..20698c78d 100644
--- a/programs/zstdcli.c
+++ b/programs/zstdcli.c
@@ -23,7 +23,6 @@
 /*-************************************
 *  Dependencies
 **************************************/
-#include "platform.h" /* IS_CONSOLE, PLATFORM_POSIX_VERSION */
 #include "util.h"     /* UTIL_HAS_CREATEFILELIST, UTIL_createFileList */
 #include <string.h>   /* strcmp, strlen */
 #include <errno.h>    /* errno */
diff --git a/tests/fuzzer.c b/tests/fuzzer.c
index 86d4c6beb..b9b0158ed 100644
--- a/tests/fuzzer.c
+++ b/tests/fuzzer.c
@@ -12,7 +12,6 @@
 *  Compiler specific
 **************************************/
 #ifdef _MSC_VER    /* Visual Studio */
-#  define _CRT_SECURE_NO_WARNINGS     /* fgets */
 #  pragma warning(disable : 4127)     /* disable: C4127: conditional expression is constant */
 #  pragma warning(disable : 4204)     /* disable: C4204: non-constant aggregate initializer */
 #endif
diff --git a/tests/zbufftest.c b/tests/zbufftest.c
index 14b739233..0fda993fc 100644
--- a/tests/zbufftest.c
+++ b/tests/zbufftest.c
@@ -12,7 +12,6 @@
 *  Compiler specific
 **************************************/
 #ifdef _MSC_VER    /* Visual Studio */
-#  define _CRT_SECURE_NO_WARNINGS     /* fgets */
 #  pragma warning(disable : 4127)     /* disable: C4127: conditional expression is constant */
 #  pragma warning(disable : 4146)     /* disable: C4146: minus unsigned expression */
 #endif
diff --git a/tests/zstreamtest.c b/tests/zstreamtest.c
index ce6193085..b52845045 100644
--- a/tests/zstreamtest.c
+++ b/tests/zstreamtest.c
@@ -12,7 +12,6 @@
 *  Compiler specific
 **************************************/
 #ifdef _MSC_VER    /* Visual Studio */
-#  define _CRT_SECURE_NO_WARNINGS     /* fgets */
 #  pragma warning(disable : 4127)     /* disable: C4127: conditional expression is constant */
 #  pragma warning(disable : 4146)     /* disable: C4146: minus unsigned expression */
 #endif