Renamed hard-to-remember 8-char headers in editeng.

Change-Id: If255802082890e1b1b4c5197a791fa79a011773e

36 files changed, 95 insertions, 95 deletions

diff --git a/editeng/Package_inc.mk b/editeng/Package_inc.mk
index 2978ec14de02..4794507ca193 100644
--- a/editeng/Package_inc.mk
+++ b/editeng/Package_inc.mk
@@ -27,24 +27,24 @@ $(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/AccessibleSelectionBas
 $(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/AccessibleStaticTextBase.hxx,editeng/AccessibleStaticTextBase.hxx))
 $(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/AccessibleStringWrap.hxx,editeng/AccessibleStringWrap.hxx))
 $(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/acorrcfg.hxx,editeng/acorrcfg.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/adjitem.hxx,editeng/adjitem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/akrnitem.hxx,editeng/akrnitem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/blnkitem.hxx,editeng/blnkitem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/bolnitem.hxx,editeng/bolnitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/adjustitem.hxx,editeng/adjustitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/autokernitem.hxx,editeng/autokernitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/blinkitem.hxx,editeng/blinkitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/lineitem.hxx,editeng/lineitem.hxx))
 $(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/borderline.hxx,editeng/borderline.hxx))
 $(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/boxitem.hxx,editeng/boxitem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/brkitem.hxx,editeng/brkitem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/brshitem.hxx,editeng/brshitem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/bulitem.hxx,editeng/bulitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/formatbreakitem.hxx,editeng/formatbreakitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/brushitem.hxx,editeng/brushitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/bulletitem.hxx,editeng/bulletitem.hxx))
 $(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/charhiddenitem.hxx,editeng/charhiddenitem.hxx))
 $(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/charreliefitem.hxx,editeng/charreliefitem.hxx))
 $(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/charrotateitem.hxx,editeng/charrotateitem.hxx))
 $(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/charscaleitem.hxx,editeng/charscaleitem.hxx))
 $(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/cmapitem.hxx,editeng/cmapitem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/cntritem.hxx,editeng/cntritem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/contouritem.hxx,editeng/contouritem.hxx))
 $(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/colritem.hxx,editeng/colritem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/crsditem.hxx,editeng/crsditem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/cscoitem.hxx,editeng/cscoitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/crossedoutitem.hxx,editeng/crossedoutitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/charsetcoloritem.hxx,editeng/charsetcoloritem.hxx))
 $(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/editdata.hxx,editeng/editdata.hxx))
 $(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/editeng.hxx,editeng/editeng.hxx))
 $(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/editengdllapi.h,editeng/editengdllapi.h))
@@ -60,8 +60,8 @@ $(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/eedata.hxx,editeng/eed
 $(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/eeitem.hxx,editeng/eeitem.hxx))
 $(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/eeitemid.hxx,editeng/eeitemid.hxx))
 $(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/eerdll.hxx,editeng/eerdll.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/emphitem.hxx,editeng/emphitem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/escpitem.hxx,editeng/escpitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/emphasismarkitem.hxx,editeng/emphasismarkitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/escapementitem.hxx,editeng/escapementitem.hxx))
 $(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/fhgtitem.hxx,editeng/fhgtitem.hxx))
 $(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/fieldupdater.hxx,editeng/fieldupdater.hxx))
 $(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/flditem.hxx,editeng/flditem.hxx))
@@ -74,7 +74,7 @@ $(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/frmdiritem.hxx,editeng
 $(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/fwdtitem.hxx,editeng/fwdtitem.hxx))
 $(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/hangulhanja.hxx,editeng/hangulhanja.hxx))
 $(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/hngpnctitem.hxx,editeng/hngpnctitem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/hyznitem.hxx,editeng/hyznitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/hyphenzoneitem.hxx,editeng/hyphenzoneitem.hxx))
 $(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/itemtype.hxx,editeng/itemtype.hxx))
 $(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/justifyitem.hxx,editeng/justifyitem.hxx))
 $(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/keepitem.hxx,editeng/keepitem.hxx))
