cleaned up includes based on include-what-you-use (#3141)

Makefile

@@ -541,7 +541,7 @@ $(libcppdir)/preprocessor.o: lib/preprocessor.cpp externals/simplecpp/simplecpp.
 $(libcppdir)/programmemory.o: lib/programmemory.cpp lib/astutils.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/programmemory.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/utils.h lib/valueflow.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CPPFILESDIR) $(CXXFLAGS) $(UNDEF_STRICT_ANSI) -c -o $(libcppdir)/programmemory.o $(libcppdir)/programmemory.cpp
 
-$(libcppdir)/reverseanalyzer.o: lib/reverseanalyzer.cpp lib/analyzer.h lib/astutils.h lib/config.h lib/errortypes.h lib/forwardanalyzer.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/reverseanalyzer.h lib/settings.h lib/standards.h lib/suppressions.h lib/symboldatabase.h lib/templatesimplifier.h lib/timer.h lib/token.h lib/utils.h lib/valueflow.h lib/valueptr.h
+$(libcppdir)/reverseanalyzer.o: lib/reverseanalyzer.cpp lib/analyzer.h lib/astutils.h lib/config.h lib/errortypes.h lib/forwardanalyzer.h lib/library.h lib/mathlib.h lib/reverseanalyzer.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/utils.h lib/valueflow.h lib/valueptr.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CPPFILESDIR) $(CXXFLAGS) $(UNDEF_STRICT_ANSI) -c -o $(libcppdir)/reverseanalyzer.o $(libcppdir)/reverseanalyzer.cpp
 
 $(libcppdir)/settings.o: lib/settings.cpp lib/astutils.h lib/config.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/summaries.h lib/suppressions.h lib/timer.h lib/utils.h lib/valueflow.h
@@ -625,7 +625,7 @@ test/testcharvar.o: test/testcharvar.cpp lib/astutils.h lib/check.h lib/checkoth
 test/testclangimport.o: test/testclangimport.cpp lib/astutils.h lib/clangimport.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/symboldatabase.h lib/templatesimplifier.h lib/timer.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h test/testsuite.h
 	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CPPFILESDIR) $(CXXFLAGS) $(UNDEF_STRICT_ANSI) -c -o test/testclangimport.o test/testclangimport.cpp
 
-test/testclass.o: test/testclass.cpp externals/tinyxml2/tinyxml2.h lib/astutils.h lib/check.h lib/checkclass.h lib/config.h lib/ctu.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/symboldatabase.h lib/templatesimplifier.h lib/timer.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h test/testsuite.h
+test/testclass.o: test/testclass.cpp externals/tinyxml2/tinyxml2.h lib/astutils.h lib/check.h lib/checkclass.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/symboldatabase.h lib/templatesimplifier.h lib/timer.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h test/testsuite.h
 	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CPPFILESDIR) $(CXXFLAGS) $(UNDEF_STRICT_ANSI) -c -o test/testclass.o test/testclass.cpp
 
 test/testcmdlineparser.o: test/testcmdlineparser.cpp cli/cmdlineparser.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/timer.h lib/utils.h test/redirect.h test/testsuite.h

gui/aboutdialog.cpp

@@ -16,11 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QDialog>
-#include <QWidget>
-#include <QString>
 #include "aboutdialog.h"
 
