Merge branch 'main' into feature/texdisp-help-links

src/libslic3r/MultiMaterialSegmentation.cpp

@@ -636,6 +636,8 @@ static std::vector<std::pair<size_t, size_t>> get_segments(const ColoredLines &p
     return segments;
 }
 
+
+
 static std::vector<PaintedLine> filter_painted_lines(const Line &line_to_process, const size_t start_idx, const size_t end_idx, const std::vector<PaintedLine> &painted_lines)
 {
     const int                filter_eps_value = scale_(0.1f);
@@ -688,15 +690,29 @@ static std::vector<std::vector<PaintedLine>> post_process_painted_lines(const st
     if (painted_lines.empty())
         return {};
 
+    // The painted lines were appended by parallel workers, so their order is arbitrary. The sort must
+    // therefore be a total order: two projections of the same span from facets of different colours
+    // tie on every geometric key, and whichever sorts first wins the span in filter_painted_lines().
+    // The colour and the end points break such ties so the result does not depend on scheduling.
     auto comp = [&contours](const PaintedLine &first, const PaintedLine &second) {
-        Point first_start_p = contours[first.contour_idx].segment_start(first.line_idx);
-        return first.contour_idx < second.contour_idx ||
-               (first.contour_idx == second.contour_idx &&
-                (first.line_idx < second.line_idx ||
-                 (first.line_idx == second.line_idx &&
-                  ((first.projected_line.a - first_start_p).cast<double>().squaredNorm() < (second.projected_line.a - first_start_p).cast<double>().squaredNorm() ||
-                   ((first.projected_line.a - first_start_p).cast<double>().squaredNorm() == (second.projected_line.a - first_start_p).cast<double>().squaredNorm() &&
-                    (first.projected_line.b - first.projected_line.a).cast<double>().squaredNorm() < (second.projected_line.b - second.projected_line.a).cast<double>().squaredNorm())))));
+        if (first.contour_idx != second.contour_idx)
+            return first.contour_idx < second.contour_idx;
+        if (first.line_idx != second.line_idx)
+            return first.line_idx < second.line_idx;
+        const Point  start_p     = contours[first.contour_idx].segment_start(first.line_idx);
+        const double first_dist  = (first.projected_line.a - start_p).cast<double>().squaredNorm();
+        const double second_dist = (second.projected_line.a - start_p).cast<double>().squaredNorm();
+        if (first_dist != second_dist)
+            return first_dist < second_dist;
+        const double first_len  = (first.projected_line.b - first.projected_line.a).cast<double>().squaredNorm();
+        const double second_len = (second.projected_line.b - second.projected_line.a).cast<double>().squaredNorm();
+        if (first_len != second_len)
+            return first_len < second_len;
+        if (first.color != second.color)
+            return first.color < second.color;
+        if (first.projected_line.a != second.projected_line.a)
+            return first.projected_line.a < second.projected_line.a;
+        return first.projected_line.b < second.projected_line.b;
     };
     std::sort(painted_lines.begin(), painted_lines.end(), comp);
 
@@ -1200,15 +1216,12 @@ static inline std::vector<std::vector<ExPolygons>> segmentation_top_and_bottom_l
     const size_t num_layers    = input_expolygons.size();
     const ConstLayerPtrsAdaptor layers = print_object.layers();
 
-    // Maximum number of top / bottom layers accounts for maximum overlap of one thread group into a neighbor thread group.
     int max_top_layers = 0;
     int max_bottom_layers = 0;
-    int granularity = 1;
     for (size_t i = 0; i < print_object.num_printing_regions(); ++ i) {
         const PrintRegionConfig &config = print_object.printing_region(i).config();
         max_top_layers    = std::max(max_top_layers, config.top_shell_layers.value);
         max_bottom_layers = std::max(max_bottom_layers, config.bottom_shell_layers.value);
-        granularity       = std::max(granularity, std::max(config.top_shell_layers.value, config.bottom_shell_layers.value) - 1);
     }
 
     // Project upwards pointing painted triangles over top surfaces,
@@ -1327,14 +1340,16 @@ static inline std::vector<std::vector<ExPolygons>> segmentation_top_and_bottom_l
 
     std::vector<std::vector<ExPolygons>> triangles_by_color_bottom(num_facets_states);
     std::vector<std::vector<ExPolygons>> triangles_by_color_top(num_facets_states);
-    triangles_by_color_bottom.assign(num_facets_states, std::vector<ExPolygons>(num_layers * 2));
-    triangles_by_color_top.assign(num_facets_states, std::vector<ExPolygons>(num_layers * 2));
+    triangles_by_color_bottom.assign(num_facets_states, std::vector<ExPolygons>(num_layers));
+    triangles_by_color_top.assign(num_facets_states, std::vector<ExPolygons>(num_layers));
 
-    // BBS: use shell_triangles_by_color_bottom & shell_triangles_by_color_top to save the top and bottom embedded layers's color information
-    std::vector<std::vector<ExPolygons>> shell_triangles_by_color_bottom(num_facets_states);
-    std::vector<std::vector<ExPolygons>> shell_triangles_by_color_top(num_facets_states);
-    shell_triangles_by_color_bottom.assign(num_facets_states, std::vector<ExPolygons>(num_layers * 2));
-    shell_triangles_by_color_top.assign(num_facets_states, std::vector<ExPolygons>(num_layers * 2));
+    // BBS: the painted top / bottom surfaces are also projected onto the shell layers below / above them.
+    // Each layer only writes the projections it produced, keyed by the layer they land on, so the
+    // parallel loop shares nothing; they are gathered per target layer afterwards, in source-layer
+    // order, which keeps the result independent of how the layers were scheduled.
+    using ShellProjections = std::vector<std::pair<size_t, ExPolygons>>;  // (target layer, projection)
+    std::vector<std::vector<ShellProjections>> shell_triangles_by_color_bottom(num_facets_states, std::vector<ShellProjections>(num_layers));
+    std::vector<std::vector<ShellProjections>> shell_triangles_by_color_top(num_facets_states, std::vector<ShellProjections>(num_layers));
 
     struct LayerColorStat {
         // Number of regions for a queried color.
@@ -1378,11 +1393,9 @@ static inline std::vector<std::vector<ExPolygons>> segmentation_top_and_bottom_l
         return out;
     };
 
-    tbb::parallel_for(tbb::blocked_range<size_t>(0, num_layers, granularity), [&granularity, &num_layers, &num_facets_states, &layer_color_stat, &top_raw, &triangles_by_color_top,
-                                                                               &throw_on_cancel_callback, &input_expolygons, &bottom_raw, &triangles_by_color_bottom,
-                                                                               &shell_triangles_by_color_top, &shell_triangles_by_color_bottom](const tbb::blocked_range<size_t> &range) {
-        size_t group_idx   = range.begin() / granularity;
-        size_t layer_idx_offset = (group_idx & 1) * num_layers;
+    tbb::parallel_for(tbb::blocked_range<size_t>(0, num_layers), [&num_layers, &num_facets_states, &layer_color_stat, &top_raw, &triangles_by_color_top,
+                                                                  &throw_on_cancel_callback, &input_expolygons, &bottom_raw, &triangles_by_color_bottom,
+                                                                  &shell_triangles_by_color_top, &shell_triangles_by_color_bottom](const tbb::blocked_range<size_t> &range) {
         for (size_t layer_idx = range.begin(); layer_idx < range.end(); ++ layer_idx) {
             for (size_t color_idx = 0; color_idx < num_facets_states; ++color_idx) {
                 throw_on_cancel_callback();
@@ -1392,7 +1405,7 @@ static inline std::vector<std::vector<ExPolygons>> segmentation_top_and_bottom_l
                         // Clean up thin projections. They are not printable anyways.
                         top_ex = opening_ex(top_ex, stat.small_region_threshold);
                         if (! top_ex.empty()) {
-                            append(triangles_by_color_top[color_idx][layer_idx + layer_idx_offset], top_ex);
+                            append(triangles_by_color_top[color_idx][layer_idx], top_ex);
                             float offset = 0.f;
                             ExPolygons layer_slices_trimmed = input_expolygons[layer_idx];
                             for (int last_idx = int(layer_idx) - 1; last_idx > std::max(int(layer_idx - stat.top_shell_layers), int(0)); --last_idx) {
@@ -1403,7 +1416,7 @@ static inline std::vector<std::vector<ExPolygons>> segmentation_top_and_bottom_l
                                 ExPolygons last = opening_ex(intersection_ex(top_ex, offset_ex(layer_slices_trimmed, offset)), stat.small_region_threshold);
                                 if (last.empty())
                                     break;
-                                append(shell_triangles_by_color_top[color_idx][last_idx + layer_idx_offset], std::move(last));
+                                shell_triangles_by_color_top[color_idx][layer_idx].emplace_back(size_t(last_idx), std::move(last));
                             }
                         }
                     }
@@ -1412,7 +1425,7 @@ static inline std::vector<std::vector<ExPolygons>> segmentation_top_and_bottom_l
                         // Clean up thin projections. They are not printable anyways.
                         bottom_ex = opening_ex(bottom_ex, stat.small_region_threshold);
                         if (! bottom_ex.empty()) {
-                            append(triangles_by_color_bottom[color_idx][layer_idx + layer_idx_offset], bottom_ex);
+                            append(triangles_by_color_bottom[color_idx][layer_idx], bottom_ex);
                             float offset = 0.f;
                             ExPolygons layer_slices_trimmed = input_expolygons[layer_idx];
                             for (size_t last_idx = layer_idx + 1; last_idx < std::min(layer_idx + stat.bottom_shell_layers, num_layers); ++last_idx) {
@@ -1423,7 +1436,7 @@ static inline std::vector<std::vector<ExPolygons>> segmentation_top_and_bottom_l
                                 ExPolygons last = opening_ex(intersection_ex(bottom_ex, offset_ex(layer_slices_trimmed, offset)), stat.small_region_threshold);
                                 if (last.empty())
                                     break;
-                                append(shell_triangles_by_color_bottom[color_idx][last_idx + layer_idx_offset], std::move(last));
+                                shell_triangles_by_color_bottom[color_idx][layer_idx].emplace_back(last_idx, std::move(last));
                             }
                         }
                     }
@@ -1431,19 +1444,28 @@ static inline std::vector<std::vector<ExPolygons>> segmentation_top_and_bottom_l
         }
     });
 
+    // Gather the shell projections per target layer, walking the source layers in order.
+    std::vector<std::vector<ExPolygons>> shell_top_by_layer(num_facets_states, std::vector<ExPolygons>(num_layers));
+    std::vector<std::vector<ExPolygons>> shell_bottom_by_layer(num_facets_states, std::vector<ExPolygons>(num_layers));
+    for (size_t color_idx = 0; color_idx < num_facets_states; ++color_idx)
+        for (size_t layer_idx = 0; layer_idx < num_layers; ++layer_idx) {
+            for (auto &[target, projection] : shell_triangles_by_color_top[color_idx][layer_idx])
+                append(shell_top_by_layer[color_idx][target], std::move(projection));
+            for (auto &[target, projection] : shell_triangles_by_color_bottom[color_idx][layer_idx])
+                append(shell_bottom_by_layer[color_idx][target], std::move(projection));
+        }
+
     std::vector<std::vector<ExPolygons>> triangles_by_color_merged(num_facets_states);
     triangles_by_color_merged.assign(num_facets_states, std::vector<ExPolygons>(num_layers));
-    tbb::parallel_for(tbb::blocked_range<size_t>(0, num_layers), [&triangles_by_color_merged, &triangles_by_color_bottom, &triangles_by_color_top, &num_layers, &throw_on_cancel_callback,
-                                                                  &shell_triangles_by_color_top, &shell_triangles_by_color_bottom](const tbb::blocked_range<size_t> &range) {
+    tbb::parallel_for(tbb::blocked_range<size_t>(0, num_layers), [&triangles_by_color_merged, &triangles_by_color_bottom, &triangles_by_color_top, &throw_on_cancel_callback,
+                                                                  &shell_top_by_layer, &shell_bottom_by_layer](const tbb::blocked_range<size_t> &range) {
         for (size_t layer_idx = range.begin(); layer_idx < range.end(); ++ layer_idx) {
             throw_on_cancel_callback();
             ExPolygons painted_exploys;
             for (size_t color_idx = 0; color_idx < triangles_by_color_merged.size(); ++color_idx) {
                 auto &self = triangles_by_color_merged[color_idx][layer_idx];
                 append(self, std::move(triangles_by_color_bottom[color_idx][layer_idx]));
-                append(self, std::move(triangles_by_color_bottom[color_idx][layer_idx + num_layers]));
                 append(self, std::move(triangles_by_color_top[color_idx][layer_idx]));
-                append(self, std::move(triangles_by_color_top[color_idx][layer_idx + num_layers]));
                 self = union_ex(self);
 
                 append(painted_exploys, self);
@@ -1455,13 +1477,8 @@ static inline std::vector<std::vector<ExPolygons>> segmentation_top_and_bottom_l
             for (size_t color_idx = 0; color_idx < triangles_by_color_merged.size(); ++color_idx) {
                 auto &self = triangles_by_color_merged[color_idx][layer_idx];
 
-                auto top_area = diff_ex(union_ex(shell_triangles_by_color_top[color_idx][layer_idx],
-                                                 shell_triangles_by_color_top[color_idx][layer_idx + num_layers]),
-                                        painted_exploys);
-
-                auto bottom_area = diff_ex(union_ex(shell_triangles_by_color_bottom[color_idx][layer_idx],
-                                                    shell_triangles_by_color_bottom[color_idx][layer_idx + num_layers]),
-                                          painted_exploys);
+                auto top_area    = diff_ex(union_ex(shell_top_by_layer[color_idx][layer_idx]), painted_exploys);
+                auto bottom_area = diff_ex(union_ex(shell_bottom_by_layer[color_idx][layer_idx]), painted_exploys);
 
                 append(self, top_area);
                 append(self, bottom_area);

src/libslic3r/PrintConfig.cpp

@@ -8,6 +8,7 @@
 #include "format.hpp"
 
 #include "GCode/Thumbnails.hpp"
+#include <numeric>
 #include <set>
 #include <boost/algorithm/string/case_conv.hpp>
 #include <boost/algorithm/string/replace.hpp>
@@ -671,19 +672,46 @@ std::string get_extruder_variant_string(ExtruderType extruder_type, NozzleVolume
     return variant_string;
 }
 
+int find_variant_index(const std::string& variant, int variant_id_1based, const std::vector<std::string>& variant_list, const std::vector<int>& variant_ids_1based)
+{
+    const int count = int(variant_list.empty() ? variant_ids_1based.size() : variant_list.size());
+    if (count == 0)
+        return 0;
+    auto same_id = [&](int index) {
+        return variant_id_1based < 0 || variant_ids_1based.empty() || (index < int(variant_ids_1based.size()) && variant_ids_1based[index] == variant_id_1based);
+    };
+    for (int index = 0; index < int(variant_list.size()); ++index)
+        if (variant_list[index] == variant && same_id(index))
+            return index;
+    // Without this variant, use the id's own first variant (usually Standard), not variant index 0,
+    // which belongs to the first filament or extruder.
+    for (int index = 0; index < count; ++index)
+        if (same_id(index))
+            return index;
+    return -1;
+}
+
+std::vector<int> map_variant_indices(const std::vector<std::string>& variants, const std::vector<int>& ids,
+                                     const std::vector<std::string>& from_variants, const std::vector<int>& from_ids)
+{
+    const size_t count = variants.empty() ? ids.size() : variants.size();
+    std::vector<int> variant_index(count);
+    for (size_t index = 0; index < count; ++index) {
+        if (!ids.empty() && index >= ids.size()) {
+            variant_index[index] = -1;
+            continue;
+        }
+        variant_index[index] = find_variant_index(index < variants.size() ? variants[index] : std::string(),
+                                                  ids.empty() ? -1 : ids[index], from_variants, from_ids);
+    }
+    return variant_index;
+}
+
 int get_config_index_base(NozzleVolumeType volume_type, ExtruderType extruder_type, int variant_id_1based, const std::vector<std::string>& variant_list, const std::vector<int>& variant_ids_1based)
 {
     assert(variant_list.size() == variant_ids_1based.size());
-    std::string extruder_variant = get_extruder_variant_string(extruder_type, volume_type);
-    for (int index = 0; index < int(variant_list.size()); ++index) {
-        if (extruder_variant == variant_list[index] && variant_ids_1based[index] == variant_id_1based) { return index; }
-    }
-    // Without this variant, use the id's own first variant (usually Standard), not variant index 0,
-    // which belongs to the first filament or extruder.
-    for (int index = 0; index < int(variant_list.size()); ++index) {
-        if (variant_ids_1based[index] == variant_id_1based) { return index; }
-    }
-    return 0;
+    const int index = find_variant_index(get_extruder_variant_string(extruder_type, volume_type), variant_id_1based, variant_list, variant_ids_1based);
+    return std::max(index, 0);
 }
 
 std::set<NozzleVolumeType> get_extruder_supported_nozzle_volume_types(const DynamicPrintConfig &printer_config, int extruder_id)
@@ -10741,14 +10769,23 @@ void normalize_filament_values_to_variants(DynamicPrintConfig &config)
     const int filament_count = *std::max_element(self_index->values.begin(), self_index->values.end());
     if (filament_count <= 0 || size_t(filament_count) >= self_index->size())
         return;
+    // The values are one per filament, without variant strings, or a single value for all of them. The
+    // variant strings do not change today's mapping; they are passed so a rule that reads them applies here too.
+    const auto *variants = config.option<ConfigOptionStrings>("filament_extruder_variant");
+    const std::vector<std::string> variant_list = variants && variants->size() == self_index->size() ? variants->values : std::vector<std::string>();
+    std::vector<int> filament_ids(filament_count);
+    std::iota(filament_ids.begin(), filament_ids.end(), 1);
+    const std::vector<int> from_filaments = map_variant_indices(variant_list, self_index->values, {}, filament_ids);
+    const std::vector<int> from_single    = map_variant_indices(variant_list, self_index->values, {}, {});
     for (const std::string &key : filament_options_with_variant) {
         auto *opt = dynamic_cast<ConfigOptionVectorBase *>(config.option(key));
         if (opt == nullptr || (opt->size() != size_t(filament_count) && opt->size() != 1))
             continue;
-        std::unique_ptr<ConfigOption> per_filament(opt->clone());
-        // set_at() takes the first value for a filament past the end of a single-value vector
+        const std::vector<int> &variant_index = opt->size() == size_t(filament_count) ? from_filaments : from_single;
+        std::unique_ptr<ConfigOption> source(opt->clone());
+        // -1 and a single-value source both resolve to the first value through get_at()
         for (size_t variant = 0; variant < self_index->size(); ++variant)
-            opt->set_at(per_filament.get(), variant, self_index->values[variant] - 1);
+            opt->set_at(source.get(), variant, variant_index[variant]);
     }
 }
 
@@ -11582,8 +11619,14 @@ void DynamicPrintConfig::update_diff_values_to_child_config(DynamicPrintConfig&
     else
         variant_index.resize(1, 0);
 
+    // A parent variant the child does not list (the parent gained it after the child was saved, or the
+    // child lists none) takes the child's first variant of the same extruder, as slicing does.
+    // Left unmatched, the parent's value would silently replace the user's.
     if (target_variant_count == 0) {
-        variant_index[0] = 0;
+        // The child's one value belongs to the extruder of the parent's first variant.
+        if (cur_variant_count > 0)
+            variant_index = map_variant_indices(cur_extruder_variants, cur_extruder_ids, {},
+                                                cur_extruder_ids.empty() ? std::vector<int>() : std::vector<int>{cur_extruder_ids[0]});
     }
     else if ((cur_extruder_ids.size() > 0) && cur_variant_count != cur_extruder_ids.size()){
         //should not happen
@@ -11595,19 +11638,8 @@ void DynamicPrintConfig::update_diff_values_to_child_config(DynamicPrintConfig&
         BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << boost::format(" size of %1% = %2%, not equal to size of %3% = %4%")
              %extruder_variant_name %target_variant_count %extruder_id_name %target_extruder_ids.size();
     }
-    else {
-        for (int i = 0; i < cur_variant_count; i++)
-        {
-            for (int j = 0; j < target_variant_count; j++)
-            {
-                if ((cur_extruder_variants[i] == target_extruder_variants[j])
-                    &&(cur_extruder_ids.empty() || (cur_extruder_ids[i] == target_extruder_ids[j])))
-                {
-                    variant_index[i] = j;
-                    break;
-                }
-            }
-        }
+    else if (cur_variant_count > 0) {
+        variant_index = map_variant_indices(cur_extruder_variants, cur_extruder_ids, target_extruder_variants, target_extruder_ids);
     }
 
     const t_config_option_keys &keys = new_config.keys();

src/libslic3r/PrintConfig.hpp

@@ -556,8 +556,19 @@ enum PrimeVolumeMode {
 
 extern std::string get_extruder_variant_string(ExtruderType extruder_type, NozzleVolumeType nozzle_volume_type);
 
-// Base slot lookup: scans a variant list (paired with its 1-based extruder/filament ids) for the
-// entry matching the given extruder/volume type and id. Returns 0 when no entry matches.
+// The variant index a value is taken from: in a variant list paired with its 1-based extruder or
+// filament ids, the variant with the same variant string and id, else that id's first variant, else -1.
+// variant_id_1based < 0 or empty variant_ids_1based match any id. A list without variant strings has
+// one variant per id, and one with neither variant strings nor ids has a single variant.
+extern int find_variant_index(const std::string& variant, int variant_id_1based, const std::vector<std::string>& variant_list, const std::vector<int>& variant_ids_1based);
+// find_variant_index for every variant of a list paired with its ids, into from_variants/from_ids.
+// A variant past the end of a shorter id list has no id and gets -1.
+extern std::vector<int> map_variant_indices(const std::vector<std::string>& variants, const std::vector<int>& ids,
+                                            const std::vector<std::string>& from_variants, const std::vector<int>& from_ids);
+
+// Variant index lookup: scans a variant list (paired with its 1-based extruder/filament ids) for the
+// entry matching the given extruder/volume type and id, as find_variant_index. Returns 0 when the id
+// has no variant.
 extern int get_config_index_base(NozzleVolumeType volume_type, ExtruderType extruder_type, int variant_id_1based, const std::vector<std::string>& variant_list, const std::vector<int>& variant_ids_1based);
 
 static std::set<NozzleVolumeType> get_valid_nozzle_volume_type() {

src/libslic3r/TriangleMeshSlicer.cpp

@@ -1062,6 +1062,23 @@ inline std::pair<SlabLines, SlabLines> slice_slabs_make_lines(
             }
         }
     );
+    // As in slice_make_lines(): the facet loop is parallel, so the per-slab line order depends on
+    // thread scheduling, and make_slab_loops() derives loop order and start vertices from it.
+    // Sort canonically; edge_type and flags only break ties, std::sort being unstable.
+    auto sort_canonically = [](std::vector<IntersectionLines> &lines_per_slab) {
+        tbb::parallel_for(tbb::blocked_range<size_t>(0, lines_per_slab.size()),
+            [&lines_per_slab](const tbb::blocked_range<size_t> &range) {
+                for (size_t i = range.begin(); i < range.end(); ++ i)
+                    std::sort(lines_per_slab[i].begin(), lines_per_slab[i].end(), [](const IntersectionLine &l, const IntersectionLine &r) {
+                        return std::make_tuple(l.edge_a_id, l.edge_b_id, l.a_id, l.b_id, l.a.x(), l.a.y(), l.b.x(), l.b.y(), l.edge_type, l.flags) <
+                               std::make_tuple(r.edge_a_id, r.edge_b_id, r.a_id, r.b_id, r.a.x(), r.a.y(), r.b.x(), r.b.y(), r.edge_type, r.flags);
+                    });
+            });
+    };
+    for (SlabLines *slab_lines : { &lines_top, &lines_bottom }) {
+        sort_canonically(slab_lines->at_slice);
+        sort_canonically(slab_lines->between_slices);
+    }
     return out;
 }
 

src/slic3r/GUI/2DBed.cpp

@@ -4,7 +4,25 @@
 #include "3DBed.hpp"
 #include "PartPlate.hpp"
 
+#include <vector>
+#include "libslic3r/Polyline.hpp"
+#include "libslic3r/ExPolygon.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/libslic3r.h"
+#include <wx/colour.h>
+#include <wx/brush.h>
+#include <algorithm>
+#include "libslic3r/Color.hpp"
+#include <string>
+#include <cstddef>
+#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp"
+#include "slic3r/GUI/Widgets/StateColor.hpp"
 #include <wx/dcbuffer.h>
+#include <wx/panel.h>
+#include <wx/wx.h>
+#include <wx/gdicmn.h>
+#include <wx/peninfobase.h>
+#include <wx/font.h>
 
 #include "libslic3r/BoundingBox.hpp"
 #include "libslic3r/Geometry.hpp"

src/slic3r/GUI/2DBed.hpp

@@ -1,6 +1,10 @@
 #ifndef slic3r_2DBed_hpp_
 #define slic3r_2DBed_hpp_
 
+#include <wx/panel.h>
+#include "libslic3r/Point.hpp"
+#include "libslic3r/Line.hpp"
+#include <vector>
 #include <wx/wx.h>
 #include "libslic3r/Config.hpp"
 #include "libslic3r/ExPolygon.hpp"

src/slic3r/GUI/3DBed.cpp

@@ -15,11 +15,27 @@
 #include "Plater.hpp"
 #include "Camera.hpp"
 
+#include <boost/version.hpp>
+#include <cstddef>
+#include <array>
 #include <glad/gl.h>
 
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/filesystem/operations.hpp>
 #include <boost/log/trivial.hpp>
+#include "slic3r/GUI/GLModel.hpp"
+#include <vector>
+#include "libslic3r/Point.hpp"
+#include <utility>
+#include "libslic3r/Color.hpp"
+#include "slic3r/GUI/ImGuiWrapper.hpp"
+#include "slic3r/GUI/GLShader.hpp"
+#include "slic3r/GUI/3DScene.hpp"
+#include "libslic3r/Geometry.hpp"
+#include <math.h>
+#include <tuple>
+#include "libslic3r/Preset.hpp"
+#include "libslic3r/Config.hpp"
 
 #if BOOST_VERSION >= 107800
 #include <boost/timer/timer.hpp>

src/slic3r/GUI/3DBed.hpp

@@ -8,8 +8,13 @@
 #include "libslic3r/BuildVolume.hpp"
 #include "libslic3r/ExPolygon.hpp"
 
+#include "libslic3r/Color.hpp"
+#include "libslic3r/Point.hpp"
+#include <string>
+#include "libslic3r/BoundingBox.hpp"
 #include <tuple>
 #include <array>
+#include <vector>
 
 namespace Slic3r {
 namespace GUI {

src/slic3r/GUI/3DScene.cpp

@@ -1,3 +1,7 @@
+#include <array>
+#include <algorithm>
+#include <functional>
+#include <cmath>
 #include <glad/gl.h>
 
 #include "3DScene.hpp"
@@ -25,6 +29,30 @@
 #include "libslic3r/Tesselate.hpp"
 #include "libslic3r/PrintConfig.hpp"
 
+#include "libslic3r/BoundingBox.hpp"
+#include "libslic3r/TriangleMeshSlicer.hpp"
+#include "libslic3r/Polygon.hpp"
+#include "libslic3r/Point.hpp"
+#include "slic3r/GUI/ImGuiWrapper.hpp"
+#include "libslic3r/Model.hpp"
+#include "libslic3r/Technologies.hpp"
+#include <optional>
+#include "slic3r/GUI/OpenGLManager.hpp"
+#include "libslic3r/Config.hpp"
+#include <memory>
+#include "slic3r/GUI/MeshUtils.hpp"
+#include "libslic3r/TriangleMesh.hpp"
+#include <math.h>
+#include "libslic3r/ObjectID.hpp"
+#include "libslic3r/libslic3r.h"
+#include <map>
+#include <set>
+#include <iterator>
+#include "libslic3r/Color.hpp"
+#include "slic3r/GUI/GUI_ObjectList.hpp"
+#include "libslic3r/Line.hpp"
+#include "libslic3r/Polyline.hpp"
+#include "libslic3r/Exception.hpp"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -36,6 +64,9 @@
 #include <boost/algorithm/string/predicate.hpp>
 
 #include <Eigen/Dense>
+#include <vector>
+#include <utility>
+#include <string>
 
 #ifdef HAS_GLSAFE
 void glAssertRecentCallImpl(const char* file_name, unsigned int line, const char* function_name)

src/slic3r/GUI/3DScene.hpp

@@ -16,8 +16,17 @@
 #include "GLShader.hpp"
 #include "MeshUtils.hpp"
 
+#include <array>
+#include <cstddef>
+#include <cmath>
 #include <functional>
+#include <map>
+#include "libslic3r/BoundingBox.hpp"
+#include <memory>
 #include <optional>
+#include <vector>
+#include <string>
+#include <utility>
 
 #ifndef NDEBUG
 #define HAS_GLSAFE

src/slic3r/GUI/AMSDryControl.cpp

@@ -19,7 +19,38 @@
 #include "libslic3r/PresetBundle.hpp"
 #include "libslic3r/Preset.hpp"
 
+#include <algorithm>
 #include <boost/log/trivial.hpp>
+#include <string>
+#include "slic3r/GUI/DeviceCore/DevDefs.h"
+#include <wx/string.h>
+#include <wx/event.h>
+#include <wx/panel.h>
+#include <wx/colour.h>
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include <wx/gdicmn.h>
+#include "libslic3r/Exception.hpp"
+#include <wx/dcclient.h>
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include <wx/toplevel.h>
+#include <wx/scrolwin.h>
+#include "slic3r/GUI/Widgets/AMSItem.hpp"
+#include <wx/chartype.h>
+#include "slic3r/GUI/Widgets/Button.hpp"
+#include <utility>
+#include <chrono>
+#include <optional>
+#include <wx/timer.h>
+#include "libslic3r/Utils.hpp"
+#include <unordered_set>
+#include <vector>
+#include <set>
+#include <sstream>
+#include <ios>
+#include <iomanip>
+#include "slic3r/GUI/DeviceCore/DevConfigUtil.h"
+#include <limits>
+#include <memory>
 
 namespace Slic3r { namespace GUI {
 

src/slic3r/GUI/AMSDryControl.hpp

@@ -9,7 +9,25 @@
 #include "slic3r/GUI/I18N.hpp" // Orca: explicit _L() catalog include
 
 #include <chrono>
+#include <memory>
+#include "libslic3r/PresetBundle.hpp"
+#include <map>
 #include <optional>
+#include <wx/panel.h>
+#include <wx/string.h>
+#include <string>
+#include <wx/event.h>
+#include <vector>
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include <wx/gdicmn.h>
+#include <wx/simplebook.h>
+#include "slic3r/GUI/Widgets/ComboBox.hpp"
+#include "slic3r/GUI/Widgets/Button.hpp"
+#include <wx/timer.h>
+#include "slic3r/GUI/DeviceCore/DevDefs.h"
+#include <unordered_map>
+#include <wx/colour.h>
+#include <wx/scrolwin.h>
 
 
 //Previous defintions

src/slic3r/GUI/AMSMaterialsSetting.cpp

@@ -8,8 +8,48 @@
 #include "I18N.hpp"
 #include <algorithm>
 #include <boost/log/trivial.hpp>
+#include <string>
+#include <sstream>
+#include <ios>
+#include <iomanip>
+#include <wx/checklst.h>
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include "slic3r/GUI/Widgets/Button.hpp"
+#include "slic3r/GUI/Widgets/Label.hpp"
+#include <utility>
+#include "slic3r/GUI/wxExtensions.hpp"
+#include "slic3r/GUI/Widgets/HyperLink.hpp"
+#include <cstdlib>
+#include <cstdio>
+#include "slic3r/GUI/DeviceCore/DevDefs.h"
+#include "libslic3r/calib.hpp"
+#include "libslic3r/Config.hpp"
+#include <vector>
+#include <unordered_map>
+#include <wx/arrstr.h>
+#include <set>
+#include "slic3r/GUI/DeviceCore/DevConfigUtil.h"
+#include <cstddef>
+#include <climits>
+#include "libslic3r/PrintConfig.hpp"
+#include <cmath>
+#include "slic3r/GUI/Widgets/PopupWindow.hpp"
+#include "slic3r/GUI/Widgets/StaticBox.hpp"
 #include <wx/colordlg.h>
+#include <wx/dcclient.h>
+#include <wx/dc.h>
+#include <wx/colour.h>
+#include <wx/colourdata.h>
 #include <wx/dcgraph.h>
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include <wx/toplevel.h>
+#include <wx/panel.h>
+#include <wx/textctrl.h>
+#include <wx/string.h>
+#include <wx/valtext.h>
+#include <wx/sizer.h>
+#include <wx/peninfobase.h>
 #include "CalibUtils.hpp"
 #include "../Utils/ColorSpaceConvert.hpp"
 #include "EncodedFilament.hpp"

src/slic3r/GUI/AMSMaterialsSetting.hpp

@@ -16,6 +16,21 @@
 #include "Widgets/TextInput.hpp"
 #include "Widgets/HyperLink.hpp"
 #include "slic3r/Utils/CalibUtils.hpp"
+#include <wx/colour.h>
+#include <vector>
+#include <wx/checklst.h>
+#include <wx/gdicmn.h>
+#include <wx/event.h>
+#include <wx/dc.h>
+#include "slic3r/GUI/Widgets/PopupWindow.hpp"
+#include "slic3r/GUI/Widgets/StaticBox.hpp"
+#include <wx/sizer.h>
+#include <wx/string.h>
+#include <string>
+#include "libslic3r/calib.hpp"
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include <wx/panel.h>
+#include <map>
 
 #define AMS_MATERIALS_SETTING_DEF_COLOUR wxColour(255, 255, 255)
 #define AMS_MATERIALS_SETTING_GREY900 wxColour(38, 46, 48)

src/slic3r/GUI/AMSSetting.cpp

@@ -2,6 +2,7 @@
 #include "GUI_App.hpp"
 #include "I18N.hpp"
 
+#include "libslic3r_version.h"
 #include "slic3r/GUI/DeviceCore/DevExtruderSystem.h"
 #include "slic3r/GUI/DeviceCore/DevFilaSystem.h"
 #include "slic3r/GUI/DeviceCore/DevManager.h"
@@ -11,6 +12,18 @@
 #include "slic3r/GUI/Widgets/AnimaController.hpp"
 #include "slic3r/GUI/Widgets/Label.hpp"
 #include "slic3r/GUI/Widgets/ComboBox.hpp"
+#include <wx/checklst.h>
+#include <wx/gdicmn.h>
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include <wx/string.h>
+#include <wx/panel.h>
+#include "slic3r/GUI/Widgets/CheckBox.hpp"
+#include <wx/tglbtn.h>
+#include "slic3r/GUI/wxExtensions.hpp"
+#include "slic3r/GUI/DeviceCore/DevFilaAmsSetting.h"
+#include "slic3r/GUI/DeviceCore/DevConfigUtil.h"
+#include <wx/event.h>
+#include <vector>
 
 namespace Slic3r { namespace GUI {
 

src/slic3r/GUI/AMSSetting.hpp

@@ -12,6 +12,15 @@
 #include "Widgets/CheckBox.hpp"
 
 #include "slic3r/GUI/DeviceCore/DevFilaAmsSetting.h"
+#include <wx/checklst.h>
+#include <wx/gdicmn.h>
+#include <wx/dialog.h>
+#include <string>
+#include <wx/event.h>
+#include <wx/panel.h>
+#include <wx/sizer.h>
+#include <memory>
+#include <unordered_map>
 
 #define AMS_SETTING_DEF_COLOUR wxColour(255, 255, 255)
 #define AMS_SETTING_GREY800 wxColour(50, 58, 61)

src/slic3r/GUI/AVVideoDecoder.cpp

@@ -1,6 +1,14 @@
 #include "AVVideoDecoder.hpp"
 
+#include <algorithm>
 #include <assert.h>
+#include "slic3r/GUI/Printer/BambuTunnel.h"
+#include <cstdio>
+#include <cstring>
+#include <cstddef>
+#include <wx/image.h>
+#include <wx/gdicmn.h>
+#include <cstdint>
 
 extern "C"
 {

src/slic3r/GUI/AVVideoDecoder.hpp

@@ -2,6 +2,7 @@
 #define AVVIDEODECODER_HPP
 
 #include "Printer/BambuTunnel.h"
+#include <cstdint>
 
 extern "C" {
     #include <libavcodec/avcodec.h>

src/slic3r/GUI/AboutDialog.cpp

@@ -9,8 +9,26 @@
 #include "MainFrame.hpp"
 #include "format.hpp"
 #include "Widgets/Button.hpp"
+#include "libslic3r_version.h"
 
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include "libslic3r/libslic3r.h"
+#include "slic3r/GUI/wxExtensions.hpp"
+#include "slic3r/GUI/Widgets/Label.hpp"
+#include <vector>
 #include <wx/clipbrd.h>
+#include <wx/panel.h>
+#include <wx/wx.h>
+#include <wx/gdicmn.h>
+#include <wx/event.h>
+#include <wx/dcclient.h>
+#include <wx/dialog.h>
+#include <wx/toplevel.h>
+#include <wx/sizer.h>
+#include <wx/html/htmlwin.h>
+#include <wx/string.h>
+#include <wx/colour.h>
+#include <wx/dataobj.h>
 
 namespace Slic3r {
 namespace GUI {

src/slic3r/GUI/AboutDialog.hpp

@@ -1,6 +1,11 @@
 #ifndef slic3r_GUI_AboutDialog_hpp_
 #define slic3r_GUI_AboutDialog_hpp_
 
+#include <wx/panel.h>
+#include <wx/event.h>
+#include <string>
+#include <vector>
+#include <wx/string.h>
 #include <wx/wx.h>
 #include <wx/intl.h>
 #include <wx/html/htmlwin.h>

src/slic3r/GUI/ActionRegistry.cpp

@@ -12,10 +12,19 @@
 #include "Tab.hpp"
 #include "slic3r/plugin/PluginManager.hpp"
 
+#include <cassert>
+#include <boost/filesystem/operations.hpp>
 #include <libslic3r/AppConfig.hpp>
 #include <libslic3r/Config.hpp>
+#include "slic3r/plugin/PluginDescriptor.hpp"
+#include <memory>
+#include "libslic3r/Preset.hpp"
+#include "slic3r/GUI/PartPlate.hpp"
 #include <slic3r/plugin/PythonPluginInterface.hpp>
 
+#include <vector>
+#include <utility>
+#include <wx/app.h>
 #include <wx/thread.h>
 
 #include <boost/filesystem.hpp>

src/slic3r/GUI/AmsMappingPopup.cpp

@@ -11,6 +11,36 @@
 #include "MainFrame.hpp"
 #include "format.hpp"
 #include "Widgets/ProgressDialog.hpp"
+#include <wx/event.h>
+#include <wx/colour.h>
+#include <string>
+#include <wx/panel.h>
+#include <wx/gdicmn.h>
+#include <vector>
+#include <boost/log/trivial.hpp>
+#include <wx/dcclient.h>
+#include <cstddef>
+#include <wx/arrstr.h>
+#include "slic3r/GUI/DeviceManager.hpp"
+#include <math.h>
+#include <cmath>
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include <wx/peninfobase.h>
+#include <wx/string.h>
+#include "slic3r/GUI/Widgets/PopupWindow.hpp"
+#include <wx/popupwin.h>
+#include <wx/anybutton.h>
+#include <wx/sizer.h>
+#include <map>
+#include "slic3r/GUI/DeviceCore/DevUtil.h"
+#include <cstdlib>
+#include "slic3r/GUI/DeviceCore/DevDefs.h"
+#include "slic3r/GUI/wxExtensions.hpp"
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include "slic3r/GUI/Widgets/SwitchButton.hpp"
+#include <utility>
+#include "slic3r/GUI/Widgets/AMSItem.hpp"
+#include <unordered_map>
 #include <wx/tooltip.h>
 #include "Widgets/RoundedRectangle.hpp"
 #include "Widgets/StaticBox.hpp"
@@ -23,6 +53,9 @@
 #include <miniz.h>
 #include <algorithm>
 #include <optional>
+#include <wx/wx.h>
+#include <wx/toplevel.h>
+#include <wx/wrapsizer.h>
 #include "Plater.hpp"
 #include "BitmapCache.hpp"
 #include "BindDialog.hpp"

src/slic3r/GUI/AmsMappingPopup.hpp

@@ -1,6 +1,16 @@
 #ifndef slic3r_GUI_AmsMappingPopup_hpp_
 #define slic3r_GUI_AmsMappingPopup_hpp_
 
+#include <string>
+#include <vector>
+#include <wx/event.h>
+#include <wx/dc.h>
+#include <optional>
+#include "libslic3r/ProjectTask.hpp"
+#include "slic3r/GUI/DeviceCore/DevDefs.h"
+#include <map>
+#include <functional>
+#include <memory>
 #include <wx/wx.h>
 #include <wx/intl.h>
 #include <wx/collpane.h>

src/slic3r/GUI/AmsMappingPopupUpdate.cpp

@@ -21,6 +21,17 @@
 #include "Widgets/RoundedRectangle.hpp"
 #include "Widgets/StaticBox.hpp"
 
+#include <list>
+#include <vector>
+#include "slic3r/GUI/DeviceCore/DevDefs.h"
+#include <boost/log/trivial.hpp>
+#include <cstddef>
+#include <string>
+#include <cstdlib>
+#include <exception>
+#include <map>
+#include "libslic3r/Config.hpp"
+#include <wx/event.h>
 #include <wx/progdlg.h>
 #include <wx/clipbrd.h>
 #include <wx/dcgraph.h>
@@ -28,6 +39,7 @@
 #include <miniz.h>
 #include <algorithm>
 #include <optional>
+#include <wx/wx.h>
 #include "Plater.hpp"
 #include "BitmapCache.hpp"
 

src/slic3r/GUI/AmsWidgets.cpp

@@ -1,7 +1,10 @@
 #include "AmsWidgets.hpp"
+#include <map>
+#include <string>
 #include <wx/button.h>
 #include <wx/sizer.h>
 #include <wx/dataview.h>
+#include <wx/variant.h>
 
 #include "GUI_App.hpp"
 #include "GUI_ObjectList.hpp"

src/slic3r/GUI/AmsWidgets.hpp

@@ -2,6 +2,7 @@
 #define slic3r_AmsWidgets_hpp_
 
 
+#include <wx/arrstr.h>
 #include <wx/notebook.h>
 #include <wx/scrolwin.h>
 #include <wx/sizer.h>
@@ -10,6 +11,7 @@
 #include <wx/treectrl.h>
 #include <wx/imaglist.h>
 #include <wx/artprov.h>
+#include <wx/variant.h>
 #include <wx/xrc/xmlres.h>
 #include <wx/string.h>
 #include <wx/stattext.h>

src/slic3r/GUI/AuiPaneLayout.cpp

@@ -1,4 +1,6 @@
 #include "AuiPaneLayout.hpp"
+#include <string>
+#include <cstddef>
 
 namespace Slic3r { namespace GUI {
 

src/slic3r/GUI/Auxiliary.cpp

@@ -4,17 +4,53 @@
 #include "libslic3r/Model.hpp"
 #include "libslic3r/Format/bbs_3mf.hpp"
 
+#include <vector>
+#include <string>
+#include <memory>
+#include <boost/filesystem/path.hpp>
+#include "slic3r/GUI/Project.hpp"
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include "slic3r/GUI/Field.hpp"
+#include "slic3r/GUI/Widgets/TextInput.hpp"
+#include "libslic3r/Preset.hpp"
+#include <cstddef>
+#include <cstring>
+#include "slic3r/GUI/GUI.hpp"
+#include <boost/filesystem/operations.hpp>
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include <utility>
+#include "slic3r/GUI/Widgets/AMSItem.hpp"
+#include <iterator>
+#include "slic3r/GUI/Widgets/Button.hpp"
+#include <wx/anybutton.h>
+#include "slic3r/GUI/Tabbook.hpp"
+#include <ctime>
+#include <map>
+#include "slic3r/GUI/Printer/PrinterFileSystem.h"
+#include "slic3r/GUI/Widgets/ComboBox.hpp"
 #include <wx/app.h>
+#include <wx/bookctrl.h>
 #include <wx/button.h>
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include <wx/panel.h>
+#include <wx/image.h>
+#include <wx/dcclient.h>
+#include <wx/notebook.h>
+#include <wx/chartype.h>
 #include <wx/scrolwin.h>
 #include <wx/sizer.h>
 
 #include <wx/bmpcbox.h>
 #include <wx/bmpbuttn.h>
+#include <wx/string.h>
+#include <wx/stattext.h>
+#include <wx/textctrl.h>
 #include <wx/treectrl.h>
 #include <wx/imaglist.h>
 #include <wx/settings.h>
 #include <wx/filedlg.h>
+#include <wx/wrapsizer.h>
 #include <wx/wupdlock.h>
 #include <wx/dataview.h>
 #include <wx/tokenzr.h>

src/slic3r/GUI/Auxiliary.hpp

@@ -2,6 +2,16 @@
 #define slic3r_Auxiliary_hpp_
 
 #include "Tabbook.hpp"
+#include <array>
+#include "slic3r/GUI/Widgets/TextInput.hpp"
+#include <boost/filesystem/path.hpp>
+#include <wx/bookctrl.h>
+#include <wx/event.h>
+#include <wx/dynarray.h>
+#include "slic3r/GUI/Widgets/Button.hpp"
+#include "slic3r/GUI/Widgets/ComboBox.hpp"
+#include <string>
+#include "slic3r/GUI/Printer/PrinterFileSystem.h"
 #include <wx/notebook.h>
 #include <wx/scrolwin.h>
 #include <wx/sizer.h>
@@ -10,6 +20,7 @@
 #include <wx/treectrl.h>
 #include <wx/imaglist.h>
 #include <wx/artprov.h>
+#include <wx/wrapsizer.h>
 #include <wx/xrc/xmlres.h>
 #include <wx/string.h>
 #include <wx/stattext.h>

src/slic3r/GUI/AuxiliaryDataViewModel.cpp

@@ -4,9 +4,22 @@
 #include "libslic3r/Format/bbs_3mf.hpp"
 
 
+#include <array>
+#include <boost/filesystem/path.hpp>
+#include <boost/filesystem/operations.hpp>
+#include <boost/filesystem/directory.hpp>
 #include <boost/log/trivial.hpp>
 
+#include <wx/filefn.h>
+#include <wx/dataview.h>
+#include <map>
+#include <wx/debug.h>
+#include <cstddef>
+#include <wx/arrstr.h>
 #include <wx/log.h>
+#include <wx/string.h>
+#include <wx/variant.h>
+#include <wx/types.h>
 
 const static std::array<wxString, 4> s_default_folders = {
     _L("Model Pictures"),

src/slic3r/GUI/AuxiliaryDataViewModel.hpp

@@ -9,6 +9,12 @@
 #include "I18N.hpp"
 
 #include <boost/filesystem.hpp>
+#include <wx/dynarray.h>
+#include <boost/filesystem/path.hpp>
+#include <cstddef>
+#include <wx/string.h>
+#include <wx/arrstr.h>
+#include <wx/variant.h>
 
 class AuxiliaryModelNode;
 WX_DEFINE_ARRAY_PTR(AuxiliaryModelNode*, AuxiliaryModelNodePtrArray);

src/slic3r/GUI/AuxiliaryDialog.cpp

@@ -5,6 +5,11 @@
 #include "libslic3r/Utils.hpp"
 
 #include <boost/property_tree/ptree.hpp>
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include <wx/wx.h>
+#include <wx/gdicmn.h>
+#include <wx/dialog.h>
+#include <wx/toplevel.h>
 
 namespace pt = boost::property_tree;
 typedef pt::ptree JSON;

src/slic3r/GUI/BBLStatusBar.cpp

@@ -1,5 +1,11 @@
 #include "BBLStatusBar.hpp"
 
+#include <wx/panel.h>
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include <wx/sizer.h>
+#include <wx/stattext.h>
+#include <string>
 #include <wx/timer.h>
 #include <wx/gauge.h>
 #include <wx/button.h>

src/slic3r/GUI/BBLStatusBarBind.cpp

@@ -1,5 +1,10 @@
 #include "BBLStatusBarBind.hpp"
 
+#include <wx/panel.h>
+#include <wx/event.h>
+#include <wx/sizer.h>
+#include "slic3r/GUI/Widgets/Label.hpp"
+#include <string>
 #include <wx/timer.h>
 #include <wx/gauge.h>
 #include <wx/button.h>

src/slic3r/GUI/BBLStatusBarBind.hpp

@@ -2,6 +2,7 @@
 #define BBLStatusBarBind_HPP
 
 #include <wx/panel.h>
+#include <wx/sizer.h>
 #include <wx/stattext.h>
 #include <wx/simplebook.h>
 

src/slic3r/GUI/BBLStatusBarPrint.cpp

@@ -1,5 +1,15 @@
 #include "BBLStatusBarPrint.hpp"
 
+#include <wx/event.h>
+#include <wx/panel.h>
+#include <wx/sizer.h>
+#include <wx/string.h>
+#include "slic3r/GUI/Widgets/Label.hpp"
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include <utility>
+#include "slic3r/GUI/Widgets/Button.hpp"
+#include "slic3r/GUI/wxExtensions.hpp"
+#include <cstddef>
 #include <wx/timer.h>
 #include <wx/gauge.h>
 #include <wx/button.h>

src/slic3r/GUI/BBLStatusBarPrint.hpp

@@ -1,7 +1,9 @@
 #ifndef BBLStatusBarPrint_HPP
 #define BBLStatusBarPrint_HPP
 
+#include <wx/event.h>
 #include <wx/panel.h>
+#include <wx/sizer.h>
 #include <wx/stattext.h>
 
 #include <memory>

src/slic3r/GUI/BBLStatusBarSend.cpp

@@ -1,5 +1,13 @@
 #include "BBLStatusBarSend.hpp"
 
+#include <wx/event.h>
+#include <wx/panel.h>
+#include <wx/sizer.h>
+#include <wx/string.h>
+#include "slic3r/GUI/Widgets/Label.hpp"
+#include "slic3r/GUI/Widgets/Button.hpp"
+#include "slic3r/GUI/wxExtensions.hpp"
+#include <cstddef>
 #include <wx/timer.h>
 #include <wx/gauge.h>
 #include <wx/button.h>

src/slic3r/GUI/BBLStatusBarSend.hpp

@@ -1,7 +1,9 @@
 #ifndef BBLSTATUSBARSEND_HPP
 #define BBLSTATUSBARSEND_HPP
 
+#include <wx/event.h>
 #include <wx/panel.h>
+#include <wx/sizer.h>
 #include <wx/stattext.h>
 
 #include <memory>

src/slic3r/GUI/BBLTopbar.cpp

@@ -2,7 +2,19 @@
 #include "wx/artprov.h"
 #include "wx/aui/framemanager.h"
 #include "wx/display.h"
+#include <wx/gdicmn.h>
+#include <wx/event.h>
+#include <wx/dcbuffer.h>
+#include <wx/dc.h>
+#include <wx/aui/auibar.h>
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include <wx/settings.h>
+#include "slic3r/GUI/Widgets/Label.hpp"
+#include <wx/image.h>
+#include <wx/string.h>
+#include <cstddef>
 #include <wx/utils.h>
+#include <wx/window.h>
 #include "I18N.hpp"
 #include "GUI_App.hpp"
 #include "GUI.hpp"

src/slic3r/GUI/BBLTopbar.hpp

@@ -7,6 +7,9 @@
 #include "DeviceManager.hpp"
 
 #include <wx/control.h>
+#include <wx/string.h>
+#include <wx/gdicmn.h>
+#include <wx/event.h>
 
 using namespace Slic3r::GUI;
 

src/slic3r/GUI/BackgroundSlicingProcess.cpp

@@ -4,8 +4,26 @@
 #include "MainFrame.hpp"
 #include "format.hpp"
 
+#include <cstddef>
+#include <exception>
+#include "libslic3r/Config.hpp"
+#include <cstdint>
+#include <functional>
 #include <libslic3r/Exception.hpp>
+#include <utility>
+#include <string>
+#include <vector>
+#include <new>
+#include "libslic3r/GCode/ThumbnailData.hpp"
+#include "libslic3r/PrintConfig.hpp"
+#include "libslic3r/Zipper.hpp"
+#include <mutex>
+#include "libslic3r/PrintBase.hpp"
+#include <ostream>
+#include <memory>
+#include "libslic3r/Polygon.hpp"
 #include <wx/app.h>
+#include <wx/event.h>
 #include <wx/panel.h>
 #include <wx/stdpaths.h>
 
@@ -36,6 +54,7 @@
 #include "I18N.hpp"
 // #include "RemovableDriveManager.hpp"
 
+#include "libslic3r_version.h"
 #include "slic3r/GUI/Plater.hpp"
 
 namespace Slic3r {

src/slic3r/GUI/BackgroundSlicingProcess.hpp

@@ -1,12 +1,21 @@
 #ifndef slic3r_GUI_BackgroundSlicingProcess_hpp_
 #define slic3r_GUI_BackgroundSlicingProcess_hpp_
 
+#include <exception>
+#include <cassert>
+#include <cstddef>
+#include "libslic3r/Config.hpp"
+#include "libslic3r/Polygon.hpp"
+#include <memory>
+#include <functional>
 #include <string>
 #include <condition_variable>
 #include <mutex>
 
 #include <boost/thread.hpp>
 
+#include <utility>
+#include <vector>
 #include <wx/event.h>
 
 #include "libslic3r/PrintBase.hpp"

src/slic3r/GUI/BaseTransparentDPIFrame.cpp

@@ -1,7 +1,14 @@
 #include "BaseTransparentDPIFrame.hpp"
 
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include "slic3r/GUI/wxExtensions.hpp"
+#include "slic3r/GUI/Widgets/Label.hpp"
+#include "slic3r/GUI/Event.hpp"
 #include <thread>
+#include <wx/dcclient.h>
 #include <wx/event.h>
+#include <wx/gdicmn.h>
 #include <wx/sizer.h>
 #include <wx/slider.h>
 #include <wx/dcmemory.h>
@@ -14,6 +21,9 @@
 #include "Widgets/TextInput.hpp"
 #include "Notebook.hpp"
 #include <chrono>
+#include <wx/string.h>
+#include <wx/toplevel.h>
+#include <wx/timer.h>
 #include "Widgets/Button.hpp"
 #include "Widgets/CheckBox.hpp"
 #include "CapsuleButton.hpp"

src/slic3r/GUI/BaseTransparentDPIFrame.hpp

@@ -2,9 +2,13 @@
 #define _BaseTransparentDPIFrame_H_
 
 #include <future>
+#include "slic3r/GUI/Event.hpp"
 #include <thread>
 #include "GUI_App.hpp"
 #include "GUI_Utils.hpp"
+#include <wx/gdicmn.h>
+#include <wx/string.h>
+#include <wx/sizer.h>
 #include <wx/timer.h>
 
 class Button;

src/slic3r/GUI/BedShapeDialog.cpp

@@ -2,6 +2,30 @@
 #include "GUI_App.hpp"
 #include "OptionsGroup.hpp"
 
+#include "libslic3r/Point.hpp"
+#include <string>
+#include <cassert>
+#include "libslic3r/Config.hpp"
+#include <utility>
+#include <wx/string.h>
+#include "libslic3r/BuildVolume.hpp"
+#include "slic3r/GUI/Field.hpp"
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include "slic3r/GUI/Widgets/Button.hpp"
+#include <wx/panel.h>
+#include <wx/bookctrl.h>
+#include "slic3r/GUI/2DBed.hpp"
+#include <memory>
+#include <boost/filesystem/operations.hpp>
+#include <boost/any.hpp>
+#include <exception>
+#include "libslic3r/libslic3r.h"
+#include <vector>
+#include <cmath>
+#include <wx/filedlg.h>
+#include "slic3r/GUI/GUI.hpp"
+#include <wx/busycursor.h>
 #include <wx/wx.h>
 #include <wx/numformatter.h>
 #include <wx/sizer.h>

src/slic3r/GUI/BedShapeDialog.hpp

@@ -11,8 +11,17 @@
 
 #include "Widgets/ComboBox.hpp"
 
+#include <memory>
+#include "libslic3r/Point.hpp"
+#include <string>
+#include <vector>
+#include "libslic3r/Config.hpp"
 #include <wx/dialog.h>
+#include <wx/panel.h>
+#include <wx/event.h>
+#include <wx/gdicmn.h>
 #include <wx/simplebook.h> // ORCA
+#include <wx/string.h>
 
 namespace Slic3r {
 namespace GUI {

src/slic3r/GUI/BindDialog.cpp

@@ -1,10 +1,44 @@
 #include "BindDialog.hpp"
 #include "GUI_App.hpp"
 
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include <wx/intl.h>
+#include <wx/gdicmn.h>
+#include <wx/toplevel.h>
+#include <wx/panel.h>
+#include <wx/simplebook.h>
+#include "slic3r/GUI/Widgets/Label.hpp"
+#include "slic3r/GUI/Widgets/HyperLink.hpp"
+#include "slic3r/GUI/Widgets/TextInput.hpp"
+#include <wx/string.h>
+#include <wx/textctrl.h>
+#include <wx/event.h>
+#include "slic3r/GUI/Widgets/Button.hpp"
+#include <cstddef>
+#include <wx/utils.h>
+#include "slic3r/GUI/MsgDialog.hpp"
+#include "slic3r/GUI/Widgets/StaticBox.hpp"
+#include "slic3r/GUI/wxExtensions.hpp"
+#include <wx/wrapsizer.h>
+#include "slic3r/GUI/Widgets/CheckBox.hpp"
+#include "slic3r/GUI/ReleaseNote.hpp"
+#include <wx/tglbtn.h>
+#include <memory>
+#include "slic3r/GUI/BBLStatusBarBind.hpp"
+#include "slic3r/GUI/Jobs/BindJob.hpp"
+#include "slic3r/GUI/Printer/PrinterFileSystem.h"
+#include "slic3r/GUI/DeviceCore/DevDefs.h"
+#include "slic3r/GUI/Jobs/Worker.hpp"
+#include <utility>
+#include "slic3r/GUI/GUI.hpp"
+#include <wx/image.h>
+#include <wx/stattext.h>
 #include <wx/wx.h>
 #include <wx/mstream.h>
 #include <wx/sizer.h>
 #include <wx/statbox.h>
+#include "bambu_networking.hpp"
+#include "Http.hpp"
 #include "wx/evtloop.h"
 #include <wx/tokenzr.h>
 #include <wx/richmsgdlg.h>

src/slic3r/GUI/BindDialog.hpp

@@ -3,9 +3,16 @@
 
 #include "I18N.hpp"
 
+#include <cstddef>
+#include "slic3r/GUI/Widgets/Label.hpp"
+#include <memory>
+#include <wx/event.h>
+#include "slic3r/GUI/Widgets/StaticBox.hpp"
 #include <wx/font.h>
 #include <wx/colour.h>
+#include <wx/panel.h>
 #include <wx/settings.h>
+#include <wx/simplebook.h>
 #include <wx/string.h>
 #include <wx/sizer.h>
 #include <wx/stattext.h>

src/slic3r/GUI/BitmapCache.cpp

@@ -5,8 +5,24 @@
 #include "GUI.hpp"
 #include "GUI_Utils.hpp"
 
+#include <algorithm>
+#include <boost/algorithm/string/replace.hpp>
 #include <boost/nowide/cstdio.hpp>
 #include <boost/filesystem.hpp>
+#include <utility>
+#include <string>
+#include <wx/image.h>
+#include <cstddef>
+#include <wx/dcmemory.h>
+#include <wx/gdicmn.h>
+#include <map>
+#include <cstdio>
+#include <cstdlib>
+#include "libslic3r/LocalesUtils.hpp"
+#include <cstring>
+#include <vector>
+#include <cstdint>
+#include <imgui.h>
 
 #ifdef __WXGTK2__
     // Broken alpha workaround

src/slic3r/GUI/BitmapCache.hpp

@@ -1,9 +1,12 @@
 #ifndef SLIC3R_GUI_BITMAP_CACHE_HPP
 #define SLIC3R_GUI_BITMAP_CACHE_HPP
 
+#include <cstddef>
 #include <map>
+#include <string>
 #include <vector>
 
+#include <wx/colour.h>
 #include <wx/wxprec.h>
 #ifndef WX_PRECOMP
     #include <wx/wx.h>

src/slic3r/GUI/BitmapComboBox.cpp

@@ -5,6 +5,8 @@
 #include <string>
 #include <boost/algorithm/string.hpp>
 
+#include <wx/bmpcbox.h>
+#include <wx/gdicmn.h>
 #include <wx/sizer.h>
 #include <wx/stattext.h>
 #include <wx/textctrl.h>

src/slic3r/GUI/BitmapComboBox.hpp

@@ -1,8 +1,10 @@
 #ifndef slic3r_BitmapComboBox_hpp_
 #define slic3r_BitmapComboBox_hpp_
 
+#include <cstddef>
 #include <wx/bmpcbox.h>
 #include <wx/gdicmn.h>
+#include <wx/string.h>
 
 #include "GUI_Utils.hpp"
 

src/slic3r/GUI/BonjourDialog.cpp

@@ -2,15 +2,27 @@
 
 #include "BonjourDialog.hpp"
 
+#include "libslic3r/Config.hpp"
+#include <memory>
+#include <boost/asio/ip/address.hpp>
+#include <cstddef>
 #include <set>
 #include <mutex>
 
 #include <boost/nowide/convert.hpp>
 
+#include <wx/event.h>
+#include <utility>
+#include <wx/gdicmn.h>
+#include <wx/dialog.h>
+#include "slic3r/GUI/Widgets/Label.hpp"
+#include <wx/listbase.h>
+#include <vector>
 #include <wx/sizer.h>
 #include <wx/listctrl.h>
 #include <wx/stattext.h>
 #include <wx/timer.h>
+#include <wx/toplevel.h>
 #include <wx/wupdlock.h>
 
 #include "slic3r/GUI/GUI.hpp"

src/slic3r/GUI/BonjourDialog.hpp

@@ -2,11 +2,14 @@
 #define slic3r_BonjourDialog_hpp_
 
 #include <cstddef>
+#include "libslic3r/Config.hpp"
 #include <memory>
 
 #include <boost/asio/ip/address.hpp>
 
+#include <vector>
 #include <wx/dialog.h>
+#include <wx/event.h>
 #include <wx/string.h>
 
 #include "libslic3r/PrintConfig.hpp"

src/slic3r/GUI/CAD/DesignCanvas.cpp

@@ -15,14 +15,32 @@
 #include "libslic3r/Config.hpp"
 #include <boost/algorithm/string/predicate.hpp>
 #include <algorithm>
+#include <cstdio>
 #include <cstdlib>
 
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include "libslic3r/CAD/SketchEngine.hpp"
+#include <vector>
+#include <memory>
+#include <string>
+#include <functional>
+#include "libslic3r/Color.hpp"
+#include "slic3r/GUI/CAD/DesignSketchTool.hpp"
+#include "libslic3r/Point.hpp"
+#include <utility>
+#include "libslic3r/CAD/CadDocument.hpp"
+#include "libslic3r/BoundingBox.hpp"
 #include <wx/glcanvas.h>
+#include <wx/panel.h>
 #include <wx/stopwatch.h>   // wxGetLocalTimeMillis: the right-click vs right-hold budget
 #include <wx/sizer.h>
 #include <wx/frame.h>
 #include <wx/stattext.h>
+#include <wx/string.h>
+#include <wx/time.h>
 #include <wx/toplevel.h>
+#include <wx/window.h>
 
 namespace Slic3r {
 namespace GUI {

src/slic3r/GUI/CAD/DesignCanvas.hpp

@@ -1,12 +1,20 @@
 #ifndef slic3r_DesignCanvas_hpp_
 #define slic3r_DesignCanvas_hpp_
 
+#include <vector>
+#include "libslic3r/Point.hpp"
+#include "libslic3r/CAD/CadDocument.hpp"
+#include "libslic3r/Color.hpp"
+#include <utility>
+#include <wx/colour.h>
+#include <wx/event.h>
 #include <wx/panel.h>
 #include <wx/popupwin.h>
 
 #include <functional>
 #include <memory>
 #include <string>
+#include <wx/string.h>
 
 #include "slic3r/GUI/3DBed.hpp"
 #include "slic3r/GUI/Camera.hpp"

src/slic3r/GUI/CAD/DesignPanel.cpp

@@ -1,4 +1,5 @@
 #include "slic3r/GUI/CAD/DesignPanel.hpp"
+#include "libslic3r_version.h"
 #include "slic3r/GUI/CAD/DesignCanvas.hpp"
 #include "slic3r/GUI/CAD/DesignSketchTool.hpp"
 #include "slic3r/GUI/CAD/DesignOffer.hpp"                // generated offer table — see scripts/CAD/tool_atlas.json
@@ -7,6 +8,11 @@
 #include "libslic3r/Format/OBJ.hpp"
 #include "libslic3r/Format/bbs_3mf.hpp"   // put_other_changes: mark the project dirty outside the undo stack
 
+#include <TopoDS_Face.hxx>
+#include <TopoDS_Edge.hxx>
+#include <TopoDS_Shape.hxx>
+#include <Eigen/Geometry>
+#include <TopAbs_Orientation.hxx>
 #include <boost/algorithm/string/case_conv.hpp>
 #include <boost/filesystem/path.hpp>
 #include <boost/log/trivial.hpp>          // the offer/atlas join check reports on the log
@@ -14,15 +20,45 @@
 
 #include <cassert>
 #include <cstdarg>                        // offer_trace: diagnostic row dump for the offer ladder
+#include <cstddef>
+#include <cstdint>
+#include <cstdio>
+#include "libslic3r/CAD/SketchEngine.hpp"
+#include "libslic3r/CAD/CadDocument.hpp"
+#include "libslic3r/Point.hpp"
+#include <cstdlib>
+#include <exception>
+#include "libslic3r/BoundingBox.hpp"
+#include "libslic3r/Color.hpp"
+#include "libslic3r/CAD/SketchSolver.hpp"
 #include <map>
+#include <math.h>
 #include <set>
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include <wx/chartype.h>
+#include <vector>
+#include <wx/scrolwin.h>
+#include <wx/anybutton.h>
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include <utility>
+#include <wx/listbase.h>
+#include <wx/busycursor.h>
+#include <wx/colourdata.h>
+#include "slic3r/GUI/CAD/DesignInteraction.hpp"
 #include <wx/sizer.h>
 #include <wx/button.h>
+#include <wx/spinbutt.h>
 #include <wx/stattext.h>
 #include <wx/checkbox.h>
 #include <wx/checklst.h>
 #include <wx/spinctrl.h>
 #include <wx/listctrl.h>
+#include <wx/string.h>
+#include <wx/treebase.h>
+#include <wx/tglbtn.h>
+#include <wx/textctrl.h>
+#include <wx/translation.h>
 #include <wx/treectrl.h>
 #include <wx/imaglist.h>
 #include <wx/statline.h>
@@ -35,6 +71,7 @@
 #include <wx/colordlg.h>
 #include <wx/menu.h>
 #include <wx/progdlg.h>
+#include <wx/unichar.h>
 #include <wx/utils.h>    // wxWindowDisabler, wxMilliSleep
 #include <wx/msgdlg.h>   // wxMessageBox
 
@@ -45,6 +82,7 @@
 #include <algorithm>
 #include <thread>
 #include <atomic>
+#include <wx/window.h>
 
 #include "slic3r/GUI/wxExtensions.hpp"   // ScalableButton, create_scaled_bitmap
 #include "slic3r/GUI/Widgets/Label.hpp"             // HarmonyOS Sans fonts (Head_*/Body_*) shared with the rest of Orca

src/slic3r/GUI/CAD/DesignPanel.hpp

@@ -1,8 +1,17 @@
 #ifndef slic3r_DesignPanel_hpp_
 #define slic3r_DesignPanel_hpp_
 
+#include <string>
+#include "libslic3r/Point.hpp"
+#include "libslic3r/CAD/SketchEngine.hpp"
+#include "libslic3r/TriangleMesh.hpp"
+#include <wx/accel.h>
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include <wx/colour.h>
 #include <wx/panel.h>
 #include <wx/scrolwin.h>
+#include <wx/string.h>
 #include <wx/treebase.h>   // wxTreeItemId
 
 #include <vector>

src/slic3r/GUI/CAD/DesignSketchTool.cpp

@@ -5,6 +5,11 @@
 #include "slic3r/GUI/CAD/SketchInlineEditor.hpp"
 #include "slic3r/GUI/Plater.hpp"
 
+#include <Eigen/Core>
+#include <TopoDS_Shape.hxx>
+#include <TopoDS_Face.hxx>
+#include <TopoDS_Edge.hxx>
+#include <Eigen/Geometry>
 #include <imgui/imgui.h>
 #include <imgui/imgui_internal.h>
 #include "libslic3r/BuildVolume.hpp"
@@ -15,6 +20,19 @@
 #include "libslic3r/TriangleMesh.hpp"
 
 #include <GL/glew.h>
+#include "libslic3r/CAD/SketchEngine.hpp"
+#include "libslic3r/Point.hpp"
+#include <vector>
+#include <math.h>
+#include "libslic3r/CAD/SketchSolver.hpp"
+#include "libslic3r/Line.hpp"
+#include <string>
+#include "libslic3r/CAD/SketchInference.hpp"
+#include <utility>
+#include "libslic3r/CAD/CadDocument.hpp"
+#include "slic3r/GUI/GLModel.hpp"
+#include "libslic3r/BoundingBox.hpp"
+#include <initializer_list>
 #include <wx/gdicmn.h>
 #include <algorithm>
 #include <climits>

src/slic3r/GUI/CAD/DesignSketchTool.hpp

@@ -8,7 +8,10 @@
 #include "libslic3r/CAD/SketchSolver.hpp"
 #include "slic3r/GUI/GLModel.hpp"
 #include "slic3r/GUI/GLSelectionRectangle.hpp"   // left-drag rubber band over the committed bodies
+#include <Eigen/Core>
 #include <functional>
+#include "libslic3r/Color.hpp"
+#include <math.h>
 #include <vector>
 #include <string>
 #include <utility>

src/slic3r/GUI/CAD/McpControl.cpp

@@ -1,4 +1,11 @@
 #include "slic3r/GUI/CAD/McpControl.hpp"
+#include "libslic3r/Point.hpp"
+#include <stdexcept>
+#include <math.h>
+#include <TopAbs_ShapeEnum.hxx>
+#include <Standard_TypeDef.hxx>
+#include <exception>
+#include <cstdint>
 
 #ifndef _WIN32  // POSIX Unix-domain-socket transport only (slice 1)
 

src/slic3r/GUI/CAD/SketchInlineEditor.cpp

@@ -5,6 +5,7 @@
 #include "slic3r/GUI/I18N.hpp"
 #include "libslic3r/Color.hpp"
 
+#include <functional>
 #include <imgui/imgui.h>
 #include <imgui/imgui_internal.h>   // BringWindowToDisplayFront / GetCurrentWindow
 
@@ -12,6 +13,8 @@
 #include <cstdlib>
 #include <cstring>
 #include <string>
+#include <wx/gdicmn.h>
+#include <utility>
 
 namespace Slic3r {
 namespace GUI {

src/slic3r/GUI/CaliHistoryDialog.cpp

@@ -8,7 +8,38 @@
 #include "MsgDialog.hpp"
 #include "slic3r/Utils/CalibUtils.hpp"
 #include "Widgets/DialogButtons.hpp"
+#include "libslic3r/Config.hpp"
+#include <boost/log/trivial.hpp>
+#include <string>
+#include <vector>
+#include "libslic3r/calib.hpp"
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include <wx/event.h>
+#include <wx/dialog.h>
+#include "slic3r/GUI/Widgets/Button.hpp"
+#include "slic3r/GUI/Widgets/SwitchButton.hpp"
+#include "slic3r/GUI/Widgets/Label.hpp"
+#include <array>
+#include <cstdlib>
+#include <cassert>
+#include "slic3r/GUI/DeviceCore/DevDefs.h"
+#include "slic3r/GUI/Widgets/TextInput.hpp"
+#include "libslic3r/PrintConfig.hpp"
+#include <algorithm>
+#include <wx/arrstr.h>
+#include <set>
+#include <sstream>
+#include <ios>
+#include <iomanip>
+#include <cstddef>
+#include <cstdint>
 #include <wx/gbsizer.h>
+#include <wx/gdicmn.h>
+#include <wx/tglbtn.h>
+#include <wx/panel.h>
+#include <wx/timer.h>
+#include <wx/sizer.h>
+#include <wx/string.h>
 
 #include "Plater.hpp"
 #include "DeviceCore/DevExtruderSystem.h"

src/slic3r/GUI/CaliHistoryDialog.hpp

@@ -6,6 +6,16 @@
 #include "Widgets/ComboBox.hpp"
 #include "Widgets/SwitchButton.hpp"
 #include "DeviceManager.hpp"
+#include <vector>
+#include "libslic3r/calib.hpp"
+#include <wx/event.h>
+#include <wx/timer.h>
+#include <wx/panel.h>
+#include "slic3r/GUI/DeviceErrorDialog.hpp"
+#include <string>
+#include "slic3r/GUI/Widgets/TextInput.hpp"
+#include <wx/arrstr.h>
+#include <map>
 
 namespace Slic3r {
 namespace GUI {

src/slic3r/GUI/Calibration.cpp

@@ -12,6 +12,23 @@
 #include "Widgets/StaticBox.hpp"
 
 #include "DeviceCore/DevConfig.h"
+#include <wx/colour.h>
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include <wx/wx.h>
+#include <wx/gdicmn.h>
+#include <wx/toplevel.h>
+#include <wx/panel.h>
+#include "slic3r/GUI/Widgets/Label.hpp"
+#include "slic3r/GUI/Widgets/AMSItem.hpp"
+#include "slic3r/GUI/Widgets/StaticLine.hpp"
+#include "slic3r/GUI/Widgets/StepCtrl.hpp"
+#include <utility>
+#include "slic3r/GUI/Widgets/Button.hpp"
+#include <wx/event.h>
+#include <wx/string.h>
+#include <wx/stattext.h>
+#include "slic3r/GUI/DeviceManager.hpp"
+#include <boost/log/trivial.hpp>
 
 static wxColour FG_COLOR = wxColour(0x32, 0x3A, 0x3D);
 static wxColour BG_COLOR = wxColour(0xF8, 0xF8, 0xF8);

src/slic3r/GUI/Calibration.hpp

@@ -1,6 +1,10 @@
 #ifndef slic3r_GUI_Calibration_hpp_
 #define slic3r_GUI_Calibration_hpp_
 
+#include <map>
+#include <string>
+#include <vector>
+#include <wx/event.h>
 #include <wx/wx.h>
 #include <wx/intl.h>
 #include <wx/collpane.h>

src/slic3r/GUI/CalibrationPanel.cpp

@@ -1,4 +1,33 @@
+#include "libslic3r/calib.hpp"
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include <wx/dcclient.h>
+#include <wx/dc.h>
+#include "slic3r/GUI/Widgets/Label.hpp"
+#include "slic3r/GUI/Widgets/PopupWindow.hpp"
+#include <boost/log/trivial.hpp>
+#include "libslic3r/Thread.hpp"
+#include <memory>
+#include <vector>
+#include <utility>
+#include <algorithm>
+#include "slic3r/GUI/Widgets/SideTools.hpp"
+#include <cstddef>
+#include "slic3r/GUI/Tabbook.hpp"
+#include <wx/colour.h>
+#include "slic3r/GUI/CalibrationWizard.hpp"
+#include "slic3r/GUI/CalibrationWizardPage.hpp"
+#include "slic3r/GUI/CalibrationWizardPresetPage.hpp"
+#include "slic3r/GUI/CalibrationWizardSavePage.hpp"
 #include <wx/dcgraph.h>
+#include <wx/event.h>
+#include <wx/string.h>
+#include <wx/gdicmn.h>
+#include <wx/panel.h>
+#include <wx/popupwin.h>
+#include <wx/sizer.h>
+#include <wx/scrolwin.h>
+#include <wx/timer.h>
+#include <wx/notebook.h>
 #include "GUI.hpp"
 #include "GUI_App.hpp"
 #include "MainFrame.hpp"

src/slic3r/GUI/CalibrationPanel.hpp

@@ -4,7 +4,8 @@
 #include "CalibrationWizard.hpp"
 #include "Tabbook.hpp"
 #include "Lazy.hpp"
-//#include "Widgets/SideTools.hpp"
+#include "SelectMachinePop.hpp"
+#include "Widgets/SideTools.hpp"
 
 namespace Slic3r { namespace GUI {
 

src/slic3r/GUI/CalibrationWizard.cpp

@@ -1,4 +1,5 @@
 #include "CalibrationWizard.hpp"
+#include "CalibUtils.hpp"
 #include "I18N.hpp"
 #include "GUI_App.hpp"
 #include "slic3r/Utils/NetworkAgent.hpp"
@@ -7,6 +8,34 @@
 #include "../../libslic3r/calib.hpp"
 #include "Tabbook.hpp"
 #include "CaliHistoryDialog.hpp"
+#include <wx/event.h>
+#include <wx/string.h>
+#include <map>
+#include "libslic3r/Preset.hpp"
+#include <utility>
+#include "libslic3r/PrintConfig.hpp"
+#include "libslic3r/libslic3r.h"
+#include <wx/gdicmn.h>
+#include <wx/panel.h>
+#include <wx/colour.h>
+#include <wx/scrolwin.h>
+#include <functional>
+#include <boost/log/trivial.hpp>
+#include <string>
+#include "libslic3r/Config.hpp"
+#include "slic3r/GUI/CalibrationWizardPresetPage.hpp"
+#include <vector>
+#include "slic3r/GUI/ReleaseNote.hpp"
+#include <cassert>
+#include "slic3r/GUI/CalibrationWizardStartPage.hpp"
+#include "slic3r/GUI/CalibrationWizardCaliPage.hpp"
+#include "slic3r/GUI/CalibrationWizardSavePage.hpp"
+#include "slic3r/GUI/DeviceCore/DevCalib.h"
+#include "slic3r/GUI/DeviceCore/DevDefs.h"
+#include <wx/arrstr.h>
+#include <algorithm>
+#include "slic3r/GUI/GUI.hpp"
+#include "libslic3r/ParameterUtils.hpp"
 
 namespace Slic3r { namespace GUI {
 

src/slic3r/GUI/CalibrationWizard.hpp

@@ -10,6 +10,20 @@
 #include "CalibrationWizardCaliPage.hpp"
 #include "CalibrationWizardSavePage.hpp"
 #include "StagedBuild.hpp"
+#include <wx/panel.h>
+#include "libslic3r/calib.hpp"
+#include <wx/string.h>
+#include <wx/gdicmn.h>
+#include <wx/event.h>
+#include <string>
+#include <map>
+#include "libslic3r/Config.hpp"
+#include "libslic3r/PrintConfig.hpp"
+#include <functional>
+#include <wx/scrolwin.h>
+#include <wx/sizer.h>
+#include <vector>
+#include "slic3r/GUI/ReleaseNote.hpp"
 
 namespace Slic3r { namespace GUI {
 

src/slic3r/GUI/CalibrationWizardCaliPage.cpp

@@ -1,9 +1,27 @@
 #include "CalibrationWizardCaliPage.hpp"
+#include "CalibUtils.hpp"
 #include "MainFrame.hpp"
 #include "I18N.hpp"
 #include "Widgets/Label.hpp"
 
 #include "DeviceCore/DevManager.h"
+#include <wx/string.h>
+#include "libslic3r/calib.hpp"
+#include "slic3r/GUI/CalibrationWizardPage.hpp"
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include <wx/sizer.h>
+#include <cstddef>
+#include <wx/arrstr.h>
+#include "slic3r/GUI/StatusPanel.hpp"
+#include "slic3r/GUI/GUI_App.hpp"
+#include "slic3r/GUI/ReleaseNote.hpp"
+#include <boost/log/trivial.hpp>
+#include <cassert>
+#include <string>
+#include "slic3r/GUI/GUI.hpp"
+#include "libslic3r/Utils.hpp"
+#include <wx/panel.h>
 
 namespace Slic3r { namespace GUI {
 

src/slic3r/GUI/CalibrationWizardCaliPage.hpp

@@ -3,6 +3,12 @@
 
 #include "CalibrationWizardPage.hpp"
 #include "StatusPanel.hpp"
+#include "libslic3r/calib.hpp"
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include "slic3r/GUI/DeviceManager.hpp"
+#include <wx/sizer.h>
+#include "slic3r/GUI/ReleaseNote.hpp"
 
 namespace Slic3r { namespace GUI {
 

src/slic3r/GUI/CalibrationWizardPage.cpp

@@ -1,9 +1,35 @@
 #include "CalibrationWizardPage.hpp"
+#include "CalibUtils.hpp"
 #include "I18N.hpp"
 #include "Widgets/Label.hpp"
 #include "MsgDialog.hpp"
 
 #include "DeviceCore/DevFilaSystem.h"
+#include <wx/event.h>
+#include "slic3r/GUI/DeviceCore/DevDefs.h"
+#include <wx/string.h>
+#include "libslic3r/calib.hpp"
+#include <string>
+#include "slic3r/GUI/GUI_App.hpp"
+#include <boost/algorithm/string/predicate.hpp>
+#include "slic3r/GUI/Widgets/Button.hpp"
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include <utility>
+#include <wx/colour.h>
+#include <wx/gdicmn.h>
+#include <wx/panel.h>
+#include "slic3r/GUI/PresetComboBoxes.hpp"
+#include "libslic3r/PrintConfig.hpp"
+#include "slic3r/GUI/wxExtensions.hpp"
+#include <wx/anybutton.h>
+#include "slic3r/GUI/Widgets/HyperLink.hpp"
+#include <wx/utils.h>
+#include <wx/arrstr.h>
+#include "slic3r/GUI/Widgets/PopupWindow.hpp"
+#include <wx/dcclient.h>
+#include "slic3r/GUI/BBLStatusBarSend.hpp"
+#include <memory>
+#include <wx/scrolwin.h>
 
 namespace Slic3r { namespace GUI {
 

src/slic3r/GUI/CalibrationWizardPage.hpp

@@ -13,6 +13,20 @@
 
 #include "slic3r/Utils/CalibUtils.hpp"
 #include "../../libslic3r/calib.hpp"
+#include "slic3r/GUI/DeviceManager.hpp"
+#include <wx/panel.h>
+#include <wx/gdicmn.h>
+#include "libslic3r/PrintConfig.hpp"
+#include <string>
+#include "slic3r/GUI/Widgets/CheckBox.hpp"
+#include <vector>
+#include <wx/arrstr.h>
+#include "slic3r/GUI/Widgets/Label.hpp"
+#include "slic3r/GUI/Widgets/PopupWindow.hpp"
+#include <wx/string.h>
+#include <memory>
+#include "slic3r/GUI/BBLStatusBarSend.hpp"
+#include <wx/scrolwin.h>
 
 namespace Slic3r { namespace GUI {
 

src/slic3r/GUI/CalibrationWizardPresetPage.cpp

@@ -1,5 +1,43 @@
+#include "libslic3r/calib.hpp"
+#include <functional>
+#include <cstddef>
+#include <boost/log/trivial.hpp>
+#include "libslic3r/PrintConfig.hpp"
+#include "libslic3r/CommonDefs.hpp"
+#include <cstdint>
+#include "libslic3r/Config.hpp"
+#include "libslic3r/Preset.hpp"
+#include <algorithm>
+#include <map>
+#include <cassert>
+#include "libslic3r/PresetBundle.hpp"
+#include <cstdlib>
 #include <regex>
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include <wx/panel.h>
+#include <wx/string.h>
+#include <wx/valtext.h>
+#include <wx/textctrl.h>
+#include <wx/arrstr.h>
+#include "slic3r/GUI/Widgets/ComboBox.hpp"
+#include <string>
+#include <wx/sizer.h>
+#include "slic3r/GUI/CalibrationWizardPage.hpp"
+#include "slic3r/GUI/Widgets/AMSItem.hpp"
+#include "slic3r/GUI/Widgets/Button.hpp"
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include <utility>
+#include <wx/anybutton.h>
+#include "slic3r/GUI/Widgets/CheckBox.hpp"
+#include <wx/tglbtn.h>
+#include <vector>
+#include "slic3r/GUI/BBLStatusBarSend.hpp"
+#include "slic3r/GUI/GUI_App.hpp"
+#include "slic3r/GUI/DeviceCore/DevDefs.h"
+#include <wx/chartype.h>
 #include "CalibrationWizardPresetPage.hpp"
+#include "CalibUtils.hpp"
 #include "GUI.hpp"
 #include "slic3r/Utils/NetworkAgent.hpp"
 #include "I18N.hpp"

src/slic3r/GUI/CalibrationWizardPresetPage.hpp

@@ -2,6 +2,30 @@
 #define slic3r_GUI_CalibrationWizardPresetPage_hpp_
 
 #include "CalibrationWizardPage.hpp"
+#include <wx/panel.h>
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include "libslic3r/calib.hpp"
+#include <wx/sizer.h>
+#include "slic3r/GUI/Widgets/TextInput.hpp"
+#include <wx/string.h>
+#include <wx/arrstr.h>
+#include <functional>
+#include "slic3r/GUI/Widgets/ComboBox.hpp"
+#include "slic3r/GUI/Widgets/Label.hpp"
+#include <vector>
+#include <string>
+#include "slic3r/GUI/DeviceManager.hpp"
+#include <map>
+#include "libslic3r/Preset.hpp"
+#include "libslic3r/PrintConfig.hpp"
+#include <memory>
+#include "slic3r/GUI/Jobs/ProgressIndicator.hpp"
+#include "slic3r/GUI/Widgets/AMSItem.hpp"
+#include <cstddef>
+#include "slic3r/GUI/Widgets/Button.hpp"
+#include <unordered_map>
+#include "slic3r/GUI/wxExtensions.hpp"
 
 namespace Slic3r { namespace GUI {
 

src/slic3r/GUI/CalibrationWizardSavePage.cpp

@@ -1,4 +1,5 @@
 #include "CalibrationWizardSavePage.hpp"
+#include "CalibUtils.hpp"
 #include "GUI.hpp"
 #include "I18N.hpp"
 #include "Widgets/Label.hpp"
@@ -6,6 +7,34 @@
 #include "DeviceCore/DevConfigUtil.h"
 #include "DeviceCore/DevNozzleSystem.h"
 #include "DeviceCore/DevNozzleRack.h"
+#include <wx/string.h>
+#include "libslic3r/calib.hpp"
+#include "libslic3r/PresetBundle.hpp"
+#include "slic3r/GUI/GUI_App.hpp"
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include "slic3r/GUI/CalibrationWizardPage.hpp"
+#include "slic3r/GUI/Widgets/TextInput.hpp"
+#include "slic3r/GUI/Widgets/ComboBox.hpp"
+#include <wx/panel.h>
+#include <vector>
+#include <utility>
+#include <unordered_set>
+#include <string>
+#include <algorithm>
+#include <wx/valtext.h>
+#include <wx/arrstr.h>
+#include <map>
+#include <wx/sizer.h>
+#include "libslic3r/PrintConfig.hpp"
+#include <wx/anybutton.h>
+#include "slic3r/GUI/wxExtensions.hpp"
+#include <boost/log/trivial.hpp>
+#include "slic3r/GUI/DeviceCore/DevCalib.h"
+#include <cassert>
+#include "slic3r/GUI/DeviceCore/DevDefs.h"
+#include "slic3r/GUI/Widgets/CheckBox.hpp"
+#include <wx/tglbtn.h>
 
 
 namespace Slic3r { namespace GUI {

src/slic3r/GUI/CalibrationWizardSavePage.hpp

@@ -3,6 +3,24 @@
 
 #include "CalibrationWizardPage.hpp"
 #include "Widgets/TextInput.hpp"
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include <wx/sizer.h>
+#include <wx/panel.h>
+#include <wx/string.h>
+#include "slic3r/GUI/Widgets/ComboBox.hpp"
+#include "slic3r/GUI/Widgets/Label.hpp"
+#include <string>
+#include "slic3r/GUI/DeviceManager.hpp"
+#include <vector>
+#include <utility>
+#include "libslic3r/calib.hpp"
+#include "slic3r/GUI/DeviceCore/DevCalib.h"
+#include "slic3r/GUI/DeviceCore/DevDefs.h"
+#include <map>
+#include <memory>
+#include "slic3r/GUI/Jobs/ProgressIndicator.hpp"
+#include "slic3r/GUI/Widgets/CheckBox.hpp"
 
 namespace Slic3r { namespace GUI {
 

src/slic3r/GUI/CalibrationWizardStartPage.cpp

@@ -1,6 +1,17 @@
 #include "CalibrationWizardStartPage.hpp"
 #include "I18N.hpp"
 #include "Widgets/Label.hpp"
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include "slic3r/GUI/CalibrationWizardPage.hpp"
+#include <wx/sizer.h>
+#include <wx/string.h>
+#include <string>
+#include "slic3r/GUI/wxExtensions.hpp"
+#include "libslic3r/calib.hpp"
+#include "slic3r/GUI/GUI_App.hpp"
+#include "slic3r/GUI/DeviceManager.hpp"
+#include "slic3r/GUI/DeviceCore/DevDefs.h"
 
 namespace Slic3r { namespace GUI {
 

src/slic3r/GUI/CalibrationWizardStartPage.hpp

@@ -2,6 +2,14 @@
 #define slic3r_GUI_CalibrationWizardStartPage_hpp_
 
 #include "CalibrationWizardPage.hpp"
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include "libslic3r/calib.hpp"
+#include <wx/sizer.h>
+#include "slic3r/GUI/Widgets/Label.hpp"
+#include <wx/string.h>
+#include <string>
+#include "slic3r/GUI/DeviceManager.hpp"
 
 namespace Slic3r { namespace GUI {
 

src/slic3r/GUI/Camera.cpp

@@ -3,6 +3,21 @@
 
 #include "Camera.hpp"
 #include "GUI_App.hpp"
+#include "libslic3r/Technologies.hpp"
+#include <string>
+#include "libslic3r/Point.hpp"
+#include <algorithm>
+#include "libslic3r/Geometry.hpp"
+#include <cmath>
+#include "libslic3r/BoundingBox.hpp"
+#include <cassert>
+#include "slic3r/GUI/3DScene.hpp"
+#include <cstdlib>
+#include <utility>
+#include <vector>
+#include <cfloat>
+#include "libslic3r/TriangleMesh.hpp"
+#include <math.h>
 #if ENABLE_CAMERA_STATISTICS
 #include "Mouse3DController.hpp"
 #include "Plater.hpp"

src/slic3r/GUI/Camera.hpp

@@ -3,7 +3,16 @@
 
 #include "libslic3r/BoundingBox.hpp"
 #include "3DScene.hpp"
+#include <Eigen/Geometry>
+#include <algorithm>
 #include <array>
+#include "libslic3r/Point.hpp"
+#include <utility>
+#include <string>
+#include <cassert>
+#include "libslic3r/Technologies.hpp"
+#include <cstdlib>
+#include "libslic3r/libslic3r.h"
 
 namespace Slic3r {
 namespace GUI {

src/slic3r/GUI/CameraPopup.cpp

@@ -4,9 +4,28 @@
 #include "Widgets/Label.hpp"
 #include "libslic3r/Utils.hpp"
 #include "BitmapCache.hpp"
+#include <wx/object.h>
+#include "slic3r/GUI/Widgets/PopupWindow.hpp"
+#include <wx/event.h>
+#include <wx/colour.h>
+#include <wx/popupwin.h>
+#include "slic3r/GUI/Widgets/SwitchButton.hpp"
+#include <wx/panel.h>
+#include <wx/gdicmn.h>
+#include <cstddef>
+#include "slic3r/GUI/Widgets/RadioBox.hpp"
+#include <string>
+#include <vector>
+#include <algorithm>
+#include <wx/dcclient.h>
+#include <wx/dc.h>
 #include <wx/progdlg.h>
 #include <wx/clipbrd.h>
 #include <wx/dcgraph.h>
+#include <wx/string.h>
+#include <wx/scrolwin.h>
+#include <wx/sizer.h>
+#include <wx/timer.h>
 #include <wx/utils.h>
 #include "GUI_App.hpp"
 #include <slic3r/GUI/StatusPanel.hpp>

src/slic3r/GUI/CameraPopup.hpp

@@ -4,9 +4,18 @@
 #include "slic3r/GUI/MonitorBasePanel.h"
 #include "DeviceManager.hpp"
 #include "GUI.hpp"
+#include <wx/event.h>
+#include <cstddef>
+#include <string>
+#include <vector>
+#include "slic3r/GUI/DeviceErrorDialog.hpp"
+#include "slic3r/GUI/wxExtensions.hpp"
 #include <wx/panel.h>
 #include <wx/bitmap.h>
 #include <wx/image.h>
+#include <wx/string.h>
+#include <wx/scrolwin.h>
+#include <wx/rtti.h>
 #include <wx/timer.h>
 #include <wx/sizer.h>
 #include <wx/gbsizer.h>

src/slic3r/GUI/CameraUtils.cpp

@@ -1,6 +1,16 @@
 #include "CameraUtils.hpp"
+#include <Eigen/Core>
+#include <cstddef>
+#include <cassert>
+#include <cmath>
 #include <igl/project.h> // projecting points
 #include <igl/unproject.h>
+#include "libslic3r/Point.hpp"
+#include "slic3r/GUI/Camera.hpp"
+#include <vector>
+#include "libslic3r/Polygon.hpp"
+#include "libslic3r/TriangleMesh.hpp"
+#include <limits>
 
 #include "slic3r/GUI/3DScene.hpp" // GLVolume
 #include "libslic3r/Geometry/ConvexHull.hpp"

src/slic3r/GUI/CameraUtils.hpp

@@ -3,6 +3,8 @@
 
 #include "Camera.hpp"
 #include "libslic3r/Point.hpp"
+#include <vector>
+#include "libslic3r/Polygon.hpp"
 namespace Slic3r {
 class GLVolume;
 }

src/slic3r/GUI/CapsuleButton.cpp

@@ -1,7 +1,15 @@
 #include "GUI_App.hpp"
 #include "CapsuleButton.hpp"
 #include "Widgets/StateColor.hpp"
+#include <wx/colour.h>
+#include "slic3r/GUI/wxExtensions.hpp"
 #include <wx/dcbuffer.h>
+#include <wx/string.h>
+#include <wx/panel.h>
+#include <wx/sizer.h>
+#include <wx/gdicmn.h>
+#include <wx/event.h>
+#include <wx/window.h>
 #include "wx/graphics.h"
 #include "Widgets/Label.hpp"
 

src/slic3r/GUI/CapsuleButton.hpp

@@ -3,6 +3,10 @@
 
 #include "wxExtensions.hpp"
 #include "Widgets/Label.hpp"
+#include <wx/panel.h>
+#include <wx/checklst.h>
+#include <wx/string.h>
+#include <wx/event.h>
 
 namespace Slic3r { namespace GUI {
 class CapsuleButton : public wxPanel

src/slic3r/GUI/CloneDialog.cpp

@@ -2,6 +2,24 @@
 
 #include "GUI_App.hpp"
 #include "MainFrame.hpp"
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include <wx/event.h>
+#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp"
+#include <wx/gdicmn.h>
+#include <wx/toplevel.h>
+#include "slic3r/GUI/Widgets/Label.hpp"
+#include <wx/sizer.h>
+#include "slic3r/GUI/Widgets/SpinInput.hpp"
+#include <wx/string.h>
+#include "slic3r/GUI/Widgets/CheckBox.hpp"
+#include "slic3r/GUI/Widgets/ProgressBar.hpp"
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include <wx/colour.h>
+#include "slic3r/GUI/Widgets/DialogButtons.hpp"
+#include "slic3r/GUI/Widgets/Button.hpp"
+#include "slic3r/GUI/Selection.hpp"
+#include <wx/utils.h>
+#include "slic3r/GUI/Jobs/Job.hpp"
 
 namespace Slic3r { namespace GUI {
 

src/slic3r/GUI/CloneDialog.hpp

@@ -10,6 +10,7 @@
 #include "Widgets/DialogButtons.hpp"
 #include "Widgets/CheckBox.hpp"
 #include "Widgets/ProgressBar.hpp"
+#include "libslic3r/AppConfig.hpp"
 
 namespace Slic3r { namespace GUI {
 

src/slic3r/GUI/ColorDecomposeDialog.cpp

@@ -2,12 +2,26 @@
 
 #include <algorithm>
 #include <cmath>
+#include <cstddef>
 #include <functional>
 #include <memory>
 #include <set>
+#include <wx/colour.h>
+#include <string>
+#include <wx/panel.h>
+#include <wx/gdicmn.h>
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include <vector>
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include <utility>
+#include <wx/event.h>
+#include <wx/peninfobase.h>
 #include <wx/sizer.h>
 #include <wx/dcclient.h>
 #include <wx/dcbuffer.h>
+#include <wx/toplevel.h>
+#include <wx/string.h>
+#include <wx/tglbtn.h>
 #include "wx/graphics.h"
 
 #include "I18N.hpp"

src/slic3r/GUI/ColorDecomposeDialog.hpp

@@ -2,14 +2,17 @@
 #define slic3r_ColorDecomposeDialog_hpp_
 
 #include <array>
+#include <cstddef>
 #include <functional>
 #include <string>
 #include <vector>
 #include <utility>
 #include <wx/colour.h>
 #include <wx/panel.h>
+#include <wx/sizer.h>
 #include <wx/statbmp.h>
 #include <wx/stattext.h>
+#include <wx/string.h>
 
 #include "GUI_Utils.hpp"
 #include "libslic3r/ColorDecomposeRecipe.hpp"

src/slic3r/GUI/ColorDecomposeSupport.cpp

@@ -10,9 +10,17 @@
 
 #include "nlohmann/json.hpp"
 
+#include <cstddef>
 #include <fstream>
 #include <algorithm>
 #include <cctype>
+#include <string>
+#include "slic3r/GUI/ColorDecomposeDialog.hpp"
+#include <wx/string.h>
+#include <vector>
+#include "libslic3r/Config.hpp"
+#include <wx/colour.h>
+#include <utility>
 
 using json = nlohmann::json;
 

src/slic3r/GUI/ColorDecomposeSupport.hpp

@@ -1,6 +1,7 @@
 #ifndef slic3r_GUI_ColorDecomposeSupport_hpp_
 #define slic3r_GUI_ColorDecomposeSupport_hpp_
 
+#include <cstddef>
 #include <string>
 #include <vector>
 #include <wx/string.h>

src/slic3r/GUI/ConfigManipulation.cpp

@@ -14,7 +14,15 @@
 #include "Plater.hpp"
 
 #include <algorithm>
+#include "slic3r/GUI/GUI.hpp"
+#include "libslic3r/libslic3r.h"
+#include "slic3r/GUI/Field.hpp"
+#include <cstdlib>
+#include <set>
+#include <map>
 #include <sstream>
+#include <string>
+#include <vector>
 #include <wx/msgdlg.h>
 
 namespace Slic3r {

src/slic3r/GUI/ConfigManipulation.hpp

@@ -10,6 +10,13 @@
 
 #include "libslic3r/PrintConfig.hpp"
 #include "Field.hpp"
+#include <functional>
+#include <string>
+#include <wx/string.h>
+#include <boost/any.hpp>
+#include "libslic3r/Config.hpp"
+#include <vector>
+#include <map>
 
 namespace Slic3r {
 

src/slic3r/GUI/ConfigValueFormatter.cpp

@@ -1,12 +1,15 @@
 #include "ConfigValueFormatter.hpp"
 
 #include <algorithm>
+#include <boost/algorithm/string/erase.hpp>
 #include <cstdlib>
+#include "libslic3r/Point.hpp"
 #include <string>
 #include <vector>
 
 #include <boost/algorithm/string.hpp>
 #include <boost/format.hpp>
+#include <wx/string.h>
 
 #include "libslic3r/Config.hpp"
 #include "libslic3r/PrintConfig.hpp"

src/slic3r/GUI/ConfigWizard.cpp

@@ -1,9 +1,30 @@
 // FIXME: extract absolute units -> em
 
 #include "ConfigWizard_private.hpp"
+#include "libslic3r_version.h"
 
 #include <algorithm>
+#include <memory>
+#include <cstddef>
+#include <cassert>
+#include <exception>
+#include "libslic3r/Exception.hpp"
+#include "libslic3r/Preset.hpp"
+#include <functional>
+#include "libslic3r/PrintConfig.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/LocalesUtils.hpp"
+#include <cstdio>
+#include <cstdlib>
+#include <boost/filesystem/directory.hpp>
+#include <map>
+#include <iterator>
 #include <numeric>
+#include <string>
+#include <set>
+#include "slic3r/GUI/Widgets/StaticLine.hpp"
+#include "slic3r/GUI/BedShapeDialog.hpp"
+#include "slic3r/GUI/wxExtensions.hpp"
 #include <utility>
 #include <unordered_map>
 #include <stdexcept>
@@ -12,8 +33,19 @@
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/nowide/convert.hpp>
 
+#include <wx/event.h>
+#include <wx/panel.h>
+#include <vector>
+#include <wx/gdicmn.h>
+#include <wx/html/htmlwin.h>
+#include <wx/arrstr.h>
+#include <wx/busycursor.h>
+#include <wx/dialog.h>
+#include <wx/scrolwin.h>
 #include <wx/settings.h>
+#include <wx/sizer.h>
 #include <wx/stattext.h>
+#include <wx/string.h>
 #include <wx/textctrl.h>
 #include <wx/dcclient.h>
 #include <wx/statbmp.h>
@@ -24,6 +56,7 @@
 #include <wx/listbook.h>
 #include <wx/display.h>
 #include <wx/filefn.h>
+#include <wx/types.h>
 #include <wx/wupdlock.h>
 #include <wx/debug.h>
 

src/slic3r/GUI/ConfigWizard.hpp

@@ -4,6 +4,7 @@
 #include <memory>
 
 #include <wx/dialog.h>
+#include <wx/string.h>
 
 #include "GUI_Utils.hpp"