diff --git a/editeng/inc/editeng/adjitem.hxx b/editeng/inc/editeng/adjustitem.hxx
index 64eceafec178..64eceafec178 100644
--- a/editeng/inc/editeng/adjitem.hxx
+++ b/editeng/inc/editeng/adjustitem.hxx
diff --git a/editeng/inc/editeng/akrnitem.hxx b/editeng/inc/editeng/autokernitem.hxx
index 19e089edf324..19e089edf324 100644
--- a/editeng/inc/editeng/akrnitem.hxx
+++ b/editeng/inc/editeng/autokernitem.hxx
diff --git a/editeng/inc/editeng/blnkitem.hxx b/editeng/inc/editeng/blinkitem.hxx
index 4ef638ed6f4e..4ef638ed6f4e 100644
--- a/editeng/inc/editeng/blnkitem.hxx
+++ b/editeng/inc/editeng/blinkitem.hxx
diff --git a/editeng/inc/editeng/brshitem.hxx b/editeng/inc/editeng/brushitem.hxx
index c92f406a0f18..c92f406a0f18 100644
--- a/editeng/inc/editeng/brshitem.hxx
+++ b/editeng/inc/editeng/brushitem.hxx
diff --git a/editeng/inc/editeng/bulitem.hxx b/editeng/inc/editeng/bulletitem.hxx
index 345cf3ff7639..345cf3ff7639 100644
--- a/editeng/inc/editeng/bulitem.hxx
+++ b/editeng/inc/editeng/bulletitem.hxx
diff --git a/editeng/inc/editeng/cscoitem.hxx b/editeng/inc/editeng/charsetcoloritem.hxx
index 6fc197fb1394..6fc197fb1394 100644
--- a/editeng/inc/editeng/cscoitem.hxx
+++ b/editeng/inc/editeng/charsetcoloritem.hxx
diff --git a/editeng/inc/editeng/cntritem.hxx b/editeng/inc/editeng/contouritem.hxx
index 079b1d41f64a..316f21fc774e 100644
--- a/editeng/inc/editeng/cntritem.hxx
+++ b/editeng/inc/editeng/contouritem.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_ITEM_HXX
-#define _SVX_ITEM_HXX
+#ifndef __EDITENG_CONTOUR_ITEM_HXX__
+#define __EDITENG_CONTOUR_ITEM_HXX__
 
 #include <svl/eitem.hxx>
 #include <editeng/editengdllapi.h>
diff --git a/editeng/inc/editeng/crsditem.hxx b/editeng/inc/editeng/crossedoutitem.hxx
index 6906d185639e..6906d185639e 100644
--- a/editeng/inc/editeng/crsditem.hxx
+++ b/editeng/inc/editeng/crossedoutitem.hxx
diff --git a/editeng/inc/editeng/emphitem.hxx b/editeng/inc/editeng/emphasismarkitem.hxx
index 7e9695f0be69..7e9695f0be69 100644
--- a/editeng/inc/editeng/emphitem.hxx
+++ b/editeng/inc/editeng/emphasismarkitem.hxx
diff --git a/editeng/inc/editeng/escpitem.hxx b/editeng/inc/editeng/escapementitem.hxx
index d16adbc1aa22..d16adbc1aa22 100644
--- a/editeng/inc/editeng/escpitem.hxx
+++ b/editeng/inc/editeng/escapementitem.hxx
diff --git a/editeng/inc/editeng/brkitem.hxx b/editeng/inc/editeng/formatbreakitem.hxx
index 9aab77c02c86..9aab77c02c86 100644
--- a/editeng/inc/editeng/brkitem.hxx
+++ b/editeng/inc/editeng/formatbreakitem.hxx
diff --git a/editeng/inc/editeng/hyznitem.hxx b/editeng/inc/editeng/hyphenzoneitem.hxx
index cacaf8cb1cb7..cacaf8cb1cb7 100644
--- a/editeng/inc/editeng/hyznitem.hxx
+++ b/editeng/inc/editeng/hyphenzoneitem.hxx
diff --git a/editeng/inc/editeng/bolnitem.hxx b/editeng/inc/editeng/lineitem.hxx
index 07ad4da38bc5..07ad4da38bc5 100644
--- a/editeng/inc/editeng/bolnitem.hxx
+++ b/editeng/inc/editeng/lineitem.hxx
diff --git a/editeng/source/editeng/editattr.cxx b/editeng/source/editeng/editattr.cxx
index 9876b9eefdd3..59dc36a3e4c7 100644
--- a/editeng/source/editeng/editattr.cxx
+++ b/editeng/source/editeng/editattr.cxx
@@ -29,18 +29,18 @@
 #include <editeng/postitem.hxx>
 #include <editeng/wghtitem.hxx>
 #include <editeng/udlnitem.hxx>
