Related: fdo#38838 remove UniString::EqualsIgnoreCaseAscii

Change-Id: Ib5c3a2daa4a48bc286b14fa2cebb3306ea0012bc

4 files changed, 10 insertions, 10 deletions

diff --git a/include/formula/FormulaCompiler.hxx b/include/formula/FormulaCompiler.hxx
index c1e94da9a7a4..963ca1b568ca 100644
--- a/include/formula/FormulaCompiler.hxx
+++ b/include/formula/FormulaCompiler.hxx
@@ -20,10 +20,10 @@
 #ifndef FORMULA_COMPILER_HXX_INCLUDED
 #define FORMULA_COMPILER_HXX_INCLUDED
 
-#include "formula/formuladllapi.h"
-#include <tools/string.hxx>
-#include <tools/debug.hxx>
+#include <formula/formuladllapi.h>
 #include <rtl/ustrbuf.hxx>
+#include <rtl/ustring.hxx>
+#include <tools/debug.hxx>
 
 #include <boost/shared_ptr.hpp>
 #include <boost/unordered_map.hpp>
@@ -34,7 +34,7 @@
 #include "formula/grammar.hxx"
 #include "formula/token.hxx"
 #include "formula/ExternalReferenceHelper.hxx"
-
+#include <tools/string.hxx>
 
 #define FORMULA_MAXJUMPCOUNT    32  /* maximum number of jumps (ocChose) */
 #define FORMULA_MAXTOKENS     8192  /* maximum number of tokens in formula */
diff --git a/include/formula/IFunctionDescription.hxx b/include/formula/IFunctionDescription.hxx
index c5d3919366df..d8182a9d64cd 100644
--- a/include/formula/IFunctionDescription.hxx
+++ b/include/formula/IFunctionDescription.hxx
@@ -24,7 +24,7 @@
 #include <memory>
 #include "formula/formuladllapi.h"
 #include <rtl/ustring.hxx>
-#include <tools/string.hxx>
+#include <tools/solar.h>
 #include <com/sun/star/sheet/XFormulaParser.hpp>
 #include <com/sun/star/sheet/XFormulaOpCodeMapper.hpp>
 
diff --git a/include/formula/formdata.hxx b/include/formula/formdata.hxx
index d7d60b55d43c..536521a0329e 100644
--- a/include/formula/formdata.hxx
+++ b/include/formula/formdata.hxx
@@ -20,9 +20,9 @@
 #ifndef FORMULA_FORMDATA_HXX
 #define FORMULA_FORMDATA_HXX
 
-#include <tools/string.hxx>
+#include <formula/formuladllapi.h>
+#include <rtl/ustring.hxx>
 #include <tools/gen.hxx>
-#include "formula/formuladllapi.h"
 
 //============================================================================
 namespace formula
diff --git a/include/formula/formulahelper.hxx b/include/formula/formulahelper.hxx
index c717dd4de34d..41095da99364 100644
--- a/include/formula/formulahelper.hxx
+++ b/include/formula/formulahelper.hxx
@@ -20,11 +20,11 @@
 #ifndef FORMULA_FORMULA_HELPER_HXX
 #define FORMULA_FORMULA_HELPER_HXX
 
-#include "formula/IFunctionDescription.hxx"
+#include <formula/IFunctionDescription.hxx>
+#include <formula/formuladllapi.h>
+#include <rtl/ustring.hxx>
 #include <vector>
-#include <tools/string.hxx>
 #include <memory>
-#include "formula/formuladllapi.h"
 
 class SvtSysLocale;
 class CharClass;