From 53dad9f4fb86b306552fbc1cd902e74a6a23aa61 Mon Sep 17 00:00:00 2001
From: Clifford Garwood <cliff@cigii.com>
Date: Mon, 5 Oct 2026 11:55:13 -0400
Subject: [PATCH] Include what the IMEX code uses

Upstream's clang-tidy gate now checks that the lines a pull request changes
include the header for every symbol they use. The IMEX sources, their tests,
and the lines this PR adds to shared files relied on the precompiled header and
transitive includes. This adds the includes clang-tidy names; no code changes.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 src/libslic3r/IMEXHelpers.cpp                | 12 ++++++++++++
 src/libslic3r/IMEXHelpers.hpp                |  2 ++
 src/libslic3r/IMEXZones.cpp                  |  6 ++++++
 src/slic3r/GUI/GCodeViewer.cpp               |  1 +
 src/slic3r/GUI/GLCanvas3D.cpp                |  1 +
 src/slic3r/GUI/IMEXFilamentPickerPopover.cpp | 11 +++++++++++
 src/slic3r/GUI/IMEXFilamentPickerPopover.hpp |  1 +
 src/slic3r/GUI/IMEXModesCtrl.cpp             | 16 ++++++++++++++++
 src/slic3r/GUI/IMEXModesCtrl.hpp             |  3 +++
 src/slic3r/GUI/Jobs/ArrangeJob.cpp           |  1 +
 src/slic3r/GUI/PartPlate.cpp                 |  3 +++
 src/slic3r/GUI/PartPlate.hpp                 |  1 +
 src/slic3r/Utils/MoonrakerPrinterAgent.cpp   |  2 ++
 tests/fff_print/test_imex_mode_gcode.cpp     |  3 +++
 tests/fff_print/test_imex_slice_offset.cpp   |  5 +++++
 tests/fff_print/test_multifilament.cpp       |  2 ++
 tests/libslic3r/test_config.cpp              |  1 +
 tests/libslic3r/test_imex_helpers.cpp        | 14 ++++++++++++++
 tests/libslic3r/test_imex_zones.cpp          |  5 +++++
 19 files changed, 90 insertions(+)

diff --git a/src/libslic3r/IMEXHelpers.cpp b/src/libslic3r/IMEXHelpers.cpp
index 209c37dda5..fffcdb0876 100644
--- a/src/libslic3r/IMEXHelpers.cpp
+++ b/src/libslic3r/IMEXHelpers.cpp
@@ -1,16 +1,28 @@
 #include "libslic3r/IMEXHelpers.hpp"
 
+#include <Eigen/Core>
 #include <algorithm>
+#include <cstddef>
+#include <map>
 #include <numeric>
 #include <cassert>
 #include <cctype>
+#include <optional>
 #include <set>
 #include <sstream>
+#include <string>
 #include <unordered_set>
 
 #include <boost/format.hpp>
 #include <boost/log/trivial.hpp>
+#include <vector>
+#include <utility>
 
+#include "Config.hpp"
+#include "libslic3r.h"
+#include "Point.hpp"
+#include "BoundingBox.hpp"
+#include "Polygon.hpp"
 #include "libslic3r/ClipperUtils.hpp"
 #include "libslic3r/I18N.hpp"
 #include "libslic3r/PresetBundle.hpp"
diff --git a/src/libslic3r/IMEXHelpers.hpp b/src/libslic3r/IMEXHelpers.hpp
index 645af85862..bc3d7b0bc9 100644
--- a/src/libslic3r/IMEXHelpers.hpp
+++ b/src/libslic3r/IMEXHelpers.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <cassert>
+#include <cstddef>
 #include <map>
 #include <optional>
 #include <string>
@@ -8,6 +9,7 @@
 #include <vector>
 
 #include <Eigen/Geometry>
+#include "Config.hpp"
 #include "libslic3r/BoundingBox.hpp"
 #include "libslic3r/PrintConfig.hpp"
 #include "libslic3r/Point.hpp"
diff --git a/src/libslic3r/IMEXZones.cpp b/src/libslic3r/IMEXZones.cpp
index 718b8f5983..f5164f0500 100644
--- a/src/libslic3r/IMEXZones.cpp
+++ b/src/libslic3r/IMEXZones.cpp
@@ -1,9 +1,15 @@
 #include "libslic3r/IMEXZones.hpp"
 
 #include <algorithm>
+#include <map>
 #include <set>