-#include <editeng/cntritem.hxx>
+#include <editeng/contouritem.hxx>
 #include <editeng/shdditem.hxx>
-#include <editeng/escpitem.hxx>
+#include <editeng/escapementitem.hxx>
 #include <editeng/colritem.hxx>
 #include <editeng/wrlmitem.hxx>
 #include <editeng/fhgtitem.hxx>
-#include <editeng/crsditem.hxx>
-#include <editeng/cscoitem.hxx>
+#include <editeng/crossedoutitem.hxx>
+#include <editeng/charsetcoloritem.hxx>
 #include <editeng/kernitem.hxx>
-#include <editeng/akrnitem.hxx>
+#include <editeng/autokernitem.hxx>
 #include <editeng/langitem.hxx>
-#include <editeng/emphitem.hxx>
+#include <editeng/emphasismarkitem.hxx>
 #include <editeng/charscaleitem.hxx>
 #include <editeng/charreliefitem.hxx>
 
diff --git a/editeng/source/editeng/editdbg.cxx b/editeng/source/editeng/editdbg.cxx
index 88aa0e3e8573..7d3d31b53aa2 100644
--- a/editeng/source/editeng/editdbg.cxx
+++ b/editeng/source/editeng/editdbg.cxx
@@ -26,22 +26,22 @@
 #include <editeng/lspcitem.hxx>
 #include <editeng/lrspitem.hxx>
 #include <editeng/ulspitem.hxx>
-#include <editeng/cntritem.hxx>
+#include <editeng/contouritem.hxx>
 #include <editeng/colritem.hxx>
 #include <editeng/fhgtitem.hxx>
 #include <editeng/fontitem.hxx>
-#include <editeng/adjitem.hxx>
+#include <editeng/adjustitem.hxx>
 #include <editeng/wghtitem.hxx>
 #include <editeng/postitem.hxx>
 #include <editeng/udlnitem.hxx>
-#include <editeng/crsditem.hxx>
+#include <editeng/crossedoutitem.hxx>
 #include <editeng/shdditem.hxx>
-#include <editeng/escpitem.hxx>
+#include <editeng/escapementitem.hxx>
 #include <editeng/kernitem.hxx>
 #include <editeng/wrlmitem.hxx>
-#include <editeng/akrnitem.hxx>
+#include <editeng/autokernitem.hxx>
 #include <editeng/langitem.hxx>
-#include <editeng/emphitem.hxx>
+#include <editeng/emphasismarkitem.hxx>
 #include <editeng/numitem.hxx>
 #include <editeng/tstpitem.hxx>
 #include <editeng/charscaleitem.hxx>
diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx
index 9b96ed77fef5..568299bd207c 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -26,20 +26,20 @@
 #include <editeng/tstpitem.hxx>
 #include <editeng/colritem.hxx>
 #include <editeng/fontitem.hxx>
