From d9b69400704a7218d07aa875fcb76529beedbfe2 Mon Sep 17 00:00:00 2001
From: chrchr-github <78114321+chrchr-github@users.noreply.github.com>
Date: Thu, 26 Aug 2021 19:36:31 +0200
Subject: [PATCH] =?UTF-8?q?Cleanup:=20unnecessary=20includes,=20fix=20incl?=
 =?UTF-8?q?ude=20order,=20fix=20unreferenced=20va=E2=80=A6=20(#3418)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cli/cppcheckexecutor.cpp | 4 +++-
 cli/threadexecutor.cpp   | 6 ++----
 cli/threadexecutor.h     | 2 --
 lib/tokenize.cpp         | 4 ++--
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/cli/cppcheckexecutor.cpp b/cli/cppcheckexecutor.cpp
index 084250aea..3cef91f87 100644
--- a/cli/cppcheckexecutor.cpp
+++ b/cli/cppcheckexecutor.cpp
@@ -68,11 +68,13 @@
 #include <execinfo.h>
 #endif
 
+#if defined(_WIN32)
 #if defined(_MSC_VER)
 #define USE_WINDOWS_SEH
+#endif
+#include <Windows.h>
 #include <DbgHelp.h>
 #include <TCHAR.H>
-#include <Windows.h>
 #include <excpt.h>
 #endif
 
diff --git a/cli/threadexecutor.cpp b/cli/threadexecutor.cpp
index 21909689b..7d4982ae8 100644
--- a/cli/threadexecutor.cpp
+++ b/cli/threadexecutor.cpp
@@ -32,8 +32,6 @@
 #include <cstring>
 #include <iostream>
 #include <utility>
-#include <future>
-#include <numeric>
 
 #ifdef __SVR4  // Solaris
 #include <sys/loadavg.h>
@@ -48,8 +46,8 @@
 #include <unistd.h>
 #endif
 #ifdef THREADING_MODEL_WIN
-#include <process.h>
-#include <windows.h>
+#include <future>
+#include <numeric>
 #endif
 
 // required for FD_ZERO
diff --git a/cli/threadexecutor.h b/cli/threadexecutor.h
index 91dbc7299..2fc9d3fd0 100644
--- a/cli/threadexecutor.h
+++ b/cli/threadexecutor.h
@@ -33,8 +33,6 @@
 #define THREADING_MODEL_FORK
 #elif defined(_WIN32)
 #define THREADING_MODEL_WIN
-#include <windows.h>
-
 #include "importproject.h"
 #endif
 
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
index 5cac88e1a..3e29e6fc0 100644
--- a/lib/tokenize.cpp
+++ b/lib/tokenize.cpp
@@ -2263,7 +2263,7 @@ bool Tokenizer::simplifyUsing()
             Token::Match(tok, "using namespace %name% ;|::")) {
             try {
                 setScopeInfo(tok, &currentScope, mSettings->debugwarnings);
-            } catch (const std::runtime_error &e) {
+            } catch (const std::runtime_error &) {
                 reportError(tok, Severity::debug, "simplifyUsingUnmatchedBodyEnd",
                             "simplifyUsing: unmatched body end");
             }
@@ -2417,7 +2417,7 @@ bool Tokenizer::simplifyUsing()
                 Token::Match(tok1, "using namespace %name% ;|::")) {
                 try {
                     setScopeInfo(tok1, &currentScope1, mSettings->debugwarnings);
-                } catch (const std::runtime_error &e) {
+                } catch (const std::runtime_error &) {
                     reportError(tok1, Severity::debug, "simplifyUsingUnmatchedBodyEnd",
                                 "simplifyUsing: unmatched body end");
                 }