Fixed conflicts after merge with master

src/slic3r/GUI/GLCanvas3D.hpp

@@ -18,6 +18,8 @@
 #include "GCodeViewer.hpp"
 #endif // ENABLE_GCODE_VIEWER
 
+#include "libslic3r/Slicing.hpp"
+
 #include <float.h>
 
 #include <wx/timer.h>
@@ -36,15 +38,18 @@ class wxGLContext;
 
 namespace Slic3r {
 
-class Bed3D;
 struct Camera;
 class BackgroundSlicingProcess;
 #if !ENABLE_GCODE_VIEWER
 class GCodePreviewData;
 #endif // !ENABLE_GCODE_VIEWER
 struct ThumbnailData;
-struct SlicingParameters;
-enum LayerHeightEditActionType : unsigned int;
+class ModelObject;
+class ModelInstance;
+class PrintObject;
+class Print;
+class SLAPrint;
+namespace CustomGCode { struct Item; }
 
 namespace GUI {