Fixed conflicts after merge with master

src/libslic3r/GCode/PrintExtents.cpp

@@ -6,6 +6,7 @@
 #include "../BoundingBox.hpp"
 #include "../ExtrusionEntity.hpp"
 #include "../ExtrusionEntityCollection.hpp"
+#include "../Layer.hpp"
 #include "../Print.hpp"
 
 #include "PrintExtents.hpp"

src/libslic3r/GCode/ThumbnailData.cpp

@@ -1,4 +1,3 @@
-#include "libslic3r/libslic3r.h"
 #include "ThumbnailData.hpp"
 
 namespace Slic3r {

src/libslic3r/GCode/ThumbnailData.hpp

@@ -24,4 +24,4 @@ typedef std::function<void(ThumbnailsList & thumbnails, const Vec2ds & sizes, bo
 
 } // namespace Slic3r
 
-#endif // slic3r_ThumbnailData_hpp_
+#endif // slic3r_ThumbnailData_hpp_

src/libslic3r/GCode/ToolOrdering.cpp

@@ -1,5 +1,6 @@
 #include "Print.hpp"
 #include "ToolOrdering.hpp"
+#include "Layer.hpp"
 
 // #define SLIC3R_DEBUG
 
@@ -15,7 +16,6 @@
 
 #include <libslic3r.h>
 
-#include "../GCodeWriter.hpp"
 
 namespace Slic3r {
 

src/libslic3r/GCode/ToolOrdering.hpp

@@ -14,6 +14,8 @@ namespace Slic3r {
 class Print;
 class PrintObject;
 class LayerTools;
+namespace CustomGCode { struct Item; }
+class PrintRegion;