#include <config.h>
#include "bufferparams.h"
-#include "tex-strings.h"
-#include "encoding.h"
-#include "layout.h"
-#include "vspace.h"
#include "debug.h"
-#include "lyxrc.h"
+#include "encoding.h"
+#include "gettext.h"
#include "language.h"
-#include "lyxtextclasslist.h"
+#include "LaTeXFeatures.h"
+#include "support/std_sstream.h"
#include "lyxlex.h"
-#include "Lsstream.h"
-#include "author.h"
-#include "gettext.h"
+#include "lyxtextclasslist.h"
+#include "tex-strings.h"
+#include "texrow.h"
-#include "LColor.h"
+#include "frontends/Alert.h"
#include "support/lyxalgo.h" // for lyx::count
-#include "support/lyxlib.h"
-#include "support/lstrings.h"
-#include "support/types.h"
-
-#include "frontends/Alert.h"
-#include <cstdlib>
-#include <algorithm>
using namespace lyx::support;