A *lot* of import fixes for flatpak (#3909)

* A *lot* of import fixes for flatpak

Aside, thank you @hadess for the majority of these fixes. You are the
base point for a lot of issues fixed during the creation of this
flatpak.

* Use slic3r::load_string_file

Boost 1.84 removed `boost::fs::load_string_file` so use the func located
in Utils.hpp

src/libslic3r/Arrange.cpp

@@ -17,6 +17,7 @@
 #define BOOST_NO_CXX17_HDR_STRING_VIEW
 #endif
 
+#include <boost/log/trivial.hpp>
 #include <boost/multiprecision/integer.hpp>
 #include <boost/rational.hpp>
 

src/libslic3r/Color.hpp

@@ -1,6 +1,8 @@
 #ifndef slic3r_Color_hpp_
 #define slic3r_Color_hpp_
 
+#include <vector>
+#include <string>
 #include <array>
 #include <algorithm>
 

src/libslic3r/Format/bbs_3mf.hpp

@@ -8,6 +8,7 @@
 
 namespace Slic3r {
 class Model;
+class ModelObject;
 struct ConfigSubstitutionContext;
 class DynamicPrintConfig;
 class Preset;

src/libslic3r/GCodeReader.cpp

@@ -1,6 +1,7 @@
 #include "GCodeReader.hpp"
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/algorithm/string/split.hpp>
+#include <boost/log/trivial.hpp>
 #include <boost/nowide/fstream.hpp>
 #include <boost/nowide/cstdio.hpp>
 #include <fstream>

src/libslic3r/Orient.cpp

@@ -3,6 +3,7 @@
 #include <numeric>
 #include <ClipperUtils.hpp>
 #include <boost/geometry/index/rtree.hpp>
+#include <boost/log/trivial.hpp>
 #include <tbb/parallel_for.h>
 
 #if defined(_MSC_VER) && defined(__clang__)

src/libslic3r/PNGReadWrite.cpp

@@ -5,6 +5,7 @@
 #include <cstdio>
 #include <png.h>
 
+#include <boost/format.hpp>
 #include <boost/log/trivial.hpp>
 #include <boost/nowide/cstdio.hpp>
 

src/libslic3r/PNGReadWrite.hpp

@@ -1,6 +1,7 @@
 #ifndef PNGREAD_HPP
 #define PNGREAD_HPP
 
+#include <cstdint>
 #include <vector>
 #include <string>
 #include <istream>

src/libslic3r/PerimeterGenerator.cpp

@@ -23,6 +23,7 @@
 
 #include <cmath>
 #include <cassert>
+#include <unordered_set>
 
 static const int overhang_sampling_number = 6;
 static const double narrow_loop_length_threshold = 10;

src/libslic3r/Print.cpp

@@ -40,6 +40,7 @@
 #include "Utils.hpp"
 #include "PrintConfig.hpp"
 #include "Model.hpp"
+#include "format.hpp"
 #include <float.h>
 
 #include <algorithm>
@@ -49,6 +50,10 @@
 #include <boost/format.hpp>
 #include <boost/log/trivial.hpp>
 #include <boost/regex.hpp>
+#include <boost/nowide/fstream.hpp>
+
+#include <tbb/blocked_range.h>
+#include <tbb/parallel_for.h>
 
 //BBS: add json support
 #include "nlohmann/json.hpp"
@@ -1117,8 +1122,8 @@ StringObjectException Print::validate(StringObjectException *warning, Polygons*
             return
                 // Test whether the last slicing plane is below or above the print volume.
                 { 0.5 * (layers[layers.size() - 2] + layers.back()) > this->config().printable_height + EPSILON ?
-                format(_u8L("The object %1% exceeds the maximum build volume height."), print_object.model_object()->name) :
-                format(_u8L("While the object %1% itself fits the build volume, its last layer exceeds the maximum build volume height."), print_object.model_object()->name) +
+                    Slic3r::format(_u8L("The object %1% exceeds the maximum build volume height."), print_object.model_object()->name) :
+                    Slic3r::format(_u8L("While the object %1% itself fits the build volume, its last layer exceeds the maximum build volume height."), print_object.model_object()->name) +
                 " " + _u8L("You might want to reduce the size of your model or change current print settings and retry.") };
         }
     }
@@ -1401,7 +1406,7 @@ StringObjectException Print::validate(StringObjectException *warning, Polygons*
 	                }
 
 	                StringObjectException except;
-	                except.string = format(L("Plate %d: %s does not support filament %s"), this->get_plate_index() + 1, L(bed_type_name), extruder_id + 1);
+	                except.string = Slic3r::format(L("Plate %d: %s does not support filament %s"), this->get_plate_index() + 1, L(bed_type_name), extruder_id + 1);
 	                except.string += "\n";
 	                except.type   = STRING_EXCEPT_FILAMENT_NOT_MATCH_BED_TYPE;
 	                except.params.push_back(std::to_string(this->get_plate_index() + 1));

src/libslic3r/PrintApply.cpp

@@ -1,6 +1,7 @@
 #include "Model.hpp"
 #include "Print.hpp"
 
+#include <boost/log/trivial.hpp>
 #include <cfloat>
 
 namespace Slic3r {

src/libslic3r/PrintBase.cpp

@@ -3,6 +3,7 @@
 
 #include <boost/filesystem.hpp>
 #include <boost/lexical_cast.hpp>
+#include <boost/log/trivial.hpp>
 
 #include "I18N.hpp"
 

src/libslic3r/PrintConfig.cpp

@@ -20,6 +20,7 @@
 ///|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
 ///|/
 #include "PrintConfig.hpp"
+#include "ClipperUtils.hpp"
 #include "Config.hpp"
 #include "I18N.hpp"
 

src/libslic3r/PrintObject.cpp

@@ -29,6 +29,7 @@
 #include "Fill/FillLightning.hpp"
 #include "Format/STL.hpp"
 #include "TreeSupport.hpp"
+#include "format.hpp"
 
 #include <float.h>
 #include <oneapi/tbb/blocked_range.h>
@@ -659,7 +660,7 @@ void PrintObject::generate_support_material()
                     {SharpTail,L("floating regions")},
                     {Cantilever,L("floating cantilever")},
                     {LargeOverhang,L("large overhangs")} };
-                std::string warning_message = format(L("It seems object %s has %s. Please re-orient the object or enable support generation."),
+                std::string warning_message = Slic3r::format(L("It seems object %s has %s. Please re-orient the object or enable support generation."),
                     this->model_object()->name, reasons[sntype]);
                 this->active_step_add_warning(PrintStateBase::WarningLevel::NON_CRITICAL, warning_message, PrintStateBase::SlicingNeedSupportOn);
             }

src/libslic3r/ProjectTask.cpp

@@ -9,6 +9,7 @@
 #include <codecvt>
 
 #include <boost/random.hpp>
+#include <boost/log/trivial.hpp>
 #include <boost/generator_iterator.hpp>
 #include <boost/uuid/uuid.hpp>
 #include <boost/uuid/uuid_generators.hpp>

src/libslic3r/SVG.cpp

@@ -1,6 +1,7 @@
 #include "SVG.hpp"
 #include <iostream>
 
+#include <boost/filesystem.hpp>
 #include <boost/nowide/cstdio.hpp>
 
 namespace Slic3r {

src/libslic3r/Shape/TextShape.cpp

@@ -28,6 +28,8 @@
 #include "BRepPrimAPI_MakePrism.hxx"
 #include "Font_FontMgr.hxx"
 
+#include <boost/log/trivial.hpp>
+
 namespace Slic3r {
 
 static std::map<std::string, std::string> g_occt_fonts_maps; //map<font_name, font_path>

src/libslic3r/Shape/TextShape.hpp

@@ -1,6 +1,8 @@
 #ifndef slic3r_Text_Shape_hpp_
 #define slic3r_Text_Shape_hpp_
 
+#include "libslic3r/TriangleMesh.hpp"
+
 namespace Slic3r {
 class TriangleMesh;
 

src/libslic3r/Support/SupportCommon.cpp

@@ -11,9 +11,11 @@
 #include "../MutablePolygon.hpp"
 #include "../Geometry.hpp"
 #include "../Point.hpp"
+#include "clipper/clipper_z.hpp"
 
 #include <cmath>
 #include <boost/container/static_vector.hpp>
+#include <boost/log/trivial.hpp>
 
 #include <tbb/parallel_for.h>
 

src/libslic3r/TreeSupport.cpp

@@ -12,6 +12,10 @@
 #include "I18N.hpp"
 #include <libnest2d/backends/libslic3r/geometries.hpp>
 
+#include <boost/log/trivial.hpp>
+#include <tbb/blocked_range.h>
+#include <tbb/parallel_for.h>
+
 #define _L(s) Slic3r::I18N::translate(s)
 
 #define USE_PLAN_LAYER_HEIGHTS 1

src/libslic3r/TriangleSelector.cpp

@@ -2,6 +2,7 @@
 #include "Model.hpp"
 
 #include <boost/container/small_vector.hpp>
+#include <boost/log/trivial.hpp>
 
 #ifndef NDEBUG
 //    #define EXPENSIVE_DEBUG_CHECKS

src/libslic3r/utils.cpp

@@ -13,6 +13,7 @@
 #include <cstdarg>
 #include <stdio.h>
 
+#include "format.hpp"
 #include "Platform.hpp"
 #include "Time.hpp"
 #include "libslic3r.h"
@@ -1510,7 +1511,7 @@ bool bbl_calc_md5(std::string &filename, std::string &md5_out)
 // SoftFever: copy directory recursively
 void copy_directory_recursively(const boost::filesystem::path &source, const boost::filesystem::path &target)
 {
-    BOOST_LOG_TRIVIAL(info) << format("copy_directory_recursively %1% -> %2%", source, target);
+    BOOST_LOG_TRIVIAL(info) << Slic3r::format("copy_directory_recursively %1% -> %2%", source, target);
     std::string error_message;
 
     if (boost::filesystem::exists(target))
@@ -1530,7 +1531,7 @@ void copy_directory_recursively(const boost::filesystem::path &source, const boo
             CopyFileResult cfr = copy_file(source_file, target_file, error_message, false);
             if (cfr != CopyFileResult::SUCCESS) {
                 BOOST_LOG_TRIVIAL(error) << "Copying failed(" << cfr << "): " << error_message;
-                throw Slic3r::CriticalException(format(
+                throw Slic3r::CriticalException(Slic3r::format(
                     ("Copying directory %1% to %2% failed: %3%"),
                     source, target, error_message));
             }

src/slic3r/GUI/AMSMaterialsSetting.cpp

@@ -4,6 +4,8 @@
 #include "GUI_App.hpp"
 #include "libslic3r/Preset.hpp"
 #include "I18N.hpp"
+#include <boost/log/trivial.hpp>
+#include <wx/colordlg.h>
 #include <wx/dcgraph.h>
 #include "CalibUtils.hpp"
 

src/slic3r/GUI/AMSMaterialsSetting.hpp

@@ -5,6 +5,7 @@
 #include "wxExtensions.hpp"
 #include "GUI_Utils.hpp"
 #include "DeviceManager.hpp"
+#include "wx/colourdata.h"
 #include "wx/clrpicker.h"
 #include "Widgets/RadioBox.hpp"
 #include "Widgets/Button.hpp"

src/slic3r/GUI/Auxiliary.cpp

@@ -21,6 +21,8 @@
 #include <wx/arrstr.h>
 #include <wx/tglbtn.h>
 
+#include <boost/log/trivial.hpp>
+
 #include "wxExtensions.hpp"
 #include "GUI_App.hpp"
 #include "GUI_ObjectList.hpp"

src/slic3r/GUI/AuxiliaryDataViewModel.cpp

@@ -3,6 +3,11 @@
 #include "libslic3r/Model.hpp"
 #include "libslic3r/Format/bbs_3mf.hpp"
 
+
+#include <boost/log/trivial.hpp>
+
+#include <wx/log.h>
+
 const static std::array<wxString, 4> s_default_folders = {
     _L("Model Pictures"),
     _L("Bill of Materials"),

src/slic3r/GUI/AuxiliaryDataViewModel.hpp

@@ -8,7 +8,7 @@
 
 #include "I18N.hpp"
 
-#include <filesystem>
+#include <boost/filesystem.hpp>
 
 class AuxiliaryModelNode;
 WX_DEFINE_ARRAY_PTR(AuxiliaryModelNode*, AuxiliaryModelNodePtrArray);

src/slic3r/GUI/AuxiliaryDialog.cpp

@@ -4,6 +4,8 @@
 
 #include "libslic3r/Utils.hpp"
 
+#include <boost/property_tree/ptree.hpp>
+
 namespace pt = boost::property_tree;
 typedef pt::ptree JSON;
 

src/slic3r/GUI/BBLStatusBar.hpp

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

src/slic3r/GUI/BBLStatusBarSend.cpp

@@ -12,7 +12,7 @@
 #include "I18N.hpp"
 
 #include <iostream>
-
+#include <regex>
 
 namespace Slic3r {
 

src/slic3r/GUI/BBLTopbar.cpp

@@ -1,6 +1,7 @@
 #include "BBLTopbar.hpp"
 #include "wx/artprov.h"
 #include "wx/aui/framemanager.h"
+#include "wx/display.h"
 #include "I18N.hpp"
 #include "GUI_App.hpp"
 #include "GUI.hpp"
@@ -10,6 +11,8 @@
 #include "WebViewDialog.hpp"
 #include "PartPlate.hpp"
 
+#include <boost/log/trivial.hpp>
+
 #define TOPBAR_ICON_SIZE  18
 #define TOPBAR_TITLE_WIDTH  300
 

src/slic3r/GUI/BindDialog.cpp

@@ -5,6 +5,7 @@
 #include <wx/sizer.h>
 #include <wx/statbox.h>
 #include "wx/evtloop.h"
+#include <wx/mstream.h>
 #include <wx/tokenzr.h>
 #include <wx/richmsgdlg.h>
 #include <wx/richtext/richtextctrl.h>

src/slic3r/GUI/BitmapCache.cpp

@@ -5,6 +5,7 @@
 #include "GUI.hpp"
 #include "GUI_Utils.hpp"
 
+#include <boost/nowide/cstdio.hpp>
 #include <boost/filesystem.hpp>
 
 #ifdef __WXGTK2__

src/slic3r/GUI/CameraPopup.hpp

@@ -7,6 +7,7 @@
 #include <wx/panel.h>
 #include <wx/bitmap.h>
 #include <wx/image.h>
+#include <wx/timer.h>
 #include <wx/sizer.h>
 #include <wx/gbsizer.h>
 #include <wx/webrequest.h>

src/slic3r/GUI/CreatePresetsDialog.cpp

@@ -6,6 +6,8 @@
 #include <openssl/md5.h>
 #include <openssl/evp.h>
 #include <wx/dcgraph.h>
+#include <wx/tooltip.h>
+#include <boost/nowide/cstdio.hpp>
 #include "libslic3r/PresetBundle.hpp"
 #include "I18N.hpp"
 #include "GUI_App.hpp"

src/slic3r/GUI/DeviceManager.hpp

@@ -6,6 +6,7 @@
 #include <string>
 #include <memory>
 #include <chrono>
+#include <mutex>
 #include <boost/thread.hpp>
 #include <boost/nowide/fstream.hpp>
 #include "nlohmann/json.hpp"

src/slic3r/GUI/ExtrusionCalibration.cpp

@@ -3,6 +3,7 @@
 #include "MsgDialog.hpp"
 #include "libslic3r/Preset.hpp"
 #include "I18N.hpp"
+#include <boost/log/trivial.hpp>
 #include <wx/dcgraph.h>
 
 namespace Slic3r { namespace GUI {

src/slic3r/GUI/GCodeViewer.cpp

@@ -2,6 +2,7 @@
 #include "GCodeViewer.hpp"
 
 #include "libslic3r/BuildVolume.hpp"
+#include "libslic3r/ClipperUtils.hpp"
 #include "libslic3r/Print.hpp"
 #include "libslic3r/Geometry.hpp"
 #include "libslic3r/Model.hpp"

src/slic3r/GUI/GLTexture.cpp

@@ -33,6 +33,7 @@
 
 #include "libslic3r/Utils.hpp"
 #include "GUI_App.hpp"
+#include <boost/log/trivial.hpp>
 #include <wx/dcgraph.h>
 namespace Slic3r {
 namespace GUI {

src/slic3r/GUI/GLTexture.hpp

@@ -6,6 +6,9 @@
 #include <vector>
 #include <thread>
 
+#include <wx/colour.h>
+#include <wx/font.h>
+
 class wxImage;
 
 namespace Slic3r {

src/slic3r/GUI/GUI_App.cpp

@@ -28,6 +28,8 @@
 #include <boost/lexical_cast.hpp>
 #include <boost/log/trivial.hpp>
 #include <boost/nowide/convert.hpp>
+#include <boost/property_tree/ptree.hpp>
+#include <boost/property_tree/json_parser.hpp>
 
 #include <wx/stdpaths.h>
 #include <wx/imagpng.h>

src/slic3r/GUI/GUI_App.hpp

@@ -1,6 +1,13 @@
 #ifndef slic3r_GUI_App_hpp_
 #define slic3r_GUI_App_hpp_
 
+#include <wx/app.h>
+#include <wx/colour.h>
+#include <wx/font.h>
+#include <wx/string.h>
+#include <wx/snglinst.h>
+#include <wx/msgdlg.h>
+
 #include <memory>
 #include <string>
 #include "ImGuiWrapper.hpp"
@@ -17,13 +24,6 @@
 #include "slic3r/GUI/HttpServer.hpp"
 #include "../Utils/PrintHost.hpp"
 
-#include <wx/app.h>
-#include <wx/colour.h>
-#include <wx/font.h>
-#include <wx/string.h>
-#include <wx/snglinst.h>
-#include <wx/msgdlg.h>
-
 #include <mutex>
 #include <stack>
 

src/slic3r/GUI/GUI_Colors.hpp

@@ -3,6 +3,7 @@
 
 #include "imgui/imgui.h"
 #include "libslic3r/Color.hpp"
+#include <array>
 
 enum RenderCol_ {
     RenderCol_3D_Background = 0,

src/slic3r/GUI/GUI_ObjectTable.cpp

@@ -1,4 +1,5 @@
 #include "wx/clipbrd.h"
+#include "wx/display.h"
 
 #include "SelectMachine.hpp"
 #include "I18N.hpp"

src/slic3r/GUI/Gizmos/GLGizmoBase.hpp

@@ -15,6 +15,8 @@
 
 #include <cereal/archives/binary.hpp>
 
+#include <wx/event.h>
+
 #define ENABLE_FIXED_GRABBER 1
 
 class wxWindow;

src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp

@@ -15,9 +15,9 @@
 #include "slic3r/GUI/GUI.hpp"
 #include "slic3r/Utils/UndoRedo.hpp"
 
-
 #include <GL/glew.h>
 
+#include <boost/log/trivial.hpp>
 
 namespace Slic3r::GUI {
 

src/slic3r/GUI/Gizmos/GLGizmoText.cpp

@@ -6,7 +6,7 @@
 #include "slic3r/GUI/ImGuiWrapper.hpp"
 #include "slic3r/GUI/GUI_ObjectList.hpp"
 #include "slic3r/GUI/Plater.hpp"
-
+#include "libslic3r/ClipperUtils.hpp"
 #include "libslic3r/Geometry/ConvexHull.hpp"
 #include "libslic3r/Model.hpp"
 
@@ -14,6 +14,8 @@
 
 #include <numeric>
 
+#include <boost/log/trivial.hpp>
+
 #include <GL/glew.h>
 
 #ifndef IMGUI_DEFINE_MATH_OPERATORS

src/slic3r/GUI/HMS.cpp

@@ -1,5 +1,6 @@
 #include "HMS.hpp"
 
+#include <boost/log/trivial.hpp>
 
 
 namespace Slic3r {

src/slic3r/GUI/HttpServer.hpp

@@ -1,6 +1,7 @@
 #ifndef slic3r_Http_App_hpp_
 #define slic3r_Http_App_hpp_
 
+#include <iostream>
 #include <mutex>
 #include <stack>
 
@@ -12,7 +13,6 @@
 #include <string>
 #include <memory>
 
-using namespace boost;
 using namespace boost::system;
 using namespace boost::asio;
 
@@ -73,21 +73,21 @@ public:
 
 class session
 {
-    asio::streambuf buff;
+    boost::asio::streambuf buff;
     http_headers headers;
 
     static void read_body(std::shared_ptr<session> pThis)
     {
         int nbuffer = 1000;
         std::shared_ptr<std::vector<char>> bufptr = std::make_shared<std::vector<char>>(nbuffer);
-        asio::async_read(pThis->socket, boost::asio::buffer(*bufptr, nbuffer), [pThis](const boost::beast::error_code& e, std::size_t s)
+        boost::asio::async_read(pThis->socket, boost::asio::buffer(*bufptr, nbuffer), [pThis](const boost::beast::error_code& e, std::size_t s)
             {
             });
     }
 
     static void read_next_line(std::shared_ptr<session> pThis)
     {
-        asio::async_read_until(pThis->socket, pThis->buff, '\r', [pThis](const boost::beast::error_code& e, std::size_t s)
+        boost::asio::async_read_until(pThis->socket, pThis->buff, '\r', [pThis](const boost::beast::error_code& e, std::size_t s)
             {
                 std::string line, ignore;
                 std::istream stream{ &pThis->buff };
@@ -100,7 +100,7 @@ class session
                     if (pThis->headers.content_length() == 0)
                     {
                         std::shared_ptr<std::string> str = std::make_shared<std::string>(pThis->headers.get_response());
-                        asio::async_write(pThis->socket, boost::asio::buffer(str->c_str(), str->length()), [pThis, str](const boost::beast::error_code& e, std::size_t s)
+                        boost::asio::async_write(pThis->socket, boost::asio::buffer(str->c_str(), str->length()), [pThis, str](const boost::beast::error_code& e, std::size_t s)
                             {
                                 std::cout << "done" << std::endl;
                             });
@@ -119,7 +119,7 @@ class session
 
     static void read_first_line(std::shared_ptr<session> pThis)
     {
-        asio::async_read_until(pThis->socket, pThis->buff, '\r', [pThis](const boost::beast::error_code& e, std::size_t s)
+        boost::asio::async_read_until(pThis->socket, pThis->buff, '\r', [pThis](const boost::beast::error_code& e, std::size_t s)
             {
                 std::string line, ignore;
                 std::istream stream{ &pThis->buff };

src/slic3r/GUI/IMSlider.hpp

@@ -3,6 +3,7 @@
 
 #include "TickCode.hpp"
 #include <imgui/imgui.h>
+#include <wx/slider.h>
 
 #include <set>
 

src/slic3r/GUI/IconManager.cpp

@@ -1,6 +1,9 @@
 #include "IconManager.hpp"
 #include <cmath>
+#include <numeric>
 #include <boost/log/trivial.hpp>
+#include <boost/filesystem.hpp>
+#include <boost/nowide/cstdio.hpp>
 #include "nanosvg/nanosvg.h"
 #include "nanosvg/nanosvgrast.h"
 #include "libslic3r/Utils.hpp" // ScopeGuard   

src/slic3r/GUI/ImGuiWrapper.hpp

@@ -7,6 +7,7 @@
 
 #include <string>
 #include <map>
+#include <cstdlib>
 
 #include <imgui/imgui.h>
 

src/slic3r/GUI/ImageGrid.cpp

@@ -8,6 +8,8 @@
 
 #include <wx/dcgraph.h>
 
+#include <boost/log/trivial.hpp>
+
 wxDEFINE_EVENT(EVT_ITEM_ACTION, wxCommandEvent);
 
 BEGIN_EVENT_TABLE(Slic3r::GUI::ImageGrid, wxPanel)

src/slic3r/GUI/ImageGrid.h

@@ -9,6 +9,7 @@
 #define ImageGrid_h
 
 #include <wx/window.h>
+#include <wx/timer.h>
 #include <wx/arrstr.h>
 #include <boost/shared_ptr.hpp>
 

src/slic3r/GUI/Jobs/Job.hpp

@@ -9,6 +9,8 @@
 #include <exception>
 #include <future>
 
+#include <wx/window.h>
+
 #include "libslic3r/libslic3r.h"
 #include "ProgressIndicator.hpp"
 

src/slic3r/GUI/Jobs/PrintJob.hpp

@@ -3,6 +3,7 @@
 
 #include <boost/filesystem/path.hpp>
 #include <boost/filesystem/operations.hpp>
+#include "libslic3r/PrintConfig.hpp"
 #include "Job.hpp"
 
 namespace fs = boost::filesystem;

src/slic3r/GUI/Jobs/ProgressIndicator.hpp

@@ -7,6 +7,7 @@
 
 #include <string>
 #include <functional>
+#include <wx/string.h>
 
 namespace Slic3r {
 

src/slic3r/GUI/Jobs/SLAImportJob.hpp

@@ -6,6 +6,7 @@
 #define SLAIMPORTJOB_HPP
 
 #include "Job.hpp"
+#include "libslic3r/Point.hpp"
 
 namespace Slic3r { namespace GUI {
 

src/slic3r/GUI/Jobs/UpgradeNetworkJob.hpp

@@ -1,8 +1,11 @@
 #ifndef __UpgradeNetworkJob_HPP__
 #define __UpgradeNetworkJob_HPP__
 
+#include <boost/filesystem.hpp>
+#include <boost/log/trivial.hpp>
 #include <functional>
 #include "Job.hpp"
+#include <wx/window.h>
 
 namespace fs = boost::filesystem;
 

src/slic3r/GUI/MainFrame.cpp

@@ -27,6 +27,7 @@
 
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/log/trivial.hpp>
+#include <boost/property_tree/ptree.hpp>
 
 #include "libslic3r/Print.hpp"
 #include "libslic3r/Polygon.hpp"

src/slic3r/GUI/MainFrame.hpp

@@ -26,6 +26,8 @@
 #include "Widgets/SideButton.hpp"
 #include "Widgets/SideMenuPopup.hpp"
 
+#include <boost/property_tree/ptree_fwd.hpp>
+
 // BBS
 #include "BBLTopbar.hpp"
 #include "PrinterWebView.hpp"

src/slic3r/GUI/MarkdownTip.cpp

@@ -7,6 +7,8 @@
 #include "libslic3r/Utils.hpp"
 #include "I18N.hpp"
 
+#include <wx/display.h>
+
 namespace fs = boost::filesystem;
 
 namespace Slic3r { namespace GUI {

src/slic3r/GUI/MediaFilePanel.h

@@ -10,7 +10,7 @@
 
 #include "GUI_Utils.hpp"
 #include "wxExtensions.hpp"
-
+#include <set>
 #include <wx/frame.h>
 
 class Button;

src/slic3r/GUI/MediaPlayCtrl.cpp

@@ -8,6 +8,9 @@
 #include "MsgDialog.hpp"
 #include "DownloadProgressDialog.hpp"
 
+#include <boost/lexical_cast.hpp>
+#include <boost/log/trivial.hpp>
+#include <boost/nowide/cstdio.hpp>
 #include <boost/nowide/utf8_codecvt.hpp>
 #undef pid_t
 #include <boost/process.hpp>
@@ -18,6 +21,8 @@
 #include <sys/shm.h>
 #endif
 
+#include <wx/clipbrd.h>
+
 namespace Slic3r {
 namespace GUI {
 

src/slic3r/GUI/MonitorPage.hpp

@@ -2,6 +2,7 @@
 #define slic3r_MonitorPage_hpp_
 
 #include <wx/panel.h>
+#include <wx/sizer.h>
 
 namespace Slic3r {
 namespace GUI {

src/slic3r/GUI/NetworkTestDialog.cpp

@@ -8,7 +8,7 @@
 #include "slic3r/Utils/Http.hpp"
 #include "libslic3r/AppConfig.hpp"
 #include <boost/asio/ip/address.hpp>
-
+#include <boost/log/trivial.hpp>
 
 namespace Slic3r {
 namespace GUI {

src/slic3r/GUI/Notebook.hpp

@@ -4,6 +4,7 @@
 //#ifdef _WIN32
 
 #include <wx/bookctrl.h>
+#include <wx/sizer.h>
 
 class ModeSizer;
 class ScalableButton;

src/slic3r/GUI/ObjectDataViewModel.hpp

@@ -5,6 +5,7 @@
 #ifndef slic3r_GUI_ObjectDataViewModel_hpp_
 #define slic3r_GUI_ObjectDataViewModel_hpp_
 
+#include <boost/log/trivial.hpp>
 #include <wx/dataview.h>
 #include <vector>
 #include <map>

src/slic3r/GUI/ParamsPanel.hpp

@@ -20,6 +20,8 @@
 #include <wx/image.h>
 #include <wx/icon.h>
 #include <wx/button.h>
+#include <wx/timer.h>
+#include <wx/wupdlock.h>
 #include <wx/sizer.h>
 #include <wx/statline.h>
 #include <wx/scrolwin.h>

src/slic3r/GUI/PartPlate.cpp

@@ -12,6 +12,7 @@
 #include <boost/filesystem/operations.hpp>
 #include <boost/log/trivial.hpp>
 #include <boost/nowide/convert.hpp>
+#include <boost/nowide/cstdio.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 
 #include "libslic3r/libslic3r.h"

src/slic3r/GUI/PresetComboBoxes.hpp

@@ -4,6 +4,7 @@
 //#include <wx/bmpcbox.h>
 #include <wx/gdicmn.h>
 #include <wx/clrpicker.h>
+#include <wx/colourdata.h>
 
 #include "libslic3r/Preset.hpp"
 #include "wxExtensions.hpp"

src/slic3r/GUI/Printer/PrinterFileSystem.cpp

@@ -7,10 +7,14 @@
 #include "../../Utils/NetworkAgent.hpp"
 #include "../BitmapCache.hpp"
 
+#include <boost/endian/conversion.hpp>
+#include <boost/log/trivial.hpp>
 #include <boost/algorithm/hex.hpp>
 #include <boost/uuid/detail/md5.hpp>
 #include <boost/regex.hpp>
 
+#include <wx/mstream.h>
+
 #include "nlohmann/json.hpp"
 
 #include <cstring>

src/slic3r/GUI/Printer/PrinterFileSystem.h

@@ -4,6 +4,7 @@
 #define BAMBU_DYNAMIC
 #include "BambuTunnel.h"
 
+#include <wx/bitmap.h>
 #include <wx/event.h>
 
 #include <boost/thread.hpp>

src/slic3r/GUI/PrivacyUpdateDialog.hpp

@@ -6,6 +6,7 @@
 #include "Widgets/Label.hpp"
 #include "Widgets/WebView.hpp"
 #include <wx/webview.h>
+#include <wx/progdlg.h>
 #include <wx/simplebook.h>
 
 namespace Slic3r { namespace GUI {

src/slic3r/GUI/Project.cpp

@@ -4,6 +4,8 @@
 #include "libslic3r/Model.hpp"
 #include "libslic3r/Format/bbs_3mf.hpp"
 
+#include <boost/log/trivial.hpp>
+
 #include <wx/app.h>
 #include <wx/button.h>
 #include <wx/scrolwin.h>

src/slic3r/GUI/SavePresetDialog.cpp

@@ -4,6 +4,7 @@
 #include <vector>
 #include <string>
 #include <boost/algorithm/string.hpp>
+#include <boost/log/trivial.hpp>
 
 #include <wx/sizer.h>
 #include <wx/stattext.h>

src/slic3r/GUI/SelectMachine.cpp

@@ -20,6 +20,7 @@
 #include <wx/progdlg.h>
 #include <wx/clipbrd.h>
 #include <wx/dcgraph.h>
+#include <wx/mstream.h>
 #include <miniz.h>
 #include <algorithm>
 #include "Plater.hpp"

src/slic3r/GUI/SliceInfoPanel.cpp

@@ -1,5 +1,6 @@
 #include "SliceInfoPanel.hpp"
 
+#include <boost/log/trivial.hpp>
 #include "I18N.hpp"
 #include "Widgets/Label.hpp"
 #include "libslic3r/Utils.hpp"

src/slic3r/GUI/StatusPanel.cpp

@@ -18,6 +18,8 @@
 #include "RecenterDialog.hpp"
 #include "CalibUtils.hpp"
 #include <slic3r/GUI/Widgets/ProgressDialog.hpp>
+#include <wx/display.h>
+#include <wx/mstream.h>
 #include <wx/sstream.h>
 #include <wx/zstream.h>
 

src/slic3r/GUI/TabButton.cpp

@@ -1,6 +1,7 @@
 #include "TabButton.hpp"
 #include "Widgets/Label.hpp"
 
+#include <wx/dcclient.h>
 #include <wx/dcgraph.h>
 
 BEGIN_EVENT_TABLE(TabButton, StaticBox)

src/slic3r/GUI/WebUserLoginDialog.hpp

@@ -24,6 +24,7 @@
 #include "wx/fs_mem.h"
 #include "wx/stdpaths.h"
 #include <wx/frame.h>
+#include "wx/timer.h"
 #include <wx/tbarbase.h>
 #include "wx/textctrl.h"
 

src/slic3r/GUI/WebViewDialog.cpp

@@ -7,6 +7,9 @@
 #include "libslic3r_version.h"
 #include "../Utils/Http.hpp"
 
+#include <boost/property_tree/ptree.hpp>
+#include <boost/property_tree/json_parser.hpp>
+
 #include <wx/sizer.h>
 #include <wx/toolbar.h>
 #include <wx/textdlg.h>

src/slic3r/GUI/Widgets/AMSControl.cpp

@@ -4,6 +4,8 @@
 #include "../I18N.hpp"
 #include "../GUI_App.hpp"
 
+#include <boost/log/trivial.hpp>
+
 #include <wx/simplebook.h>
 #include <wx/dcgraph.h>
 #include "CalibUtils.hpp"

src/slic3r/GUI/Widgets/AxisCtrlButton.cpp

@@ -1,6 +1,8 @@
 #include "AxisCtrlButton.hpp"
 #include "Label.hpp"
+#include "libslic3r/libslic3r.h"
 
+#include <wx/dcclient.h>
 #include <wx/dcgraph.h>
 
 StateColor blank_bg(StateColor(std::make_pair(wxColour("#FFFFFF"), (int)StateColor::Normal)));

src/slic3r/GUI/Widgets/DropDown.cpp

@@ -1,6 +1,8 @@
 #include "DropDown.hpp"
 #include "Label.hpp"
 
+#include <wx/display.h>
+#include <wx/dcbuffer.h>
 #include <wx/dcgraph.h>
 
 #ifdef __WXGTK__

src/slic3r/GUI/Widgets/DropDown.hpp

@@ -1,6 +1,7 @@
 #ifndef slic3r_GUI_DropDown_hpp_
 #define slic3r_GUI_DropDown_hpp_
 
+#include <boost/date_time/posix_time/posix_time.hpp>
 #include <wx/stattext.h>
 #include "../wxExtensions.hpp"
 #include "StateHandler.hpp"

src/slic3r/GUI/Widgets/ErrorMsgStaticText.cpp

@@ -1,4 +1,5 @@
 #include "ErrorMsgStaticText.hpp"
+#include <wx/dcclient.h>
 
 ErrorMsgStaticText::ErrorMsgStaticText() {}
 

src/slic3r/GUI/Widgets/ErrorMsgStaticText.hpp

@@ -2,6 +2,7 @@
 #ifndef _WX_ERRORMSGSTATTEXT_H_
 #define _WX_ERRORMSGSTATTEXT_H_
 
+#include <wx/panel.h>
 #include "wx/stattext.h"
 
 class WXDLLIMPEXP_CORE ErrorMsgStaticText : public wxPanel

src/slic3r/GUI/Widgets/ImageSwitchButton.cpp

@@ -3,6 +3,7 @@
 #include "StaticBox.hpp"
 #include "../wxExtensions.hpp"
 
+#include <wx/dcclient.h>
 #include <wx/dcgraph.h>
 
 BEGIN_EVENT_TABLE(ImageSwitchButton, StaticBox)

src/slic3r/GUI/Widgets/Label.cpp

@@ -2,6 +2,10 @@
 #include "Label.hpp"
 #include "StaticBox.hpp"
 #include <wx/intl.h> // For wxLocale
+#include <wx/dcclient.h>
+#include <wx/settings.h>
+#include <boost/log/trivial.hpp>
+
 
 wxFont Label::sysFont(int size, bool bold)
 {

src/slic3r/GUI/Widgets/ProgressBar.cpp

@@ -1,5 +1,6 @@
 #include "ProgressBar.hpp"
 #include "../I18N.hpp"
+#include <wx/dcclient.h>
 #include <wx/dcgraph.h>
 #include "Label.hpp"
 

src/slic3r/GUI/Widgets/ProgressDialog.hpp

@@ -2,6 +2,7 @@
 #define slic3r_GUI_PROGRESSDIALOG_hpp_
 
 #include "wx/dialog.h"
+#include "wx/progdlg.h"
 #include "wx/weakref.h"
 #include "wx/simplebook.h"
 #include "Button.hpp"

src/slic3r/GUI/Widgets/RoundedRectangle.cpp

@@ -1,6 +1,7 @@
 #include "RoundedRectangle.hpp"
 #include "../wxExtensions.hpp"
 #include <wx/dcgraph.h>
+#include <wx/dcclient.h>
 
 BEGIN_EVENT_TABLE(RoundedRectangle, wxPanel)
 EVT_PAINT(RoundedRectangle::OnPaint)

src/slic3r/GUI/Widgets/SideButton.cpp

@@ -1,6 +1,7 @@
 #include "SideButton.hpp"
 #include "Label.hpp"
 
+#include <wx/dcclient.h>
 #include <wx/dcgraph.h>
 
 BEGIN_EVENT_TABLE(SideButton, wxPanel)

src/slic3r/GUI/Widgets/SideMenuPopup.cpp

@@ -1,6 +1,7 @@
 #include "SideMenuPopup.hpp"
 #include "Label.hpp"
 
+#include <wx/display.h>
 #include <wx/dcgraph.h>
 #include "../GUI_App.hpp"
 

src/slic3r/GUI/Widgets/SpinInput.hpp

@@ -1,7 +1,10 @@
 #ifndef slic3r_GUI_SpinInput_hpp_
 #define slic3r_GUI_SpinInput_hpp_
 
+#include <wx/dcclient.h>
+#include <wx/timer.h>
 #include <wx/textctrl.h>
+#include <wx/valtext.h>
 #include "StaticBox.hpp"
 
 class Button;

src/slic3r/GUI/Widgets/StateHandler.cpp

@@ -1,4 +1,5 @@
 #include "StateHandler.hpp"
+#include <wx/window.h>
 
 wxDEFINE_EVENT(EVT_ENABLE_CHANGED, wxCommandEvent);
 

src/slic3r/GUI/Widgets/StateHandler.hpp

@@ -1,6 +1,7 @@
 #ifndef slic3r_GUI_StateHandler_hpp_
 #define slic3r_GUI_StateHandler_hpp_
 
+#include <memory>
 #include <wx/event.h>
 
 #include "StateColor.hpp"

src/slic3r/GUI/Widgets/StaticBox.cpp

@@ -1,5 +1,6 @@
 #include "StaticBox.hpp"
 #include "../GUI.hpp"
+#include <wx/dcclient.h>
 #include <wx/dcgraph.h>
 
 BEGIN_EVENT_TABLE(StaticBox, wxWindow)

src/slic3r/GUI/Widgets/StaticLine.cpp

@@ -2,6 +2,7 @@
 #include "Label.hpp"
 #include "StateColor.hpp"
 
+#include <wx/dcclient.h>
 #include <wx/dcgraph.h>
 
 BEGIN_EVENT_TABLE(StaticLine, wxWindow)

src/slic3r/GUI/Widgets/StepCtrl.cpp

@@ -1,6 +1,9 @@
 #include "StepCtrl.hpp"
 #include "Label.hpp"
 
+#include <wx/dc.h>
+#include <wx/pen.h>
+
 wxDEFINE_EVENT( EVT_STEP_CHANGING, wxCommandEvent );
 wxDEFINE_EVENT( EVT_STEP_CHANGED, wxCommandEvent );