-#include <editeng/crsditem.hxx>
+#include <editeng/crossedoutitem.hxx>
 #include <editeng/fhgtitem.hxx>
 #include <editeng/postitem.hxx>
 #include <editeng/kernitem.hxx>
 #include <editeng/wrlmitem.hxx>
 #include <editeng/wghtitem.hxx>
 #include <editeng/udlnitem.hxx>
-#include <editeng/cntritem.hxx>
-#include <editeng/escpitem.hxx>
+#include <editeng/contouritem.hxx>
+#include <editeng/escapementitem.hxx>
 #include <editeng/shdditem.hxx>
-#include <editeng/akrnitem.hxx>
-#include <editeng/cscoitem.hxx>
+#include <editeng/autokernitem.hxx>
+#include <editeng/charsetcoloritem.hxx>
 #include <editeng/langitem.hxx>
-#include <editeng/emphitem.hxx>
+#include <editeng/emphasismarkitem.hxx>
 #include <editeng/charscaleitem.hxx>
 #include <editeng/charreliefitem.hxx>
 #include <editeng/xmlcnitm.hxx>
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index 762fcaf8b479..42f4a1811885 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -39,11 +39,11 @@
 #include <editeng/txtrange.hxx>
 #include <vcl/graph.hxx>
 
-#include <editeng/akrnitem.hxx>
-#include <editeng/cntritem.hxx>
+#include <editeng/autokernitem.hxx>
+#include <editeng/contouritem.hxx>
 #include <editeng/colritem.hxx>
-#include <editeng/crsditem.hxx>
-#include <editeng/escpitem.hxx>
+#include <editeng/crossedoutitem.hxx>
+#include <editeng/escapementitem.hxx>
 #include <editeng/fhgtitem.hxx>
 #include <editeng/fontitem.hxx>
 #include <editeng/kernitem.hxx>
@@ -53,10 +53,10 @@
 #include <editeng/udlnitem.hxx>
 #include <editeng/wghtitem.hxx>
 #include <editeng/wrlmitem.hxx>
-#include <editeng/brshitem.hxx>
-#include <editeng/cscoitem.hxx>
+#include <editeng/brushitem.hxx>
+#include <editeng/charsetcoloritem.hxx>
 #include <editeng/langitem.hxx>
-#include <editeng/emphitem.hxx>
+#include <editeng/emphasismarkitem.hxx>
 #include <editeng/charscaleitem.hxx>
 #include <editeng/charreliefitem.hxx>
 
@@ -64,7 +64,7 @@
 #include <sot/formats.hxx>
 
 #include <editeng/numitem.hxx>
-#include <editeng/bulitem.hxx>
+#include <editeng/bulletitem.hxx>
 #include <editeng/unolingu.hxx>
 #include <linguistic/lngprops.hxx>
 #include <i18npool/mslangid.hxx>
diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx
index 244978781356..34b91b771fdb 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -33,13 +33,13 @@
 #include <editattr.hxx>
 #include <editeng/editeng.hxx>
 #include <editeng/fontitem.hxx>
-#include <editeng/cscoitem.hxx>
+#include <editeng/charsetcoloritem.hxx>
 #include <editeng/flditem.hxx>
 #include <editeng/lrspitem.hxx>
 #include <editeng/tstpitem.hxx>
-#include <editeng/bulitem.hxx>
+#include <editeng/bulletitem.hxx>
 #include <editeng/numitem.hxx>
-#include <editeng/brshitem.hxx>
+#include <editeng/brushitem.hxx>
 
 #include <vcl/graph.hxx>
 #include <svl/intitem.hxx>
diff --git a/editeng/source/editeng/eehtml.cxx b/editeng/source/editeng/eehtml.cxx
index cae0a756d057..24780099c2a9 100644
--- a/editeng/source/editeng/eehtml.cxx
+++ b/editeng/source/editeng/eehtml.cxx
@@ -23,7 +23,7 @@
 #include <vcl/msgbox.hxx>
 #include <vcl/svapp.hxx>
 #include <eehtml.hxx>
