merge with dev

rtgui/editorpanel.cc

@@ -28,9 +28,12 @@
 #include "soundman.h"
 #include "rtimage.h"
 #include "rtwindow.h"
+#include "filepanel.h"
 #include "guiutils.h"
 #include "popupbutton.h"
 #include "options.h"
+#include "navigator.h"
+#include "previewwindow.h"
 #include "progressconnector.h"
 #include "procparamchangers.h"
 #include "placesbrowser.h"
@@ -38,6 +41,10 @@
 #include "thumbnail.h"
 #include "toolpanelcoord.h"
 
+#ifdef WIN32
+#include "windows.h"
+#endif
+
 using namespace rtengine::procparams;
 
 namespace