+#include <QDialogButtonBox>
+#include <QLabel>
+
 AboutDialog::AboutDialog(const QString &version, const QString &extraVersion, QWidget *parent)
     : QDialog(parent)
 {

gui/applicationdialog.cpp

@@ -16,12 +16,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QString>
-#include <QWidget>
-#include <QDialog>
+#include "applicationdialog.h"
+
+#include <QDialogButtonBox>
 #include <QFileDialog>
 #include <QMessageBox>
-#include "applicationdialog.h"
+#include <QPushButton>
+
 #include "application.h"
 #include "common.h"
 

gui/applicationlist.cpp

@@ -16,13 +16,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "applicationlist.h"
+
 #include <QFileInfo>
-#include <QObject>
 #include <QSettings>
 #include <QStringList>
 
 #include "common.h"
-#include "applicationlist.h"
 #include "application.h"
 
 #include <cstdlib>

gui/checkstatistics.cpp

@@ -16,10 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QDebug>
-#include <QStringList>
 #include "checkstatistics.h"
 
+#include <QDebug>
+
 CheckStatistics::CheckStatistics(QObject *parent)
     : QObject(parent)
 {

gui/checkstatistics.h

@@ -20,6 +20,9 @@
 #define CHECKSTATISTICS_H
 
 #include <QObject>
+#include <QMap>
+#include <QString>
+
 #include "showtypes.h"
 
 /// @addtogroup GUI

gui/checkthread.cpp

@@ -16,17 +16,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QApplication>
-#include <QString>
+#include "checkthread.h"
+
 #include <QDebug>
 #include <QDir>
 #include <QFile>
-#include <QFileInfo>
-#include <QJsonDocument>
-#include <QJsonObject>
 #include <QProcess>
 #include <QSettings>
-#include "checkthread.h"
 #include "erroritem.h"
 #include "threadresult.h"
 #include "cppcheck.h"

gui/codeeditor.cpp

@@ -1,6 +1,7 @@
-#include <QtWidgets>
-#include <QShortcut>
 #include "codeeditor.h"
+
+#include <QShortcut>
+#include <QPainter>
 #include "codeeditorstyle.h"
 
 

gui/codeeditor.h

@@ -3,7 +3,6 @@
 
 #include <QSyntaxHighlighter>
 #include <QPlainTextEdit>
-#include <QObject>
 #include <QRegularExpression>
 
 class CodeEditorStyle;

gui/codeeditstyledialog.cpp

@@ -16,11 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "codeeditor.h"
 #include "codeeditstyledialog.h"
+
+#include "codeeditor.h"
 #include "codeeditstylecontrols.h"
-#include <QHBoxLayout>
-#include <QVBoxLayout>
 #include <QFormLayout>
 #include <QDialogButtonBox>
 

gui/codeeditstyledialog.h

@@ -20,12 +20,12 @@
 #define CODEEDITSTYLEDIALOG_H
 
 #include <QDialog>
-#include <QPushButton>
 #include "codeeditorstyle.h"
 
 class CodeEditor;
 class SelectColorButton;
 class SelectFontWeightCombo;
+class QPushButton;
 
 class StyleEditDialog : public QDialog {
     Q_OBJECT

gui/cppchecklibrarydata.cpp

@@ -21,7 +21,6 @@
 #include <stdexcept>
 
 #include <QXmlStreamReader>
-#include <QXmlStreamWriter>
 #include <QVariant>
 
 const unsigned int CppcheckLibraryData::Function::Arg::ANY = ~0U;

gui/cppchecklibrarydata.h

@@ -22,7 +22,8 @@
 #include <QList>
 #include <QString>
 #include <QStringList>
-#include <QIODevice>
+
+class QIODevice;
 
 class CppcheckLibraryData {
 public:

gui/csvreport.cpp

@@ -16,13 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QObject>
-#include <QString>
+#include "csvreport.h"
+
 #include <QDir>
-#include <QTextStream>
 #include "erroritem.h"
 #include "report.h"
-#include "csvreport.h"
 
 CsvReport::CsvReport(const QString &filename) :
     Report(filename)

gui/erroritem.h

@@ -20,8 +20,8 @@
 #define ERRORITEM_H
 
 #include <QString>
-#include <QStringList>
 #include <QMetaType>
+#include <QList>
 #include "errorlogger.h"
 
 /// @addtogroup GUI

gui/filelist.cpp

@@ -16,10 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QString>
-#include <QDir>
-#include <QFileInfo>
 #include "filelist.h"
+
+#include <QDir>
 #include "pathmatch.h"
 
 QStringList FileList::getDefaultFilters()

gui/fileviewdialog.cpp

@@ -16,11 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "fileviewdialog.h"
+
 #include <QFile>
 #include <QByteArray>
 #include <QMessageBox>
 #include <QTextEdit>
-#include "fileviewdialog.h"
 
 FileViewDialog::FileViewDialog(const QString &file,
                                const QString &title,

gui/libraryaddfunctiondialog.cpp

@@ -2,7 +2,6 @@
 #include "ui_libraryaddfunctiondialog.h"
 
 #include <QRegExp>
-#include <QValidator>
 
 LibraryAddFunctionDialog::LibraryAddFunctionDialog(QWidget *parent) :
     QDialog(parent),

gui/librarydialog.cpp

@@ -26,7 +26,6 @@
 #include <QFile>
 #include <QFileDialog>
 #include <QTextStream>
-#include <QInputDialog>
 #include <QMessageBox>
 
 // TODO: get/compare functions from header

gui/librarydialog.h

@@ -20,7 +20,6 @@
 #define LIBRARYDIALOG_H
 
 #include <QDialog>
-#include <QFile>
 
 #include "cppchecklibrarydata.h"
 

gui/main.cpp

@@ -18,7 +18,6 @@
 
 #include <QApplication>
 #include <QCoreApplication>
-#include <QTextCodec>
 #include <QMetaType>
 #include <QStringList>
 #include <QSettings>

gui/mainwindow.cpp

@@ -16,18 +16,19 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "mainwindow.h"
+
 #include <QApplication>
 #include <QDebug>
 #include <QMessageBox>
 #include <QFileInfo>
 #include <QDir>
-#include <QDesktopServices>
-#include <QUrl>
 #include <QAction>
 #include <QActionGroup>
 #include <QFile>
 #include <QInputDialog>
-#include "mainwindow.h"
+#include <QTimer>
+#include <QSettings>
 
 #include "cppcheck.h"
 

gui/mainwindow.h

@@ -20,10 +20,7 @@
 #define MAINWINDOW_H
 
 #include <QMainWindow>
-#include <QSettings>
 #include <QFileDialog>
-#include <QActionGroup>
-#include <QTimer>
 #include <QStringList>
 
 #include "settings.h"
@@ -35,6 +32,9 @@ class TranslationHandler;
 class ScratchPad;
 class ProjectFile;
 class QAction;
+class QActionGroup;
+class QSettings;
+class QTimer;
 
 /// @addtogroup GUI
 /// @{

gui/platforms.h

@@ -22,9 +22,10 @@
 #include <QObject>
 #include <QString>
 #include <QList>
-#include <QAction>
 #include "settings.h"
 
+class QAction;
+
 /// @addtogroup GUI
 /// @{
 

gui/printablereport.cpp

@@ -16,8 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "erroritem.h"
 #include "printablereport.h"
+
+#include "erroritem.h"
 #include <QDir>
 
 PrintableReport::PrintableReport() :

gui/projectfile.cpp

@@ -16,13 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QObject>
-#include <QString>
-#include <QXmlStreamReader>
-#include <QXmlStreamWriter>
+#include "projectfile.h"
+
 #include <QFile>
 #include <QDir>
-#include "projectfile.h"
+#include <QXmlStreamReader>
 #include "common.h"
 #include "importproject.h"
 

gui/projectfile.h

@@ -23,12 +23,14 @@
 #include <QObject>
 #include <QString>
 #include <QStringList>
-#include <QXmlStreamReader>
 
 #include "suppressions.h"
 
 #include <settings.h>
 
+class QXmlStreamReader;
+class QXmlStreamWriter;
+
 /// @addtogroup GUI
 /// @{
 

gui/projectfiledialog.cpp

@@ -16,20 +16,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QWidget>
-#include <QDialog>
-#include <QString>
-#include <QStringList>
+#include "projectfiledialog.h"
+
 #include <QFileInfo>
 #include <QFileDialog>
-#include <QInputDialog>
 #include <QDir>
 #include <QSettings>
-#include <QProcess>
-#include <QListView>
 #include "common.h"
 #include "newsuppressiondialog.h"
-#include "projectfiledialog.h"
 #include "checkthread.h"
 #include "projectfile.h"
 #include "library.h"

gui/projectfiledialog.h

@@ -22,13 +22,13 @@
 #include <QDialog>
 #include <QString>
 #include <QStringList>
-#include <QCheckBox>
 
 #include "suppressions.h"
 
 #include "ui_projectfiledialog.h"
 
 class QWidget;
+class QCheckBox;
 
 /// @addtogroup GUI
 /// @{

gui/report.cpp

@@ -16,8 +16,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QString>
-#include <QFile>
 #include "report.h"
 
 Report::Report(const QString &filename) :

gui/resultstree.cpp

@@ -16,11 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "resultstree.h"
+
 #include <QApplication>
-#include <QWidget>
 #include <QDebug>
-#include <QString>
-#include <QStringList>
 #include <QList>
 #include <QMap>
 #include <QVariant>
@@ -35,12 +34,11 @@
 #include <QClipboard>
 #include <QDesktopServices>
 #include <QUrl>
-#include <QContextMenuEvent>
-#include <QModelIndex>
+#include <QKeyEvent>
+#include <QSettings>
 #include "common.h"
 #include "erroritem.h"
 #include "applicationlist.h"
-#include "resultstree.h"
 #include "report.h"
 #include "application.h"
 #include "projectfile.h"

gui/resultstree.h

@@ -22,9 +22,6 @@
 
 #include <QTreeView>
 #include <QStandardItemModel>
-#include <QStandardItem>
-#include <QSettings>
-#include <QContextMenuEvent>
 #include "errortypes.h"
 #include "showtypes.h"
 
@@ -36,6 +33,8 @@ class QModelIndex;
 class QWidget;
 class QItemSelectionModel;
 class ThreadHandler;
+class QContextMenuEvent;
+class QSettings;
 
 /// @addtogroup GUI
 /// @{

gui/resultsview.cpp

@@ -16,12 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "resultsview.h"
+
 #include <QMessageBox>
 #include <QStandardItemModel>
-#include <QStandardItem>
 #include <QVariant>
-#include <QString>
-#include <QModelIndex>
 #include <QPrinter>
 #include <QPrintDialog>
 #include <QPrintPreviewDialog>
@@ -30,7 +29,6 @@
 #include <QDate>
 #include <QMenu>
 #include <QClipboard>
-#include "resultsview.h"
 #include "common.h"
 #include "erroritem.h"
 #include "txtreport.h"
@@ -38,7 +36,6 @@
 #include "xmlreportv2.h"
 #include "csvreport.h"
 #include "printablereport.h"
-#include "applicationlist.h"
 #include "checkstatistics.h"
 #include "path.h"
 #include "codeeditorstyle.h"

gui/resultsview.h

@@ -21,7 +21,6 @@
 #define RESULTSVIEW_H
 
 
-#include <QWidget>
 #include "report.h"
 #include "showtypes.h"
 #include "ui_resultsview.h"

gui/scratchpad.cpp

@@ -18,7 +18,6 @@
 
 #include "scratchpad.h"
 #include "mainwindow.h"
-#include <QWidget>
 
 ScratchPad::ScratchPad(MainWindow& mainWindow)
     : QDialog(&mainWindow)

gui/settingsdialog.cpp

@@ -16,16 +16,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "settingsdialog.h"
 
-#include <QDialog>
 #include <QWidget>
 #include <QList>
-#include <QListWidgetItem>
-#include <QSettings>
 #include <QFileDialog>
 #include <QFileInfo>
 #include <QThread>
-#include "settingsdialog.h"
+#include <QSettings>
 #include "applicationdialog.h"
 #include "applicationlist.h"
 #include "translationhandler.h"

gui/showtypes.cpp

@@ -16,10 +16,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QSettings>
-#include "common.h"
 #include "showtypes.h"
 
+#include "common.h"
+
+#include <QSettings>
+#include <QMap>
+#include <QString>
+
 ShowTypes::ShowTypes()
 {
     load();

gui/showtypes.h

@@ -19,10 +19,10 @@
 #ifndef SHOWTYPES_H
 #define SHOWTYPES_H
 
-#include "errortypes.h"
-
 #include <QVariant>
 
+#include "errortypes.h"
+
 /// @addtogroup GUI
 /// @{
 

gui/statsdialog.cpp

@@ -15,17 +15,19 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
+#include "statsdialog.h"
+
 #include <QPrinter>
 #include <QDate>
 #include <QFileDialog>
 #include <QFileInfo>
 #include <QTextDocument>
 #include <QWidget>
-#include <QString>
 #include <QClipboard>
 #include <QMimeData>
+
 #include "projectfile.h"
-#include "statsdialog.h"
 #include "checkstatistics.h"
 #include "common.h"
 

gui/threadhandler.cpp

@@ -16,14 +16,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QObject>
+#include "threadhandler.h"
+
 #include <QFileInfo>
-#include <QStringList>
 #include <QDebug>
+#include <QSettings>
 #include "common.h"
 #include "settings.h"
 #include "checkthread.h"
-#include "threadhandler.h"
 #include "resultsview.h"
 
 ThreadHandler::ThreadHandler(QObject *parent) :

gui/threadresult.cpp

@@ -16,16 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "threadresult.h"
+
 #include <QFile>
-#include <QString>
-#include <QMutexLocker>
-#include <QList>
-#include <QStringList>
-#include <QDebug>
 #include "common.h"
 #include "erroritem.h"
 #include "errorlogger.h"
-#include "threadresult.h"
 
 ThreadResult::ThreadResult() : QObject(), ErrorLogger(), mMaxProgress(0), mProgress(0), mFilesChecked(0), mTotalFiles(0)
 {

gui/translationhandler.cpp

@@ -16,13 +16,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "translationhandler.h"
+
 #include <QApplication>
 #include <QFile>
-#include <QDebug>
 #include <QLocale>
 #include <QMessageBox>
 #include <QFileInfo>
-#include "translationhandler.h"
+#include <QTranslator>
 #include "common.h"
 
 

gui/translationhandler.h

@@ -20,10 +20,11 @@
 #define TRANSLATIONHANDLER_H
 
 #include <QStringList>
-#include <QTranslator>
 #include <QObject>
 #include <QList>
 
+class QTranslator;
+
 /// @addtogroup GUI
 /// @{
 

gui/txtreport.cpp

@@ -16,9 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "txtreport.h"
+
 #include <QDir>
 #include "erroritem.h"
-#include "txtreport.h"
 
 TxtReport::TxtReport(const QString &filename) :
     Report(filename)

gui/xmlreport.cpp

@@ -16,12 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QObject>
-#include <QString>
+#include "xmlreport.h"
+
 #include <QFile>
 #include <QXmlStreamReader>
 #include "report.h"
-#include "xmlreport.h"
 
 static const char ResultElementName[] = "results";
 static const char VersionAttribute[] = "version";

gui/xmlreportv2.cpp

@@ -16,16 +16,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QObject>
-#include <QString>
-#include <QList>
+#include "xmlreportv2.h"
+
 #include <QDir>
 #include <QXmlStreamWriter>
 #include <QDebug>
 #include "report.h"
 #include "erroritem.h"
 #include "xmlreport.h"
-#include "xmlreportv2.h"
 #include "cppcheck.h"
 
 static const QString ResultElementName = "results";

gui/xmlreportv2.h

@@ -19,12 +19,12 @@
 #ifndef XML_REPORTV2_H
 #define XML_REPORTV2_H
 
-#include <QObject>
 #include <QString>
-#include <QXmlStreamReader>
-#include <QXmlStreamWriter>
 #include "xmlreport.h"
 
+class QXmlStreamReader;
+class QXmlStreamWriter;
+
 /// @addtogroup GUI
 /// @{
 

lib/astutils.h

@@ -28,12 +28,10 @@
 #include <vector>
 
 #include "errortypes.h"
-#include "mathlib.h"
 #include "utils.h"
 
 class Function;
 class Library;
-class Scope;
 class Settings;
 class Token;
 class Variable;

lib/check.cpp

@@ -24,6 +24,7 @@
 #include "settings.h"
 #include "tokenize.h"
 
+#include <cctype>
 #include <iostream>
 
 //---------------------------------------------------------------------------

lib/check64bit.cpp

@@ -27,7 +27,6 @@
 #include "token.h"
 #include "tokenize.h"
 
-#include <cstddef>
 
 //---------------------------------------------------------------------------
 

lib/checkautovariables.cpp

@@ -30,9 +30,7 @@
 #include "tokenize.h"
 #include "valueflow.h"
 
-#include <cstddef>
 #include <list>
-#include <functional>
 
 //---------------------------------------------------------------------------
 

lib/checkbool.cpp

@@ -21,13 +21,11 @@
 #include "checkbool.h"
 
 #include "astutils.h"
-#include "mathlib.h"
 #include "settings.h"
 #include "symboldatabase.h"
 #include "token.h"
 #include "tokenize.h"
 
-#include <cstddef>
 #include <list>
 //---------------------------------------------------------------------------
 

lib/checkboost.cpp

@@ -21,8 +21,6 @@
 #include "symboldatabase.h"
 #include "token.h"
 
-#include <cstddef>
-
 // Register this check class (by creating a static instance of it)
 namespace {
     CheckBoost instance;

lib/checkbufferoverrun.h

@@ -29,7 +29,6 @@
 #include "symboldatabase.h"
 #include "valueflow.h"
 
-#include <cstddef>
 #include <list>
 #include <map>
 #include <string>

lib/checkclass.h

@@ -33,12 +33,8 @@
 #include <vector>
 
 class ErrorLogger;
-class Function;
-class Scope;
 class Settings;
-class SymbolDatabase;
 class Token;
-class Type;
 
 /// @addtogroup Checks
 /// @{

lib/checkcondition.cpp

@@ -30,12 +30,9 @@
 #include "valueflow.h"
 
 #include <algorithm>
-#include <cstddef>
 #include <limits>
 #include <list>
-#include <ostream>
 #include <set>
-#include <stack>
 #include <utility>
 
 // CWE ids used

lib/checkexceptionsafety.cpp

@@ -22,7 +22,6 @@
 #include "settings.h"
 #include "symboldatabase.h"
 
-#include <cstddef>
 #include <set>
 #include <utility>
 

lib/checkfunctions.cpp

@@ -30,10 +30,7 @@
 #include "tokenize.h"
 #include "valueflow.h"
 
-#include <cmath>
-#include <cstddef>
 #include <iomanip>
-#include <ostream>
 #include <vector>
 
 //---------------------------------------------------------------------------

lib/checkleakautovar.cpp

@@ -32,10 +32,8 @@
 #include "token.h"
 #include "tokenize.h"
 
-#include <cstddef>
 #include <iostream>
 #include <list>
-#include <stack>
 #include <utility>
 
 //---------------------------------------------------------------------------

lib/checkmemoryleak.cpp

@@ -29,8 +29,6 @@
 #include "utils.h"
 
 #include <algorithm>
-#include <cstddef>
-#include <set>
 
 //---------------------------------------------------------------------------
 

lib/checknullpointer.cpp

@@ -31,7 +31,6 @@
 
 #include <algorithm>
 #include <cctype>
-#include <cstddef>
 #include <set>
 //---------------------------------------------------------------------------
 

lib/checkother.cpp

@@ -36,8 +36,8 @@
 #include <algorithm> // find_if()
 #include <list>
 #include <map>
-#include <ostream>
 #include <utility>
+#include <cctype>
 //---------------------------------------------------------------------------
 
 // Register this check class (by creating a static instance of it)

lib/checkother.h

@@ -27,7 +27,6 @@
 #include "errortypes.h"
 #include "utils.h"
 
-#include <cstddef>
 #include <string>
 #include <vector>
 

lib/checkpostfixoperator.cpp

@@ -27,8 +27,6 @@
 #include "symboldatabase.h"
 #include "token.h"
 
-#include <cstddef>
-
 //---------------------------------------------------------------------------
 
 

lib/checksizeof.cpp

@@ -25,7 +25,6 @@
 #include "token.h"
 #include "tokenize.h"
 
-#include <cstddef>
 //---------------------------------------------------------------------------
 
 // Register this check class (by creating a static instance of it)

lib/checkstl.cpp

@@ -33,14 +33,12 @@
 #include "valueflow.h"
 
 #include <algorithm>
-#include <cstddef>
 #include <iterator>
 #include <list>
 #include <map>
 #include <set>
 #include <sstream>
 #include <unordered_map>
-#include <unordered_set>
 #include <utility>
 
 // Register this check class (by creating a static instance of it)

lib/checkstring.cpp

@@ -31,7 +31,6 @@
 #include <cstddef>
 #include <list>
 #include <vector>
-#include <stack>
 #include <utility>
 
 //---------------------------------------------------------------------------

lib/checktype.cpp

@@ -20,7 +20,6 @@
 //---------------------------------------------------------------------------
 #include "checktype.h"
 
-#include "astutils.h"
 #include "mathlib.h"
 #include "platform.h"
 #include "settings.h"
@@ -29,10 +28,7 @@
 #include "tokenize.h"
 
 #include <cmath>
-#include <cstddef>
 #include <list>
-#include <ostream>
-#include <stack>
 //---------------------------------------------------------------------------
 
 // Register this check class (by creating a static instance of it)

lib/checkuninitvar.cpp

@@ -32,10 +32,8 @@
 #include "valueflow.h"
 
 #include <cassert>
-#include <cstddef>
 #include <list>
 #include <map>
-#include <stack>
 #include <utility>
 
 

lib/checkunusedfunctions.cpp

@@ -33,7 +33,6 @@
 #include <algorithm>
 #include <cstdlib>
 #include <cstring>
-#include <istream>
 #include <utility>
 //---------------------------------------------------------------------------
 

lib/clangimport.cpp

@@ -28,6 +28,7 @@
 #include <memory>
 #include <stack>
 #include <vector>
+#include <cctype>
 
 static const std::string AccessSpecDecl = "AccessSpecDecl";
 static const std::string ArraySubscriptExpr = "ArraySubscriptExpr";

lib/cppcheck.h

@@ -28,7 +28,6 @@
 #include "importproject.h"
 #include "settings.h"
 
-#include <cstddef>
 #include <functional>
 #include <istream>
 #include <list>

lib/errorlogger.cpp

@@ -32,7 +32,6 @@
 #include <cstdlib>
 #include <cstring>
 #include <iomanip>
-#include <functional> // std::hash
 
 InternalError::InternalError(const Token *tok, const std::string &errorMsg, Type type) :
     token(tok), errorMessage(errorMsg), type(type)

lib/errorlogger.h

@@ -25,7 +25,6 @@
 #include "errortypes.h"
 #include "suppressions.h"
 
-#include <cstddef>
 #include <fstream>
 #include <list>
 #include <string>

lib/exprengine.cpp

@@ -138,6 +138,7 @@
 #include "symboldatabase.h"
 #include "tokenize.h"
 
+#include <cctype>
 #include <limits>
 #include <memory>
 #include <iostream>

lib/exprengine.h

@@ -29,7 +29,6 @@
 #include <memory>
 #include <string>
 #include <vector>
-#include <cstdint>
 
 class ErrorLogger;
 class Tokenizer;

lib/forwardanalyzer.h

@@ -20,7 +20,6 @@
 #define forwardanalyzerH
 
 #include "analyzer.h"
-#include <vector>
 
 class Settings;
 class Token;

lib/importproject.cpp

@@ -31,7 +31,6 @@
 #include <cstring>
 #include <fstream>
 #include <utility>
-#include <sstream>
 
 
 ImportProject::ImportProject()

lib/path.cpp

@@ -25,9 +25,7 @@
 #include <algorithm>
 #include <cctype>
 #include <cstdlib>
-#include <cstring>
 #include <fstream>
-#include <sstream>
 
 #ifndef _WIN32
 #include <unistd.h>

lib/preprocessor.cpp

@@ -28,7 +28,6 @@
 
 #include <algorithm>
 #include <cstdint>
-#include <cstring>
 #include <iterator> // back_inserter
 #include <utility>
 

lib/programmemory.cpp

@@ -7,7 +7,6 @@
 #include "valueflow.h"
 #include <algorithm>
 #include <cassert>
-#include <cstdio>
 #include <limits>
 #include <memory>
 

lib/programmemory.h

@@ -1,7 +1,6 @@
 #ifndef GUARD_PROGRAMMEMORY_H
 #define GUARD_PROGRAMMEMORY_H
 
-#include "config.h"
 #include "utils.h"
 #include "valueflow.h" // needed for alias
 #include "mathlib.h"

lib/reverseanalyzer.cpp

@@ -3,13 +3,11 @@
 #include "astutils.h"
 #include "errortypes.h"
 #include "forwardanalyzer.h"
-#include "settings.h"
 #include "symboldatabase.h"
 #include "token.h"
 #include "valueptr.h"
 
 #include <algorithm>
-#include <functional>
 
 struct ReverseTraversal {
     ReverseTraversal(const ValuePtr<Analyzer>& analyzer, const Settings* settings)

lib/symboldatabase.cpp

@@ -33,7 +33,6 @@
 
 #include <algorithm>
 #include <cassert>
-#include <climits>
 #include <cstring>
 #include <limits>
 #include <iomanip>

lib/symboldatabase.h

@@ -27,6 +27,7 @@
 #include "token.h"
 #include "utils.h"
 
+#include <cctype>
 #include <cstddef>
 #include <list>
 #include <map>

lib/tokenize.cpp

@@ -39,7 +39,6 @@
 #include <cassert>
 #include <cctype>
 #include <cstring>
-#include <ctime>
 #include <iostream>
 #include <set>
 #include <stack>

lib/utils.cpp

@@ -20,6 +20,7 @@
 
 #include <utility>
 #include <stack>
+#include <cctype>
 
 
 int caseInsensitiveStringCompare(const std::string &lhs, const std::string &rhs)

lib/utils.h

@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-#include <cctype>
 #include <cstddef>
 #include <string>
 #include <vector>

oss-fuzz/translate.cpp

@@ -1,6 +1,6 @@
 
-#include <fstream>
 #include <iostream>
+#include <fstream>
 
 #include "type2.h"
 

test/options.cpp

@@ -16,8 +16,6 @@
 
 #include "options.h"
 
-#include <iterator>
-
 options::options(int argc, const char* const argv[])
     :mWhichTests(argv + 1, argv + argc)
     ,mQuiet(mWhichTests.count("-q") != 0)

test/testbufferoverrun.cpp

@@ -27,9 +27,7 @@
 #include "tokenize.h"
 
 #include <tinyxml2.h>
-#include <climits>
 #include <list>
-#include <ostream>
 #include <string>
 
 

test/testclass.cpp

@@ -19,7 +19,6 @@
 #include <tinyxml2.h>
 
 #include "checkclass.h"
-#include "ctu.h"
 #include "library.h"
 #include "settings.h"
 #include "testsuite.h"

test/testcmdlineparser.cpp

@@ -27,7 +27,6 @@
 
 #include <list>
 #include <set>
-#include <sstream>
 #include <string>
 #include <vector>
 

test/testexprengine.cpp

@@ -25,7 +25,6 @@
 #include "tokenize.h"
 #include "testsuite.h"
 
-#include <limits>
 #include <string>
 
 class TestExprEngine : public TestFixture {

test/testfilelister.cpp

@@ -20,7 +20,6 @@
 #include "pathmatch.h"
 #include "testsuite.h"
 
-#include <cstddef>
 #include <fstream>
 #include <map>
 #include <string>

test/testlibrary.cpp

@@ -26,7 +26,6 @@
 
 #include <tinyxml2.h>
 #include <map>
-#include <set>
 #include <string>
 #include <vector>
 

test/testmemleak.cpp

@@ -24,7 +24,6 @@
 #include "tokenize.h"
 
 #include <list>
-#include <ostream>
 #include <string>
 
 

test/testsamples.cpp

@@ -27,12 +27,9 @@
 #include "testsuite.h"
 
 #include <algorithm>
-#include <cstddef>
-#include <cstring>
 #include <fstream>
 #include <iterator>
 #include <map>
-#include <sstream>
 #include <string>
 #include <utility>
 #include <vector>

test/testsimplifytokens.cpp

@@ -23,7 +23,6 @@
 #include "tokenize.h"
 #include "tokenlist.h"
 
-#include <ostream>
 #include <string>
 
 

test/testsuppressions.cpp

@@ -23,7 +23,6 @@
 #include "testsuite.h"
 #include "threadexecutor.h"
 
-#include <cstddef>
 #include <list>
 #include <map>
 #include <string>