-#include <editeng/adjitem.hxx>
+#include <editeng/adjustitem.hxx>
 #include <editeng/flditem.hxx>
 #include <tools/urlobj.hxx>
 #include <editeng/fhgtitem.hxx>
diff --git a/editeng/source/editeng/eerdll.cxx b/editeng/source/editeng/eerdll.cxx
index 8c076ff1c41b..0ad2efce6a99 100644
--- a/editeng/source/editeng/eerdll.cxx
+++ b/editeng/source/editeng/eerdll.cxx
@@ -30,21 +30,21 @@
 #include <editeng/eerdll.hxx>
 #include <eerdll2.hxx>
 #include <editeng/lspcitem.hxx>
-#include <editeng/adjitem.hxx>
+#include <editeng/adjustitem.hxx>
 #include <editeng/tstpitem.hxx>
-#include <editeng/bulitem.hxx>
+#include <editeng/bulletitem.hxx>
 #include <editeng/flditem.hxx>
-#include <editeng/emphitem.hxx>
+#include <editeng/emphasismarkitem.hxx>
 #include <editeng/scriptspaceitem.hxx>
 #include <svl/itempool.hxx>
 #include <vcl/virdev.hxx>
 
-#include <editeng/akrnitem.hxx>
-#include <editeng/cntritem.hxx>
+#include <editeng/autokernitem.hxx>
+#include <editeng/contouritem.hxx>
 #include <editeng/colritem.hxx>
-#include <editeng/crsditem.hxx>
-#include <editeng/cscoitem.hxx>
-#include <editeng/escpitem.hxx>
+#include <editeng/crossedoutitem.hxx>
+#include <editeng/charsetcoloritem.hxx>
+#include <editeng/escapementitem.hxx>
 #include <editeng/fhgtitem.hxx>
 #include <editeng/fontitem.hxx>
 #include <editeng/kernitem.hxx>
diff --git a/editeng/source/editeng/eertfpar.cxx b/editeng/source/editeng/eertfpar.cxx
index 04622ca9cfa8..3d64a9943a8e 100644
--- a/editeng/source/editeng/eertfpar.cxx
+++ b/editeng/source/editeng/eertfpar.cxx
@@ -26,7 +26,7 @@
 #include <eertfpar.hxx>
 #include <impedit.hxx>
 #include <svl/intitem.hxx>
-#include <editeng/escpitem.hxx>
+#include <editeng/escapementitem.hxx>
 #include <editeng/fhgtitem.hxx>
 #include <editeng/fontitem.hxx>
 #include <editeng/flditem.hxx>
diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx
index 3269fc6beb46..a6d6dda4a4ca 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -44,7 +44,7 @@
 #include <editeng/wghtitem.hxx>
 #include <editeng/postitem.hxx>
 #include <editeng/udlnitem.hxx>
-#include <editeng/adjitem.hxx>
+#include <editeng/adjustitem.hxx>
 #include <editeng/scripttypeitem.hxx>
 #include <editeng/frmdiritem.hxx>
 #include <editeng/fontitem.hxx>
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index 75b18b372e74..4f94c06e1bff 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -25,7 +25,7 @@
 #include <vcl/metaact.hxx>
 #include <vcl/gdimtf.hxx>
 
-#include <editeng/adjitem.hxx>
+#include <editeng/adjustitem.hxx>
 #include <editeng/tstpitem.hxx>
 #include <editeng/lspcitem.hxx>
 #include <editeng/flditem.hxx>
@@ -33,7 +33,7 @@
 #include <editeng/editeng.hxx>
 #include <editeng/editview.hxx>
 #include <editeng/txtrange.hxx>