+#include <string>
 #include <utility>
+#include <vector>
 
+#include "PrintConfig.hpp"
+#include "BoundingBox.hpp"
+#include "Config.hpp"
 #include "libslic3r/IMEXHelpers.hpp"
 
 namespace Slic3r {
diff --git a/src/slic3r/GUI/GCodeViewer.cpp b/src/slic3r/GUI/GCodeViewer.cpp
index d34646a4dc..5174c9a1cb 100644
--- a/src/slic3r/GUI/GCodeViewer.cpp
+++ b/src/slic3r/GUI/GCodeViewer.cpp
@@ -25,6 +25,7 @@
 #include "MsgDialog.hpp"
 #include <boost/container_hash/hash.hpp>
 #include "slic3r/GUI/MeshUtils.hpp"
+#include <set>
 #include <string>
 #include "libvgcode/include/Types.hpp"
 #include <vector>
diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp
index ddf41a0c38..6b987cf386 100644
--- a/src/slic3r/GUI/GLCanvas3D.cpp
+++ b/src/slic3r/GUI/GLCanvas3D.cpp
@@ -1,5 +1,6 @@
 #include "libslic3r/libslic3r.h"
 #include "libslic3r/Point.hpp"
+#include <limits>
 #include <string>
 #include <sstream>
 #include <iomanip>
diff --git a/src/slic3r/GUI/IMEXFilamentPickerPopover.cpp b/src/slic3r/GUI/IMEXFilamentPickerPopover.cpp
index 418765e2cb..d0fb83f869 100644
--- a/src/slic3r/GUI/IMEXFilamentPickerPopover.cpp
+++ b/src/slic3r/GUI/IMEXFilamentPickerPopover.cpp
@@ -1,8 +1,19 @@
 #include "slic3r/GUI/IMEXFilamentPickerPopover.hpp"
 
+#include <libslic3r/Config.hpp>
+#include <wx/popupwin.h>
+#include <utility>
+#include <wx/sizer.h>
+#include <vector>
+#include <cstddef>
+#include <wx/gdicmn.h>
+#include <algorithm>
+#include <wx/event.h>
 #include <wx/stattext.h>
 #include <wx/dcmemory.h>
 #include <wx/image.h>
+#include <wx/window.h>
+#include <wx/string.h>
 
 #include "libslic3r/IMEXHelpers.hpp"
 #include "libslic3r/PresetBundle.hpp"
diff --git a/src/slic3r/GUI/IMEXFilamentPickerPopover.hpp b/src/slic3r/GUI/IMEXFilamentPickerPopover.hpp
index fd81b0e66d..0a51b91f86 100644
--- a/src/slic3r/GUI/IMEXFilamentPickerPopover.hpp
+++ b/src/slic3r/GUI/IMEXFilamentPickerPopover.hpp
@@ -1,6 +1,7 @@
 #ifndef slic3r_IMEXFilamentPickerPopover_hpp_
 #define slic3r_IMEXFilamentPickerPopover_hpp_
 
+#include <libslic3r/Config.hpp>
 #include <wx/popupwin.h>
 #include <wx/panel.h>
 #include <wx/sizer.h>
diff --git a/src/slic3r/GUI/IMEXModesCtrl.cpp b/src/slic3r/GUI/IMEXModesCtrl.cpp
index 04ea84894f..ae6dee7085 100644
--- a/src/slic3r/GUI/IMEXModesCtrl.cpp
+++ b/src/slic3r/GUI/IMEXModesCtrl.cpp
@@ -1,12 +1,28 @@
 #include "slic3r/GUI/IMEXModesCtrl.hpp"
 
+#include <wx/anybutton.h>
+#include <libslic3r/IMEXHelpers.hpp>
+#include <cstddef>
+#include <vector>
+#include <tuple>
+#include <libslic3r/Config.hpp>
+#include <map>
+#include <string>
+#include <optional>
+#include <functional>
 #include <wx/app.h>
+#include <wx/event.h>
+#include <wx/colour.h>
 #include <wx/font.h>
+#include <wx/panel.h>
+#include <wx/sizer.h>
+#include <wx/gdicmn.h>
 #include <wx/stattext.h>
 
 #include <algorithm>
 #include <boost/algorithm/string/predicate.hpp>
 #include <utility>
+#include <wx/string.h>
 
 #include "slic3r/GUI/EditGCodeDialog.hpp"
 #include "slic3r/GUI/GUI.hpp"
diff --git a/src/slic3r/GUI/IMEXModesCtrl.hpp b/src/slic3r/GUI/IMEXModesCtrl.hpp
index 74589dd6ae..4b019a068e 100644
--- a/src/slic3r/GUI/IMEXModesCtrl.hpp
+++ b/src/slic3r/GUI/IMEXModesCtrl.hpp
@@ -1,6 +1,9 @@
 #ifndef slic3r_IMEXModesCtrl_hpp_
 #define slic3r_IMEXModesCtrl_hpp_
 
+#include <libslic3r/PrintConfig.hpp>
+#include <utility>
+#include <wx/colour.h>
 #include <wx/panel.h>
 #include <wx/string.h>
 #include <wx/sizer.h>
diff --git a/src/slic3r/GUI/Jobs/ArrangeJob.cpp b/src/slic3r/GUI/Jobs/ArrangeJob.cpp
index d319333d5e..6da77dbfad 100644
--- a/src/slic3r/GUI/Jobs/ArrangeJob.cpp
+++ b/src/slic3r/GUI/Jobs/ArrangeJob.cpp
@@ -17,6 +17,7 @@
 
 #include "libnest2d/common.hpp"
 #include "libslic3r/Arrange.hpp"
+#include <libslic3r/BoundingBox.hpp>
 #include <utility>
 #include "libslic3r/Point.hpp"
 #include "libslic3r/Polygon.hpp"
diff --git a/src/slic3r/GUI/PartPlate.cpp b/src/slic3r/GUI/PartPlate.cpp
index 7fe093e009..23e85d0274 100644
--- a/src/slic3r/GUI/PartPlate.cpp
+++ b/src/slic3r/GUI/PartPlate.cpp
@@ -14,6 +14,7 @@
 #include "libslic3r/Line.hpp"
 #include "libslic3r/Polyline.hpp"
 #include "libslic3r/ExPolygon.hpp"
+#include <functional>
 #include <iterator>
 #include "libslic3r/BuildVolume.hpp"
 #include "libslic3r/GCode/WipeTower.hpp"
@@ -39,6 +40,8 @@
 #include <mutex>
 #include <numeric>
 #include "slic3r/GUI/ImGuiWrapper.hpp"
+#include <optional>
+#include <tuple>
 #include <utility>
 #include "slic3r/GUI/MeshUtils.hpp"
 #include "slic3r/GUI/GLTexture.hpp"
diff --git a/src/slic3r/GUI/PartPlate.hpp b/src/slic3r/GUI/PartPlate.hpp
index 687e743343..0ea6d25707 100644
--- a/src/slic3r/GUI/PartPlate.hpp
+++ b/src/slic3r/GUI/PartPlate.hpp
@@ -3,6 +3,7 @@
 
 #include <cmath>
 #include "libslic3r/Config.hpp"
+#include <memory>
 #include <utility>
 #include "libslic3r/Point.hpp"
 #include <string>
diff --git a/src/slic3r/Utils/MoonrakerPrinterAgent.cpp b/src/slic3r/Utils/MoonrakerPrinterAgent.cpp
index 1738598b96..a23c1cde2e 100644
--- a/src/slic3r/Utils/MoonrakerPrinterAgent.cpp
+++ b/src/slic3r/Utils/MoonrakerPrinterAgent.cpp
@@ -41,6 +41,7 @@
 #include <ios>
 #include <functional>
 #include <exception>
+#include <libslic3r/Config.hpp>
 #include <map>
 #include <string>
 #include <mutex>
@@ -50,6 +51,7 @@
 #include <thread>
 #include <vector>
 #include <utility>
+#include <wx/app.h>
 
 namespace {
 
diff --git a/tests/fff_print/test_imex_mode_gcode.cpp b/tests/fff_print/test_imex_mode_gcode.cpp
index d9772a1ea6..f27cc64c3d 100644
--- a/tests/fff_print/test_imex_mode_gcode.cpp
+++ b/tests/fff_print/test_imex_mode_gcode.cpp
@@ -1,5 +1,8 @@
 #include <catch2/catch_all.hpp>
 
+#include "catch2/catch_test_macros.hpp"
+#include "catch2/generators/catch_generators.hpp"
+#include "catch2/catch_message.hpp"
 #include "libslic3r/Config.hpp"
 #include "libslic3r/PrintConfig.hpp"
 
diff --git a/tests/fff_print/test_imex_slice_offset.cpp b/tests/fff_print/test_imex_slice_offset.cpp
index 03477dff7d..6746070607 100644
--- a/tests/fff_print/test_imex_slice_offset.cpp
+++ b/tests/fff_print/test_imex_slice_offset.cpp
@@ -1,5 +1,8 @@
 #include <catch2/catch_all.hpp>
 
+#include "catch2/matchers/catch_matchers_floating_point.hpp"
+#include "catch2/catch_test_macros.hpp"
+#include "catch2/matchers/catch_matchers.hpp"
 #include "libslic3r/GCodeReader.hpp"
 #include "libslic3r/Model.hpp"
 #include "libslic3r/Point.hpp"
@@ -10,7 +13,9 @@
 
 #include <algorithm>
 #include <cmath>
+#include <cstddef>
 #include <exception>
+#include <libslic3r/PrintConfig.hpp>
 #include <limits>
 #include <sstream>
 #include <string>
diff --git a/tests/fff_print/test_multifilament.cpp b/tests/fff_print/test_multifilament.cpp
index 56e7e02a99..06b2bb9c79 100644
--- a/tests/fff_print/test_multifilament.cpp
+++ b/tests/fff_print/test_multifilament.cpp
@@ -20,6 +20,8 @@
 #include "libslic3r/Model.hpp"
 #include "libslic3r/TriangleMesh.hpp"
 #include "libslic3r/Print.hpp"
+#include <libslic3r/PrintBase.hpp>
+#include <libslic3r/CustomGCode.hpp>
 #include <limits>
 #include <map>
 #include <optional>
diff --git a/tests/libslic3r/test_config.cpp b/tests/libslic3r/test_config.cpp
index 2c9a0c8a5e..10ab2c7004 100644
--- a/tests/libslic3r/test_config.cpp
+++ b/tests/libslic3r/test_config.cpp
@@ -5,6 +5,7 @@
 #include <catch2/matchers/catch_matchers.hpp>
 #include <catch2/matchers/catch_matchers_floating_point.hpp>
 #include <catch2/generators/catch_generators.hpp>
+#include "catch2/catch_approx.hpp"
 #include "libslic3r/PrintConfig.hpp"
 #include "libslic3r/PrintConfigConstants.hpp"
 #include "libslic3r/LocalesUtils.hpp"
diff --git a/tests/libslic3r/test_imex_helpers.cpp b/tests/libslic3r/test_imex_helpers.cpp
index 26105cc360..027a49a2bd 100644
--- a/tests/libslic3r/test_imex_helpers.cpp
+++ b/tests/libslic3r/test_imex_helpers.cpp
@@ -1,11 +1,25 @@
 #include <catch2/catch_all.hpp>
 
+#include "catch2/matchers/catch_matchers_floating_point.hpp"
+#include "catch2/catch_test_macros.hpp"
+#include "catch2/matchers/catch_matchers.hpp"
+#include "catch2/matchers/catch_matchers_string.hpp"
+#include "catch2/catch_message.hpp"
+#include "catch2/generators/catch_generators.hpp"
 #include "libslic3r/IMEXHelpers.hpp"
 #include "libslic3r/PrintConfig.hpp"
 #include "libslic3r/Point.hpp"
 
+#include <cstddef>
 #include <iterator>
+#include <libslic3r/Config.hpp>
+#include <map>
+#include <optional>
+#include <libslic3r/Polygon.hpp>
+#include <libslic3r/BoundingBox.hpp>
 #include <set>
+#include <vector>
+#include <utility>
 
 using namespace Slic3r;
 using Catch::Matchers::WithinAbs;
diff --git a/tests/libslic3r/test_imex_zones.cpp b/tests/libslic3r/test_imex_zones.cpp
index 6f600b8731..67123854e8 100644
--- a/tests/libslic3r/test_imex_zones.cpp
+++ b/tests/libslic3r/test_imex_zones.cpp
@@ -1,8 +1,13 @@
 #include <catch2/catch_all.hpp>
 
+#include <libslic3r/BoundingBox.hpp>
+#include <libslic3r/Config.hpp>
 #include <string>
 #include <vector>
 
+#include "catch2/matchers/catch_matchers_floating_point.hpp"
+#include "catch2/matchers/catch_matchers.hpp"
+#include "catch2/catch_test_macros.hpp"
 #include "libslic3r/IMEXHelpers.hpp"
 #include "libslic3r/IMEXZones.hpp"
 #include "libslic3r/PrintConfig.hpp"