Add Missing Includes Across the Remaining Sources and Tests (#16071)

* Ignore Clipper, libpng, mcut and Boost.Polygon Internals in clang-tidy

Each only works through a wrapper or umbrella header: libslic3r/clipper.hpp or clipper_z.hpp configure Clipper before including it, png.h pulls in libpng's config headers, and Boost.Polygon's headers only compile through polygon.hpp or voronoi.hpp.

* Ignore minilzo's Config Headers in clang-tidy

lzoconf.h and lzodefs.h are internal to minilzo.h, which is what the code includes.

* Add Missing Includes Across the Remaining Sources and Tests

Covers src/slic3r/Utils, src/slic3r/plugin, src/slic3r/Config, src/libvgcode, src/dev-utils, src/OrcaSlicer.cpp and tests/, the directories left after src/slic3r/GUI and src/libslic3r. Generated with clang-tidy misc-include-cleaner. libvgcode's own headers are included by relative path as in the rest of that library, and Catch2 and pybind11 with angle brackets as elsewhere in the repo.

* Make the GUI and Test Headers Compile on Their Own

Each now includes, or forward-declares, what it uses instead of relying on what its includers happened to include first. Headers that only compile on one platform, or that nothing built includes, are left alone.

* Keep Windows and nanosvg Setup Ahead of the Added Includes

OrcaSlicer.cpp and several tests set _WIN32_WINNT, WIN32_LEAN_AND_MEAN or NOMINMAX before including Windows.h, and the profile validator defines NANOSVG_IMPLEMENTATION before any libslic3r header. The added includes had landed above those blocks, which broke the Windows build.

* Add the GUI Includes the First Pass Missed

Covers headers that only became editable once they compiled on their own, and wx symbols whose suggested header changed as the clang-tidy ignore list grew after the src/slic3r/GUI pass.

* Keep the Added Test Includes Below the NOMINMAX Guard

test_marchingsquares.cpp and test_texture_displacement.cpp had includes inside #ifndef NOMINMAX, which the tests inherit as defined on Windows from libslic3r, so those were skipped there. .clang-tidy also ignores the MSVC STL and UCRT internals, Boost.Multiprecision's fwd.hpp and CPython's Windows include directory, as in #16068.

.clang-tidy

@@ -7,9 +7,15 @@ CheckOptions:
   misc-include-cleaner.UnusedIncludes: false
   # Headers that declare a symbol but are not the one to include: per-platform
   # implementations of wxWidgets and Boost.Thread (a Linux run would suggest the
-  # GTK or pthread one), library internals and forward declarations, CPython's
-  # headers behind Python.h, curl's behind curl.h, oneTBB's behind tbb/, and
+  # GTK or pthread one), library internals and forward declarations (MSVC's STL
+  # __msvc_* and the Windows UCRT's corecrt_* included), CPython's headers behind
+  # Python.h (python3.x/ on Linux and macOS, libpython/include/ on Windows),
+  # curl's behind curl.h, oneTBB's behind tbb/, and
   # admesh's stl.h, which the include path also exposes without its directory.
+  # Clipper's own clipper.hpp is only included through libslic3r/clipper.hpp or
+  # clipper_z.hpp, which configure it first, and Boost.Polygon's headers only
+  # work through boost/polygon/polygon.hpp or voronoi.hpp. minilzo's config
+  # headers are internal to minilzo.h.
   # FFmpeg's C headers are left alone because they are only included inside
   # extern "C", which an inserted include would miss. OS-specific headers (GLib,
   # GTK, D-Bus, POSIX, the Windows SDK) are only used inside platform #if blocks,
@@ -23,7 +29,11 @@ CheckOptions:
     .*[/\\]impl[/\\].*;
     .*_fwd\.hpp;
     python3\.[0-9]+[/\\].*;
+    libpython[/\\]include[/\\].*;
     bits[/\\].*;
+    corecrt_.*\.h;
+    __msvc_.*\.hpp;
+    boost[/\\]multiprecision[/\\]fwd\.hpp;
     imconfig\.h;
     expat_external\.h;
     admesh[/\\]stl\.h;
@@ -44,4 +54,9 @@ CheckOptions:
     fcntl\.h;
     termios\.h;
     [/\\](um|shared)[/\\].*;
-    sal\.h
+    sal\.h;
+    clipper[/\\]clipper\.hpp;
+    png(lib)?conf\.h;
+    mcut[/\\]platform\.h;
+    boost[/\\]polygon[/\\].*;
+    lzo(conf|defs)\.h

src/OrcaSlicer.cpp

@@ -20,6 +20,49 @@
     #endif /* SLIC3R_GUI */
 #endif /* WIN32 */
 
+#include <map>
+#include <vector>
+#include "libslic3r/PrintBase.hpp"
+#include "slic3r/Utils/json_diff.hpp"
+#include <boost/date_time/posix_time/posix_time_duration.hpp>
+#include <cerrno>
+#include <utility>
+#include <boost/filesystem/operations.hpp>
+#include <boost/filesystem/fstream.hpp>
+#include "libslic3r/LocalesUtils.hpp"
+#include <fstream>
+#include <exception>
+#include <set>
+#include "libslic3r/Color.hpp"
+#include "libslic3r/TriangleSelector.hpp"
+#include <algorithm>
+#include "libslic3r/Format/bbs_3mf.hpp"
+#include <cstdlib>
+#include <stdlib.h>
+#include <stdexcept>
+#include "libslic3r/Point.hpp"
+#include "libslic3r_version.h"
+#include "libslic3r/Semver.hpp"
+#include "libslic3r/PrintConfig.hpp"
+#include "libslic3r/BoundingBox.hpp"
+#include "libslic3r/CustomGCode.hpp"
+#include <memory>
+#include <sstream>
+#include <iomanip>
+#include <iterator>
+#include "libslic3r/ClipperUtils.hpp"
+#include "libslic3r/GCode/WipeTowerEstimate.hpp"
+#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp"
+#include <functional>
+#include "libslic3r/Arrange.hpp"
+#include "libslic3r/Polygon.hpp"
+#include "libslic3r/GCode/ThumbnailData.hpp"
+#include "slic3r/GUI/3DScene.hpp"
+#include "slic3r/GUI/GLShader.hpp"
+#include <cassert>
+#include <boost/filesystem/exception.hpp>
+#include <signal.h>
+
 #include <cstdio>
 #include <string>
 #include <cstring>

src/OrcaSlicer.hpp

@@ -1,7 +1,14 @@
 #ifndef SLIC3R_HPP
 #define SLIC3R_HPP
 
+#include <map>
+#include "libslic3r/BoundingBox.hpp"
+#include "libslic3r/PrintConfig.hpp"
+#include "libslic3r/Format/bbs_3mf.hpp"
+#include "libslic3r/GCode/ThumbnailData.hpp"
 #include <set>
+#include <string>
+#include <vector>
 
 #include "libslic3r/Config.hpp"
 #include "libslic3r/Model.hpp"

src/dev-utils/OrcaSlicer_profile_validator.cpp

@@ -8,6 +8,28 @@
 #define NANOSVGRAST_IMPLEMENTATION
 #include "nanosvg/nanosvgrast.h"
 
+#include <vector>
+#include <boost/filesystem/path.hpp>
+#include <map>
+#include "libslic3r/Point.hpp"
+#include "libslic3r/libslic3r.h"
+#include "libslic3r/Polygon.hpp"
+#include "libslic3r/PrintConfig.hpp"
+#include <utility>
+#include "libslic3r/CustomGCode.hpp"
+#include <iterator>
+#include <boost/smart_ptr/make_shared_object.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
+#include <boost/log/core/record_view.hpp>
+#include <boost/log/expressions/message.hpp>
+#include <cstddef>
+#include <exception>
+#include "libslic3r/PlaceholderParser.hpp"
+#include <boost/program_options/options_description.hpp>
+#include <boost/program_options/value_semantic.hpp>
+#include <boost/program_options/variables_map.hpp>
+#include <boost/program_options/errors.hpp>
+
 #include "libslic3r/BoundingBox.hpp"
 #include "libslic3r/GCode.hpp"
 #include "libslic3r/GCode/WipeTower.hpp"

src/dev-utils/encoding-check.cpp

@@ -1,3 +1,4 @@
+#include <iosfwd>
 #include <vector>
 #include <iostream>
 #include <fstream>

src/dev-utils/generate_system_cache.cpp

@@ -4,9 +4,19 @@
 
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/filesystem.hpp>
+#include <boost/filesystem/operations.hpp>
+#include <boost/filesystem/directory.hpp>
 #include <boost/log/trivial.hpp>
 #include <boost/program_options.hpp>
+#include <boost/program_options/options_description.hpp>
+#include <boost/program_options/value_semantic.hpp>
+#include <boost/program_options/variables_map.hpp>
+#include <boost/program_options/errors.hpp>
+#include <exception>
+#include <cstddef>
 #include <iostream>
+#include <memory>
+#include "libslic3r/Config.hpp"
 
 using namespace Slic3r;
 namespace fs = boost::filesystem;

src/dev-utils/profile_include_dump.cpp

@@ -11,13 +11,19 @@
 #include "libslic3r/Utils.hpp"
 
 #include <boost/filesystem.hpp>
+#include <boost/filesystem/path.hpp>
+#include <boost/filesystem/operations.hpp>
 #include <boost/nowide/fstream.hpp>
 #include "nlohmann/json.hpp"
 
 #include <algorithm>
+#include <cstddef>
+#include <exception>
 #include <iostream>
+#include "libslic3r/Config.hpp"
 #include <map>
 #include <set>
+#include <stdexcept>
 #include <string>
 #include <vector>
 

src/libvgcode/include/ColorPrint.hpp

@@ -6,6 +6,8 @@
 #define VGCODE_COLORPRINT_HPP
 
 #include "../include/Types.hpp"
+#include <cstdint>
+#include <array>
 
 namespace libvgcode {
 

src/libvgcode/include/ColorRange.hpp

@@ -7,7 +7,10 @@
 
 #include "../include/Types.hpp"
 
+#include <array>
 #include <cfloat>
+#include <vector>
+#include <cstddef>
 
 namespace libvgcode {
 

src/libvgcode/include/GCodeInputData.hpp

@@ -6,6 +6,8 @@
 #define VGCODE_GCODEINPUTDATA_HPP
 
 #include "PathVertex.hpp"
+#include <vector>
+#include "Types.hpp"
 
 namespace libvgcode {
 

src/libvgcode/include/PathVertex.hpp

@@ -7,7 +7,9 @@
 
 #include "Types.hpp"
 
+#include <array>
 #include <cfloat>
+#include <cstdint>
 
 namespace libvgcode {
 

src/libvgcode/include/Types.hpp

@@ -5,6 +5,7 @@
 #ifndef VGCODE_TYPES_HPP
 #define VGCODE_TYPES_HPP
 
+#include <cstddef>
 #define VGCODE_ENABLE_COG_AND_TOOL_MARKERS 0
 
 #include <array>

src/libvgcode/include/Viewer.hpp

@@ -7,7 +7,10 @@
 
 #include "Types.hpp"
 
+#include <cstddef>
+#include <cstdint>
 #include <string>
+#include <vector>
 
 namespace libvgcode {
 

src/libvgcode/src/Bitset.hpp

@@ -6,6 +6,9 @@
 #define VGCODE_BITSET_HPP
 
 #include <atomic>
+#include <cstddef>
+#include <type_traits>
+#include <utility>
 #include <vector>
 
 namespace libvgcode {

src/libvgcode/src/ColorRange.cpp

@@ -7,8 +7,13 @@
 #include "Utils.hpp"
 
 #include <algorithm>
+#include <array>
 #include <assert.h>
+#include <cfloat>
 #include <cmath>
+#include "../include/Types.hpp"
+#include <cstddef>
+#include <vector>
 
 namespace libvgcode {
 

src/libvgcode/src/ExtrusionRoles.cpp

@@ -3,6 +3,11 @@
 ///|/ libvgcode is released under the terms of the AGPLv3 or higher
 ///|/
 #include "ExtrusionRoles.hpp"
+#include "../include/Types.hpp"
+#include <array>
+#include <utility>
+#include <cstddef>
+#include <vector>
 
 namespace libvgcode {
 

src/libvgcode/src/ExtrusionRoles.hpp

@@ -7,7 +7,10 @@
 
 #include "../include/Types.hpp"
 
+#include <array>
+#include <cstddef>
 #include <map>
+#include <vector>
 
 namespace libvgcode {
 

src/libvgcode/src/Layers.cpp

@@ -9,6 +9,11 @@
 
 #include <assert.h>
 #include <algorithm>
+#include "../include/Types.hpp"
+#include <cstdint>
+#include <cstddef>
+#include <vector>
+#include <iterator>
 
 namespace libvgcode {
 

src/libvgcode/src/Layers.hpp

@@ -6,6 +6,11 @@
 #define VGCODE_LAYERS_HPP
 
 #include "Range.hpp"
+#include <cstdint>
+#include <cstddef>
+#include "../include/Types.hpp"
+#include <array>
+#include <vector>
 
 namespace libvgcode {
 

src/libvgcode/src/OpenGLUtils.cpp

@@ -10,6 +10,7 @@
 #include <cctype>
 #include <stdio.h>
 #include <cstring>
+#include <string>
 
 namespace libvgcode {
 

src/libvgcode/src/OptionTemplate.cpp

@@ -6,6 +6,9 @@
 #include "OpenGLUtils.hpp"
 #include "Utils.hpp"
 
+#include <cstdint>
+#include "../include/Types.hpp"
+#include <cstddef>
 #include <vector>
 #include <algorithm>
 #include <cmath>

src/libvgcode/src/PathVertex.cpp

@@ -3,6 +3,7 @@
 ///|/ libvgcode is released under the terms of the AGPLv3 or higher
 ///|/
 #include "../include/PathVertex.hpp"
+#include "../include/Types.hpp"
 
 namespace libvgcode {
 

src/libvgcode/src/Range.cpp

@@ -5,6 +5,7 @@
 #include "Range.hpp"
 
 #include <algorithm>
+#include "../include/Types.hpp"
 
 namespace libvgcode {
 

src/libvgcode/src/SegmentTemplate.cpp

@@ -5,6 +5,7 @@
 #include "SegmentTemplate.hpp"
 #include "OpenGLUtils.hpp"
 
+#include <cstddef>
 #include <cstdint>
 #include <array>
 

src/libvgcode/src/Settings.hpp

@@ -7,6 +7,8 @@
 
 #include "../include/Types.hpp"
 
+#include <array>
+#include <cstddef>
 #include <map>
 
 namespace libvgcode {

src/libvgcode/src/ToolMarker.cpp

@@ -7,6 +7,7 @@
 #include "Utils.hpp"
 
 #include <cmath>
+#include "../include/Types.hpp"
 
 #if VGCODE_ENABLE_COG_AND_TOOL_MARKERS
 

src/libvgcode/src/Types.cpp

@@ -5,6 +5,7 @@
 #include "../include/Types.hpp"
 
 #include <algorithm>
+#include <cstdint>
 
 namespace libvgcode {
 

src/libvgcode/src/Utils.cpp

@@ -6,6 +6,9 @@
 
 #include <assert.h>
 #include <cmath>
+#include "../include/Types.hpp"
+#include <vector>
+#include <cstdint>
 
 namespace libvgcode {
 

src/libvgcode/src/Utils.hpp

@@ -6,6 +6,8 @@
 #define VGCODE_UTILS_HPP
 
 #include "../include/Types.hpp"
+#include <vector>
+#include <cstdint>
 
 #ifdef _WIN32
 #define STDVEC_MEMSIZE(NAME, TYPE) NAME.capacity() * ((sizeof(TYPE) + __alignof(TYPE) - 1) / __alignof(TYPE)) * __alignof(TYPE)

src/libvgcode/src/ViewRange.cpp

@@ -3,6 +3,7 @@
 ///|/ libvgcode is released under the terms of the AGPLv3 or higher
 ///|/
 #include "ViewRange.hpp"
+#include "../include/Types.hpp"
 
 namespace libvgcode {
 

src/libvgcode/src/ViewRange.hpp

@@ -6,6 +6,7 @@
 #define VGCODE_VIEWRANGE_HPP
 
 #include "Range.hpp"
+#include "../include/Types.hpp"
 
 namespace libvgcode {
 

src/libvgcode/src/Viewer.cpp

@@ -4,6 +4,12 @@
 ///|/
 #include "../include/Viewer.hpp"
 #include "ViewerImpl.hpp"
+#include <string>
+#include <utility>
+#include "../include/Types.hpp"
+#include <cstddef>
+#include <vector>
+#include <cstdint>
 
 namespace libvgcode {
 

src/libvgcode/src/ViewerImpl.cpp

@@ -9,14 +9,26 @@
 #include "OpenGLUtils.hpp"
 #include "Utils.hpp"
 
+#include <cstdint>
+#include "../include/Types.hpp"
+#include <array>
+#include "../include/PathVertex.hpp"
+#include "Bitset.hpp"
+#include "../include/ColorPrint.hpp"
+#include <cfloat>
+#include <iterator>
 #include <map>
 #include <assert.h>
+#include <optional>
 #include <stdexcept>
 #include <cstdio>
 #include <string>
 #include <algorithm>
 #include <cmath>
 #include <numeric>
+#include <type_traits>
+#include <vector>
+#include <utility>
 
 namespace libvgcode {
 

src/libvgcode/src/ViewerImpl.hpp

@@ -8,6 +8,12 @@
 #include "Settings.hpp"
 #include "SegmentTemplate.hpp"
 #include "OptionTemplate.hpp"
+#include "../include/Types.hpp"
+#include <vector>
+#include <cstddef>
+#include <cstdint>
+#include <map>
+#include <array>
 #if VGCODE_ENABLE_COG_AND_TOOL_MARKERS
 #include "CogMarker.hpp"
 #include "ToolMarker.hpp"

src/slic3r/Config/Snapshot.cpp

@@ -1,5 +1,21 @@
 #include "Snapshot.hpp"
 
+#include <fstream>
+#include <stdexcept>
+#include <cstdio>
+#include <algorithm>
+#include <ios>
+#include <ostream>
+#include <string>
+#include <cassert>
+#include <map>
+#include <set>
+#include <boost/filesystem/directory.hpp>
+#include <cstring>
+#include <boost/filesystem/file_status.hpp>
+#include "libslic3r/Exception.hpp"
+#include "slic3r/Config/Version.hpp"
+#include <exception>
 #include <time.h>
 
 #include <boost/algorithm/string/predicate.hpp>
@@ -26,7 +42,10 @@
 #include "../GUI/MainFrame.hpp"
 #include "../GUI/MsgDialog.hpp"
 
+#include <vector>
+#include <utility>
 #include <wx/richmsgdlg.h>
+#include <wx/string.h>
 
 #define SLIC3R_SNAPSHOTS_DIR "snapshots"
 #define SLIC3R_SNAPSHOT_FILE "snapshot.ini"

src/slic3r/Config/Snapshot.hpp

@@ -1,6 +1,8 @@
 #ifndef slic3r_GUI_Snapshot_
 #define slic3r_GUI_Snapshot_
 
+#include <ctime>
+#include <cstddef>
 #include <map>
 #include <set>
 #include <string>

src/slic3r/Config/Version.cpp

@@ -1,9 +1,21 @@
 #include "Version.hpp"
 
+#include <boost/filesystem/path.hpp>
+#include <boost/optional/optional.hpp>
+#include <algorithm>
+#include <boost/filesystem/directory.hpp>
 #include <cctype>
 
 #include <boost/filesystem/operations.hpp>
 #include <boost/nowide/fstream.hpp>
+#include "libslic3r/Semver.hpp"
+#include <cstring>
+#include <string>
+#include <cstddef>
+#include <vector>
+#include <stdexcept>
+#include <utility>
+#include "libslic3r/Exception.hpp"
 
 #include "libslic3r/libslic3r.h"
 #include "libslic3r/Config.hpp"

src/slic3r/Config/Version.hpp

@@ -1,6 +1,7 @@
 #ifndef slic3r_GUI_ConfigIndex_
 #define slic3r_GUI_ConfigIndex_
 
+#include <cstddef>
 #include <string>
 #include <vector>
 

src/slic3r/GUI/2DBed.cpp

@@ -18,6 +18,7 @@
 #include "slic3r/GUI/Gizmos/GLGizmoBase.hpp"
 #include "slic3r/GUI/Widgets/StateColor.hpp"
 #include <wx/dcbuffer.h>
+#include <wx/event.h>
 #include <wx/panel.h>
 #include <wx/wx.h>
 #include <wx/gdicmn.h>

src/slic3r/GUI/AMSMaterialsSetting.cpp

@@ -12,6 +12,7 @@
 #include <sstream>
 #include <ios>
 #include <iomanip>
+#include <wx/anybutton.h>
 #include <wx/checklst.h>
 #include "slic3r/GUI/GUI_Utils.hpp"
 #include "slic3r/GUI/Widgets/Button.hpp"

src/slic3r/GUI/AMSMaterialsSetting.hpp

@@ -16,6 +16,7 @@
 #include "Widgets/TextInput.hpp"
 #include "Widgets/HyperLink.hpp"
 #include "slic3r/Utils/CalibUtils.hpp"
+#include <wx/anybutton.h>
 #include <wx/colour.h>
 #include <vector>
 #include <wx/checklst.h>

src/slic3r/GUI/AMSSetting.cpp

@@ -12,6 +12,7 @@
 #include "slic3r/GUI/Widgets/AnimaController.hpp"
 #include "slic3r/GUI/Widgets/Label.hpp"
 #include "slic3r/GUI/Widgets/ComboBox.hpp"
+#include <wx/anybutton.h>
 #include <wx/checklst.h>
 #include <wx/gdicmn.h>
 #include "slic3r/GUI/GUI_Utils.hpp"

src/slic3r/GUI/AMSSetting.hpp

@@ -12,6 +12,7 @@
 #include "Widgets/CheckBox.hpp"
 
 #include "slic3r/GUI/DeviceCore/DevFilaAmsSetting.h"
+#include <wx/anybutton.h>
 #include <wx/checklst.h>
 #include <wx/gdicmn.h>
 #include <wx/dialog.h>

src/slic3r/GUI/CAD/DesignCanvas.cpp

@@ -18,6 +18,7 @@
 #include <cstdio>
 #include <cstdlib>
 
+#include <wx/colour.h>
 #include <wx/event.h>
 #include <wx/gdicmn.h>
 #include "libslic3r/CAD/SketchEngine.hpp"

src/slic3r/GUI/CAD/DesignPanel.cpp

@@ -34,6 +34,7 @@
 #include <map>
 #include <math.h>
 #include <set>
+#include <wx/accel.h>
 #include <wx/event.h>
 #include <wx/gdicmn.h>
 #include <wx/chartype.h>

src/slic3r/GUI/CalibrationPanel.hpp

@@ -6,6 +6,24 @@
 #include "Lazy.hpp"
 #include "SelectMachinePop.hpp"
 #include "Widgets/SideTools.hpp"
+#include <wx/string.h>
+#include "libslic3r/calib.hpp"
+#include <wx/panel.h>
+#include "slic3r/GUI/wxExtensions.hpp"
+#include "slic3r/GUI/DeviceManager.hpp"
+#include <wx/gdicmn.h>
+#include <wx/event.h>
+#include <wx/dc.h>
+#include "slic3r/GUI/Widgets/PopupWindow.hpp"
+#include <cstddef>
+#include <wx/sizer.h>
+#include <wx/scrolwin.h>
+#include <wx/timer.h>
+#include <vector>
+#include <string>
+#include <memory>
+#include <map>
+#include "slic3r/GUI/StagedBuild.hpp"
 
 namespace Slic3r { namespace GUI {
 

src/slic3r/GUI/CapsuleButton.hpp

@@ -3,6 +3,7 @@
 
 #include "wxExtensions.hpp"
 #include "Widgets/Label.hpp"
+#include <wx/anybutton.h>
 #include <wx/panel.h>
 #include <wx/checklst.h>
 #include <wx/string.h>

src/slic3r/GUI/ConfigExceptions.hpp

@@ -1,4 +1,8 @@
 #include <exception> 
+#include <stdexcept>
+
+#include "libslic3r/Exception.hpp"
+
 namespace Slic3r {
 
 class ConfigError : public Slic3r::RuntimeError { 

src/slic3r/GUI/ConfigManipulation.cpp

@@ -24,6 +24,7 @@
 #include <string>
 #include <vector>
 #include <wx/msgdlg.h>
+#include <wx/string.h>
 
 namespace Slic3r {
 namespace GUI {

src/slic3r/GUI/DeviceTab/uiAMSBestPositionPopup.cpp

@@ -13,6 +13,7 @@
 #include "slic3r/GUI/Widgets/StateColor.hpp"
 
 
+#include <wx/anybutton.h>
 #include <wx/checklst.h>
 #include <wx/colour.h>
 #include <wx/dcclient.h>

src/slic3r/GUI/DeviceTab/uiAMSBestPositionPopup.hpp

@@ -18,6 +18,7 @@
 #include "libslic3r/ProjectTask.hpp"
 #include <string>
 #include <tuple>
+#include <wx/anybutton.h>
 #include <wx/panel.h>
 #include <wx/checklst.h>
 #include <wx/gdicmn.h>

src/slic3r/GUI/DeviceTab/uiAmsHumidityPopup.cpp

@@ -14,6 +14,7 @@
 #include "slic3r/GUI/Widgets/StateColor.hpp"
 
 
+#include <wx/anybutton.h>
 #include <wx/checklst.h>
 #include "slic3r/GUI/Widgets/Label.hpp"
 #include <string>

src/slic3r/GUI/DeviceTab/wgtDeviceNozzleRack.h

@@ -14,9 +14,16 @@
 #include "slic3r/GUI/Widgets/StaticBox.hpp"
 #include "slic3r/GUI/Widgets/AnimaController.hpp"
 
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include <string>
+#include <vector>
+#include <unordered_map>
 #include <wx/panel.h>
 #include <wx/simplebook.h>
 #include <memory>
+#include <wx/string.h>
+#include <wx/sizer.h>
 
 // Previous definitions
 class Button;

src/slic3r/GUI/ExtrusionCalibration.cpp

@@ -6,6 +6,7 @@
 #include <algorithm>
 #include "I18N.hpp"
 #include <boost/log/trivial.hpp>
+#include <wx/anybutton.h>
 #include <wx/checklst.h>
 #include "slic3r/GUI/GUI_Utils.hpp"
 #include "slic3r/GUI/wxExtensions.hpp"

src/slic3r/GUI/ExtrusionCalibration.hpp

@@ -16,6 +16,7 @@
 #include "ParamsDialog.hpp"
 #include "GUI_App.hpp"
 #include "wx/hyperlink.h"
+#include <wx/anybutton.h>
 #include <wx/checklst.h>
 #include <wx/string.h>
 #include <string>

src/slic3r/GUI/GUI_AuxiliaryList.hpp

@@ -6,10 +6,14 @@
 #include <set>
 
 #include <wx/bitmap.h>
+#include <wx/button.h>
 #include <wx/dataview.h>
+#include <wx/event.h>
 #include <wx/menu.h>
 #include <wx/file.h>
 #include <wx/dir.h>
+#include <wx/window.h>
+#include <wx/string.h>
 
 #include "AuxiliaryDataViewModel.hpp"
 

src/slic3r/GUI/GUI_ObjectList.cpp

@@ -67,6 +67,7 @@
 #include <functional>
 #include <boost/algorithm/string.hpp>
 #include <boost/log/trivial.hpp>
+#include <wx/arrstr.h>
 #include <wx/dc.h>
 #include <wx/gdicmn.h>
 #include <wx/colour.h>

src/slic3r/GUI/GUI_ObjectTableSettings.cpp

@@ -15,6 +15,7 @@
 #include "I18N.hpp"
 #include "ConfigManipulation.hpp"
 
+#include <wx/arrstr.h>
 #include <wx/event.h>
 #include <memory>
 #include <cstddef>

src/slic3r/GUI/GUI_ObjectTableSettings.hpp

@@ -1,15 +1,21 @@
 #ifndef slic3r_GUI_ObjectTableSettings_hpp_
 #define slic3r_GUI_ObjectTableSettings_hpp_
 
+#include <map>
 #include <memory>
+#include <string>
 #include <vector>
+#include <wx/event.h>
 #include <wx/panel.h>
+#include <wx/sizer.h>
 #include "wxExtensions.hpp"
+#include "libslic3r/PrintConfig.hpp"
 
 class wxBoxSizer;
 
 namespace Slic3r {
 class DynamicPrintConfig;
+class ModelObject;
 class ModelConfig;
 namespace GUI {
 class ConfigOptionsGroup;

src/slic3r/GUI/Gizmos/GLGizmoCut.cpp

@@ -32,6 +32,7 @@
 #include "slic3r/GUI/3DScene.hpp"
 #include "libslic3r/Config.hpp"
 #include "libslic3r/Line.hpp"
+#include <wx/string.h>
 #include <wx/utils.h>
 #include "libslic3r/TriangleMesh.hpp"
 #include "slic3r/GUI/MeshUtils.hpp"

src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp

@@ -75,6 +75,7 @@
 #include <boost/filesystem/operations.hpp>
 #include "slic3r/GUI/Jobs/Worker.hpp"
 #include <cfloat>
+#include <wx/string.h>
 #ifndef IMGUI_DEFINE_MATH_OPERATORS
 #define IMGUI_DEFINE_MATH_OPERATORS
 #endif

src/slic3r/GUI/Gizmos/GLGizmoMove.cpp

@@ -25,6 +25,7 @@
 #include "libslic3r/Geometry.hpp"
 #include <wx/intl.h>
 #include "libslic3r/Model.hpp"
+#include <wx/string.h>
 #include <wx/utils.h>
 
 namespace Slic3r {

src/slic3r/GUI/Gizmos/GLGizmoScale.cpp

@@ -24,6 +24,7 @@
 #include "slic3r/GUI/GLShader.hpp"
 #include <utility>
 #include "libslic3r/Geometry.hpp"
+#include <wx/string.h>
 #include <wx/utils.h>
 
 namespace Slic3r {

src/slic3r/GUI/Gizmos/GizmoObjectManipulation.hpp

@@ -1,11 +1,16 @@
 #ifndef slic3r_GizmoObjectManipulation_hpp_
 #define slic3r_GizmoObjectManipulation_hpp_
 
+#include <cstddef>
 #include <memory>
 
 #include "libslic3r/Point.hpp"
 #include "libslic3r/Geometry.hpp"
 #include <float.h>
+#include <string>
+#include <vector>
+#include <utility>
+#include <wx/string.h>
 
 #include "slic3r/GUI/GUI_Geometry.hpp"
 
@@ -14,6 +19,7 @@
 namespace Slic3r {
 namespace GUI {
 
+class ImGuiWrapper;
 class Selection;
 class GLCanvas3D;
 

src/slic3r/GUI/Jobs/PlaterWorker.hpp

@@ -1,13 +1,26 @@
 #ifndef PLATERWORKER_HPP
 #define PLATERWORKER_HPP
 
+#include <future>
+#include <functional>
+#include <exception>
+#include <boost/log/trivial.hpp>
+#include <ios>
 #include <map>
 #include <chrono>
 
 #include "Worker.hpp"
 #include "BusyCursorJob.hpp"
 
+#include "slic3r/GUI/Jobs/Job.hpp"
+#include <memory>
+#include <string>
+#include <utility>
+#include <wx/app.h>
+#include <wx/event.h>
+
 #include "slic3r/GUI/GUI.hpp"
+#include "slic3r/GUI/GUI_Utils.hpp"
 #include "slic3r/GUI/I18N.hpp"
 
 namespace Slic3r { namespace GUI {

src/slic3r/GUI/Jobs/SLAImportDialog.hpp

@@ -3,7 +3,14 @@
 
 #include "SLAImportJob.hpp"
 
+#include <vector>
+#include <algorithm>
+#include "libslic3r/Point.hpp"
+#include <string>
 #include <wx/dialog.h>
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include <wx/filedlg.h>
 #include <wx/stattext.h>
 #include <wx/combobox.h>
 #include <wx/filename.h>

src/slic3r/GUI/KBShortcutsDialog.cpp

@@ -34,6 +34,7 @@
 #include "Widgets/StaticLine.hpp"
 #include "Widgets/TabCtrl.hpp"
 #include <wx/notebook.h>
+#include <wx/string.h>
 #include <wx/wx.h>
 #include <wx/treebase.h>
 #include <wx/simplebook.h>

src/slic3r/GUI/MarkdownTip.cpp

@@ -16,6 +16,7 @@
 #include <boost/log/trivial.hpp>
 #include <cstddef>
 #include <wx/display.h>
+#include <wx/gdicmn.h>
 #include <wx/popupwin.h>
 #include <wx/sizer.h>
 #include <wx/timer.h>

src/slic3r/GUI/MultiChoiceDialog.cpp

@@ -2,6 +2,7 @@
 
 #include "GUI_App.hpp"
 #include "MainFrame.hpp"
+#include <wx/anybutton.h>
 #include <wx/string.h>
 #include <wx/arrstr.h>
 #include "slic3r/GUI/GUI_Utils.hpp"

src/slic3r/GUI/PartSkipCommon.hpp

@@ -1,6 +1,8 @@
 #ifndef PARTSKIPCOMMON_H
 #define PARTSKIPCOMMON_H
 
+#include <utility>
+#include <vector>
 
 namespace Slic3r { namespace GUI {
     

src/slic3r/GUI/Plater.cpp

@@ -6,6 +6,7 @@
 #include "libslic3r/Config.hpp"
 #include "libslic3r_version.h"
 
+#include <boost/assert/source_location.hpp>
 #include <boost/optional/optional.hpp>
 #include <cmath>
 #include <boost/algorithm/string/join.hpp>

src/slic3r/GUI/SavePresetDialog.cpp

@@ -21,6 +21,7 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/log/trivial.hpp>
 
+#include <wx/anybutton.h>
 #include <wx/checklst.h>
 #include <wx/gdicmn.h>
 #include <wx/event.h>

src/slic3r/GUI/SavePresetDialog.hpp

@@ -12,6 +12,7 @@
 #include "Widgets/Label.hpp"
 #include "Widgets/TextInput.hpp"
 #include <string>
+#include <wx/anybutton.h>
 #include <wx/sizer.h>
 #include <wx/checklst.h>
 #include <vector>

src/slic3r/GUI/SendToPrinter.cpp

@@ -16,6 +16,7 @@
 #include "Jobs/BoostThreadWorker.hpp"
 #include "Jobs/PlaterWorker.hpp"
 
+#include <wx/containr.h>
 #include <wx/event.h>
 #include <map>
 #include <string>

src/slic3r/GUI/TabButton.cpp

@@ -2,6 +2,7 @@
 #include "Widgets/Label.hpp"
 
 #include "slic3r/GUI/Widgets/StaticBox.hpp"
+#include <wx/anybutton.h>
 #include <wx/colour.h>
 #include <utility>
 #include "slic3r/GUI/wxExtensions.hpp"

src/slic3r/GUI/UpgradePanel.cpp

@@ -11,6 +11,7 @@
 #include <slic3r/GUI/Widgets/SideTools.hpp>
 #include <slic3r/GUI/Widgets/Label.hpp>
 #include <slic3r/GUI/I18N.hpp>
+#include <wx/anybutton.h>
 #include <wx/colour.h>
 #include <unordered_map>
 #include <wx/string.h>

src/slic3r/GUI/UpgradePanel.hpp

@@ -2,6 +2,7 @@
 #define slic3r_UpgradePanel_hpp_
 
 #include "slic3r/GUI/wxExtensions.hpp"
+#include <wx/anybutton.h>
 #include <wx/event.h>
 #include <wx/gdicmn.h>
 #include <wx/dynarray.h>

src/slic3r/GUI/Widgets/AMSControl.cpp

@@ -11,6 +11,7 @@
 #include "slic3r/GUI/DeviceCore/DevFilaSystem.h"
 #include "slic3r/GUI/DeviceCore/DevFilaSwitch.h"
 
+#include <wx/anybutton.h>
 #include <wx/checklst.h>
 #include <wx/gdicmn.h>
 #include "slic3r/GUI/AmsMappingPopup.hpp"

src/slic3r/GUI/Widgets/AMSControl.hpp

@@ -9,6 +9,7 @@
 #include "../DeviceManager.hpp"
 #include "slic3r/GUI/Event.hpp"
 #include "slic3r/GUI/AmsMappingPopup.hpp"
+#include <wx/anybutton.h>
 #include <wx/checklst.h>
 #include <wx/gdicmn.h>
 #include <string>

src/slic3r/GUI/Widgets/AMSItem.cpp

@@ -12,6 +12,7 @@
 #include "slic3r/GUI/DeviceCore/DevConfig.h"
 #include "slic3r/GUI/DeviceCore/DevManager.h"
 
+#include <wx/anybutton.h>
 #include <wx/colour.h>
 #include <wx/event.h>
 #include "slic3r/GUI/Event.hpp"

src/slic3r/GUI/Widgets/AMSItem.hpp

@@ -9,6 +9,7 @@
 #include "slic3r/GUI/Event.hpp"
 #include "slic3r/GUI/AmsMappingPopup.hpp"
 #include <string>
+#include <wx/anybutton.h>
 #include <wx/colour.h>
 #include <vector>
 #include "slic3r/GUI/DeviceCore/DevDefs.h"

src/slic3r/GUI/Widgets/AnimaController.cpp

@@ -1,5 +1,6 @@
 #include "AnimaController.hpp"
 
+#include <wx/anybutton.h>
 #include <wx/checklst.h>
 #include <vector>
 #include <string>

src/slic3r/GUI/Widgets/AnimaController.hpp

@@ -3,6 +3,7 @@
 
 #include "../wxExtensions.hpp"
 #include "Label.hpp"
+#include <wx/anybutton.h>
 #include <wx/panel.h>
 #include <wx/checklst.h>
 #include <vector>

src/slic3r/GUI/Widgets/Button.cpp

@@ -3,6 +3,7 @@
 
 #include "slic3r/GUI/Widgets/StaticBox.hpp"
 #include <utility>
+#include <wx/anybutton.h>
 #include <wx/checklst.h>
 #include <vector>
 #include <wx/colour.h>

src/slic3r/GUI/Widgets/Button.hpp

@@ -3,6 +3,7 @@
 
 #include "../wxExtensions.hpp"
 #include "StaticBox.hpp"
+#include <wx/anybutton.h>
 #include <wx/gdicmn.h>
 #include "slic3r/GUI/Widgets/StateColor.hpp"
 #include <wx/string.h>

src/slic3r/GUI/Widgets/CheckBox.cpp

@@ -1,6 +1,7 @@
 #include "CheckBox.hpp"
 
 #include "../wxExtensions.hpp"
+#include <wx/anybutton.h>
 #include <wx/gdicmn.h>
 #include <wx/checklst.h>
 #include <wx/tglbtn.h>

src/slic3r/GUI/Widgets/CheckBox.hpp

@@ -3,6 +3,7 @@
 
 #include "../wxExtensions.hpp"
 
+#include <wx/anybutton.h>
 #include <wx/checklst.h>
 #include <wx/tglbtn.h>
 

src/slic3r/GUI/Widgets/CheckList.cpp

@@ -2,6 +2,7 @@
 
 #include "slic3r/GUI/GUI_App.hpp"
 #include "slic3r/GUI/I18N.hpp"
+#include <wx/anybutton.h>
 #include <wx/arrstr.h>
 #include <wx/checklst.h>
 #include <wx/sizer.h>

src/slic3r/GUI/Widgets/CheckList.hpp

@@ -6,6 +6,7 @@
 #include "Label.hpp"
 #include "TextInput.hpp"
 
+#include <wx/anybutton.h>
 #include <wx/arrstr.h>
 #include <wx/checklst.h>
 #include <wx/dynarray.h>

src/slic3r/GUI/Widgets/ComboBox.cpp

@@ -8,6 +8,7 @@
 #include <vector>
 #include <wx/arrstr.h>
 #include <cstddef>
+#include <wx/containr.h>
 #include <wx/dcgraph.h>
 #include <wx/textctrl.h>
 #include <wx/string.h>

src/slic3r/GUI/Widgets/ComboBox.hpp

@@ -3,6 +3,7 @@
 
 #include "TextInput.hpp"
 #include "DropDown.hpp"
+#include <wx/containr.h>
 #include <wx/ctrlsub.h>
 #include <vector>
 #include <wx/string.h>

src/slic3r/GUI/Widgets/FanControl.cpp

@@ -6,6 +6,7 @@
 #include "../MsgDialog.hpp"
 #include "json_diff.hpp"
 
+#include <wx/anybutton.h>
 #include <wx/event.h>
 #include <wx/checklst.h>
 #include <wx/gdicmn.h>

src/slic3r/GUI/Widgets/FanControl.hpp

@@ -9,6 +9,7 @@
 #include "../SelectMachine.hpp"
 #include "../DeviceManager.hpp"
 #include "slic3r/GUI/Event.hpp"
+#include <wx/anybutton.h>
 #include <wx/gdicmn.h>
 #include <wx/checklst.h>
 #include <wx/event.h>

src/slic3r/GUI/Widgets/FilamentLoad.cpp

@@ -5,6 +5,7 @@
 #include "../GUI_App.hpp"
 #include "../DeviceCore/DevFilaSystem.h"
 
+#include <wx/anybutton.h>
 #include <wx/checklst.h>
 #include <wx/gdicmn.h>
 #include "slic3r/GUI/Widgets/StepCtrl.hpp"

src/slic3r/GUI/Widgets/FilamentLoad.hpp

@@ -8,6 +8,7 @@
 #include "../DeviceManager.hpp"
 #include "slic3r/GUI/Event.hpp"
 #include "slic3r/GUI/AmsMappingPopup.hpp"
+#include <wx/anybutton.h>
 #include <wx/checklst.h>
 #include <wx/gdicmn.h>
 #include <map>

src/slic3r/GUI/Widgets/ImageSwitchButton.cpp

@@ -4,6 +4,7 @@
 #include "../wxExtensions.hpp"
 
 #include "slic3r/GUI/I18N.hpp"
+#include <wx/anybutton.h>
 #include <wx/colour.h>
 #include <utility>
 #include <wx/checklst.h>

src/slic3r/GUI/Widgets/RadioBox.cpp

@@ -1,6 +1,7 @@
 #include "RadioBox.hpp"
 
 #include "../wxExtensions.hpp"
+#include <wx/anybutton.h>
 #include <wx/checklst.h>
 #include <wx/gdicmn.h>
 

src/slic3r/GUI/Widgets/RadioGroup.hpp

@@ -3,6 +3,7 @@
 
 #include "../wxExtensions.hpp"
 
+#include <wx/anybutton.h>
 #include <wx/panel.h>
 #include <wx/string.h>
 #include <wx/checklst.h>

src/slic3r/GUI/Widgets/RoundedRectangle.cpp

@@ -1,5 +1,6 @@
 #include "RoundedRectangle.hpp"
 #include "../wxExtensions.hpp"
+#include <wx/anybutton.h>
 #include <wx/colour.h>
 #include <wx/checklst.h>
 #include <wx/dcgraph.h>

src/slic3r/GUI/Widgets/ScrolledWindow.hpp

@@ -1,4 +1,5 @@
 #pragma once
+#include <wx/control.h>
 #include <wx/scrolwin.h>
 #include <wx/gdicmn.h>
 #include <wx/event.h>