-#include <editeng/cscoitem.hxx>
+#include <editeng/charsetcoloritem.hxx>
 #include <editeng/colritem.hxx>
 #include <editeng/udlnitem.hxx>
 #include <editeng/fhgtitem.hxx>
diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx
index a00e28e48f69..7d34c1451f9a 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -25,7 +25,7 @@
 
 #include <svl/srchitem.hxx>
 #include <editeng/lspcitem.hxx>
-#include <editeng/adjitem.hxx>
+#include <editeng/adjustitem.hxx>
 #include <editeng/tstpitem.hxx>
 
 #include <eertfpar.hxx>
@@ -38,11 +38,11 @@
 
 #include "editxml.hxx"
 
-#include <editeng/akrnitem.hxx>
-#include <editeng/cntritem.hxx>
+#include <editeng/autokernitem.hxx>
+#include <editeng/contouritem.hxx>
 #include <editeng/colritem.hxx>
-#include <editeng/crsditem.hxx>
-#include <editeng/escpitem.hxx>
+#include <editeng/crossedoutitem.hxx>
+#include <editeng/escapementitem.hxx>
 #include <editeng/fhgtitem.hxx>
 #include <editeng/fontitem.hxx>
 #include <editeng/kernitem.hxx>
@@ -55,7 +55,7 @@
 #include <editeng/langitem.hxx>
 #include <editeng/charreliefitem.hxx>
 #include <editeng/frmdiritem.hxx>
-#include <editeng/emphitem.hxx>
+#include <editeng/emphasismarkitem.hxx>
 #include <textconv.hxx>
 #include <rtl/tencinfo.h>
 #include <svtools/rtfout.hxx>
diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx
index 6b93d576429f..42ed83f56b15 100644
--- a/editeng/source/items/bulitem.cxx
+++ b/editeng/source/items/bulitem.cxx
@@ -22,7 +22,7 @@
 
 #define _SVX_BULITEM_CXX
 
-#include <editeng/bulitem.hxx>
+#include <editeng/bulletitem.hxx>
 #include <editeng/editrids.hrc>
 
 #include <tools/tenccvt.hxx>
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index 1d6798c495d8..a35808f8618a 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -66,10 +66,10 @@
 #include <editeng/protitem.hxx>
 #include <editeng/shaditem.hxx>
 #include <editeng/boxitem.hxx>
-#include <editeng/brkitem.hxx>
+#include <editeng/formatbreakitem.hxx>
 #include <editeng/keepitem.hxx>
-#include <editeng/bolnitem.hxx>
-#include <editeng/brshitem.hxx>
+#include <editeng/lineitem.hxx>
+#include <editeng/brushitem.hxx>
 #include <editeng/frmdiritem.hxx>
 #include <editeng/itemtype.hxx>
 #include <editeng/eerdll.hxx>
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index 5cf1227c4238..9a71ec5e140a 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/text/HoriOrientation.hpp>
 #include <com/sun/star/text/VertOrientation.hpp>
 #include <com/sun/star/text/RelOrientation.hpp>
-#include <editeng/brshitem.hxx>
+#include <editeng/brushitem.hxx>
 #include <vcl/font.hxx>
 #include <editeng/editids.hrc>
 #include <editeng/editrids.hrc>
diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx
index f9e7c5ed7378..d247bb837031 100644
--- a/editeng/source/items/paraitem.cxx
+++ b/editeng/source/items/paraitem.cxx
@@ -33,13 +33,13 @@ using namespace ::com::sun::star;
 #include <svl/memberid.hrc>
 #include <editeng/editrids.hrc>
 #include <editeng/lspcitem.hxx>
-#include <editeng/adjitem.hxx>
+#include <editeng/adjustitem.hxx>
 #include <editeng/orphitem.hxx>
 #include <editeng/widwitem.hxx>
 #include <editeng/tstpitem.hxx>
 #include <editeng/pmdlitem.hxx>
 #include <editeng/spltitem.hxx>
