Let the CLI Resolve Presets on Installs That Ship Preset Caches Only

Release builds install each vendor as its preset cache alone. The
read-only preset load the CLI uses to resolve an inheriting user preset
passed allow_cache = false to keep caches from being written, which
also stopped them from being read, so every vendor fell back to JSONs
that are not installed and the CLI failed.

The flag now only gates writing: a read-only load reads caches and
writes none. The filament library is also read from its cache whenever
that is all that is installed, so a vendor updated over the air still
resolves against it.

.clang-tidy

@@ -1,56 +0,0 @@
-# clang-tidy configuration. Only missing includes are reported for now: a file
-# should include the header for every symbol it uses, not rely on the
-# precompiled header or another header's includes. Run with --fix to add them.
-Checks: '-*,misc-include-cleaner'
-CheckOptions:
-  # Missing includes only. Builds without the precompiled header break on these.
-  misc-include-cleaner.UnusedIncludes: false
-  # Headers that declare a symbol but are not the one to include: per-platform
-  # implementations of wxWidgets and Boost.Thread (a Linux run would suggest the
-  # GTK or pthread one), library internals and forward declarations, CPython's
-  # headers behind Python.h, curl's behind curl.h, oneTBB's behind tbb/, and
-  # admesh's stl.h, which the include path also exposes without its directory.
-  # Clipper's own clipper.hpp is only included through libslic3r/clipper.hpp or
-  # clipper_z.hpp, which configure it first, and Boost.Polygon's headers only
-  # work through boost/polygon/polygon.hpp or voronoi.hpp. minilzo's config
-  # headers are internal to minilzo.h.
-  # FFmpeg's C headers are left alone because they are only included inside
-  # extern "C", which an inserted include would miss. OS-specific headers (GLib,
-  # GTK, D-Bus, POSIX, the Windows SDK) are only used inside platform #if blocks,
-  # and an include added at the top of the file would break the other platforms'
-  # builds. A symbol these provide is not reported missing.
-  # Write every / as [/\\] so the patterns also match Windows paths.
-  # No comments inside the block below, because a # there silently becomes part of a pattern.
-  misc-include-cleaner.IgnoreHeaders: >-
-    wx[/\\](gtk|gtk1|msw|osx|unix|x11|motif|univ|qt|dfb|generic|private)[/\\].*;
-    .*[/\\]detail[/\\].*;
-    .*[/\\]impl[/\\].*;
-    .*_fwd\.hpp;
-    python3\.[0-9]+[/\\].*;
-    bits[/\\].*;
-    imconfig\.h;
-    expat_external\.h;
-    admesh[/\\]stl\.h;
-    boost[/\\]thread[/\\](pthread|win32)[/\\].*;
-    boost[/\\]regex[/\\]v[0-9]+[/\\].*;
-    curl[/\\](easy|multi|system|urlapi|header|options|websockets|mprintf)\.h;
-    oneapi[/\\]tbb[/\\].*;
-    opencv2[/\\]core[/\\]hal[/\\].*;
-    openssl[/\\]ossl_typ\.h;
-    libav[a-z]+[/\\].*;
-    libsw[a-z]+[/\\].*;
-    glib-2\.0[/\\].*;
-    gtk-3\.0[/\\].*;
-    dbus-1\.0[/\\].*;
-    sys[/\\].*;
-    unistd\.h;
-    strings\.h;
-    fcntl\.h;
-    termios\.h;
-    [/\\](um|shared)[/\\].*;
-    sal\.h;
-    clipper[/\\]clipper\.hpp;
-    png(lib)?conf\.h;
-    mcut[/\\]platform\.h;
-    boost[/\\]polygon[/\\].*;
-    lzo(conf|defs)\.h

.github/workflows/build_all.yml

@@ -45,7 +45,7 @@ on:
 
 
   schedule:
-      - cron: '15 2 * * *' # 10:15 AM Singapore time (UTC+8), when macOS runners are least busy
+      - cron: '0 17 * * *' # run once a day at 1 AM Singapore time (UTC+8)
 
   workflow_dispatch: # allows for manual dispatch
     inputs:

.github/workflows/main_build_status.yml

@@ -1,28 +0,0 @@
-# Reports the newest push build of main that was not cancelled, for the README badge.
-name: Main build status
-
-on:
-  workflow_run:
-    workflows: ["Build all"]
-    types: [completed]
-    branches: [main]
-  workflow_dispatch:
-
-permissions:
-  actions: read
-
-jobs:
-  status:
-    if: github.repository == 'OrcaSlicer/OrcaSlicer'
-    runs-on: ubuntu-latest
-    steps:
-      - env:
-          GH_TOKEN: ${{ github.token }}
-        run: |
-          for attempt in 1 2 3; do
-            conclusion=$(gh api "repos/${{ github.repository }}/actions/workflows/build_all.yml/runs?branch=main&event=push&status=completed&per_page=100" \
-              --jq '[.workflow_runs[] | select(.conclusion != "cancelled")][0].conclusion') && break
-            sleep 10
-          done
-          echo "Latest finished push build of main: $conclusion"
-          [ "$conclusion" = success ]

README.md

@@ -6,7 +6,7 @@
 
 <a href="https://trendshift.io/repositories/15552" target="_blank"><img src="https://trendshift.io/api/badge/repositories/15552" alt="OrcaSlicer%2FOrcaSlicer | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
 
