diff --git a/src/libslic3r/PlaceholderParser.cpp b/src/libslic3r/PlaceholderParser.cpp
index d2be6e9f64..eae8f418b7 100644
--- a/src/libslic3r/PlaceholderParser.cpp
+++ b/src/libslic3r/PlaceholderParser.cpp
@@ -154,11 +154,8 @@ bool PlaceholderParser::apply_config(const DynamicPrintConfig &rhs)
 
 void PlaceholderParser::apply_only(const DynamicPrintConfig &rhs, const std::vector<std::string> &keys)
 {
-#ifdef _DEBUG
-    const ConfigDef *def = rhs.def();
-#endif /* _DEBUG */
     for (const t_config_option_key &opt_key : keys) {
-        assert(! placeholder_parser_ignore(def, opt_key));
+        assert(! placeholder_parser_ignore(rhs.def(), opt_key));
         // Store a copy of the config option.
         // Convert FloatOrPercent values to floats first.
         //FIXME there are some ratio_over chains, which end with empty ratio_with.
diff --git a/src/libslic3r/Print.cpp b/src/libslic3r/Print.cpp
index 6bc953eded..1edb73ed46 100644
--- a/src/libslic3r/Print.cpp
+++ b/src/libslic3r/Print.cpp
@@ -10,8 +10,6 @@
 #include "GCode/WipeTowerPrusaMM.hpp"
 #include <algorithm>
 #include <unordered_set>
-#include <boost/filesystem.hpp>
-#include <boost/lexical_cast.hpp>
 #include <boost/log/trivial.hpp>
 
 #include "PrintExport.hpp"
diff --git a/src/libslic3r/PrintBase.cpp b/src/libslic3r/PrintBase.cpp
index e18ebe16e4..cf8c5b1939 100644
--- a/src/libslic3r/PrintBase.cpp
+++ b/src/libslic3r/PrintBase.cpp
@@ -1,5 +1,6 @@
 #include "PrintBase.hpp"
 
+#include <boost/filesystem.hpp>
 #include <boost/lexical_cast.hpp>
 
 #include "I18N.hpp"