-#include <editeng/hyznitem.hxx>
+#include <editeng/hyphenzoneitem.hxx>
 #include <editeng/scriptspaceitem.hxx>
 #include <editeng/hngpnctitem.hxx>
 #include <editeng/forbiddenruleitem.hxx>
diff --git a/editeng/source/items/svxfont.cxx b/editeng/source/items/svxfont.cxx
index 3d9d2252f030..7d5e72dc3336 100644
--- a/editeng/source/items/svxfont.cxx
+++ b/editeng/source/items/svxfont.cxx
@@ -26,7 +26,7 @@
 #include <editeng/unolingu.hxx>
 #include <com/sun/star/i18n/KCharacterType.hpp>
 #include <editeng/svxfont.hxx>
-#include <editeng/escpitem.hxx>
+#include <editeng/escapementitem.hxx>
 
 // Minimum: Percentage of kernel
 #define MINKERNPERCENT 5
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index a993a15bc62c..f7a6e807672e 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -68,23 +68,23 @@
 #include <editeng/fhgtitem.hxx>
 #include <editeng/fwdtitem.hxx>
 #include <editeng/udlnitem.hxx>
-#include <editeng/crsditem.hxx>
+#include <editeng/crossedoutitem.hxx>
 #include <editeng/shdditem.hxx>
-#include <editeng/akrnitem.hxx>
+#include <editeng/autokernitem.hxx>
 #include <editeng/wrlmitem.hxx>
-#include <editeng/cntritem.hxx>
+#include <editeng/contouritem.hxx>
 #include <editeng/prszitem.hxx>
 #include <editeng/colritem.hxx>
-#include <editeng/cscoitem.hxx>
+#include <editeng/charsetcoloritem.hxx>
 #include <editeng/kernitem.hxx>
 #include <editeng/cmapitem.hxx>
-#include <editeng/escpitem.hxx>
+#include <editeng/escapementitem.hxx>
 #include <editeng/langitem.hxx>
 #include <editeng/nlbkitem.hxx>
 #include <editeng/nhypitem.hxx>
 #include <editeng/lcolitem.hxx>
-#include <editeng/blnkitem.hxx>
-#include <editeng/emphitem.hxx>
+#include <editeng/blinkitem.hxx>
+#include <editeng/emphasismarkitem.hxx>
 #include <editeng/twolinesitem.hxx>
 #include <editeng/scripttypeitem.hxx>
 #include <editeng/charrotateitem.hxx>
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index f311fa6523af..f6fd9ba51c86 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -44,7 +44,7 @@
 #include <sot/storage.hxx>
 #include <editeng/udlnitem.hxx>
 #include <editeng/wghtitem.hxx>
-#include <editeng/escpitem.hxx>
+#include <editeng/escapementitem.hxx>
 #include <editeng/svxacorr.hxx>
 #include <editeng/unolingu.hxx>
 #include "vcl/window.hxx"
diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx
index 607e66a0d44c..5eed71a46a30 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -43,13 +43,13 @@
 #include <svl/whiter.hxx>
 #include <vcl/metric.hxx>
 #include <editeng/numitem.hxx>
-#include <editeng/adjitem.hxx>
+#include <editeng/adjustitem.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/gdimtf.hxx>
 #include <vcl/metaact.hxx>
 #include <svtools/grfmgr.hxx>
 #include <editeng/svxfont.hxx>
-#include <editeng/brshitem.hxx>
+#include <editeng/brushitem.hxx>
 #include <svl/itempool.hxx>
 
 // calculate if it's RTL or not
diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx
index a8b100cde7da..a5e7a771b97f 100644
--- a/editeng/source/rtf/rtfitem.cxx
+++ b/editeng/source/rtf/rtfitem.cxx
@@ -25,23 +25,23 @@
 #include <editeng/fhgtitem.hxx>
 #include <editeng/fwdtitem.hxx>
 #include <editeng/udlnitem.hxx>