-[![GitHub Repo stars](https://img.shields.io/github/stars/OrcaSlicer/OrcaSlicer)](https://github.com/OrcaSlicer/OrcaSlicer/stargazers) [![Build all](https://img.shields.io/github/actions/workflow/status/OrcaSlicer/OrcaSlicer/main_build_status.yml?label=Build%20all)](https://github.com/OrcaSlicer/OrcaSlicer/actions/workflows/build_all.yml)
+[![GitHub Repo stars](https://img.shields.io/github/stars/OrcaSlicer/OrcaSlicer)](https://github.com/OrcaSlicer/OrcaSlicer/stargazers) [![Build all](https://github.com/OrcaSlicer/OrcaSlicer/actions/workflows/build_all.yml/badge.svg?branch=main)](https://github.com/OrcaSlicer/OrcaSlicer/actions/workflows/build_all.yml)
 
 OrcaSlicer: an open source Next-Gen Slicing Software for Precision 3D Prints.  
 Optimize your prints with ultra-fast slicing, intelligent support generation, and seamless printer compatibility—engineered for perfection.

src/libslic3r/AABBMesh.cpp

@@ -1,19 +1,10 @@
 #include "AABBMesh.hpp"
-#include "Point.hpp"
-#include <Eigen/Core>
 #include <Execution/ExecutionTBB.hpp>
 
-#include <igl/Hit.h>
-#include <cstddef>
-#include <cassert>
-#include <cmath>
-#include <algorithm>
 #include <libslic3r/AABBTreeIndirect.hpp>
 #include <libslic3r/TriangleMesh.hpp>
 
-#include <limits>
 #include <numeric>
-#include <vector>
 
 #ifdef SLIC3R_HOLE_RAYCASTER
 #include <libslic3r/SLA/Hollowing.hpp>

src/libslic3r/AABBMesh.hpp

@@ -1,10 +1,6 @@
 #ifndef PRUSASLICER_AABBMESH_H
 #define PRUSASLICER_AABBMESH_H
 
-#include <cstddef>
-#include <limits>
-#include <cmath>
-#include <cassert>
 #include <memory>
 #include <vector>
 

src/libslic3r/AABBTreeIndirect.hpp

@@ -6,20 +6,15 @@
 #ifndef slic3r_AABBTreeIndirect_hpp_
 #define slic3r_AABBTreeIndirect_hpp_
 
-#include <Eigen/Core>
 #include <algorithm>
-#include <cstddef>
-#include <cassert>
 #include <limits>
 #include <type_traits>
-#include <utility>
 #include <vector>
 
 #include <Eigen/Geometry>
 
 #include "BoundingBox.hpp"
 #include "Utils.hpp" // for next_highest_power_of_2()
-#include "libslic3r.h"
 
 // Definition of the ray intersection hit structure.
 #include <igl/Hit.h>

src/libslic3r/AABBTreeLines.hpp

@@ -6,15 +6,9 @@
 #include "libslic3r.h"
 #include "libslic3r/AABBTreeIndirect.hpp"
 #include "libslic3r/Line.hpp"
-#include <Eigen/Core>
 #include <algorithm>
-#include <cassert>
 #include <cmath>
-#include <cstddef>
-#include <tuple>
-#include <limits>
 #include <type_traits>
-#include <utility>
 #include <vector>
 
 namespace Slic3r {

src/libslic3r/AStar.hpp

@@ -1,11 +1,7 @@
 #ifndef ASTAR_HPP
 #define ASTAR_HPP
 
-#include <cassert>
 #include <cmath> // std::isinf() is here
-#include <type_traits>
-#include <cstddef>
-#include <limits>
 #include <unordered_map>
 
 #include "libslic3r/MutablePriorityQueue.hpp"

src/libslic3r/Algorithm/LineSplit.cpp

@@ -1,19 +1,8 @@
 #include "LineSplit.hpp"
 
 #include "AABBTreeLines.hpp"
-#include "libslic3r/ClipperZUtils.hpp"
-#include "libslic3r/Point.hpp"
-#include "libslic3r/Line.hpp"
-#include "libslic3r/ExPolygon.hpp"
 #include "SVG.hpp"
 #include "Utils.hpp"
-#include <limits>
-#include "libslic3r/libslic3r.h"
-#include <algorithm>
-#include <cstddef>
-#include <cassert>
-#include <vector>
-#include <utility>
 
 //#define DEBUG_SPLIT_LINE
 

src/libslic3r/Algorithm/LineSplit.hpp

@@ -2,11 +2,6 @@
 #define SRC_LIBSLIC3R_ALGORITHM_LINE_SPLIT_HPP_
 
 #include "ClipperZUtils.hpp"
-#include "libslic3r/Point.hpp"
-#include <cstdint>
-#include <cstddef>
-#include <vector>
-#include "libslic3r/ExPolygon.hpp"
 
 namespace Slic3r {
 namespace Algorithm {

src/libslic3r/Algorithm/RegionExpansion.cpp

@@ -1,25 +1,11 @@
 #include "RegionExpansion.hpp"
-#include "libslic3r/Point.hpp"
-#include "libslic3r/ExPolygon.hpp"
-#include "libslic3r/libslic3r.h"
-#include "libslic3r/Polyline.hpp"
-#include "libslic3r/Polygon.hpp"
 
-#include <algorithm>
-#include <cmath>
-#include <cstddef>
-#include <cassert>
-#include <iterator>
-#include <cstdint>
 #include <libslic3r/AABBTreeIndirect.hpp>
 #include <libslic3r/ClipperZUtils.hpp>
 #include <libslic3r/ClipperUtils.hpp>
 #include <libslic3r/Utils.hpp>
 
-#include <math.h>
 #include <numeric>
-#include <vector>
-#include <utility>
 
 namespace Slic3r {
 namespace Algorithm {

src/libslic3r/Algorithm/RegionExpansion.hpp

@@ -1,12 +1,10 @@
 #ifndef SRC_LIBSLIC3R_ALGORITHM_REGION_EXPANSION_HPP_
 #define SRC_LIBSLIC3R_ALGORITHM_REGION_EXPANSION_HPP_
 
-#include <cstddef>
 #include <cstdint>
 #include <libslic3r/Point.hpp>
 #include <libslic3r/Polygon.hpp>
 #include <libslic3r/ExPolygon.hpp>
-#include <vector>
 
 namespace Slic3r {
 namespace Algorithm {

src/libslic3r/AnyPtr.hpp

@@ -1,7 +1,6 @@
 #ifndef ANYPTR_HPP
 #define ANYPTR_HPP
 
-#include <boost/variant/variant.hpp>
 #include <memory>
 #include <type_traits>
 #include <boost/variant.hpp>

src/libslic3r/AppConfig.cpp

@@ -1,8 +1,3 @@
-#include "Technologies.hpp"
-#include "Config.hpp"
-#include "PrintConfig.hpp"
-#include "calib.hpp"
-#include "Semver.hpp"
 #include "libslic3r/libslic3r.h"
 #include "libslic3r/Utils.hpp"
 #include "libslic3r/Format/DRC.hpp"
@@ -10,22 +5,12 @@
 //BBS
 #include "Preset.hpp"
 #include "Exception.hpp"
-#include "InstanceLock.hpp"
 #include "LocalesUtils.hpp"
 #include "Thread.hpp"
 #include "format.hpp"
-#include "libslic3r_version.h"
 #include "nlohmann/json.hpp"
 
 #include <algorithm>
-#include <string>
-#include <exception>
-#include <boost/none.hpp>
-#include <cstddef>
-#include <system_error>
-#include <chrono>
-#include <map>
-#include <cstring>
 #include <utility>
 #include <vector>
 #include <stdexcept>
@@ -758,13 +743,10 @@ static bool verify_config_file_checksum(boost::nowide::ifstream &ifs)
 
 
 #ifdef USE_JSON_CONFIG
-std::string AppConfig::load(bool read_only)
+std::string AppConfig::load()
 {
     json j;
 
-    // Keep another instance from replacing or restoring the file mid-read.
-    InstanceLock instance_lock(read_only ? std::string() : lock_path());
-
     // 1) Read the complete config file into a boost::property_tree.
     namespace pt = boost::property_tree;
     pt::ptree tree;
@@ -1014,6 +996,7 @@ void AppConfig::save()
     // The config is first written to a file with a PID suffix and then moved
     // to avoid race conditions with multiple instances of Slic3r
     const auto path = config_path();
+    std::string path_pid = (boost::format("%1%.%2%") % path % get_current_pid()).str();
 
     json j;
 
@@ -1143,18 +1126,43 @@ void AppConfig::save()
 
         j["local_machines"][local_machine.first] = m_json;
     }
-    const std::string config_str = j.dump(1, '\t');
-    if (write_config_file(path, config_str + "\n", config_str))
+    boost::nowide::ofstream c;
+    c.open(path_pid, std::ios::out | std::ios::trunc);
+    c << j.dump(1, '\t') << std::endl;
+
+#ifdef WIN32
+    // WIN32 specific: The final "rename_file()" call is not safe in case of an application crash, there is no atomic "rename file" API
+    // provided by Windows (sic!). Therefore we save a MD5 checksum to be able to verify file corruption. In addition,
+    // we save the config file into a backup first before moving it to the final destination.
+    c << appconfig_md5_hash_line(j.dump(1, '\t'));
+#endif
+
+    c.close();
+    if (c.fail()) {
+      BOOST_LOG_TRIVIAL(error) << "Failed to write new configuration to " << path_pid << "; aborting attempt to overwrite original configuration";
+      return;
+    }
+
+#ifdef WIN32
+    // Make a backup of the configuration file before copying it to the final destination.
+    std::string error_message;
+    std::string backup_path = (boost::format("%1%.bak") % path).str();
+    // Copy configuration file with PID suffix into the configuration file with "bak" suffix.
+    if (copy_file(path_pid, backup_path, error_message, false) != SUCCESS)
+        BOOST_LOG_TRIVIAL(error) << "Copying from " << path_pid << " to " << backup_path << " failed. Failed to create a backup configuration.";
+#endif
+
+    // Rename the config atomically.
+    // On Windows, the rename is likely NOT atomic, thus it may fail if PrusaSlicer crashes on another thread in the meanwhile.
+    // To cope with that, we already made a backup of the config on Windows.
+    rename_file(path_pid, path);
     m_dirty = false;
 }
 
 #else
 
-std::string AppConfig::load(bool read_only)
+std::string AppConfig::load()
 {
-    // Keep another instance from replacing or restoring the file mid-read.
-    InstanceLock instance_lock(read_only ? std::string() : lock_path());
-
     // 1) Read the complete config file into a boost::property_tree.
     namespace pt = boost::property_tree;
     pt::ptree tree;
@@ -1292,6 +1300,7 @@ void AppConfig::save()
     // The config is first written to a file with a PID suffix and then moved
     // to avoid race conditions with multiple instances of Slic3r
     const auto path = config_path();
+    std::string path_pid = (boost::format("%1%.%2%") % path % get_current_pid()).str();
 
     std::stringstream config_ss;
     if (m_mode == EAppMode::Editor)
@@ -1327,39 +1336,39 @@ void AppConfig::save()
     // One empty line before the MD5 sum.
     config_ss << std::endl;
 
-    const std::string config_str = config_ss.str();
-    if (write_config_file(path, config_str, config_str))
+    std::string config_str = config_ss.str();
+    boost::nowide::ofstream c;
+    c.open(path_pid, std::ios::out | std::ios::trunc);
+    c << config_str;
+#ifdef WIN32
+    // WIN32 specific: The final "rename_file()" call is not safe in case of an application crash, there is no atomic "rename file" API
+    // provided by Windows (sic!). Therefore we save a MD5 checksum to be able to verify file corruption. In addition,
+    // we save the config file into a backup first before moving it to the final destination.
+    c << appconfig_md5_hash_line(config_str);
+#endif
+    c.close();
+    if (c.fail()) {
+      BOOST_LOG_TRIVIAL(error) << "Failed to write new configuration to " << path_pid << "; aborting attempt to overwrite original configuration";
+      return;
+    }
+
+#ifdef WIN32
+    // Make a backup of the configuration file before copying it to the final destination.
+    std::string error_message;
+    std::string backup_path = (boost::format("%1%.bak") % path).str();
+    // Copy configuration file with PID suffix into the configuration file with "bak" suffix.
+    if (copy_file(path_pid, backup_path, error_message, false) != SUCCESS)
+        BOOST_LOG_TRIVIAL(error) << "Copying from " << path_pid << " to " << backup_path << " failed. Failed to create a backup configuration.";
+#endif
+
+    // Rename the config atomically.
+    // On Windows, the rename is likely NOT atomic, thus it may fail if PrusaSlicer crashes on another thread in the meanwhile.
+    // To cope with that, we already made a backup of the config on Windows.
+    rename_file(path_pid, path);
     m_dirty = false;
 }
 #endif
 
-bool AppConfig::write_config_file(const std::string &path, std::string body, const std::string &checksum_source)
-{
-    // Everything before this is assembly; only the writes need the other instances kept out.
-    InstanceLock instance_lock(lock_path());
-#ifdef WIN32
-    // WIN32 specific: the final replace is not safe in case of an application crash, there is no atomic "rename file" API
-    // provided by Windows (sic!). Therefore we save a MD5 checksum to be able to verify file corruption. In addition,
-    // we save the config file into a backup first before moving it to the final destination.
-    body += appconfig_md5_hash_line(checksum_source);
-#endif
-    // Not flushed to the device: the idle handler saves on the GUI thread after
-    // any change, and the rename already gives a complete old or new file.
-    if (const std::error_code ec = write_file_atomically(path, body)) {
-        BOOST_LOG_TRIVIAL(error) << "Failed to write the configuration " << path << ": " << ec.message() << "; trying again in 10 s";
-        m_retry_save_at = std::chrono::steady_clock::now() + std::chrono::seconds(10);
-        return false;
-    }
-    m_retry_save_at = {};
-#ifdef WIN32
-    // Written after the config, so the backup never holds a state that was not confirmed written.
-    const std::string backup_path = (boost::format("%1%.bak") % path).str();
-    if (const std::error_code ec = write_file_atomically(backup_path, body))
-        BOOST_LOG_TRIVIAL(error) << "Failed to write the backup configuration " << backup_path << ": " << ec.message();
-#endif
-    return true;
-}
-
 bool AppConfig::get_variant(const std::string &vendor, const std::string &model, const std::string &variant) const
 {
     const auto it_v = m_vendors.find(vendor);
@@ -1848,11 +1857,6 @@ void AppConfig::reset_selections()
     }
 }
 
-std::string AppConfig::lock_path()
-{
-    return Slic3r::data_dir().empty() ? std::string() : config_path() + ".lock";
-}
-
 std::string AppConfig::config_path()
 {
 #ifdef USE_JSON_CONFIG
@@ -1889,7 +1893,7 @@ bool AppConfig::exists()
 
 std::string AppConfig::load_if_exists()
 {
-    return boost::filesystem::exists(loading_path()) ? load(/*read_only=*/true) : std::string();
+    return boost::filesystem::exists(loading_path()) ? load() : std::string();
 }
 
 }; // namespace Slic3r

src/libslic3r/AppConfig.hpp

@@ -2,14 +2,10 @@
 #define slic3r_AppConfig_hpp_
 
 #include <set>
-#include <chrono>
 #include <map>
 #include <string>
-#include "LocalesUtils.hpp"
 #include "nlohmann/json.hpp"
 #include <boost/algorithm/string/trim_all.hpp>
-#include <utility>
-#include <vector>
 
 #include "libslic3r/Config.hpp"
 #include "libslic3r/Semver.hpp"
@@ -126,18 +122,14 @@ public:
 
 	// Load the slic3r.ini from a user profile directory (or a datadir, if configured).
 	// Return an error string, or an empty string on success.
-	std::string         load(bool read_only = false);
+	std::string         load();
 	// Treat a missing config as default state; otherwise load it normally.
-	// The CLI's load: it never saves, so it takes no lock and creates no lock file.
 	std::string         load_if_exists();
 	// Store the slic3r.ini into a user profile directory (or a datadir, if configured).
 	void 			   	save();
 
 	// Does this config need to be saved?
 	bool 				dirty() const { return m_dirty; }
-	// False for ten seconds after a failed write, so the idle handler does not
-	// repeat a hopeless attempt on every event; an explicit save() always tries.
-	bool 				save_due() const { return std::chrono::steady_clock::now() >= m_retry_save_at; }
 
 
 	void				set_dirty() { m_dirty = true; }
@@ -347,8 +339,6 @@ public:
 
 	// Get the default config path from Slic3r::data_dir().
 	std::string			config_path();
-	// Lock file guarding config_path() against other running instances; empty without a data dir.
-	std::string			lock_path();
 
 	// Returns true if the user's data directory comes from before Slic3r 1.40.0 (no updating)
 	bool 				legacy_datadir() const { return m_legacy_datadir; }
@@ -459,16 +449,8 @@ private:
 
 	// Preset for each machine
 	MachineSettingMap											m_printer_settings;
-	// Writes the assembled config text, and on Windows its checksum and a backup copy; false when the
-	// config itself could not be written, in which case the caller stays dirty and retries. `checksum_source`
-	// is the text load() will verify, which for the JSON config ends before the trailing newline.
-	bool												write_config_file(const std::string &path, std::string body, const std::string &checksum_source);
-
 	// Has any value been modified since the config.ini has been last saved or loaded?
 	bool														m_dirty;
-	// After a failed write, save_due() is false for the next ten seconds, so the
-	// idle handler does not repeat a hopeless write on every event.
-	std::chrono::steady_clock::time_point						m_retry_save_at{};
 	// Original version found in the ini file before it was overwritten
 	Semver                                                      m_orig_version;
 	// Whether the existing version is before system profiles & configuration updating

src/libslic3r/Arachne/BeadingStrategy/BeadingStrategy.cpp

@@ -2,9 +2,7 @@
 //CuraEngine is released under the terms of the AGPLv3 or higher.
 
 #include "BeadingStrategy.hpp"
-#include "libslic3r/libslic3r.h"
 #include "libslic3r/Point.hpp"
-#include <vector>
 
 namespace Slic3r::Arachne
 {

src/libslic3r/Arachne/BeadingStrategy/BeadingStrategyFactory.cpp

@@ -12,7 +12,6 @@
 #include "DistributedBeadingStrategy.hpp"
 #include "RedistributeBeadingStrategy.hpp"
 #include "OuterWallInsetBeadingStrategy.hpp"
-#include "libslic3r/libslic3r.h"
 #include "libslic3r/Arachne/BeadingStrategy/BeadingStrategy.hpp"
 
 namespace Slic3r::Arachne {

src/libslic3r/Arachne/BeadingStrategy/DistributedBeadingStrategy.cpp

@@ -6,7 +6,6 @@
 #include <cassert>
 
 #include "DistributedBeadingStrategy.hpp"
-#include "libslic3r/libslic3r.h"
 #include "libslic3r/Arachne/BeadingStrategy/BeadingStrategy.hpp"
 
 namespace Slic3r::Arachne

src/libslic3r/Arachne/BeadingStrategy/LimitedBeadingStrategy.cpp

@@ -3,12 +3,10 @@
 
 #include <boost/log/trivial.hpp>
 #include <cassert>
-#include <string>
 #include <utility>
 #include <cstddef>
 
 #include "LimitedBeadingStrategy.hpp"
-#include "libslic3r/libslic3r.h"
 #include "libslic3r/Point.hpp"
 #include "libslic3r/Arachne/BeadingStrategy/BeadingStrategy.hpp"
 

src/libslic3r/Arachne/BeadingStrategy/OuterWallInsetBeadingStrategy.cpp

@@ -6,7 +6,6 @@
 #include <algorithm>
 #include <utility>
 
-#include "libslic3r/libslic3r.h"
 #include "libslic3r/Arachne/BeadingStrategy/BeadingStrategy.hpp"
 
 namespace Slic3r::Arachne

src/libslic3r/Arachne/BeadingStrategy/RedistributeBeadingStrategy.cpp

@@ -7,7 +7,6 @@
 #include <numeric>
 #include <utility>
 
-#include "libslic3r/libslic3r.h"
 #include "libslic3r/Arachne/BeadingStrategy/BeadingStrategy.hpp"
 
 namespace Slic3r::Arachne

src/libslic3r/Arachne/BeadingStrategy/WideningBeadingStrategy.cpp

@@ -4,11 +4,8 @@
 #include "WideningBeadingStrategy.hpp"
 
 #include <algorithm>
-#include <string>
 #include <utility>
-#include <vector>
 
-#include "libslic3r/libslic3r.h"
 #include "libslic3r/Arachne/BeadingStrategy/BeadingStrategy.hpp"
 
 namespace Slic3r::Arachne

src/libslic3r/Arachne/SkeletalTrapezoidation.cpp

@@ -10,18 +10,10 @@
 #include <cmath>
 #include <cstdint>
 #include <limits>
-#include <math.h>
-#include <list>
-#include <memory>
 #include <utility>
 #include <cassert>
 #include <cstdlib>
-#include <vector>
 
-#include "libslic3r/Point.hpp"
-#include "libslic3r/libslic3r.h"
-#include "libslic3r/Polygon.hpp"
-#include "libslic3r/Arachne/BeadingStrategy/BeadingStrategy.hpp"
 #include "libslic3r/Geometry/VoronoiUtils.hpp"
 #include "ankerl/unordered_dense.h"
 #include "libslic3r/Arachne/SkeletalTrapezoidationEdge.hpp"

src/libslic3r/Arachne/SkeletalTrapezoidationEdge.hpp

@@ -4,12 +4,10 @@
 #ifndef SKELETAL_TRAPEZOIDATION_EDGE_H
 #define SKELETAL_TRAPEZOIDATION_EDGE_H
 
-#include <cassert>
 #include <memory> // smart pointers
 #include <list>
 #include <vector>
 
-#include "libslic3r/libslic3r.h"
 #include "utils/ExtrusionJunction.hpp"
 
 namespace Slic3r::Arachne

src/libslic3r/Arachne/SkeletalTrapezoidationGraph.cpp

@@ -6,17 +6,11 @@
 #include <ankerl/unordered_dense.h>
 #include <boost/log/trivial.hpp>
 #include <algorithm>
-#include <cstdint>
 #include <iostream>
 #include <cassert>
 #include <cinttypes>
-#include <optional>
-#include <utility>
 
 #include "../Line.hpp"
-#include "libslic3r/Arachne/utils/HalfEdge.hpp"
-#include "libslic3r/libslic3r.h"
-#include "libslic3r/Arachne/utils/HalfEdgeNode.hpp"
 #include "libslic3r/Arachne/SkeletalTrapezoidationEdge.hpp"
 #include "libslic3r/Arachne/SkeletalTrapezoidationJoint.hpp"
 #include "libslic3r/Point.hpp"

src/libslic3r/Arachne/SkeletalTrapezoidationJoint.hpp

@@ -6,7 +6,6 @@
 
 #include <memory> // smart pointers
 
-#include "libslic3r/libslic3r.h"
 #include "libslic3r/Arachne/BeadingStrategy/BeadingStrategy.hpp"
 
 namespace Slic3r::Arachne

src/libslic3r/Arachne/WallToolPaths.cpp

@@ -2,31 +2,12 @@
 // CuraEngine is released under the terms of the AGPLv3 or higher.
 
 #include <algorithm> //For std::partition_copy and std::min_element.
-#include <cstddef>
-#include <cstdint>
-#include <memory>
-#include <cassert>
-#include <cmath>
-#include <math.h>
-#include <limits>
 #include <unordered_set>
 
 #include "WallToolPaths.hpp"
 
-#include "libslic3r/PrintConfig.hpp"
-#include "libslic3r/Point.hpp"
-#include "libslic3r/Polygon.hpp"
-#include "libslic3r/Arachne/utils/ExtrusionLine.hpp"
-#include "libslic3r/Line.hpp"
-#include "libslic3r/Arachne/utils/PolygonsPointIndex.hpp"
-#include "libslic3r/Flow.hpp"
-#include "libslic3r/Arachne/BeadingStrategy/BeadingStrategyFactory.hpp"
-#include "libslic3r/Arachne/utils/ExtrusionJunction.hpp"
-#include "libslic3r/Arachne/utils/SparsePointGrid.hpp"
-#include "libslic3r/Arachne/utils/SquareGrid.hpp"
 #include "SkeletalTrapezoidation.hpp"
 #include "../ClipperUtils.hpp"
-#include "libslic3r/libslic3r.h"
 #include "utils/linearAlg2D.hpp"
 #include "EdgeGrid.hpp"
 #include "utils/SparseLineGrid.hpp"
@@ -36,8 +17,6 @@
 #include "Utils.hpp"
 
 #include <boost/log/trivial.hpp>
-#include <utility>
-#include <vector>
 
 //#define ARACHNE_STITCH_PATCH_DEBUG
 

src/libslic3r/Arachne/WallToolPaths.hpp

@@ -4,16 +4,10 @@
 #ifndef CURAENGINE_WALLTOOLPATHS_H
 #define CURAENGINE_WALLTOOLPATHS_H
 
-#include <cstddef>
-#include <boost/container_hash/hash.hpp>
 #include <memory>
 #include <ankerl/unordered_dense.h>
-#include <vector>
-#include <utility>
 
 #include "BeadingStrategy/BeadingStrategyFactory.hpp"
-#include "libslic3r/libslic3r.h"
-#include "libslic3r/Point.hpp"
 #include "utils/ExtrusionLine.hpp"
 #include "../Polygon.hpp"
 #include "../PrintConfig.hpp"

src/libslic3r/Arachne/utils/ExtrusionJunction.hpp

@@ -6,9 +6,6 @@
 #define UTILS_EXTRUSION_JUNCTION_H
 
 #include "../../Point.hpp"
-#include "libslic3r/libslic3r.h"
-#include <cstddef>
-#include <vector>
 
 namespace Slic3r::Arachne
 {

src/libslic3r/Arachne/utils/ExtrusionLine.cpp

@@ -2,16 +2,11 @@
 //CuraEngine is released under the terms of the AGPLv3 or higher.
 
 #include <algorithm>
-#include <cassert>
 #include <cmath>
-#include <cstdint>
 #include <cstdlib>
-#include <vector>
 
 #include "ExtrusionLine.hpp"
 #include "../../VariableWidth.hpp"
-#include "libslic3r/libslic3r.h"
-#include "libslic3r/Point.hpp"
 #include "libslic3r/Arachne/utils/ExtrusionJunction.hpp"
 #include "libslic3r/BoundingBox.hpp"
 #include "libslic3r/ExtrusionEntity.hpp"

src/libslic3r/Arachne/utils/ExtrusionLine.hpp

@@ -22,7 +22,6 @@
 #include "../../BoundingBox.hpp"
 #include "../../ExtrusionEntity.hpp"
 #include "../../Flow.hpp"
-#include "libslic3r/libslic3r.h"
 #include "libslic3r/Point.hpp"
 
 namespace Slic3r {

src/libslic3r/Arachne/utils/PolygonsPointIndex.hpp

@@ -4,9 +4,6 @@
 #ifndef UTILS_POLYGONS_POINT_INDEX_H
 #define UTILS_POLYGONS_POINT_INDEX_H
 
-#include <utility>
-#include <functional>
-#include <cstddef>
 #include <vector>
 
 #include "../../Point.hpp"

src/libslic3r/Arachne/utils/PolygonsSegmentIndex.hpp

@@ -6,10 +6,7 @@
 
 #include <vector>
 
-#include "libslic3r/Polygon.hpp"
-#include "libslic3r/Point.hpp"
 #include "PolygonsPointIndex.hpp"
-#include "libslic3r/libslic3r.h"
 
 namespace Slic3r::Arachne
 {

src/libslic3r/Arachne/utils/PolylineStitcher.cpp

@@ -4,7 +4,6 @@
 #include "PolylineStitcher.hpp"
 
 #include "ExtrusionLine.hpp"
-#include "libslic3r/Point.hpp"
 #include "libslic3r/Arachne/utils/PolygonsPointIndex.hpp"
 #include "libslic3r/Polygon.hpp"
 

src/libslic3r/Arachne/utils/SparseGrid.hpp

@@ -6,14 +6,11 @@
 #define UTILS_SPARSE_GRID_H
 
 #include <cassert>
-#include <unordered_map>
-#include <cstddef>
 #include <vector>
 #include <functional>
 
 #include "../../Point.hpp"
 #include "SquareGrid.hpp"
-#include "libslic3r/libslic3r.h"
 
 namespace Slic3r::Arachne {
 

src/libslic3r/Arachne/utils/SparseLineGrid.hpp

@@ -6,15 +6,10 @@
 #define UTILS_SPARSE_LINE_GRID_H
 
 #include <cassert>
-#include <cstddef>
-#include <utility>
-#include <unordered_map>
 #include <vector>
 #include <functional>
 
-#include "libslic3r/Point.hpp"
 #include "SparseGrid.hpp"
-#include "libslic3r/libslic3r.h"
 
 namespace Slic3r::Arachne {
 

src/libslic3r/Arachne/utils/SparsePointGrid.hpp

@@ -6,13 +6,9 @@
 #define UTILS_SPARSE_POINT_GRID_H
 
 #include <cassert>
-#include <cstddef>
-#include <cstdint>
 #include <vector>
 
-#include "libslic3r/Point.hpp"
 #include "SparseGrid.hpp"
-#include "libslic3r/libslic3r.h"
 
 namespace Slic3r::Arachne {
 

src/libslic3r/Arachne/utils/SquareGrid.cpp

@@ -4,11 +4,7 @@
 #include "SquareGrid.hpp"
 
 #include <cassert>
-#include <cstdint>
-#include <utility>
-#include <functional>
 
-#include "libslic3r/libslic3r.h"
 #include "libslic3r/Point.hpp"
 
 using namespace Slic3r::Arachne;

src/libslic3r/Arachne/utils/linearAlg2D.hpp

@@ -5,9 +5,6 @@
 #define UTILS_LINEAR_ALG_2D_H
 
 #include "../../Point.hpp"
-#include <cstdint>
-#include <math.h>
-#include <cmath>
 
 namespace Slic3r::Arachne::LinearAlg2D
 {

src/libslic3r/ArcFitter.cpp

@@ -1,14 +1,8 @@
 #include "ArcFitter.hpp"
-#include "Point.hpp"
-#include "Circle.hpp"
-#include "MultiPoint.hpp"
 #include "Polyline.hpp"
-#include "libslic3r.h"
 
 #include <cmath>
 #include <cassert>
-#include <vector>
-#include <cstddef>
 
 namespace Slic3r {
 

src/libslic3r/ArcFitter.hpp

@@ -2,9 +2,6 @@
 #define slic3r_ArcFitter_hpp_
 
 #include "Circle.hpp"
-#include <cstddef>
-#include "Point.hpp"
-#include <vector>
 
 namespace Slic3r {
 

src/libslic3r/Arrange.cpp

@@ -1,28 +1,9 @@
 #include "Arrange.hpp"
-#include "ExPolygon.hpp"
-#include "Point.hpp"
 #include "Print.hpp"
 #include "BoundingBox.hpp"
-#include "PrintConfig.hpp"
 #include "libslic3r.h"
 
-#include <Eigen/Core>
-#include <boost/geometry/index/parameters.hpp>
-#include <functional>
-#include <algorithm>
-#include <cstdlib>
-#include <cmath>
-#include <cstddef>
-#include <boost/geometry/algorithms/convert.hpp>
-#include <array>
-#include <boost/geometry/index/predicates.hpp>
-#include <iterator>
-#include <exception>
 #include <libnest2d/backends/libslic3r/geometries.hpp>
-#include "libnest2d/common.hpp"
-#include "libnest2d/geometry_traits_nfp.hpp"
-#include "libnest2d/nester.hpp"
-#include "libnest2d/geometry_traits.hpp"
 #include <libnest2d/optimizers/nlopt/subplex.hpp>
 #include <libnest2d/placers/nfpplacer.hpp>
 #include <libnest2d/selections/firstfit.hpp>
@@ -32,11 +13,6 @@
 #include <ClipperUtils.hpp>
 
 #include <boost/geometry/index/rtree.hpp>
-#include <utility>
-#include <vector>
-#include <tuple>
-#include <set>
-#include <string>
 
 #if defined(_MSC_VER) && defined(__clang__)
 #define BOOST_NO_CXX17_HDR_STRING_VIEW

src/libslic3r/Arrange.hpp

@@ -2,17 +2,8 @@
 #define ARRANGE_HPP
 
 #include "ExPolygon.hpp"
-#include "Point.hpp"
-#include "Polygon.hpp"
 #include "PrintConfig.hpp"
 #include "Print.hpp"
-#include <cmath>
-#include "libslic3r.h"
-#include <vector>
-#include <string>
-#include <functional>
-#include <iostream>
-#include <ostream>
 
 #define BED_SHRINK_SEQ_PRINT 5
 

src/libslic3r/BoundingBox.cpp

@@ -1,8 +1,5 @@
 #include "BoundingBox.hpp"
-#include "Point.hpp"
 #include "Polygon.hpp"
-#include "libslic3r.h"
-#include <Eigen/Core>
 #include <algorithm>
 #include <assert.h>
 

src/libslic3r/BoundingBox.hpp

@@ -5,10 +5,7 @@
 #include "Exception.hpp"
 #include "Point.hpp"
 #include "Polygon.hpp"
-#include <cassert>
-#include <cstddef>
 #include <ostream>
-#include <vector>
 
 namespace Slic3r {
 

src/libslic3r/BridgeDetector.cpp

@@ -1,18 +1,7 @@
 #include "BridgeDetector.hpp"
-#include "BoundingBox.hpp"
 #include "ClipperUtils.hpp"
-#include "ExPolygon.hpp"
 #include "Geometry.hpp"
-#include "libslic3r.h"
-#include "Polygon.hpp"
-#include "Line.hpp"
-#include "Polyline.hpp"
-#include "Point.hpp"
 #include <algorithm>
-#include <utility>
-#include <vector>
-#include <cstddef>
-#include <cmath>
 
 namespace Slic3r {
 

src/libslic3r/BridgeDetector.hpp

@@ -9,14 +9,7 @@
 #include "PrincipalComponents2D.hpp"
 #include "libslic3r.h"
 #include "ExPolygon.hpp"
-#include <cmath>
-#include <cstdlib>
-#include <limits>
 #include <string>
-#include <vector>
-#include <tuple>
-#include <unordered_map>
-#include <utility>
 
 namespace Slic3r {
 

src/libslic3r/Brim.cpp

@@ -1,37 +1,18 @@
-#include "BoundingBox.hpp"
-#include "BrimEarsPoint.hpp"
 #include "ClipperUtils.hpp"
 #include "EdgeGrid.hpp"
-#include "ExPolygon.hpp"
-#include "Flow.hpp"
-#include "Geometry.hpp"
-#include "ExtrusionEntity.hpp"
 #include "Layer.hpp"
-#include "Point.hpp"
-#include "ObjectID.hpp"
-#include "Polygon.hpp"
-#include "Line.hpp"
-#include "MultiPoint.hpp"
-#include "Polyline.hpp"
 #include "Print.hpp"
-#include "PrintBase.hpp"
 #include "ShortestPath.hpp"
 #include "libslic3r.h"
 #include "PrintConfig.hpp"
 #include "MaterialType.hpp"
 #include "Model.hpp"
 #include <algorithm>
-#include <cstddef>
-#include <cmath>
 #include <cstdint>
 #include <limits>
-#include <map>
-#include <string>
 #include <tbb/parallel_for.h>
 
 #include <boost/log/trivial.hpp>
-#include <utility>
-#include <vector>
 
 #ifndef NDEBUG
     // #define BRIM_DEBUG_TO_SVG

src/libslic3r/Brim.hpp

@@ -4,10 +4,8 @@
 #include "ExPolygon.hpp"
 #include "ObjectID.hpp"
 #include "Point.hpp"
-#include "Polygon.hpp"
 
 #include<map>
-#include <utility>
 #include<vector>
 
 namespace Slic3r {

src/libslic3r/BrimEarsPoint.hpp

@@ -1,10 +1,7 @@
 #ifndef BRIMEARSPOINT_HPP
 #define BRIMEARSPOINT_HPP
 
-#include <cstdlib>
-#include "libslic3r.h"
 #include <libslic3r/Point.hpp>
-#include <vector>
 
 
 namespace Slic3r {

src/libslic3r/BuildVolume.cpp

@@ -1,24 +1,11 @@
 #include "BuildVolume.hpp"
-#include "BoundingBox.hpp"
 #include "ClipperUtils.hpp"
-#include "Polygon.hpp"
-#include "Geometry/Circle.hpp"
-#include "ExtrusionEntity.hpp"
 #include "TriangleMesh.hpp"
 #include "Geometry/ConvexHull.hpp"
 #include "GCode/GCodeProcessor.hpp"
 #include "Point.hpp"
-#include "libslic3r.h"
 
-#include <algorithm>
 #include <boost/log/trivial.hpp>
-#include <vector>
-#include <cassert>
-#include <cstdlib>
-#include <limits>
-#include <utility>
-#include <cstddef>
-#include <string_view>
 
 namespace Slic3r {
 

src/libslic3r/BuildVolume.hpp

@@ -5,13 +5,9 @@
 #include "Geometry/Circle.hpp"
 #include "Polygon.hpp"
 #include "BoundingBox.hpp"
-#include "libslic3r.h"
 #include <admesh/stl.h>
 
-#include <array>
 #include <string_view>
-#include <vector>
-#include <utility>
 
 namespace Slic3r {
 

src/libslic3r/CAD/CadDocument.cpp

@@ -1,14 +1,8 @@
 #include "libslic3r/CAD/CadDocument.hpp"
-#include "libslic3r/Point.hpp"
-#include "libslic3r/CAD/SketchEngine.hpp"
-#include "libslic3r/CAD/GeometryEngine.hpp"
 #include "libslic3r/CAD/SketchConstraints.hpp"
 #include "libslic3r/CAD/SketchSolver.hpp"
 #include "libslic3r/CAD/SketchImport.hpp"   // transform_regions for imported art
 
-#include <Standard_Handle.hxx>
-#include <TopAbs_ShapeEnum.hxx>
-#include <Standard_TypeDef.hxx>
 #include <array>
 
 #include <Standard_Failure.hxx>
@@ -32,10 +26,6 @@
 #include <BRepOffsetAPI_DraftAngle.hxx>
 #include <Bnd_Box.hxx>
 #include <BRepBndLib.hxx>
-#include <functional>
-#include <exception>
-#include <cstdint>
-#include <cereal/cereal.hpp>
 #include <gp_Pln.hxx>
 #include <TopTools_ListOfShape.hxx>
 #include <BRepPrimAPI_MakeCylinder.hxx>
@@ -79,18 +69,12 @@
 #include <cmath>
 #include <cctype>
 #include <cstdio>
-#include <math.h>
-#include <map>
-#include <set>
 #include <stdexcept>
 #include <algorithm>
 #include <sstream>
 
 #include <cereal/archives/binary.hpp>
 #include <BRepTools.hxx>
-#include <string>
-#include <vector>
-#include <utility>
 
 namespace Slic3r {
 

src/libslic3r/CAD/CadDocument.hpp

@@ -1,20 +1,16 @@
 #ifndef slic3r_CadDocument_hpp_
 #define slic3r_CadDocument_hpp_
 
-#include "libslic3r/Point.hpp"
 #include "libslic3r/TriangleMesh.hpp"
 #include "libslic3r/CAD/SketchEngine.hpp"
 #include "libslic3r/CAD/GeometryEngine.hpp"   // FaceGroup
 #include "libslic3r/Color.hpp"            // ColorRGBA (per-body display colour override)
 
-#include <TopoDS_Face.hxx>
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Wire.hxx>
 #include <cereal/cereal.hpp>
 #include <cereal/types/vector.hpp>
 #include <cereal/types/string.hpp>
-#include <cstdint>
-#include <cstddef>
 #include <map>
 #include <cereal/types/map.hpp>
 #include <string>

src/libslic3r/CAD/GeometryEngine.cpp

@@ -1,25 +1,12 @@
 #include "libslic3r/CAD/GeometryEngine.hpp"
-#include "libslic3r/Point.hpp"
-#include "libslic3r/TriangleMesh.hpp"
 
 #include <BRepMesh_IncrementalMesh.hxx>
 #include <BRep_Tool.hxx>
 #include <BRepAdaptor_Surface.hxx>
 #include <BRepLProp_SLProps.hxx>
-#include <TopAbs_ShapeEnum.hxx>
-#include <cstddef>
-#include <algorithm>
-#include <GeomAbs_SurfaceType.hxx>
-#include <TopAbs_Orientation.hxx>
-#include <Standard_Handle.hxx>
-#include <cstdint>
-#include <Poly_Triangle.hxx>
-#include <GeomAbs_CurveType.hxx>
 #include <gp_Cylinder.hxx>
 #include <BRepFilletAPI_MakeFillet.hxx>
 #include <BRepFilletAPI_MakeChamfer.hxx>
-#include <math.h>
-#include <gp_Mat.hxx>
 #include <stdexcept>
 #include <TopExp_Explorer.hxx>
 #include <TopoDS.hxx>
@@ -56,9 +43,6 @@
 #include <array>
 #include <map>
 #include <cmath>
-#include <vector>
-#include <string>
-#include <utility>
 
 namespace Slic3r {
 

src/libslic3r/CAD/GeometryEngine.hpp

@@ -1,7 +1,6 @@
 #ifndef slic3r_GeometryEngine_hpp_
 #define slic3r_GeometryEngine_hpp_
 
-#include "libslic3r/Point.hpp"
 #include "libslic3r/TriangleMesh.hpp"
 
 #include <BRepPrimAPI_MakeBox.hxx>
@@ -9,8 +8,6 @@
 #include <BRepPrimAPI_MakeSphere.hxx>
 #include <BRepPrimAPI_MakeCone.hxx>
 #include <BRepPrimAPI_MakeTorus.hxx>
-#include <TopoDS_Shape.hxx>
-#include <array>
 #include <gp_Ax2.hxx>
 #include <TopoDS_Solid.hxx>
 #include <TopoDS_Face.hxx>

src/libslic3r/CAD/SketchConstraints.cpp

@@ -1,11 +1,6 @@
 #include "libslic3r/CAD/SketchConstraints.hpp"
-#include "libslic3r/Point.hpp"
-#include <Eigen/Core>
 #include <Eigen/Dense>
-#include <algorithm>
 #include <cmath>
-#include <cstddef>
-#include <vector>
 
 namespace Slic3r {
 

src/libslic3r/CAD/SketchConstraints.hpp

@@ -2,7 +2,6 @@
 #define slic3r_SketchConstraints_hpp_
 
 #include "libslic3r/Point.hpp"
-#include <Eigen/Core>
 #include <vector>
 #include <Eigen/Dense>
 

src/libslic3r/CAD/SketchEngine.cpp

@@ -1,18 +1,7 @@
 #include "libslic3r/CAD/SketchEngine.hpp"
-#include "libslic3r/Point.hpp"
-#include "libslic3r/TriangleMesh.hpp"
 
-#include <Standard_Handle.hxx>
-#include <GeomAbs_SurfaceType.hxx>
-#include <GeomAbs_JoinType.hxx>
-#include <TopAbs_ShapeEnum.hxx>
-#include <Standard_TypeDef.hxx>
-#include <TopAbs_Orientation.hxx>
-#include <Poly_Triangle.hxx>
-#include <TopAbs_State.hxx>
 #include <algorithm>
 #include <cmath>
-#include <cstddef>
 #include <limits>
 
 #include <BRepBuilderAPI_MakeWire.hxx>
@@ -58,11 +47,8 @@
 #include <TopoDS_Wire.hxx>
 #include <GeomAPI_IntCS.hxx>
 #include <map>
-#include <math.h>
 #include <tuple>
 #include <stdexcept>
-#include <vector>
-#include <utility>
 
 namespace Slic3r {
 

src/libslic3r/CAD/SketchImport.cpp

@@ -1,8 +1,5 @@
 #include "libslic3r/CAD/SketchImport.hpp"
 
-#include "libslic3r/Polygon.hpp"
-#include "libslic3r/Point.hpp"
-#include "libslic3r/EmbossShape.hpp"
 #include "libslic3r/Emboss.hpp"
 #include "libslic3r/NSVGUtils.hpp"
 #include "libslic3r/ExPolygon.hpp"
@@ -12,11 +9,6 @@
 
 #include <algorithm>
 #include <limits>
-#include <vector>
-#include <string>
-#include <memory>
-#include <utility>
-#include <nanosvg/nanosvg.h>
 
 namespace Slic3r {
 

src/libslic3r/CAD/SketchInference.cpp

@@ -1,13 +1,7 @@
 #include "libslic3r/CAD/SketchInference.hpp"
-#include "libslic3r/CAD/SketchEngine.hpp"
-#include "libslic3r/Point.hpp"
 
 #include <algorithm>
 #include <cmath>
-#include <vector>
-#include <cstddef>
-#include <optional>
-#include <math.h>
 
 namespace Slic3r {
 

src/libslic3r/CAD/SketchInference.hpp

@@ -1,9 +1,7 @@
 #ifndef slic3r_SketchInference_hpp_
 #define slic3r_SketchInference_hpp_
 
-#include "libslic3r/Point.hpp"
 #include "libslic3r/CAD/SketchEngine.hpp"
-#include <math.h>
 #include <vector>
 #include <optional>
 #include <cmath>

src/libslic3r/CAD/SketchSolver.cpp

@@ -1,7 +1,5 @@
 #include "libslic3r/CAD/SketchSolver.hpp"
-#include "libslic3r/CAD/SketchEngine.hpp"
 
-#include <math.h>
 #include <slvs.h>
 
 #include <cmath>
@@ -9,8 +7,6 @@
 #include <functional>
 #include <map>
 #include <unordered_map>
-#include <vector>
-#include <utility>
 
 namespace Slic3r {
 

src/libslic3r/CAD/ThreadStandards.cpp

@@ -1,6 +1,4 @@
 #include "libslic3r/CAD/ThreadStandards.hpp"
-#include <vector>
-#include <string>
 
 namespace Slic3r {
 

src/libslic3r/CMakeLists.txt

@@ -306,8 +306,6 @@ set(lisbslic3r_sources
     Geometry/VoronoiUtils.cpp
     Geometry/VoronoiUtils.hpp
     Geometry/VoronoiVisualUtils.hpp
-    InstanceLock.cpp
-    InstanceLock.hpp
     Int128.hpp
     KDTreeIndirect.hpp
     Layer.cpp

src/libslic3r/CSGMesh/CSGMesh.hpp

@@ -2,11 +2,7 @@
 #define CSGMESH_HPP
 
 #include <libslic3r/AnyPtr.hpp>
-#include <libslic3r/Point.hpp>
-#include <libslic3r/TriangleMesh.hpp>
 #include <admesh/stl.h>
-#include <string>
-#include <utility>
 
 namespace Slic3r { namespace csg {
 

src/libslic3r/CSGMesh/CSGMeshCopy.hpp

@@ -1,11 +1,7 @@
 #ifndef CSGMESHCOPY_HPP
 #define CSGMESHCOPY_HPP
 
-#include "libslic3r/AnyPtr.hpp"
 #include "CSGMesh.hpp"
-#include "libslic3r/libslic3r.h"
-#include <utility>
-#include <cstddef>
 
 namespace Slic3r { namespace csg {
 

src/libslic3r/CSGMesh/ModelToCSGMesh.hpp

@@ -3,13 +3,9 @@
 
 #include "CSGMesh.hpp"
 
-#include "libslic3r/Point.hpp"
-#include "libslic3r/TriangleMesh.hpp"
 #include "libslic3r/Model.hpp"
 #include "libslic3r/SLA/Hollowing.hpp"
 #include "libslic3r/MeshSplitImpl.hpp"
-#include <utility>
-#include <memory>
 
 namespace Slic3r { namespace csg {
 

src/libslic3r/CSGMesh/PerformCSGMeshBooleans.hpp

@@ -1,17 +1,11 @@
 #ifndef PERFORMCSGMESHBOOLEANS_HPP
 #define PERFORMCSGMESHBOOLEANS_HPP
 
-#include <cstddef>
 #include <stack>
-#include <utility>
-#include <tuple>
 #include <vector>
 
-#include <boost/log/trivial.hpp>
-
 #include "CSGMesh.hpp"
 
-#include "libslic3r/libslic3r.h"
 #include "libslic3r/Execution/ExecutionTBB.hpp"
 //#include "libslic3r/Execution/ExecutionSeq.hpp"
 #include "libslic3r/MeshBoolean.hpp"

src/libslic3r/CSGMesh/SliceCSGMesh.hpp

@@ -3,16 +3,8 @@
 
 #include "CSGMesh.hpp"
 
-#include <cstddef>
-#include <functional>
-#include <cassert>
 #include <stack>
-#include <vector>
-#include <utility>
 
-#include "libslic3r/ExPolygon.hpp"
-#include "libslic3r/libslic3r.h"
-#include "libslic3r/Execution/Execution.hpp"
 #include "libslic3r/TriangleMeshSlicer.hpp"
 #include "libslic3r/ClipperUtils.hpp"
 #include "libslic3r/Execution/ExecutionTBB.hpp"

src/libslic3r/CSGMesh/TriangleMeshAdapter.hpp

@@ -3,7 +3,6 @@
 
 #include "CSGMesh.hpp"
 
-#include "libslic3r/Point.hpp"
 #include "libslic3r/TriangleMesh.hpp"
 
 namespace Slic3r { namespace csg {

src/libslic3r/Channel.hpp

@@ -1,9 +1,6 @@
 #ifndef slic3r_Channel_hpp_
 #define slic3r_Channel_hpp_
 
-#include <boost/optional/optional.hpp>
-#include <boost/none.hpp>
-#include <cstddef>
 #include <memory>
 #include <deque>
 #include <condition_variable>

src/libslic3r/Circle.cpp

@@ -2,14 +2,8 @@
 
 #include <cmath>
 #include <cassert>
-#include <cstddef>
-#include <utility>
-#include <math.h>
 #include "Geometry.hpp"
-#include "Point.hpp"
-#include "Line.hpp"
 #include "Polygon.hpp"
-#include "libslic3r.h"
 
 
 //BBS: Refer to ArcWelderLib for the arc fitting functions

src/libslic3r/Circle.hpp

@@ -3,8 +3,6 @@
 
 #include "Point.hpp"
 #include "Line.hpp"
-#include "libslic3r.h"
-#include <cmath>
 
 namespace Slic3r {
 

src/libslic3r/Clipper2Utils.cpp

@@ -1,14 +1,6 @@
 #include "Clipper2Utils.hpp"
-#include "Polyline.hpp"
-#include "clipper2/clipper.core.h"
-#include "Point.hpp"
-#include "ExPolygon.hpp"
-#include "clipper2/clipper.engine.h"
-#include "clipper2/clipper.offset.h"
 #include "libslic3r.h"
 #include "clipper2/clipper.h"
-#include <utility>
-#include <cstddef>
 
 namespace Slic3r {
 

src/libslic3r/Clipper2Utils.hpp

@@ -4,9 +4,7 @@
 #include "ExPolygon.hpp"
 #include "Polygon.hpp"
 #include "Polyline.hpp"
-#include "clipper2/clipper.core.h"
 #include "clipper2/clipper.h"
-#include "clipper2/clipper.offset.h"
 
 namespace Slic3r {
 

src/libslic3r/Clipper2ZUtils.hpp

@@ -1,18 +1,10 @@
 #ifndef slic3r_Clipper2ZUtils_hpp_
 #define slic3r_Clipper2ZUtils_hpp_
-#include "clipper2/clipper.core.h"
-#include <cstdint>
-#include <cstddef>
-#include <array>
-#include <iterator>
-#include <cassert>
 #include <numeric>
-#include <utility>
 #include <vector>
 #include <algorithm>
 
 #include <clipper2/clipper2_z.hpp>
-#include <libslic3r/ExPolygon.hpp>
 #include <libslic3r/Point.hpp>
 namespace Slic3r { namespace Clipper2ZUtils {
 

src/libslic3r/ClipperUtils.cpp

@@ -1,25 +1,10 @@
-#include <cstddef>
-#include <algorithm>
-#include <cstdlib>
-#include <cassert>
-#include <cmath>
 #include <limits>
 #include <numeric>
 #include <unordered_map>
-#include <utility>
-#include <vector>
 
 #include "ClipperUtils.hpp"
-#include "BoundingBox.hpp"
-#include "ExPolygon.hpp"
 #include "Geometry.hpp"
-#include "Point.hpp"
-#include "Polygon.hpp"
-#include "Polyline.hpp"
-#include "Line.hpp"
 #include "ShortestPath.hpp"
-#include "libslic3r.h"
-#include "Surface.hpp"
 
 // #define CLIPPER_UTILS_DEBUG
 

src/libslic3r/ClipperUtils.hpp

@@ -1,18 +1,11 @@
 #ifndef slic3r_ClipperUtils_hpp_
 #define slic3r_ClipperUtils_hpp_
 
-#include "Point.hpp"
-#include "Polyline.hpp"
-#include "Line.hpp"
 #include "libslic3r.h"
 #include "clipper.hpp"
 #include "ExPolygon.hpp"
 #include "Polygon.hpp"
 #include "Surface.hpp"
-#include <cstddef>
-#include <iterator>
-#include <cassert>
-#include <vector>
 
 // import these wherever we're included
 using Slic3r::ClipperLib::jtMiter;

src/libslic3r/ClipperZUtils.hpp

@@ -1,12 +1,7 @@
 #ifndef slic3r_ClipperZUtils_hpp_
 #define slic3r_ClipperZUtils_hpp_
 
-#include "libslic3r.h"
-#include <cstddef>
-#include <algorithm>
-#include <cassert>
 #include <numeric>
-#include <utility>
 #include <vector>
 
 #include <clipper/clipper_z.hpp>

src/libslic3r/Color.cpp

@@ -1,15 +1,7 @@
 #include "libslic3r.h"
 #include "Color.hpp"
 
-#include <cstddef>
-#include <cstdlib>
-#include <cassert>
-#include <algorithm>
-#include <cmath>
-#include <cstdio>
 #include <random>
-#include <string>
-#include <vector>
 
 static const float INV_255 = 1.0f / 255.0f;
 

src/libslic3r/ColorDecomposeRecipe.cpp

@@ -9,9 +9,7 @@
 #include <cstdio>
 #include <fstream>
 #include <limits>
-#include <string>
 #include <utility>
-#include <vector>
 
 namespace Slic3r {
 namespace {

src/libslic3r/Config.cpp

@@ -1,6 +1,4 @@
 #include "Config.hpp"
-#include "Exception.hpp"
-#include "Point.hpp"
 #include "format.hpp"
 #include "Utils.hpp"
 #include "LocalesUtils.hpp"
@@ -8,20 +6,7 @@
 
 #include <algorithm>
 #include <assert.h>
-#include <cmath>
-#include <boost/algorithm/string/join.hpp>
-#include <cstdlib>
-#include <exception>
-#include <cctype>
-#include <boost/algorithm/string/trim.hpp>
 #include <fstream>
-#include <functional>
-#include <set>
-#include <initializer_list>
-#include <map>
-#include <list>
-#include <optional>
-#include <memory>
 #include <sstream>
 #include <iostream>
 #include <iomanip>
@@ -41,15 +26,8 @@
 #include <boost/nowide/fstream.hpp>
 #include <boost/property_tree/ini_parser.hpp>
 #include <boost/format.hpp>
-#include <stdexcept>
 #include <string.h>
-#include <string>
-#include <vector>
-#include <utility>
-#include <system_error>
 //BBS: add json support
-#include "libslic3r.h"
-#include "libslic3r_version.h"
 #include "nlohmann/json.hpp"
 
 using namespace nlohmann;
@@ -1560,9 +1538,11 @@ void ConfigBase::save_to_json(const std::string &file, const std::string &name,
     // Serialize first: if that throws (invalid UTF-8), the existing file stays untouched.
     std::ostringstream ss;
     this->save_to_json(ss, name, from, version);
-    if (const std::error_code ec = write_file_atomically(file, ss.str()))
-        BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << boost::format(": failed to save config to %1%: %2%") % file % ec.message();
-    else
+    boost::nowide::ofstream c;
+    c.open(file, std::ios::out | std::ios::trunc);
+    c << ss.str();
+    c.close();
+
     BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ":" <<__LINE__ << boost::format(", saved config to %1%\n")%file;
 }
 

src/libslic3r/Config.hpp

@@ -3,11 +3,6 @@
 
 #include <assert.h>
 #include <algorithm>
-#include <boost/container_hash/hash.hpp>
-#include <cctype>
-#include <initializer_list>
-#include <limits>
-#include <cmath>
 #include <map>
 #include <climits>
 #include <cfloat>
@@ -15,15 +10,10 @@
 #include <cstdlib>
 #include <functional>
 #include <iostream>
-#include <memory>
 #include <optional>
-#include <sstream>
-#include <set>
 #include <stdexcept>
 #include <string>
-#include <utility>
 #include <vector>
-#include "LocalesUtils.hpp"
 #include "libslic3r.h"
 #include "clonable_ptr.hpp"
 #include "Exception.hpp"

src/libslic3r/ContourZ.cpp

@@ -2,18 +2,14 @@
 #include "ExtrusionEntity.hpp"
 #include "ExtrusionEntityCollection.hpp"
 #include "Layer.hpp"
-#include "Line.hpp"
 #include "Point.hpp"
 #include "Print.hpp"
 #include "SLA/IndexedMesh.hpp"
 #include "libslic3r.h"
-#include <Eigen/Core>
 #include <cfloat>
 #include <cmath>
 #include <initializer_list>
-#include <math.h>
 #include <string>
-#include <utility>
 
 namespace Slic3r {
 

src/libslic3r/CustomGCode.cpp

@@ -2,10 +2,6 @@
 #include "Config.hpp"
 #include "GCode.hpp"
 #include "GCodeWriter.hpp"
-#include <vector>
-#include <utility>
-#include <cstddef>
-#include <cassert>
 
 namespace Slic3r {
 

src/libslic3r/CustomGCode.hpp

@@ -1,10 +1,7 @@
 #ifndef slic3r_CustomGCode_hpp_
 #define slic3r_CustomGCode_hpp_
 
-#include <map>
-#include <cstddef>
 #include <string>
-#include <utility>
 #include <vector>
 #include <nlohmann/json.hpp>
 

src/libslic3r/CutSurface.cpp

@@ -1,38 +1,4 @@
 #include "CutSurface.hpp"
-#include "libslic3r/Emboss.hpp"
-#include <vector>
-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
-#include <CGAL/Surface_mesh/Surface_mesh.h>
-#include "libslic3r/Point.hpp"
-#include "libslic3r/ExPolygon.hpp"
-#include <cstdint>
-#include <limits>
-#include <string>
-#include <utility>
-#include "libslic3r/BoundingBox.hpp"
-#include <cstddef>
-#include "libslic3r/Polygon.hpp"
-#include <cassert>
-#include <array>
-#include <cmath>
-#include <math.h>
-#include <algorithm>
-#include <queue>
-#include <CGAL/enum.h>
-#include <CGAL/Kernel/global_functions_3.h>
-#include <CGAL/Named_function_parameters.h>
-#include "libslic3r/AABBTreeIndirect.hpp"
-#include <cstdlib>
-#include "libslic3r/libslic3r.h"
-#include <boost/property_map/property_map.hpp>
-#include <CGAL/Polygon_mesh_processing/self_intersections.h>
-#include <CGAL/AABB_face_graph_triangle_primitive.h>
-#include <CGAL/AABB_traits.h>
-#include <CGAL/AABB_tree.h>
-#include <CGAL/boost/graph/graph_traits_Surface_mesh.h>
-#include <iterator>
-#include <optional>
-#include <CGAL/Surface_mesh/IO/OFF.h>
 
 /// models_input.obj - Check transormation of model to each others
 /// projection_center.obj - circle representing center of projection with correct distance

src/libslic3r/CutSurface.hpp

@@ -1,8 +1,6 @@
 #ifndef slic3r_CutSurface_hpp_
 #define slic3r_CutSurface_hpp_
 
-#include "libslic3r/BoundingBox.hpp"
-#include <string>
 #include <vector>
 #include <admesh/stl.h> // indexed_triangle_set
 #include "ExPolygon.hpp"

src/libslic3r/CutUtils.cpp

@@ -1,24 +1,13 @@
 
 #include "CutUtils.hpp"
 #include "Geometry.hpp"
-#include "Point.hpp"
-#include "TriangleMesh.hpp"
 #include "libslic3r.h"
 #include "Model.hpp"
 #include "TriangleMeshSlicer.hpp"
 #include "TriangleSelector.hpp"
 #include "ObjectID.hpp"
 
-#include <algorithm>
 #include <boost/log/trivial.hpp>
-#include <cassert>
-#include <string>
-#include <vector>
-#include <utility>
-#include <cstddef>
-#include <optional>
-#include <math.h>
-#include <cmath>
 
 namespace Slic3r {
 

src/libslic3r/CutUtils.hpp

@@ -5,7 +5,6 @@
 #include "Point.hpp"
 #include "Model.hpp"
 
-#include <optional>
 #include <vector>
 
 namespace Slic3r {

src/libslic3r/EdgeGrid.cpp

@@ -1,21 +1,10 @@
 #include <algorithm>
-#include <cstddef>
-#include <cstdlib>
-#include <cstdint>
-#include <utility>
-#include <cmath>
-#include <set>
 #include <vector>
 #include <float.h>
 #include <unordered_map>
 
 #include <png.h>
 
-#include "Polygon.hpp"
-#include "Point.hpp"
-#include "Polyline.hpp"
-#include "ExPolygon.hpp"
-#include "Line.hpp"
 #include "libslic3r.h"
 #include "ClipperUtils.hpp"
 #include "EdgeGrid.hpp"

src/libslic3r/EdgeGrid.hpp

@@ -1,24 +1,12 @@
 #ifndef slic3r_EdgeGrid_hpp_
 #define slic3r_EdgeGrid_hpp_
 
-#include <cstddef>
-#include <cassert>
-#include <limits>
-#include <cstdlib>
-#include <algorithm>
 #include <stdint.h>
 #include <math.h>
-#include <vector>
-#include <utility>
-#include <string>
 
-#include "Line.hpp"
 #include "Point.hpp"
 #include "BoundingBox.hpp"
 #include "ExPolygon.hpp"
-#include "libslic3r.h"
-#include "Polygon.hpp"
-#include "Polyline.hpp"
 
 namespace Slic3r {
 namespace EdgeGrid {

src/libslic3r/ElephantFootCompensation.cpp

@@ -1,6 +1,3 @@
-#include "Point.hpp"
-#include "BoundingBox.hpp"
-#include "Polygon.hpp"
 #include "clipper/clipper_z.hpp"
 
 #include "libslic3r.h"
@@ -13,14 +10,8 @@
 #include "SVG.hpp"
 #include "Utils.hpp"
 
-#include <algorithm>
 #include <cmath>
 #include <cassert>
-#include <cstddef>
-#include <vector>
-#include <utility>
-#include <math.h>
-#include <limits>
 
 // #define CONTOUR_DISTANCE_DEBUG_SVG
 

src/libslic3r/Emboss.cpp

@@ -1,35 +1,12 @@
-#include <cmath>
-#include <cassert>
-#include <algorithm>
-#include <functional>
-#include <iterator>
-#include <cstdint>
-#include <memory>
-#include <cstdio>
-#include <cctype>
-#include <limits>
-#include <math.h>
-#include <Eigen/Geometry>
-#include <Eigen/Core>
 #include <numeric>
 #include "Emboss.hpp"
-#include <optional>
 #include <stdio.h>
 #include <numeric>
 #include <cstdlib>
 #include <boost/nowide/convert.hpp>
 #include <boost/log/trivial.hpp>
 #include <ClipperUtils.hpp> // union_ex + for boldness(polygon extend(offset))
-#include "ExPolygon.hpp"
-#include <vector>
-#include "AABBTreeIndirect.hpp"
-#include <utility>
-#include "EmbossShape.hpp"
-#include <string>
 #include "IntersectionPoints.hpp"
-#include "Polygon.hpp"
-#include "TextConfiguration.hpp"
-#include "Point.hpp"
 
 #define STB_TRUETYPE_IMPLEMENTATION // force following include to generate implementation
 #include "imgui/imstb_truetype.h" // stbtt_fontinfo

src/libslic3r/Emboss.hpp

@@ -1,19 +1,11 @@
 #ifndef slic3r_Emboss_hpp_
 #define slic3r_Emboss_hpp_
 
-#include <string>
-#include <map>
-#include <utility>
-#include <cassert>
-#include <cstddef>
-#include <functional>
-#include <cstdint>
 #include <vector>
 #include <set>
 #include <optional>
 #include <memory>
 #include <admesh/stl.h> // indexed_triangle_set
-#include "Point.hpp"
 #include "Polygon.hpp"
 #include "ExPolygon.hpp"
 #include "EmbossShape.hpp" // ExPolygonsWithIds

src/libslic3r/EmbossShape.hpp

@@ -9,11 +9,9 @@
 #include <cereal/types/vector.hpp>
 #include <cereal/types/optional.hpp>
 #include <cereal/archives/binary.hpp>
-#include <vector>
 #include "Point.hpp" // Transform3d
 #include "ExPolygon.hpp"
 #include "ExPolygonSerialize.hpp"
-#include "libslic3r.h"
 #include "nanosvg/nanosvg.h" // NSVGimage
 
 namespace Slic3r {

src/libslic3r/ExPolygon.cpp

@@ -2,23 +2,13 @@
 #include "ExPolygon.hpp"
 #include "Exception.hpp"
 #include "Geometry/MedialAxis.hpp"
-#include "Point.hpp"
-#include "MultiPoint.hpp"
 #include "Polygon.hpp"
 #include "Line.hpp"
 #include "ClipperUtils.hpp"
-#include "Polyline.hpp"
 #include "SVG.hpp"
-#include "libslic3r.h"
 #include <algorithm>
 #include <cassert>
-#include <limits>
-#include <cstddef>
-#include <cmath>
-#include <cstdlib>
 #include <list>
-#include <utility>
-#include <vector>
 
 namespace Slic3r {
 

src/libslic3r/ExPolygon.hpp

@@ -1,17 +1,10 @@
 #ifndef slic3r_ExPolygon_hpp_
 #define slic3r_ExPolygon_hpp_
 
-#include "Line.hpp"
 #include "Point.hpp"
 #include "libslic3r.h"
 #include "Polygon.hpp"
 #include "Polyline.hpp"
-#include <utility>
-#include <initializer_list>
-#include <cstddef>
-#include <cstdint>
-#include <cassert>
-#include <iterator>
 #include <vector>
 
 namespace Slic3r {