#include "lyxrow.h"
#include "paragraph.h"
#include "ParagraphParameters.h"
-#include "iterators.h"
+#include "pariterator.h"
#include "frontends/Alert.h"
#include "frontends/LyXView.h"
#include "insets/insettext.h"
#include "support/tostr.h"
-#include "support/std_sstream.h"
+
+#include <sstream>
using lyx::support::bformat;