diff --git a/programs/fileio.c b/programs/fileio.c
index 5544fe3..8305fbd 100644
--- a/programs/fileio.c
+++ b/programs/fileio.c
@@ -22,7 +22,7 @@
 /*-*************************************
 *  Includes
 ***************************************/
-#include "util.h"       /* UTIL_getFileSize */
+#include "util.h"       /* SET_BINARY_MODE, UTIL_getFileSize */
 #include <stdio.h>      /* fprintf, fopen, fread, _fileno, stdin, stdout */
 #include <stdlib.h>     /* malloc, free */
 #include <string.h>     /* strcmp, strlen */
diff --git a/programs/zstdcli.c b/programs/zstdcli.c
index 20698c7..0b6f924 100644
--- a/programs/zstdcli.c
+++ b/programs/zstdcli.c
@@ -23,7 +23,7 @@
 /*-************************************
 *  Dependencies
 **************************************/
-#include "util.h"     /* UTIL_HAS_CREATEFILELIST, UTIL_createFileList */
+#include "util.h"     /* IS_CONSOLE, UTIL_HAS_CREATEFILELIST, UTIL_createFileList */
 #include <string.h>   /* strcmp, strlen */
 #include <errno.h>    /* errno */
 #include "fileio.h"
diff --git a/tests/fuzzer.c b/tests/fuzzer.c
index b9b0158..86d4c6b 100644
--- a/tests/fuzzer.c
+++ b/tests/fuzzer.c
@@ -12,6 +12,7 @@
 *  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 0fda993..14b7392 100644
--- a/tests/zbufftest.c
+++ b/tests/zbufftest.c
@@ -12,6 +12,7 @@
 *  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 b528450..ce61930 100644
--- a/tests/zstreamtest.c
+++ b/tests/zstreamtest.c
@@ -12,6 +12,7 @@
 *  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