-#include <editeng/crsditem.hxx>
+#include <editeng/crossedoutitem.hxx>
 #include <editeng/shdditem.hxx>
-#include <editeng/akrnitem.hxx>
+#include <editeng/autokernitem.hxx>
 #include <editeng/wrlmitem.hxx>
-#include <editeng/cntritem.hxx>
+#include <editeng/contouritem.hxx>
 #include <editeng/prszitem.hxx>
 #include <editeng/colritem.hxx>
-#include <editeng/cscoitem.hxx>
+#include <editeng/charsetcoloritem.hxx>
 #include <editeng/kernitem.hxx>
 #include <editeng/cmapitem.hxx>
-#include <editeng/escpitem.hxx>
+#include <editeng/escapementitem.hxx>
 #include <editeng/langitem.hxx>
 #include <editeng/nlbkitem.hxx>
 #include <editeng/nhypitem.hxx>
 #include <editeng/lcolitem.hxx>
-#include <editeng/blnkitem.hxx>
-#include <editeng/emphitem.hxx>
+#include <editeng/blinkitem.hxx>
+#include <editeng/emphasismarkitem.hxx>
 #include <editeng/twolinesitem.hxx>
 #include <editeng/pbinitem.hxx>
 #include <editeng/sizeitem.hxx>
@@ -52,18 +52,18 @@
 #include <editeng/protitem.hxx>
 #include <editeng/shaditem.hxx>
 #include <editeng/boxitem.hxx>
-#include <editeng/brkitem.hxx>
+#include <editeng/formatbreakitem.hxx>
 #include <editeng/keepitem.hxx>
-#include <editeng/bolnitem.hxx>
-#include <editeng/brshitem.hxx>
+#include <editeng/lineitem.hxx>
+#include <editeng/brushitem.hxx>
 #include <editeng/lspcitem.hxx>
-#include <editeng/adjitem.hxx>
+#include <editeng/adjustitem.hxx>
 #include <editeng/orphitem.hxx>
 #include <editeng/widwitem.hxx>
 #include <editeng/tstpitem.hxx>
 #include <editeng/pmdlitem.hxx>
 #include <editeng/spltitem.hxx>
-#include <editeng/hyznitem.hxx>
+#include <editeng/hyphenzoneitem.hxx>
 #include <editeng/charscaleitem.hxx>
 #include <editeng/charrotateitem.hxx>
 #include <editeng/charreliefitem.hxx>
diff --git a/editeng/source/uno/unofdesc.cxx b/editeng/source/uno/unofdesc.cxx
index 4bd6028f235c..b1315861e34c 100644
--- a/editeng/source/uno/unofdesc.cxx
+++ b/editeng/source/uno/unofdesc.cxx
@@ -27,7 +27,7 @@
 #include <editeng/postitem.hxx>
 #include <editeng/udlnitem.hxx>
 #include <editeng/wghtitem.hxx>
-#include <editeng/crsditem.hxx>
+#include <editeng/crossedoutitem.hxx>
 #include <editeng/wrlmitem.hxx>
 #include <editeng/memberids.hrc>
 #include <svl/itempool.hxx>
diff --git a/editeng/source/uno/unonrule.cxx b/editeng/source/uno/unonrule.cxx
index 749dad5c75d2..4e6a4141e53c 100644
--- a/editeng/source/uno/unonrule.cxx
+++ b/editeng/source/uno/unonrule.cxx
@@ -26,7 +26,7 @@
 #include <svtools/grfmgr.hxx>
 #include <toolkit/unohlp.hxx>
 
-#include <editeng/brshitem.hxx>
+#include <editeng/brushitem.hxx>
 #include <editeng/unoprnms.hxx>
 #include <editeng/numitem.hxx>
 #include <editeng/eeitem.hxx>