Merge branch 'dev' into newlocallab

rtgui/filebrowser.cc

@@ -21,7 +21,7 @@
 #include <algorithm>
 #include <map>
 
-#include <glibmm.h>
+#include <glibmm/ustring.h>
 
 #include "filebrowser.h"
 
@@ -29,16 +29,17 @@
 #include "clipboard.h"
 #include "multilangmgr.h"
 #include "options.h"
+#include "paramsedited.h"
+#include "profilestorecombobox.h"
 #include "procparamchangers.h"
 #include "rtimage.h"
 #include "threadutils.h"
+#include "thumbnail.h"
 
 #include "../rtengine/dfmanager.h"
 #include "../rtengine/ffmanager.h"
 #include "../rtengine/procparams.h"
 
-extern Options options;
-
 namespace
 {