diff --git a/app/actions.cpp b/app/actions.cpp
index 46130052..32062ed8 100644
--- a/app/actions.cpp
+++ b/app/actions.cpp
@@ -45,7 +45,7 @@
 #include <fcntl.h>
 #include <io.h>
 #else
-# include <utime.h>
+#include <utime.h>
 #endif
 
 #if !defined(__MINGW__) && !defined(_MSC_VER)
diff --git a/app/exiv2.cpp b/app/exiv2.cpp
index 64171e9e..eb098c9d 100644
--- a/app/exiv2.cpp
+++ b/app/exiv2.cpp
@@ -965,7 +965,6 @@ static int readFileToBuf(FILE* f,Exiv2::DataBuf& buf)
     return nBytes;
 }
 
-//#define DEBUG
 void Params::getStdin(Exiv2::DataBuf& buf)
 {
     // copy stdin to stdinBuf
diff --git a/app/exiv2app.hpp b/app/exiv2app.hpp
index 84099644..fa34b601 100644
--- a/app/exiv2app.hpp
+++ b/app/exiv2app.hpp
@@ -35,7 +35,6 @@
 #include "getopt.hpp"
 
 // + standard includes
-#include <vector>
 #include <set>
 #include <iostream>
 #include <regex>
@@ -44,12 +43,8 @@
 #ifndef  _MSC_VER
 #include <cstdlib>
 #include <stdio.h>
-#if defined(__CYGWIN__) || defined(__MINGW__)
-#include <windows.h>
-#else
 #include <sys/select.h>
 #endif
-#endif
 
 // *****************************************************************************
 // class definitions
diff --git a/app/getopt.cpp b/app/getopt.cpp
index 9dff95de..3c76ae27 100644
--- a/app/getopt.cpp
+++ b/app/getopt.cpp
@@ -1,9 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#if _MSC_VER >= 1400
-# pragma warning(disable : 4996)
-#endif
-
 // included header files
 #include <assert.h>
 #include <errno.h>
diff --git a/src/futils.cpp b/src/futils.cpp
index 34f76f39..e7334a52 100644
--- a/src/futils.cpp
+++ b/src/futils.cpp
@@ -26,13 +26,9 @@ namespace fs = std::filesystem;
 #include <psapi.h>  // For access to GetModuleFileNameEx
 #endif
 
-#if defined(_MSC_VER)
-#define S_ISREG(m)      (((m) & S_IFMT) == S_IFREG)
-#elif defined(__APPLE__)
-#if defined(EXV_HAVE_LIBPROC_H)
+#if defined(__APPLE__) && defined(EXV_HAVE_LIBPROC_H)
 #include <libproc.h>
 #endif
-#endif
 
 #if defined(__FreeBSD__)
 #include <sys/mount.h>
diff --git a/src/image.cpp b/src/image.cpp
index 9197d9e6..97521ac3 100644
--- a/src/image.cpp
+++ b/src/image.cpp
@@ -51,9 +51,6 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
-#ifdef _MSC_VER
-# define S_ISREG(m)      (((m) & S_IFMT) == S_IFREG)
-#endif
 #ifdef EXV_HAVE_UNISTD_H
 # include <unistd.h>                            // stat
 #endif