[Libreoffice-commits] core.git: accessibility/inc accessibility/source bridges/inc bridges/source idlc/inc idlc/source pyuno/inc pyuno/source svgio/inc svgio/source unodevtools/inc unodevtools/source xmlsecurity/inc xmlsecurity/qa xmlsecurity/source

Tor Lillqvist tml at collabora.com
Fri May 27 17:11:16 UTC 2016


 accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx             |  289 ----
 accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx         |  447 ------
 accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx |   84 -
 accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderBar.hxx    |  258 ---
 accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderCell.hxx   |   74 -
 accessibility/inc/accessibility/extended/AccessibleBrowseBoxTable.hxx        |  152 --
 accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableBase.hxx    |  267 ---
 accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableCell.hxx    |  133 -
 accessibility/inc/accessibility/extended/AccessibleGridControl.hxx           |  239 ---
 accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx       |  356 -----
 accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx     |  181 --
 accessibility/inc/accessibility/extended/AccessibleGridControlHeaderCell.hxx |   86 -
 accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx      |  210 ---
 accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx  |  207 --
 accessibility/inc/accessibility/extended/AccessibleGridControlTableCell.hxx  |  154 --
 accessibility/inc/accessibility/extended/accessiblebrowseboxcell.hxx         |   77 -
 accessibility/inc/accessibility/extended/accessibleeditbrowseboxcell.hxx     |  142 --
 accessibility/inc/accessibility/extended/accessibleiconchoicectrl.hxx        |  110 -
 accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx   |  191 --
 accessibility/inc/accessibility/extended/accessiblelistbox.hxx               |  133 -
 accessibility/inc/accessibility/extended/accessiblelistboxentry.hxx          |  230 ---
 accessibility/inc/accessibility/extended/accessibletabbar.hxx                |  112 -
 accessibility/inc/accessibility/extended/accessibletabbarbase.hxx            |   65 
 accessibility/inc/accessibility/extended/accessibletabbarpage.hxx            |  128 -
 accessibility/inc/accessibility/extended/accessibletabbarpagelist.hxx        |  132 -
 accessibility/inc/accessibility/extended/accessibletablistbox.hxx            |  104 -
 accessibility/inc/accessibility/extended/accessibletablistboxtable.hxx       |  109 -
 accessibility/inc/accessibility/extended/listboxaccessible.hxx               |   84 -
 accessibility/inc/accessibility/extended/textwindowaccessibility.hxx         |  693 ----------
 accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx               |   69 
 accessibility/inc/accessibility/helper/accessiblestrings.hrc                 |   51 
 accessibility/inc/accessibility/helper/accresmgr.hxx                         |   66 
 accessibility/inc/accessibility/helper/characterattributeshelper.hxx         |   52 
 accessibility/inc/accessibility/helper/listboxhelper.hxx                     |  189 --
 accessibility/inc/accessibility/standard/accessiblemenubasecomponent.hxx     |  145 --
 accessibility/inc/accessibility/standard/accessiblemenucomponent.hxx         |   89 -
 accessibility/inc/accessibility/standard/accessiblemenuitemcomponent.hxx     |   90 -
 accessibility/inc/accessibility/standard/vclxaccessiblebox.hxx               |  185 --
 accessibility/inc/accessibility/standard/vclxaccessiblebutton.hxx            |   78 -
 accessibility/inc/accessibility/standard/vclxaccessiblecheckbox.hxx          |   85 -
 accessibility/inc/accessibility/standard/vclxaccessiblecombobox.hxx          |   57 
 accessibility/inc/accessibility/standard/vclxaccessibledropdowncombobox.hxx  |   56 
 accessibility/inc/accessibility/standard/vclxaccessibledropdownlistbox.hxx   |   56 
 accessibility/inc/accessibility/standard/vclxaccessibleedit.hxx              |  111 -
 accessibility/inc/accessibility/standard/vclxaccessiblefixedhyperlink.hxx    |   47 
 accessibility/inc/accessibility/standard/vclxaccessiblefixedtext.hxx         |   47 
 accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx              |  210 ---
 accessibility/inc/accessibility/standard/vclxaccessiblelistbox.hxx           |   56 
 accessibility/inc/accessibility/standard/vclxaccessiblelistitem.hxx          |  173 --
 accessibility/inc/accessibility/standard/vclxaccessiblemenu.hxx              |   79 -
 accessibility/inc/accessibility/standard/vclxaccessiblemenubar.hxx           |   66 
 accessibility/inc/accessibility/standard/vclxaccessiblemenuitem.hxx          |  109 -
 accessibility/inc/accessibility/standard/vclxaccessiblemenuseparator.hxx     |   46 
 accessibility/inc/accessibility/standard/vclxaccessiblepopupmenu.hxx         |   52 
 accessibility/inc/accessibility/standard/vclxaccessibleradiobutton.hxx       |   76 -
 accessibility/inc/accessibility/standard/vclxaccessiblescrollbar.hxx         |   79 -
 accessibility/inc/accessibility/standard/vclxaccessiblestatusbar.hxx         |   74 -
 accessibility/inc/accessibility/standard/vclxaccessiblestatusbaritem.hxx     |  134 -
 accessibility/inc/accessibility/standard/vclxaccessibletabcontrol.hxx        |   96 -
 accessibility/inc/accessibility/standard/vclxaccessibletabpage.hxx           |  139 --
 accessibility/inc/accessibility/standard/vclxaccessibletabpagewindow.hxx     |   60 
 accessibility/inc/accessibility/standard/vclxaccessibletextcomponent.hxx     |   85 -
 accessibility/inc/accessibility/standard/vclxaccessibletextfield.hxx         |   92 -
 accessibility/inc/accessibility/standard/vclxaccessibletoolbox.hxx           |  105 -
 accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx       |  154 --
 accessibility/inc/extended/AccessibleBrowseBox.hxx                           |  289 ++++
 accessibility/inc/extended/AccessibleBrowseBoxBase.hxx                       |  447 ++++++
 accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx               |   84 +
 accessibility/inc/extended/AccessibleBrowseBoxHeaderBar.hxx                  |  258 +++
 accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx                 |   74 +
 accessibility/inc/extended/AccessibleBrowseBoxTable.hxx                      |  152 ++
 accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx                  |  267 +++
 accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx                  |  133 +
 accessibility/inc/extended/AccessibleGridControl.hxx                         |  239 +++
 accessibility/inc/extended/AccessibleGridControlBase.hxx                     |  356 +++++
 accessibility/inc/extended/AccessibleGridControlHeader.hxx                   |  181 ++
 accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx               |   86 +
 accessibility/inc/extended/AccessibleGridControlTable.hxx                    |  210 +++
 accessibility/inc/extended/AccessibleGridControlTableBase.hxx                |  207 ++
 accessibility/inc/extended/AccessibleGridControlTableCell.hxx                |  154 ++
 accessibility/inc/extended/accessiblebrowseboxcell.hxx                       |   77 +
 accessibility/inc/extended/accessibleeditbrowseboxcell.hxx                   |  142 ++
 accessibility/inc/extended/accessibleiconchoicectrl.hxx                      |  110 +
 accessibility/inc/extended/accessibleiconchoicectrlentry.hxx                 |  191 ++
 accessibility/inc/extended/accessiblelistbox.hxx                             |  133 +
 accessibility/inc/extended/accessiblelistboxentry.hxx                        |  230 +++
 accessibility/inc/extended/accessibletabbar.hxx                              |  112 +
 accessibility/inc/extended/accessibletabbarbase.hxx                          |   65 
 accessibility/inc/extended/accessibletabbarpage.hxx                          |  128 +
 accessibility/inc/extended/accessibletabbarpagelist.hxx                      |  132 +
 accessibility/inc/extended/accessibletablistbox.hxx                          |  104 +
 accessibility/inc/extended/accessibletablistboxtable.hxx                     |  109 +
 accessibility/inc/extended/listboxaccessible.hxx                             |   84 +
 accessibility/inc/extended/textwindowaccessibility.hxx                       |  693 ++++++++++
 accessibility/inc/helper/IComboListBoxHelper.hxx                             |   69 
 accessibility/inc/helper/accessiblestrings.hrc                               |   51 
 accessibility/inc/helper/accresmgr.hxx                                       |   66 
 accessibility/inc/helper/characterattributeshelper.hxx                       |   52 
 accessibility/inc/helper/listboxhelper.hxx                                   |  189 ++
 accessibility/inc/pch/precompiled_acc.hxx                                    |   32 
 accessibility/inc/standard/accessiblemenubasecomponent.hxx                   |  145 ++
 accessibility/inc/standard/accessiblemenucomponent.hxx                       |   89 +
 accessibility/inc/standard/accessiblemenuitemcomponent.hxx                   |   90 +
 accessibility/inc/standard/vclxaccessiblebox.hxx                             |  185 ++
 accessibility/inc/standard/vclxaccessiblebutton.hxx                          |   78 +
 accessibility/inc/standard/vclxaccessiblecheckbox.hxx                        |   85 +
 accessibility/inc/standard/vclxaccessiblecombobox.hxx                        |   57 
 accessibility/inc/standard/vclxaccessibledropdowncombobox.hxx                |   56 
 accessibility/inc/standard/vclxaccessibledropdownlistbox.hxx                 |   56 
 accessibility/inc/standard/vclxaccessibleedit.hxx                            |  111 +
 accessibility/inc/standard/vclxaccessiblefixedhyperlink.hxx                  |   47 
 accessibility/inc/standard/vclxaccessiblefixedtext.hxx                       |   47 
 accessibility/inc/standard/vclxaccessiblelist.hxx                            |  210 +++
 accessibility/inc/standard/vclxaccessiblelistbox.hxx                         |   56 
 accessibility/inc/standard/vclxaccessiblelistitem.hxx                        |  173 ++
 accessibility/inc/standard/vclxaccessiblemenu.hxx                            |   79 +
 accessibility/inc/standard/vclxaccessiblemenubar.hxx                         |   66 
 accessibility/inc/standard/vclxaccessiblemenuitem.hxx                        |  109 +
 accessibility/inc/standard/vclxaccessiblemenuseparator.hxx                   |   46 
 accessibility/inc/standard/vclxaccessiblepopupmenu.hxx                       |   52 
 accessibility/inc/standard/vclxaccessibleradiobutton.hxx                     |   76 +
 accessibility/inc/standard/vclxaccessiblescrollbar.hxx                       |   79 +
 accessibility/inc/standard/vclxaccessiblestatusbar.hxx                       |   74 +
 accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx                   |  134 +
 accessibility/inc/standard/vclxaccessibletabcontrol.hxx                      |   96 +
 accessibility/inc/standard/vclxaccessibletabpage.hxx                         |  139 ++
 accessibility/inc/standard/vclxaccessibletabpagewindow.hxx                   |   60 
 accessibility/inc/standard/vclxaccessibletextcomponent.hxx                   |   85 +
 accessibility/inc/standard/vclxaccessibletextfield.hxx                       |   92 +
 accessibility/inc/standard/vclxaccessibletoolbox.hxx                         |  105 +
 accessibility/inc/standard/vclxaccessibletoolboxitem.hxx                     |  154 ++
 accessibility/source/extended/AccessibleBrowseBox.cxx                        |   12 
 accessibility/source/extended/AccessibleBrowseBoxBase.cxx                    |    2 
 accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx            |    2 
 accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx               |    4 
 accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx              |    4 
 accessibility/source/extended/AccessibleBrowseBoxTable.cxx                   |    2 
 accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx               |    2 
 accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx               |    2 
 accessibility/source/extended/AccessibleGridControl.cxx                      |   10 
 accessibility/source/extended/AccessibleGridControlBase.cxx                  |    2 
 accessibility/source/extended/AccessibleGridControlHeader.cxx                |    8 
 accessibility/source/extended/AccessibleGridControlHeaderCell.cxx            |    4 
 accessibility/source/extended/AccessibleGridControlTable.cxx                 |    4 
 accessibility/source/extended/AccessibleGridControlTableBase.cxx             |    2 
 accessibility/source/extended/AccessibleGridControlTableCell.cxx             |    2 
 accessibility/source/extended/accessiblebrowseboxcell.cxx                    |    2 
 accessibility/source/extended/accessibleeditbrowseboxcell.cxx                |    2 
 accessibility/source/extended/accessibleiconchoicectrl.cxx                   |    4 
 accessibility/source/extended/accessibleiconchoicectrlentry.cxx              |    2 
 accessibility/source/extended/accessiblelistbox.cxx                          |    4 
 accessibility/source/extended/accessiblelistboxentry.cxx                     |    6 
 accessibility/source/extended/accessibletabbar.cxx                           |    4 
 accessibility/source/extended/accessibletabbarbase.cxx                       |    4 
 accessibility/source/extended/accessibletabbarpage.cxx                       |    2 
 accessibility/source/extended/accessibletabbarpagelist.cxx                   |    4 
 accessibility/source/extended/accessibletablistbox.cxx                       |    4 
 accessibility/source/extended/accessibletablistboxtable.cxx                  |    6 
 accessibility/source/extended/listboxaccessible.cxx                          |    2 
 accessibility/source/extended/textwindowaccessibility.cxx                    |    2 
 accessibility/source/helper/IComboListBoxHelper.cxx                          |    2 
 accessibility/source/helper/acc_factory.cxx                                  |   62 
 accessibility/source/helper/accessiblestrings.src                            |    2 
 accessibility/source/helper/accresmgr.cxx                                    |    2 
 accessibility/source/helper/characterattributeshelper.cxx                    |    2 
 accessibility/source/standard/accessiblemenubasecomponent.cxx                |    8 
 accessibility/source/standard/accessiblemenucomponent.cxx                    |    2 
 accessibility/source/standard/accessiblemenuitemcomponent.cxx                |    6 
 accessibility/source/standard/vclxaccessiblebox.cxx                          |   14 
 accessibility/source/standard/vclxaccessiblebutton.cxx                       |    6 
 accessibility/source/standard/vclxaccessiblecheckbox.cxx                     |    6 
 accessibility/source/standard/vclxaccessiblecombobox.cxx                     |    4 
 accessibility/source/standard/vclxaccessibledropdowncombobox.cxx             |   12 
 accessibility/source/standard/vclxaccessibledropdownlistbox.cxx              |    8 
 accessibility/source/standard/vclxaccessibleedit.cxx                         |    6 
 accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx               |    2 
 accessibility/source/standard/vclxaccessiblefixedtext.cxx                    |    2 
 accessibility/source/standard/vclxaccessiblelist.cxx                         |    6 
 accessibility/source/standard/vclxaccessiblelistbox.cxx                      |    6 
 accessibility/source/standard/vclxaccessiblelistitem.cxx                     |    4 
 accessibility/source/standard/vclxaccessiblemenu.cxx                         |    2 
 accessibility/source/standard/vclxaccessiblemenubar.cxx                      |    2 
 accessibility/source/standard/vclxaccessiblemenuitem.cxx                     |    8 
 accessibility/source/standard/vclxaccessiblemenuseparator.cxx                |    2 
 accessibility/source/standard/vclxaccessiblepopupmenu.cxx                    |    2 
 accessibility/source/standard/vclxaccessibleradiobutton.cxx                  |    6 
 accessibility/source/standard/vclxaccessiblescrollbar.cxx                    |    6 
 accessibility/source/standard/vclxaccessiblestatusbar.cxx                    |    4 
 accessibility/source/standard/vclxaccessiblestatusbaritem.cxx                |    4 
 accessibility/source/standard/vclxaccessibletabcontrol.cxx                   |    4 
 accessibility/source/standard/vclxaccessibletabpage.cxx                      |    4 
 accessibility/source/standard/vclxaccessibletabpagewindow.cxx                |    2 
 accessibility/source/standard/vclxaccessibletextcomponent.cxx                |    4 
 accessibility/source/standard/vclxaccessibletextfield.cxx                    |    4 
 accessibility/source/standard/vclxaccessibletoolbox.cxx                      |    4 
 accessibility/source/standard/vclxaccessibletoolboxitem.cxx                  |    6 
 bridges/inc/arraypointer.hxx                                                 |   49 
 bridges/inc/bridge.hxx                                                       |  122 +
 bridges/inc/bridges/cpp_uno/shared/arraypointer.hxx                          |   49 
 bridges/inc/bridges/cpp_uno/shared/bridge.hxx                                |  122 -
 bridges/inc/bridges/cpp_uno/shared/cppinterfaceproxy.hxx                     |  100 -
 bridges/inc/bridges/cpp_uno/shared/except.hxx                                |   41 
 bridges/inc/bridges/cpp_uno/shared/types.hxx                                 |   71 -
 bridges/inc/bridges/cpp_uno/shared/unointerfaceproxy.hxx                     |  110 -
 bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx                         |  222 ---
 bridges/inc/bridges/cpp_uno/shared/vtables.hxx                               |  102 -
 bridges/inc/cppinterfaceproxy.hxx                                            |  100 +
 bridges/inc/except.hxx                                                       |   41 
 bridges/inc/types.hxx                                                        |   71 +
 bridges/inc/unointerfaceproxy.hxx                                            |  110 +
 bridges/inc/vtablefactory.hxx                                                |  222 +++
 bridges/inc/vtables.hxx                                                      |  102 +
 bridges/source/cpp_uno/gcc3_aix_powerpc/cpp2uno.cxx                          |    8 
 bridges/source/cpp_uno/gcc3_aix_powerpc/uno2cpp.cxx                          |    8 
 bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm.cxx                          |    8 
 bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm64.cxx                        |    8 
 bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-i386.cxx                         |    8 
 bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno.cxx                              |    2 
 bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx                          |    8 
 bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm64.cxx                        |    8 
 bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-i386.cxx                         |    8 
 bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp.cxx                              |    8 
 bridges/source/cpp_uno/gcc3_linux_aarch64/cpp2uno.cxx                        |    8 
 bridges/source/cpp_uno/gcc3_linux_aarch64/uno2cpp.cxx                        |    8 
 bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx                          |    8 
 bridges/source/cpp_uno/gcc3_linux_alpha/uno2cpp.cxx                          |    8 
 bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx                            |    8 
 bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx                            |    8 
 bridges/source/cpp_uno/gcc3_linux_hppa/call.cxx                              |    8 
 bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx                           |    8 
 bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx                           |    8 
 bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx                           |    8 
 bridges/source/cpp_uno/gcc3_linux_ia64/share.hxx                             |    2 
 bridges/source/cpp_uno/gcc3_linux_ia64/uno2cpp.cxx                           |    8 
 bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx                          |    8 
 bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx                          |    8 
 bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx                           |    8 
 bridges/source/cpp_uno/gcc3_linux_m68k/uno2cpp.cxx                           |    8 
 bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx                           |    8 
 bridges/source/cpp_uno/gcc3_linux_mips/uno2cpp.cxx                           |    8 
 bridges/source/cpp_uno/gcc3_linux_mips64/cpp2uno.cxx                         |    8 
 bridges/source/cpp_uno/gcc3_linux_mips64/uno2cpp.cxx                         |    8 
 bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx                        |    8 
 bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx                        |    8 
 bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx                      |    8 
 bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx                      |    8 
 bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx                           |    8 
 bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx                           |    8 
 bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx                          |    8 
 bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx                          |    8 
 bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx                          |    8 
 bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx                          |    8 
 bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx                         |    8 
 bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx                         |    8 
 bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx                        |    8 
 bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx                        |    8 
 bridges/source/cpp_uno/gcc3_solaris_intel/callvirtualmethod.cxx              |    8 
 bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx                        |    8 
 bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx                        |    8 
 bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx                        |    8 
 bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx                        |    8 
 bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx                               |    8 
 bridges/source/cpp_uno/mingw_intel/smallstruct.cxx                           |    2 
 bridges/source/cpp_uno/mingw_intel/uno2cpp.cxx                               |    8 
 bridges/source/cpp_uno/mingw_x86-64/cpp2uno.cxx                              |    8 
 bridges/source/cpp_uno/mingw_x86-64/uno2cpp.cxx                              |    8 
 bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx                          |    8 
 bridges/source/cpp_uno/msvc_win32_intel/except.cxx                           |    2 
 bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx                          |    8 
 bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx                         |    8 
 bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx                          |    2 
 bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx                         |    8 
 bridges/source/cpp_uno/shared/bridge.cxx                                     |    6 
 bridges/source/cpp_uno/shared/component.cxx                                  |    2 
 bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx                          |    6 
 bridges/source/cpp_uno/shared/types.cxx                                      |    2 
 bridges/source/cpp_uno/shared/unointerfaceproxy.cxx                          |    4 
 bridges/source/cpp_uno/shared/vtablefactory.cxx                              |    4 
 bridges/source/cpp_uno/shared/vtables.cxx                                    |    2 
 idlc/inc/astattribute.hxx                                                    |  110 +
 idlc/inc/astbasetype.hxx                                                     |   55 
 idlc/inc/astconstant.hxx                                                     |   50 
 idlc/inc/astconstants.hxx                                                    |   35 
 idlc/inc/astdeclaration.hxx                                                  |  132 +
 idlc/inc/astenum.hxx                                                         |   48 
 idlc/inc/astexception.hxx                                                    |   36 
 idlc/inc/astexpression.hxx                                                   |  143 ++
 idlc/inc/astinterface.hxx                                                    |  126 +
 idlc/inc/astinterfacemember.hxx                                              |   46 
 idlc/inc/astmember.hxx                                                       |   50 
 idlc/inc/astmodule.hxx                                                       |   44 
 idlc/inc/astneeds.hxx                                                        |   41 
 idlc/inc/astobserves.hxx                                                     |   41 
 idlc/inc/astoperation.hxx                                                    |   59 
 idlc/inc/astparameter.hxx                                                    |   48 
 idlc/inc/astscope.hxx                                                        |   70 +
 idlc/inc/astsequence.hxx                                                     |   52 
 idlc/inc/astservice.hxx                                                      |   62 
 idlc/inc/astservicemember.hxx                                                |   46 
 idlc/inc/aststack.hxx                                                        |   49 
 idlc/inc/aststruct.hxx                                                       |   58 
 idlc/inc/aststructinstance.hxx                                               |   49 
 idlc/inc/asttype.hxx                                                         |   38 
 idlc/inc/asttypedef.hxx                                                      |   46 
 idlc/inc/errorhandler.hxx                                                    |  132 +
 idlc/inc/fehelper.hxx                                                        |   76 +
 idlc/inc/idlc.hxx                                                            |  166 ++
 idlc/inc/idlc/astattribute.hxx                                               |  110 -
 idlc/inc/idlc/astbasetype.hxx                                                |   55 
 idlc/inc/idlc/astconstant.hxx                                                |   50 
 idlc/inc/idlc/astconstants.hxx                                               |   35 
 idlc/inc/idlc/astdeclaration.hxx                                             |  132 -
 idlc/inc/idlc/astenum.hxx                                                    |   48 
 idlc/inc/idlc/astexception.hxx                                               |   36 
 idlc/inc/idlc/astexpression.hxx                                              |  143 --
 idlc/inc/idlc/astinterface.hxx                                               |  126 -
 idlc/inc/idlc/astinterfacemember.hxx                                         |   46 
 idlc/inc/idlc/astmember.hxx                                                  |   50 
 idlc/inc/idlc/astmodule.hxx                                                  |   44 
 idlc/inc/idlc/astneeds.hxx                                                   |   41 
 idlc/inc/idlc/astobserves.hxx                                                |   41 
 idlc/inc/idlc/astoperation.hxx                                               |   59 
 idlc/inc/idlc/astparameter.hxx                                               |   48 
 idlc/inc/idlc/astscope.hxx                                                   |   70 -
 idlc/inc/idlc/astsequence.hxx                                                |   52 
 idlc/inc/idlc/astservice.hxx                                                 |   62 
 idlc/inc/idlc/astservicemember.hxx                                           |   46 
 idlc/inc/idlc/aststack.hxx                                                   |   49 
 idlc/inc/idlc/aststruct.hxx                                                  |   58 
 idlc/inc/idlc/aststructinstance.hxx                                          |   49 
 idlc/inc/idlc/asttype.hxx                                                    |   38 
 idlc/inc/idlc/asttypedef.hxx                                                 |   46 
 idlc/inc/idlc/errorhandler.hxx                                               |  132 -
 idlc/inc/idlc/fehelper.hxx                                                   |   76 -
 idlc/inc/idlc/idlc.hxx                                                       |  166 --
 idlc/inc/idlc/idlctypes.hxx                                                  |  209 ---
 idlc/inc/idlc/inheritedinterface.hxx                                         |   55 
 idlc/inc/idlc/options.hxx                                                    |   83 -
 idlc/inc/idlctypes.hxx                                                       |  209 +++
 idlc/inc/inheritedinterface.hxx                                              |   55 
 idlc/inc/options.hxx                                                         |   83 +
 idlc/source/astconstant.cxx                                                  |    4 
 idlc/source/astdeclaration.cxx                                               |    4 
 idlc/source/astdump.cxx                                                      |   22 
 idlc/source/astenum.cxx                                                      |    2 
 idlc/source/astexpression.cxx                                                |    8 
 idlc/source/astinterface.cxx                                                 |    8 
 idlc/source/astoperation.cxx                                                 |   10 
 idlc/source/astscope.cxx                                                     |    8 
 idlc/source/astservice.cxx                                                   |    8 
 idlc/source/aststack.cxx                                                     |    4 
 idlc/source/aststruct.cxx                                                    |    4 
 idlc/source/aststructinstance.cxx                                            |    6 
 idlc/source/errorhandler.cxx                                                 |    4 
 idlc/source/fehelper.cxx                                                     |    6 
 idlc/source/idlc.cxx                                                         |   32 
 idlc/source/idlccompile.cxx                                                  |    2 
 idlc/source/idlcmain.cxx                                                     |    2 
 idlc/source/idlcproduce.cxx                                                  |    4 
 idlc/source/options.cxx                                                      |    2 
 idlc/source/parser.y                                                         |   42 
 idlc/source/scanner.l                                                        |    6 
 pyuno/inc/pyuno.hxx                                                          |  316 ++++
 pyuno/inc/pyuno/pyuno.hxx                                                    |  316 ----
 pyuno/source/loader/pyuno_loader.cxx                                         |    2 
 pyuno/source/module/pyuno_impl.hxx                                           |    2 
 svgio/inc/pch/precompiled_svgio.hxx                                          |   12 
 svgio/inc/svganode.hxx                                                       |   58 
 svgio/inc/svgcharacternode.hxx                                               |  169 ++
 svgio/inc/svgcirclenode.hxx                                                  |   73 +
 svgio/inc/svgclippathnode.hxx                                                |   68 
 svgio/inc/svgdocument.hxx                                                    |   83 +
 svgio/inc/svgdocumenthandler.hxx                                             |   68 
 svgio/inc/svgellipsenode.hxx                                                 |   78 +
 svgio/inc/svggnode.hxx                                                       |   59 
 svgio/inc/svggradientnode.hxx                                                |  130 +
 svgio/inc/svggradientstopnode.hxx                                            |   57 
 svgio/inc/svgimagenode.hxx                                                   |   89 +
 svgio/inc/svgio/svgreader/svganode.hxx                                       |   58 
 svgio/inc/svgio/svgreader/svgcharacternode.hxx                               |  169 --
 svgio/inc/svgio/svgreader/svgcirclenode.hxx                                  |   73 -
 svgio/inc/svgio/svgreader/svgclippathnode.hxx                                |   68 
 svgio/inc/svgio/svgreader/svgdocument.hxx                                    |   83 -
 svgio/inc/svgio/svgreader/svgdocumenthandler.hxx                             |   68 
 svgio/inc/svgio/svgreader/svgellipsenode.hxx                                 |   78 -
 svgio/inc/svgio/svgreader/svggnode.hxx                                       |   59 
 svgio/inc/svgio/svgreader/svggradientnode.hxx                                |  130 -
 svgio/inc/svgio/svgreader/svggradientstopnode.hxx                            |   57 
 svgio/inc/svgio/svgreader/svgimagenode.hxx                                   |   89 -
 svgio/inc/svgio/svgreader/svglinenode.hxx                                    |   78 -
 svgio/inc/svgio/svgreader/svgmarkernode.hxx                                  |  116 -
 svgio/inc/svgio/svgreader/svgmasknode.hxx                                    |   93 -
 svgio/inc/svgio/svgreader/svgnode.hxx                                        |  190 --
 svgio/inc/svgio/svgreader/svgpaint.hxx                                       |   58 
 svgio/inc/svgio/svgreader/svgpathnode.hxx                                    |   70 -
 svgio/inc/svgio/svgreader/svgpatternnode.hxx                                 |  119 -
 svgio/inc/svgio/svgreader/svgpolynode.hxx                                    |   71 -
 svgio/inc/svgio/svgreader/svgrectnode.hxx                                    |   88 -
 svgio/inc/svgio/svgreader/svgstyleattributes.hxx                             |  478 ------
 svgio/inc/svgio/svgreader/svgstylenode.hxx                                   |   64 
 svgio/inc/svgio/svgreader/svgsvgnode.hxx                                     |  104 -
 svgio/inc/svgio/svgreader/svgsymbolnode.hxx                                  |   59 
 svgio/inc/svgio/svgreader/svgtextnode.hxx                                    |   75 -
 svgio/inc/svgio/svgreader/svgtextpathnode.hxx                                |   77 -
 svgio/inc/svgio/svgreader/svgtitledescnode.hxx                               |   54 
 svgio/inc/svgio/svgreader/svgtoken.hxx                                       |  196 --
 svgio/inc/svgio/svgreader/svgtools.hxx                                       |  233 ---
 svgio/inc/svgio/svgreader/svgtrefnode.hxx                                    |   58 
 svgio/inc/svgio/svgreader/svgtspannode.hxx                                   |   59 
 svgio/inc/svgio/svgreader/svgusenode.hxx                                     |   80 -
 svgio/inc/svglinenode.hxx                                                    |   78 +
 svgio/inc/svgmarkernode.hxx                                                  |  116 +
 svgio/inc/svgmasknode.hxx                                                    |   93 +
 svgio/inc/svgnode.hxx                                                        |  190 ++
 svgio/inc/svgpaint.hxx                                                       |   58 
 svgio/inc/svgpathnode.hxx                                                    |   70 +
 svgio/inc/svgpatternnode.hxx                                                 |  119 +
 svgio/inc/svgpolynode.hxx                                                    |   71 +
 svgio/inc/svgrectnode.hxx                                                    |   88 +
 svgio/inc/svgstyleattributes.hxx                                             |  478 ++++++
 svgio/inc/svgstylenode.hxx                                                   |   64 
 svgio/inc/svgsvgnode.hxx                                                     |  104 +
 svgio/inc/svgsymbolnode.hxx                                                  |   59 
 svgio/inc/svgtextnode.hxx                                                    |   75 +
 svgio/inc/svgtextpathnode.hxx                                                |   77 +
 svgio/inc/svgtitledescnode.hxx                                               |   54 
 svgio/inc/svgtoken.hxx                                                       |  196 ++
 svgio/inc/svgtools.hxx                                                       |  233 +++
 svgio/inc/svgtrefnode.hxx                                                    |   58 
 svgio/inc/svgtspannode.hxx                                                   |   59 
 svgio/inc/svgusenode.hxx                                                     |   80 +
 svgio/source/svgreader/svganode.cxx                                          |    2 
 svgio/source/svgreader/svgcharacternode.cxx                                  |    4 
 svgio/source/svgreader/svgcirclenode.cxx                                     |    2 
 svgio/source/svgreader/svgclippathnode.cxx                                   |    2 
 svgio/source/svgreader/svgdocument.cxx                                       |    2 
 svgio/source/svgreader/svgdocumenthandler.cxx                                |   56 
 svgio/source/svgreader/svgellipsenode.cxx                                    |    2 
 svgio/source/svgreader/svggnode.cxx                                          |    2 
 svgio/source/svgreader/svggradientnode.cxx                                   |    6 
 svgio/source/svgreader/svggradientstopnode.cxx                               |    2 
 svgio/source/svgreader/svgimagenode.cxx                                      |    4 
 svgio/source/svgreader/svglinenode.cxx                                       |    2 
 svgio/source/svgreader/svgmarkernode.cxx                                     |    2 
 svgio/source/svgreader/svgmasknode.cxx                                       |    2 
 svgio/source/svgreader/svgnode.cxx                                           |    6 
 svgio/source/svgreader/svgpaint.cxx                                          |    2 
 svgio/source/svgreader/svgpathnode.cxx                                       |    2 
 svgio/source/svgreader/svgpatternnode.cxx                                    |    4 
 svgio/source/svgreader/svgpolynode.cxx                                       |    2 
 svgio/source/svgreader/svgrectnode.cxx                                       |    2 
 svgio/source/svgreader/svgstyleattributes.cxx                                |   16 
 svgio/source/svgreader/svgstylenode.cxx                                      |    4 
 svgio/source/svgreader/svgsvgnode.cxx                                        |    2 
 svgio/source/svgreader/svgsymbolnode.cxx                                     |    2 
 svgio/source/svgreader/svgtextnode.cxx                                       |   12 
 svgio/source/svgreader/svgtextpathnode.cxx                                   |   10 
 svgio/source/svgreader/svgtitledescnode.cxx                                  |    2 
 svgio/source/svgreader/svgtoken.cxx                                          |    2 
 svgio/source/svgreader/svgtools.cxx                                          |    4 
 svgio/source/svgreader/svgtrefnode.cxx                                       |    4 
 svgio/source/svgreader/svgtspannode.cxx                                      |    2 
 svgio/source/svgreader/svgusenode.cxx                                        |    4 
 svgio/source/svguno/xsvgparser.cxx                                           |    2 
 unodevtools/inc/options.hxx                                                  |   42 
 unodevtools/inc/unodevtools/options.hxx                                      |   42 
 unodevtools/source/skeletonmaker/skeletonmaker.cxx                           |    2 
 unodevtools/source/unodevtools/options.cxx                                   |    2 
 xmlsecurity/inc/biginteger.hxx                                               |   33 
 xmlsecurity/inc/certificatechooser.hxx                                       |   84 +
 xmlsecurity/inc/certificateviewer.hxx                                        |  150 ++
 xmlsecurity/inc/digitalsignaturesdialog.hxx                                  |  129 +
 xmlsecurity/inc/documentsignaturehelper.hxx                                  |  102 +
 xmlsecurity/inc/documentsignaturemanager.hxx                                 |    8 
 xmlsecurity/inc/global.hrc                                                   |   29 
 xmlsecurity/inc/macrosecurity.hxx                                            |  152 ++
 xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx                              |    4 
 xmlsecurity/inc/pch/precompiled_xsec_fw.hxx                                  |    2 
 xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx                              |    4 
 xmlsecurity/inc/sigstruct.hxx                                                |  102 +
 xmlsecurity/inc/xmlsec-wrapper.h                                             |   46 
 xmlsecurity/inc/xmlsecurity/biginteger.hxx                                   |   33 
 xmlsecurity/inc/xmlsecurity/certificatechooser.hxx                           |   84 -
 xmlsecurity/inc/xmlsecurity/certificateviewer.hxx                            |  150 --
 xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx                      |  129 -
 xmlsecurity/inc/xmlsecurity/documentsignaturehelper.hxx                      |  102 -
 xmlsecurity/inc/xmlsecurity/global.hrc                                       |   29 
 xmlsecurity/inc/xmlsecurity/macrosecurity.hxx                                |  152 --
 xmlsecurity/inc/xmlsecurity/sigstruct.hxx                                    |  102 -
 xmlsecurity/inc/xmlsecurity/xmlsec-wrapper.h                                 |   46 
 xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx                           |  198 --
 xmlsecurity/inc/xmlsecuritydllapi.h                                          |    6 
 xmlsecurity/inc/xmlsignaturehelper.hxx                                       |  198 ++
 xmlsecurity/qa/unit/signing/signing.cxx                                      |    4 
 xmlsecurity/source/component/documentdigitalsignatures.cxx                   |   12 
 xmlsecurity/source/component/documentdigitalsignatures.hxx                   |    2 
 xmlsecurity/source/component/warnbox.src                                     |    2 
 xmlsecurity/source/dialogs/certificatechooser.cxx                            |    6 
 xmlsecurity/source/dialogs/certificateviewer.cxx                             |    4 
 xmlsecurity/source/dialogs/dialogs.hrc                                       |    2 
 xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx                       |    8 
 xmlsecurity/source/dialogs/digitalsignaturesdialog.hrc                       |    2 
 xmlsecurity/source/dialogs/macrosecurity.cxx                                 |    8 
 xmlsecurity/source/helper/documentsignaturehelper.cxx                        |    2 
 xmlsecurity/source/helper/ooxmlsecexporter.hxx                               |    2 
 xmlsecurity/source/helper/xmlsignaturehelper.cxx                             |    4 
 xmlsecurity/source/helper/xmlsignaturehelper2.cxx                            |    2 
 xmlsecurity/source/helper/xsecctl.hxx                                        |    2 
 xmlsecurity/source/xmlsec/biginteger.cxx                                     |    4 
 xmlsecurity/source/xmlsec/errorcallback.cxx                                  |    2 
 xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx        |    4 
 xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx        |    2 
 xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx              |    2 
 xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx              |    2 
 xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx         |    2 
 xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx               |    2 
 xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx                |    4 
 xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx                |    2 
 xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx                      |    2 
 xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx                 |    2 
 xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx                       |    2 
 xmlsecurity/source/xmlsec/serialnumberadapter.cxx                            |    2 
 xmlsecurity/source/xmlsec/xmlstreamio.cxx                                    |    2 
 523 files changed, 17286 insertions(+), 17286 deletions(-)

New commits:
commit e0849330bc4875384704fe031d563f8971ca4d96
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri May 27 10:56:17 2016 +0300

    Get rid of unnecessary directory levels $D/inc/$D
    
    Change-Id: Ibf313b8948a493043006ebf3a8281487c1f67b48
    Reviewed-on: https://gerrit.libreoffice.org/25532
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx b/accessibility/inc/extended/AccessibleBrowseBox.hxx
similarity index 97%
rename from accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx
rename to accessibility/inc/extended/AccessibleBrowseBox.hxx
index 927b77a..0b1d2fe 100644
--- a/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBox.hxx
@@ -18,10 +18,10 @@
  */
 
 
-#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEBROWSEBOX_HXX
-#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEBROWSEBOX_HXX
+#ifndef INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEBROWSEBOX_HXX
+#define INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEBROWSEBOX_HXX
 
-#include <accessibility/extended/AccessibleBrowseBoxBase.hxx>
+#include <extended/AccessibleBrowseBoxBase.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/weakref.hxx>
 #include <svtools/accessibletableprovider.hxx>
diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx b/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx
similarity index 99%
rename from accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx
rename to accessibility/inc/extended/AccessibleBrowseBoxBase.hxx
index fe2035f..de94fa7 100644
--- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx
@@ -18,8 +18,8 @@
  */
 
 
-#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEBROWSEBOXBASE_HXX
-#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEBROWSEBOXBASE_HXX
+#ifndef INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEBROWSEBOXBASE_HXX
+#define INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEBROWSEBOXBASE_HXX
 
 #include <sal/config.h>
 
diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx b/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx
similarity index 91%
rename from accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx
rename to accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx
index 91a4c13..2533ded 100644
--- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx
@@ -16,13 +16,13 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEBROWSEBOXCHECKBOXCELL_HXX
-#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEBROWSEBOXCHECKBOXCELL_HXX
+#ifndef INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEBROWSEBOXCHECKBOXCELL_HXX
+#define INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEBROWSEBOXCHECKBOXCELL_HXX
 
 #include <com/sun/star/accessibility/XAccessibleValue.hpp>
 #include <com/sun/star/accessibility/XAccessible.hpp>
 #include <com/sun/star/lang/XTypeProvider.hpp>
-#include "accessibility/extended/accessiblebrowseboxcell.hxx"
+#include "extended/accessiblebrowseboxcell.hxx"
 #include <cppuhelper/implbase2.hxx>
 #include <tools/wintypes.hxx>
 
@@ -79,6 +79,6 @@ namespace accessibility
         void        SetChecked( bool _bChecked );
     };
 }
-#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEBROWSEBOXCHECKBOXCELL_HXX
+#endif // INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEBROWSEBOXCHECKBOXCELL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderBar.hxx b/accessibility/inc/extended/AccessibleBrowseBoxHeaderBar.hxx
similarity index 97%
rename from accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderBar.hxx
rename to accessibility/inc/extended/AccessibleBrowseBoxHeaderBar.hxx
index 72011d8..d9ea755 100644
--- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderBar.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBoxHeaderBar.hxx
@@ -18,10 +18,10 @@
  */
 
 
-#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEBROWSEBOXHEADERBAR_HXX
-#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEBROWSEBOXHEADERBAR_HXX
+#ifndef INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEBROWSEBOXHEADERBAR_HXX
+#define INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEBROWSEBOXHEADERBAR_HXX
 
-#include "accessibility/extended/AccessibleBrowseBoxTableBase.hxx"
+#include "extended/AccessibleBrowseBoxTableBase.hxx"
 #include <cppuhelper/implbase1.hxx>
 #include <com/sun/star/accessibility/XAccessibleSelection.hpp>
 
diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderCell.hxx b/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx
similarity index 90%
rename from accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderCell.hxx
rename to accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx
index 0f9f1ba..b616529 100644
--- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderCell.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx
@@ -16,10 +16,10 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEBROWSEBOXHEADERCELL_HXX
-#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEBROWSEBOXHEADERCELL_HXX
+#ifndef INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEBROWSEBOXHEADERCELL_HXX
+#define INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEBROWSEBOXHEADERCELL_HXX
 
-#include "accessibility/extended/AccessibleBrowseBoxBase.hxx"
+#include "extended/AccessibleBrowseBoxBase.hxx"
 
 namespace accessibility
 {
@@ -69,6 +69,6 @@ namespace accessibility
     };
 }
 
-#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEBROWSEBOXHEADERCELL_HXX
+#endif // INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEBROWSEBOXHEADERCELL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTable.hxx b/accessibility/inc/extended/AccessibleBrowseBoxTable.hxx
similarity index 96%
rename from accessibility/inc/accessibility/extended/AccessibleBrowseBoxTable.hxx
rename to accessibility/inc/extended/AccessibleBrowseBoxTable.hxx
index 2bd31e1..5cbe7df 100644
--- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTable.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBoxTable.hxx
@@ -18,10 +18,10 @@
  */
 
 
-#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEBROWSEBOXTABLE_HXX
-#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEBROWSEBOXTABLE_HXX
+#ifndef INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEBROWSEBOXTABLE_HXX
+#define INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEBROWSEBOXTABLE_HXX
 
-#include "accessibility/extended/AccessibleBrowseBoxTableBase.hxx"
+#include "extended/AccessibleBrowseBoxTableBase.hxx"
 
 
 namespace accessibility {
diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableBase.hxx b/accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx
similarity index 97%
rename from accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableBase.hxx
rename to accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx
index 1baa85f..9ea46eb 100644
--- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableBase.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx
@@ -18,10 +18,10 @@
  */
 
 
-#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEBROWSEBOXTABLEBASE_HXX
-#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEBROWSEBOXTABLEBASE_HXX
+#ifndef INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEBROWSEBOXTABLEBASE_HXX
+#define INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEBROWSEBOXTABLEBASE_HXX
 
-#include "accessibility/extended/AccessibleBrowseBoxBase.hxx"
+#include "extended/AccessibleBrowseBoxBase.hxx"
 #include <cppuhelper/implbase1.hxx>
 #include <com/sun/star/accessibility/XAccessibleTable.hpp>
 
diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableCell.hxx b/accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx
similarity index 95%
rename from accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableCell.hxx
rename to accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx
index 6c10d4e..0fb9388 100644
--- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableCell.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx
@@ -16,10 +16,10 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEBROWSEBOXTABLECELL_HXX
-#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEBROWSEBOXTABLECELL_HXX
+#ifndef INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEBROWSEBOXTABLECELL_HXX
+#define INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEBROWSEBOXTABLECELL_HXX
 
-#include "accessibility/extended/accessiblebrowseboxcell.hxx"
+#include "extended/accessiblebrowseboxcell.hxx"
 #include <comphelper/accessibletexthelper.hxx>
 #include <cppuhelper/implbase2.hxx>
 
@@ -128,6 +128,6 @@ namespace accessibility
         virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
     };
 }
-#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEBROWSEBOXTABLECELL_HXX
+#endif // INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEBROWSEBOXTABLECELL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx b/accessibility/inc/extended/AccessibleGridControl.hxx
similarity index 96%
rename from accessibility/inc/accessibility/extended/AccessibleGridControl.hxx
rename to accessibility/inc/extended/AccessibleGridControl.hxx
index 865f825..a2f19e5 100644
--- a/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx
+++ b/accessibility/inc/extended/AccessibleGridControl.hxx
@@ -17,11 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEGRIDCONTROL_HXX
-#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEGRIDCONTROL_HXX
+#ifndef INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEGRIDCONTROL_HXX
+#define INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEGRIDCONTROL_HXX
 
-#include <accessibility/extended/AccessibleGridControlBase.hxx>
-#include <accessibility/extended/AccessibleGridControlTable.hxx>
+#include <extended/AccessibleGridControlBase.hxx>
+#include <extended/AccessibleGridControlTable.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/weakref.hxx>
 #include <svtools/accessibletable.hxx>
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx b/accessibility/inc/extended/AccessibleGridControlBase.hxx
similarity index 98%
rename from accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx
rename to accessibility/inc/extended/AccessibleGridControlBase.hxx
index b5ba1bd..978baf9 100644
--- a/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx
+++ b/accessibility/inc/extended/AccessibleGridControlBase.hxx
@@ -18,8 +18,8 @@
  */
 
 
-#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEGRIDCONTROLBASE_HXX
-#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEGRIDCONTROLBASE_HXX
+#ifndef INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEGRIDCONTROLBASE_HXX
+#define INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEGRIDCONTROLBASE_HXX
 
 #include <svtools/accessibletable.hxx>
 #include <rtl/ustring.hxx>
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx b/accessibility/inc/extended/AccessibleGridControlHeader.hxx
similarity index 95%
rename from accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx
rename to accessibility/inc/extended/AccessibleGridControlHeader.hxx
index 5f4039f..882f87a 100644
--- a/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx
+++ b/accessibility/inc/extended/AccessibleGridControlHeader.hxx
@@ -18,11 +18,11 @@
  */
 
 
-#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEGRIDCONTROLHEADER_HXX
-#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEGRIDCONTROLHEADER_HXX
+#ifndef INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEGRIDCONTROLHEADER_HXX
+#define INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEGRIDCONTROLHEADER_HXX
 
-#include <accessibility/extended/AccessibleGridControlHeaderCell.hxx>
-#include <accessibility/extended/AccessibleGridControlTableBase.hxx>
+#include <extended/AccessibleGridControlHeaderCell.hxx>
+#include <extended/AccessibleGridControlTableBase.hxx>
 
 namespace accessibility {
 
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlHeaderCell.hxx b/accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx
similarity index 91%
rename from accessibility/inc/accessibility/extended/AccessibleGridControlHeaderCell.hxx
rename to accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx
index ad1449d..82272a0 100644
--- a/accessibility/inc/accessibility/extended/AccessibleGridControlHeaderCell.hxx
+++ b/accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx
@@ -16,10 +16,10 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEGRIDCONTROLHEADERCELL_HXX
-#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEGRIDCONTROLHEADERCELL_HXX
+#ifndef INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEGRIDCONTROLHEADERCELL_HXX
+#define INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEGRIDCONTROLHEADERCELL_HXX
 
-#include "accessibility/extended/AccessibleGridControlTableCell.hxx"
+#include "extended/AccessibleGridControlTableCell.hxx"
 
 namespace accessibility
 {
@@ -81,6 +81,6 @@ namespace accessibility
     };
 }
 
-#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEGRIDCONTROLHEADERCELL_HXX
+#endif // INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEGRIDCONTROLHEADERCELL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx b/accessibility/inc/extended/AccessibleGridControlTable.hxx
similarity index 96%
rename from accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx
rename to accessibility/inc/extended/AccessibleGridControlTable.hxx
index 22c71db..e784544 100644
--- a/accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx
+++ b/accessibility/inc/extended/AccessibleGridControlTable.hxx
@@ -18,13 +18,13 @@
  */
 
 
-#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEGRIDCONTROLTABLE_HXX
-#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEGRIDCONTROLTABLE_HXX
+#ifndef INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEGRIDCONTROLTABLE_HXX
+#define INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEGRIDCONTROLTABLE_HXX
 
-#include "accessibility/extended/AccessibleGridControlTableBase.hxx"
+#include "extended/AccessibleGridControlTableBase.hxx"
 #include <cppuhelper/implbase1.hxx>
 #include <com/sun/star/accessibility/XAccessibleSelection.hpp>
-#include <accessibility/extended/AccessibleGridControlTableCell.hxx>
+#include <extended/AccessibleGridControlTableCell.hxx>
 
 
 namespace accessibility {
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx b/accessibility/inc/extended/AccessibleGridControlTableBase.hxx
similarity index 97%
rename from accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx
rename to accessibility/inc/extended/AccessibleGridControlTableBase.hxx
index e2311aa..e818cdd 100644
--- a/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx
+++ b/accessibility/inc/extended/AccessibleGridControlTableBase.hxx
@@ -18,10 +18,10 @@
  */
 
 
-#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEGRIDCONTROLTABLEBASE_HXX
-#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEGRIDCONTROLTABLEBASE_HXX
+#ifndef INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEGRIDCONTROLTABLEBASE_HXX
+#define INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEGRIDCONTROLTABLEBASE_HXX
 
-#include "accessibility/extended/AccessibleGridControlBase.hxx"
+#include "extended/AccessibleGridControlBase.hxx"
 #include <cppuhelper/implbase1.hxx>
 #include <com/sun/star/accessibility/XAccessibleTable.hpp>
 
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlTableCell.hxx b/accessibility/inc/extended/AccessibleGridControlTableCell.hxx
similarity index 96%
rename from accessibility/inc/accessibility/extended/AccessibleGridControlTableCell.hxx
rename to accessibility/inc/extended/AccessibleGridControlTableCell.hxx
index f03df43..489f695 100644
--- a/accessibility/inc/accessibility/extended/AccessibleGridControlTableCell.hxx
+++ b/accessibility/inc/extended/AccessibleGridControlTableCell.hxx
@@ -16,12 +16,12 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEGRIDCONTROLTABLECELL_HXX
-#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEGRIDCONTROLTABLECELL_HXX
+#ifndef INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEGRIDCONTROLTABLECELL_HXX
+#define INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEGRIDCONTROLTABLECELL_HXX
 
 #include <comphelper/accessibletexthelper.hxx>
 #include <cppuhelper/implbase2.hxx>
-#include "accessibility/extended/AccessibleGridControlBase.hxx"
+#include "extended/AccessibleGridControlBase.hxx"
 #include <svtools/accessibletable.hxx>
 
 namespace accessibility
@@ -149,6 +149,6 @@ namespace accessibility
         virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
     };
 }
-#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEGRIDCONTROLTABLECELL_HXX
+#endif // INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEGRIDCONTROLTABLECELL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/extended/accessiblebrowseboxcell.hxx b/accessibility/inc/extended/accessiblebrowseboxcell.hxx
similarity index 89%
rename from accessibility/inc/accessibility/extended/accessiblebrowseboxcell.hxx
rename to accessibility/inc/extended/accessiblebrowseboxcell.hxx
index bafb059..e39739e 100644
--- a/accessibility/inc/accessibility/extended/accessiblebrowseboxcell.hxx
+++ b/accessibility/inc/extended/accessiblebrowseboxcell.hxx
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEBROWSEBOXCELL_HXX
-#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEBROWSEBOXCELL_HXX
+#ifndef INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEBROWSEBOXCELL_HXX
+#define INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEBROWSEBOXCELL_HXX
 
-#include "accessibility/extended/AccessibleBrowseBoxBase.hxx"
+#include "extended/AccessibleBrowseBoxBase.hxx"
 #include <svtools/AccessibleBrowseBoxObjType.hxx>
 
 
@@ -72,6 +72,6 @@ namespace accessibility
 }   // namespace accessibility
 
 
-#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEBROWSEBOXCELL_HXX
+#endif // INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEBROWSEBOXCELL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/extended/accessibleeditbrowseboxcell.hxx b/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx
similarity index 96%
rename from accessibility/inc/accessibility/extended/accessibleeditbrowseboxcell.hxx
rename to accessibility/inc/extended/accessibleeditbrowseboxcell.hxx
index 8ec563a..24e98b7 100644
--- a/accessibility/inc/accessibility/extended/accessibleeditbrowseboxcell.hxx
+++ b/accessibility/inc/extended/accessibleeditbrowseboxcell.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 INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEEDITBROWSEBOXCELL_HXX
-#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEEDITBROWSEBOXCELL_HXX
+#ifndef INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEEDITBROWSEBOXCELL_HXX
+#define INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEEDITBROWSEBOXCELL_HXX
 
 #include "accessiblebrowseboxcell.hxx"
 #include <com/sun/star/accessibility/XAccessibleAction.hpp>
@@ -137,6 +137,6 @@ namespace accessibility
     };
 }
 
-#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEEDITBROWSEBOXCELL_HXX
+#endif // INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEEDITBROWSEBOXCELL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/extended/accessibleiconchoicectrl.hxx b/accessibility/inc/extended/accessibleiconchoicectrl.hxx
similarity index 95%
rename from accessibility/inc/accessibility/extended/accessibleiconchoicectrl.hxx
rename to accessibility/inc/extended/accessibleiconchoicectrl.hxx
index 0bcaea6..837ee7f 100644
--- a/accessibility/inc/accessibility/extended/accessibleiconchoicectrl.hxx
+++ b/accessibility/inc/extended/accessibleiconchoicectrl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEICONCHOICECTRL_HXX
-#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEICONCHOICECTRL_HXX
+#ifndef INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEICONCHOICECTRL_HXX
+#define INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEICONCHOICECTRL_HXX
 
 #include <com/sun/star/accessibility/XAccessibleSelection.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
@@ -105,6 +105,6 @@ namespace accessibility
 }// namespace accessibility
 
 
-#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEICONCHOICECTRL_HXX
+#endif // INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEICONCHOICECTRL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx b/accessibility/inc/extended/accessibleiconchoicectrlentry.hxx
similarity index 97%
rename from accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx
rename to accessibility/inc/extended/accessibleiconchoicectrlentry.hxx
index 180aedf..f1fea9f 100644
--- a/accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx
+++ b/accessibility/inc/extended/accessibleiconchoicectrlentry.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEICONCHOICECTRLENTRY_HXX
-#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEICONCHOICECTRLENTRY_HXX
+#ifndef INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEICONCHOICECTRLENTRY_HXX
+#define INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEICONCHOICECTRLENTRY_HXX
 
 #include <deque>
 #include <com/sun/star/accessibility/XAccessible.hpp>
@@ -186,6 +186,6 @@ namespace accessibility
 }// namespace accessibility
 
 
-#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEICONCHOICECTRLENTRY_HXX
+#endif // INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEICONCHOICECTRLENTRY_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/extended/accessiblelistbox.hxx b/accessibility/inc/extended/accessiblelistbox.hxx
similarity index 96%
rename from accessibility/inc/accessibility/extended/accessiblelistbox.hxx
rename to accessibility/inc/extended/accessiblelistbox.hxx
index a6e0c5c..fbdc250 100644
--- a/accessibility/inc/accessibility/extended/accessiblelistbox.hxx
+++ b/accessibility/inc/extended/accessiblelistbox.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLELISTBOX_HXX
-#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLELISTBOX_HXX
+#ifndef INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLELISTBOX_HXX
+#define INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLELISTBOX_HXX
 
 #include <com/sun/star/accessibility/XAccessibleSelection.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
@@ -128,6 +128,6 @@ private:
 }// namespace accessibility
 
 
-#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLELISTBOX_HXX
+#endif // INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLELISTBOX_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/extended/accessiblelistboxentry.hxx b/accessibility/inc/extended/accessiblelistboxentry.hxx
similarity index 98%
rename from accessibility/inc/accessibility/extended/accessiblelistboxentry.hxx
rename to accessibility/inc/extended/accessiblelistboxentry.hxx
index 3ce8741..bfcbbfc 100644
--- a/accessibility/inc/accessibility/extended/accessiblelistboxentry.hxx
+++ b/accessibility/inc/extended/accessiblelistboxentry.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLELISTBOXENTRY_HXX
-#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLELISTBOXENTRY_HXX
+#ifndef INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLELISTBOXENTRY_HXX
+#define INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLELISTBOXENTRY_HXX
 
 #include <deque>
 #include <com/sun/star/accessibility/XAccessible.hpp>
@@ -37,7 +37,7 @@
 #include <comphelper/accessibletexthelper.hxx>
 #include <svtools/treelistentry.hxx>
 #include <tools/gen.hxx>
-#include "accessibility/extended/listboxaccessible.hxx"
+#include "extended/listboxaccessible.hxx"
 
 // forward ---------------------------------------------------------------
 
@@ -225,6 +225,6 @@ namespace accessibility
 }// namespace accessibility
 
 
-#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLELISTBOXENTRY_HXX
+#endif // INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLELISTBOXENTRY_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/extended/accessibletabbar.hxx b/accessibility/inc/extended/accessibletabbar.hxx
similarity index 94%
rename from accessibility/inc/accessibility/extended/accessibletabbar.hxx
rename to accessibility/inc/extended/accessibletabbar.hxx
index 60c8d52..b248839 100644
--- a/accessibility/inc/accessibility/extended/accessibletabbar.hxx
+++ b/accessibility/inc/extended/accessibletabbar.hxx
@@ -17,13 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLETABBAR_HXX
-#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLETABBAR_HXX
+#ifndef INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLETABBAR_HXX
+#define INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLETABBAR_HXX
 
 #include <com/sun/star/accessibility/XAccessible.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <cppuhelper/implbase2.hxx>
-#include "accessibility/extended/accessibletabbarbase.hxx"
+#include "extended/accessibletabbarbase.hxx"
 
 #include <vector>
 
@@ -107,6 +107,6 @@ namespace accessibility
 }   // namespace accessibility
 
 
-#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLETABBAR_HXX
+#endif // INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLETABBAR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/extended/accessibletabbarbase.hxx b/accessibility/inc/extended/accessibletabbarbase.hxx
similarity index 91%
rename from accessibility/inc/accessibility/extended/accessibletabbarbase.hxx
rename to accessibility/inc/extended/accessibletabbarbase.hxx
index 40fadf7..2c2d738 100644
--- a/accessibility/inc/accessibility/extended/accessibletabbarbase.hxx
+++ b/accessibility/inc/extended/accessibletabbarbase.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLETABBARBASE_HXX
-#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLETABBARBASE_HXX
+#ifndef INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLETABBARBASE_HXX
+#define INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLETABBARBASE_HXX
 
 #include <comphelper/accessiblecomponenthelper.hxx>
 #include <tools/link.hxx>
diff --git a/accessibility/inc/accessibility/extended/accessibletabbarpage.hxx b/accessibility/inc/extended/accessibletabbarpage.hxx
similarity index 95%
rename from accessibility/inc/accessibility/extended/accessibletabbarpage.hxx
rename to accessibility/inc/extended/accessibletabbarpage.hxx
index 8904a14..795aebc 100644
--- a/accessibility/inc/accessibility/extended/accessibletabbarpage.hxx
+++ b/accessibility/inc/extended/accessibletabbarpage.hxx
@@ -17,13 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLETABBARPAGE_HXX
-#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLETABBARPAGE_HXX
+#ifndef INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLETABBARPAGE_HXX
+#define INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLETABBARPAGE_HXX
 
 #include <com/sun/star/accessibility/XAccessible.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <cppuhelper/implbase2.hxx>
-#include "accessibility/extended/accessibletabbarbase.hxx"
+#include "extended/accessibletabbarbase.hxx"
 
 #include <vector>
 
@@ -123,6 +123,6 @@ namespace accessibility
 }   // namespace accessibility
 
 
-#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLETABBARPAGE_HXX
+#endif // INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLETABBARPAGE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/extended/accessibletabbarpagelist.hxx b/accessibility/inc/extended/accessibletabbarpagelist.hxx
similarity index 95%
rename from accessibility/inc/accessibility/extended/accessibletabbarpagelist.hxx
rename to accessibility/inc/extended/accessibletabbarpagelist.hxx
index a9d7556..e46d73f 100644
--- a/accessibility/inc/accessibility/extended/accessibletabbarpagelist.hxx
+++ b/accessibility/inc/extended/accessibletabbarpagelist.hxx
@@ -17,14 +17,14 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLETABBARPAGELIST_HXX
-#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLETABBARPAGELIST_HXX
+#ifndef INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLETABBARPAGELIST_HXX
+#define INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLETABBARPAGELIST_HXX
 
 #include <com/sun/star/accessibility/XAccessible.hpp>
 #include <com/sun/star/accessibility/XAccessibleSelection.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <cppuhelper/implbase3.hxx>
-#include "accessibility/extended/accessibletabbarbase.hxx"
+#include "extended/accessibletabbarbase.hxx"
 
 #include <vector>
 
@@ -127,6 +127,6 @@ namespace accessibility
 }   // namespace accessibility
 
 
-#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLETABBARPAGELIST_HXX
+#endif // INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLETABBARPAGELIST_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/extended/accessibletablistbox.hxx b/accessibility/inc/extended/accessibletablistbox.hxx
similarity index 93%
rename from accessibility/inc/accessibility/extended/accessibletablistbox.hxx
rename to accessibility/inc/extended/accessibletablistbox.hxx
index bfc9e2a..b172099 100644
--- a/accessibility/inc/accessibility/extended/accessibletablistbox.hxx
+++ b/accessibility/inc/extended/accessibletablistbox.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLETABLISTBOX_HXX
-#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLETABLISTBOX_HXX
+#ifndef INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLETABLISTBOX_HXX
+#define INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLETABLISTBOX_HXX
 
 #include "AccessibleBrowseBox.hxx"
 #include <cppuhelper/implbase1.hxx>
@@ -99,6 +99,6 @@ protected:
 } // namespace accessibility
 
 
-#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLETABLISTBOX_HXX
+#endif // INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLETABLISTBOX_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/extended/accessibletablistboxtable.hxx b/accessibility/inc/extended/accessibletablistboxtable.hxx
similarity index 94%
rename from accessibility/inc/accessibility/extended/accessibletablistboxtable.hxx
rename to accessibility/inc/extended/accessibletablistboxtable.hxx
index 4c79a99..feb9aad 100644
--- a/accessibility/inc/accessibility/extended/accessibletablistboxtable.hxx
+++ b/accessibility/inc/extended/accessibletablistboxtable.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLETABLISTBOXTABLE_HXX
-#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLETABLISTBOXTABLE_HXX
+#ifndef INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLETABLISTBOXTABLE_HXX
+#define INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLETABLISTBOXTABLE_HXX
 
 #include "AccessibleBrowseBoxTable.hxx"
 #include <comphelper/uno3.hxx>
@@ -104,6 +104,6 @@ public:
 } // namespace accessibility
 
 
-#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLETABLISTBOXTABLE_HXX
+#endif // INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLETABLISTBOXTABLE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/extended/listboxaccessible.hxx b/accessibility/inc/extended/listboxaccessible.hxx
similarity index 91%
rename from accessibility/inc/accessibility/extended/listboxaccessible.hxx
rename to accessibility/inc/extended/listboxaccessible.hxx
index ed6e0a2..ef673d9 100644
--- a/accessibility/inc/accessibility/extended/listboxaccessible.hxx
+++ b/accessibility/inc/extended/listboxaccessible.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_LISTBOXACCESSIBLE_HXX
-#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_LISTBOXACCESSIBLE_HXX
+#ifndef INCLUDED_ACCESSIBILITY_INC_EXTENDED_LISTBOXACCESSIBLE_HXX
+#define INCLUDED_ACCESSIBILITY_INC_EXTENDED_LISTBOXACCESSIBLE_HXX
 
 #include <com/sun/star/uno/RuntimeException.hpp>
 #include <tools/link.hxx>
@@ -79,6 +79,6 @@ namespace accessibility
 }   // namespace accessibility
 
 
-#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_LISTBOXACCESSIBLE_HXX
+#endif // INCLUDED_ACCESSIBILITY_INC_EXTENDED_LISTBOXACCESSIBLE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx b/accessibility/inc/extended/textwindowaccessibility.hxx
similarity index 99%
rename from accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
rename to accessibility/inc/extended/textwindowaccessibility.hxx
index 6d10161..70fa94f 100644
--- a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
+++ b/accessibility/inc/extended/textwindowaccessibility.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_TEXTWINDOWACCESSIBILITY_HXX
-#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_TEXTWINDOWACCESSIBILITY_HXX
+#ifndef INCLUDED_ACCESSIBILITY_INC_EXTENDED_TEXTWINDOWACCESSIBILITY_HXX
+#define INCLUDED_ACCESSIBILITY_INC_EXTENDED_TEXTWINDOWACCESSIBILITY_HXX
 
 #include <toolkit/awt/vclxaccessiblecomponent.hxx>
 #include <svl/lstner.hxx>
@@ -688,6 +688,6 @@ private:
 
 }
 
-#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_TEXTWINDOWACCESSIBILITY_HXX
+#endif // INCLUDED_ACCESSIBILITY_INC_EXTENDED_TEXTWINDOWACCESSIBILITY_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx b/accessibility/inc/helper/IComboListBoxHelper.hxx
similarity index 92%
rename from accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx
rename to accessibility/inc/helper/IComboListBoxHelper.hxx
index 7777e92..8d528be 100644
--- a/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx
+++ b/accessibility/inc/helper/IComboListBoxHelper.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 INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_HELPER_ICOMBOLISTBOXHELPER_HXX
-#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_HELPER_ICOMBOLISTBOXHELPER_HXX
+#ifndef INCLUDED_ACCESSIBILITY_INC_HELPER_ICOMBOLISTBOXHELPER_HXX
+#define INCLUDED_ACCESSIBILITY_INC_HELPER_ICOMBOLISTBOXHELPER_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
 
@@ -63,7 +63,7 @@ namespace accessibility
                                 GetClipboard() = 0;
     };
 }
-#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_HELPER_ICOMBOLISTBOXHELPER_HXX
+#endif // INCLUDED_ACCESSIBILITY_INC_HELPER_ICOMBOLISTBOXHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
 
diff --git a/accessibility/inc/accessibility/helper/accessiblestrings.hrc b/accessibility/inc/helper/accessiblestrings.hrc
similarity index 100%
rename from accessibility/inc/accessibility/helper/accessiblestrings.hrc
rename to accessibility/inc/helper/accessiblestrings.hrc
diff --git a/accessibility/inc/accessibility/helper/accresmgr.hxx b/accessibility/inc/helper/accresmgr.hxx
similarity index 88%
rename from accessibility/inc/accessibility/helper/accresmgr.hxx
rename to accessibility/inc/helper/accresmgr.hxx
index fe8ae62..38ceaa1 100644
--- a/accessibility/inc/accessibility/helper/accresmgr.hxx
+++ b/accessibility/inc/helper/accresmgr.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_HELPER_ACCRESMGR_HXX
-#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_HELPER_ACCRESMGR_HXX
+#ifndef INCLUDED_ACCESSIBILITY_INC_HELPER_ACCRESMGR_HXX
+#define INCLUDED_ACCESSIBILITY_INC_HELPER_ACCRESMGR_HXX
 
 #include <rtl/ustring.hxx>
 
@@ -61,6 +61,6 @@ public:
 
 }
 
-#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_HELPER_ACCRESMGR_HXX
+#endif // INCLUDED_ACCESSIBILITY_INC_HELPER_ACCRESMGR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/helper/characterattributeshelper.hxx b/accessibility/inc/helper/characterattributeshelper.hxx
similarity index 86%
rename from accessibility/inc/accessibility/helper/characterattributeshelper.hxx
rename to accessibility/inc/helper/characterattributeshelper.hxx
index 3ed820b..6b679a9 100644
--- a/accessibility/inc/accessibility/helper/characterattributeshelper.hxx
+++ b/accessibility/inc/helper/characterattributeshelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_HELPER_CHARACTERATTRIBUTESHELPER_HXX
-#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_HELPER_CHARACTERATTRIBUTESHELPER_HXX
+#ifndef INCLUDED_ACCESSIBILITY_INC_HELPER_CHARACTERATTRIBUTESHELPER_HXX
+#define INCLUDED_ACCESSIBILITY_INC_HELPER_CHARACTERATTRIBUTESHELPER_HXX
 
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
@@ -47,6 +47,6 @@ public:
     css::uno::Sequence< css::beans::PropertyValue > GetCharacterAttributes( const css::uno::Sequence< OUString >& aRequestedAttributes );
 };
 
-#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_HELPER_CHARACTERATTRIBUTESHELPER_HXX
+#endif // INCLUDED_ACCESSIBILITY_INC_HELPER_CHARACTERATTRIBUTESHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/helper/listboxhelper.hxx b/accessibility/inc/helper/listboxhelper.hxx
similarity index 95%
rename from accessibility/inc/accessibility/helper/listboxhelper.hxx
rename to accessibility/inc/helper/listboxhelper.hxx
index 1dec33d..9236d32 100644
--- a/accessibility/inc/accessibility/helper/listboxhelper.hxx
+++ b/accessibility/inc/helper/listboxhelper.hxx
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_HELPER_LISTBOXHELPER_HXX
-#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_HELPER_LISTBOXHELPER_HXX
+#ifndef INCLUDED_ACCESSIBILITY_INC_HELPER_LISTBOXHELPER_HXX
+#define INCLUDED_ACCESSIBILITY_INC_HELPER_LISTBOXHELPER_HXX
 
-#include <accessibility/helper/IComboListBoxHelper.hxx>
+#include <helper/IComboListBoxHelper.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/combobox.hxx>
 #include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
@@ -184,6 +184,6 @@ public:
 
 };
 
-#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_HELPER_LISTBOXHELPER_HXX
+#endif // INCLUDED_ACCESSIBILITY_INC_HELPER_LISTBOXHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/pch/precompiled_acc.hxx b/accessibility/inc/pch/precompiled_acc.hxx
index c0ab3af..f0c4ba2 100644
--- a/accessibility/inc/pch/precompiled_acc.hxx
+++ b/accessibility/inc/pch/precompiled_acc.hxx
@@ -337,21 +337,21 @@
 #include <unotools/fontdefs.hxx>
 #include <unotools/options.hxx>
 #include <unotools/unotoolsdllapi.h>
-#include <accessibility/extended/AccessibleBrowseBox.hxx>
-#include <accessibility/extended/AccessibleBrowseBoxBase.hxx>
-#include <accessibility/extended/AccessibleBrowseBoxTableBase.hxx>
-#include <accessibility/extended/AccessibleGridControl.hxx>
-#include <accessibility/extended/AccessibleGridControlBase.hxx>
-#include <accessibility/extended/AccessibleGridControlTableCell.hxx>
-#include <accessibility/extended/accessibletabbarbase.hxx>
-#include <accessibility/helper/accresmgr.hxx>
-#include <accessibility/helper/characterattributeshelper.hxx>
-#include <accessibility/helper/listboxhelper.hxx>
-#include <accessibility/standard/accessiblemenubasecomponent.hxx>
-#include <accessibility/standard/accessiblemenuitemcomponent.hxx>
-#include <accessibility/standard/vclxaccessiblebox.hxx>
-#include <accessibility/standard/vclxaccessibleedit.hxx>
-#include <accessibility/standard/vclxaccessiblelist.hxx>
-#include <accessibility/standard/vclxaccessibletextcomponent.hxx>
+#include <extended/AccessibleBrowseBox.hxx>
+#include <extended/AccessibleBrowseBoxBase.hxx>
+#include <extended/AccessibleBrowseBoxTableBase.hxx>
+#include <extended/AccessibleGridControl.hxx>
+#include <extended/AccessibleGridControlBase.hxx>
+#include <extended/AccessibleGridControlTableCell.hxx>
+#include <extended/accessibletabbarbase.hxx>
+#include <helper/accresmgr.hxx>
+#include <helper/characterattributeshelper.hxx>
+#include <helper/listboxhelper.hxx>
+#include <standard/accessiblemenubasecomponent.hxx>
+#include <standard/accessiblemenuitemcomponent.hxx>
+#include <standard/vclxaccessiblebox.hxx>
+#include <standard/vclxaccessibleedit.hxx>
+#include <standard/vclxaccessiblelist.hxx>
+#include <standard/vclxaccessibletextcomponent.hxx>
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/standard/accessiblemenubasecomponent.hxx b/accessibility/inc/standard/accessiblemenubasecomponent.hxx
similarity index 94%
rename from accessibility/inc/accessibility/standard/accessiblemenubasecomponent.hxx
rename to accessibility/inc/standard/accessiblemenubasecomponent.hxx
index 11cbf87..167c957 100644
--- a/accessibility/inc/accessibility/standard/accessiblemenubasecomponent.hxx
+++ b/accessibility/inc/standard/accessiblemenubasecomponent.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_ACCESSIBLEMENUBASECOMPONENT_HXX
-#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_ACCESSIBLEMENUBASECOMPONENT_HXX
+#ifndef INCLUDED_ACCESSIBILITY_INC_STANDARD_ACCESSIBLEMENUBASECOMPONENT_HXX
+#define INCLUDED_ACCESSIBILITY_INC_STANDARD_ACCESSIBLEMENUBASECOMPONENT_HXX
 
 #include <com/sun/star/accessibility/XAccessible.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -140,6 +140,6 @@ public:
     virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) throw (css::uno::RuntimeException, std::exception) override;
 };
 
-#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_ACCESSIBLEMENUBASECOMPONENT_HXX
+#endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_ACCESSIBLEMENUBASECOMPONENT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/standard/accessiblemenucomponent.hxx b/accessibility/inc/standard/accessiblemenucomponent.hxx
similarity index 94%
rename from accessibility/inc/accessibility/standard/accessiblemenucomponent.hxx
rename to accessibility/inc/standard/accessiblemenucomponent.hxx
index 8597560..eb570e07 100644
--- a/accessibility/inc/accessibility/standard/accessiblemenucomponent.hxx
+++ b/accessibility/inc/standard/accessiblemenucomponent.hxx
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_ACCESSIBLEMENUCOMPONENT_HXX
-#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_ACCESSIBLEMENUCOMPONENT_HXX
+#ifndef INCLUDED_ACCESSIBILITY_INC_STANDARD_ACCESSIBLEMENUCOMPONENT_HXX
+#define INCLUDED_ACCESSIBILITY_INC_STANDARD_ACCESSIBLEMENUCOMPONENT_HXX
 
-#include <accessibility/standard/accessiblemenubasecomponent.hxx>
+#include <standard/accessiblemenubasecomponent.hxx>
 #include <com/sun/star/accessibility/XAccessibleSelection.hpp>
 #include <cppuhelper/implbase1.hxx>
 
@@ -84,6 +84,6 @@ public:
     virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
 };
 
-#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_ACCESSIBLEMENUCOMPONENT_HXX
+#endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_ACCESSIBLEMENUCOMPONENT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/standard/accessiblemenuitemcomponent.hxx b/accessibility/inc/standard/accessiblemenuitemcomponent.hxx
similarity index 93%
rename from accessibility/inc/accessibility/standard/accessiblemenuitemcomponent.hxx
rename to accessibility/inc/standard/accessiblemenuitemcomponent.hxx
index 2bcf01f..84d0cc2 100644
--- a/accessibility/inc/accessibility/standard/accessiblemenuitemcomponent.hxx
+++ b/accessibility/inc/standard/accessiblemenuitemcomponent.hxx
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_ACCESSIBLEMENUITEMCOMPONENT_HXX
-#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_ACCESSIBLEMENUITEMCOMPONENT_HXX
+#ifndef INCLUDED_ACCESSIBILITY_INC_STANDARD_ACCESSIBLEMENUITEMCOMPONENT_HXX
+#define INCLUDED_ACCESSIBILITY_INC_STANDARD_ACCESSIBLEMENUITEMCOMPONENT_HXX
 
-#include <accessibility/standard/accessiblemenubasecomponent.hxx>
+#include <standard/accessiblemenubasecomponent.hxx>
 
 
 //  class OAccessibleMenuItemComponent
@@ -85,6 +85,6 @@ public:
     virtual OUString SAL_CALL getToolTipText(  ) throw (css::uno::RuntimeException, std::exception) override;
 };
 
-#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_ACCESSIBLEMENUITEMCOMPONENT_HXX
+#endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_ACCESSIBLEMENUITEMCOMPONENT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblebox.hxx b/accessibility/inc/standard/vclxaccessiblebox.hxx
similarity index 96%
rename from accessibility/inc/accessibility/standard/vclxaccessiblebox.hxx
rename to accessibility/inc/standard/vclxaccessiblebox.hxx
index 7fec38d..1943f1e 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblebox.hxx
+++ b/accessibility/inc/standard/vclxaccessiblebox.hxx
@@ -17,11 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLEBOX_HXX
-#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLEBOX_HXX
+#ifndef INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEBOX_HXX
+#define INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEBOX_HXX
 
 #include <map>
-#include <accessibility/standard/vclxaccessibleedit.hxx>
+#include <standard/vclxaccessibleedit.hxx>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/accessibility/XAccessibleKeyBinding.hpp>
 #include <com/sun/star/accessibility/XAccessibleValue.hpp>
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblebutton.hxx b/accessibility/inc/standard/vclxaccessiblebutton.hxx
similarity index 91%
rename from accessibility/inc/accessibility/standard/vclxaccessiblebutton.hxx
rename to accessibility/inc/standard/vclxaccessiblebutton.hxx
index 8f0a8f1..e5f4a12 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblebutton.hxx
+++ b/accessibility/inc/standard/vclxaccessiblebutton.hxx
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLEBUTTON_HXX
-#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLEBUTTON_HXX
+#ifndef INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEBUTTON_HXX
+#define INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEBUTTON_HXX
 
-#include <accessibility/standard/vclxaccessibletextcomponent.hxx>
+#include <standard/vclxaccessibletextcomponent.hxx>
 
 #include <com/sun/star/accessibility/XAccessibleAction.hpp>
 #include <com/sun/star/accessibility/XAccessibleValue.hpp>
@@ -73,6 +73,6 @@ public:
     virtual css::uno::Any SAL_CALL getMinimumValue(  ) throw (css::uno::RuntimeException, std::exception) override;
 };
 
-#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLEBUTTON_HXX
+#endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEBUTTON_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblecheckbox.hxx b/accessibility/inc/standard/vclxaccessiblecheckbox.hxx
similarity index 91%
rename from accessibility/inc/accessibility/standard/vclxaccessiblecheckbox.hxx
rename to accessibility/inc/standard/vclxaccessiblecheckbox.hxx
index db0f699..ca406a2 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblecheckbox.hxx
+++ b/accessibility/inc/standard/vclxaccessiblecheckbox.hxx
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLECHECKBOX_HXX
-#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLECHECKBOX_HXX
+#ifndef INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLECHECKBOX_HXX
+#define INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLECHECKBOX_HXX
 
-#include <accessibility/standard/vclxaccessibletextcomponent.hxx>
+#include <standard/vclxaccessibletextcomponent.hxx>
 
 #include <com/sun/star/accessibility/XAccessibleAction.hpp>
 #include <com/sun/star/accessibility/XAccessibleValue.hpp>
@@ -80,6 +80,6 @@ public:
     virtual css::uno::Any SAL_CALL getMinimumValue(  ) throw (css::uno::RuntimeException, std::exception) override;
 };
 
-#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLECHECKBOX_HXX
+#endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLECHECKBOX_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblecombobox.hxx b/accessibility/inc/standard/vclxaccessiblecombobox.hxx
similarity index 86%
rename from accessibility/inc/accessibility/standard/vclxaccessiblecombobox.hxx
rename to accessibility/inc/standard/vclxaccessiblecombobox.hxx
index 082bd30..4fd6bf8 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblecombobox.hxx
+++ b/accessibility/inc/standard/vclxaccessiblecombobox.hxx
@@ -17,11 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLECOMBOBOX_HXX
-#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLECOMBOBOX_HXX
+#ifndef INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLECOMBOBOX_HXX
+#define INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLECOMBOBOX_HXX
 
 #include <map>
-#include <accessibility/standard/vclxaccessiblebox.hxx>
+#include <standard/vclxaccessiblebox.hxx>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 
 
@@ -52,6 +52,6 @@ protected:
     virtual void ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent) override;
 };
 
-#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLECOMBOBOX_HXX
+#endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLECOMBOBOX_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/standard/vclxaccessibledropdowncombobox.hxx b/accessibility/inc/standard/vclxaccessibledropdowncombobox.hxx
similarity index 83%
rename from accessibility/inc/accessibility/standard/vclxaccessibledropdowncombobox.hxx
rename to accessibility/inc/standard/vclxaccessibledropdowncombobox.hxx
index ab6d71b..e6ae128 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessibledropdowncombobox.hxx
+++ b/accessibility/inc/standard/vclxaccessibledropdowncombobox.hxx
@@ -17,11 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLEDROPDOWNCOMBOBOX_HXX
-#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLEDROPDOWNCOMBOBOX_HXX
+#ifndef INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEDROPDOWNCOMBOBOX_HXX
+#define INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEDROPDOWNCOMBOBOX_HXX
 
-#include <accessibility/standard/vclxaccessiblebox.hxx>
-#include <accessibility/standard/vclxaccessibleedit.hxx>
+#include <standard/vclxaccessiblebox.hxx>
+#include <standard/vclxaccessibleedit.hxx>
 #include <com/sun/star/accessibility/XAccessibleAction.hpp>
 
 /** The accessible drop down combobox has two children.  The first is the
@@ -51,6 +51,6 @@ protected:
     virtual void ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent) override;
 };
 
-#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLEDROPDOWNCOMBOBOX_HXX
+#endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEDROPDOWNCOMBOBOX_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/standard/vclxaccessibledropdownlistbox.hxx b/accessibility/inc/standard/vclxaccessibledropdownlistbox.hxx
similarity index 85%
rename from accessibility/inc/accessibility/standard/vclxaccessibledropdownlistbox.hxx
rename to accessibility/inc/standard/vclxaccessibledropdownlistbox.hxx
index 23f1ab4..f18945d 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessibledropdownlistbox.hxx
+++ b/accessibility/inc/standard/vclxaccessibledropdownlistbox.hxx
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLEDROPDOWNLISTBOX_HXX
-#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLEDROPDOWNLISTBOX_HXX
+#ifndef INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEDROPDOWNLISTBOX_HXX
+#define INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEDROPDOWNLISTBOX_HXX
 
-#include <accessibility/standard/vclxaccessiblebox.hxx>
+#include <standard/vclxaccessiblebox.hxx>
 #include <com/sun/star/accessibility/XAccessibleAction.hpp>
 
 /** The accessible drop down combobox has two children.  The first is the
@@ -51,6 +51,6 @@ protected:
 
 };
 
-#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLEDROPDOWNLISTBOX_HXX
+#endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEDROPDOWNLISTBOX_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/standard/vclxaccessibleedit.hxx b/accessibility/inc/standard/vclxaccessibleedit.hxx
similarity index 96%
rename from accessibility/inc/accessibility/standard/vclxaccessibleedit.hxx
rename to accessibility/inc/standard/vclxaccessibleedit.hxx
index 7e39562..429588f 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessibleedit.hxx
+++ b/accessibility/inc/standard/vclxaccessibleedit.hxx
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLEEDIT_HXX
-#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLEEDIT_HXX
+#ifndef INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEEDIT_HXX
+#define INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEEDIT_HXX
 
-#include <accessibility/standard/vclxaccessibletextcomponent.hxx>
+#include <standard/vclxaccessibletextcomponent.hxx>
 #include <com/sun/star/accessibility/XAccessibleEditableText.hpp>
 #include <com/sun/star/accessibility/XAccessibleAction.hpp>
 
@@ -106,6 +106,6 @@ public:
     virtual sal_Bool SAL_CALL setText( const OUString& sText ) throw (css::uno::RuntimeException, std::exception) override;
 };
 
-#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLEEDIT_HXX
+#endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEEDIT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblefixedhyperlink.hxx b/accessibility/inc/standard/vclxaccessiblefixedhyperlink.hxx
similarity index 83%
rename from accessibility/inc/accessibility/standard/vclxaccessiblefixedhyperlink.hxx
rename to accessibility/inc/standard/vclxaccessiblefixedhyperlink.hxx
index d6e876f..246988d 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblefixedhyperlink.hxx
+++ b/accessibility/inc/standard/vclxaccessiblefixedhyperlink.hxx
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLEFIXEDHYPERLINK_HXX
-#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLEFIXEDHYPERLINK_HXX
+#ifndef INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEFIXEDHYPERLINK_HXX
+#define INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEFIXEDHYPERLINK_HXX
 
-#include <accessibility/standard/vclxaccessibletextcomponent.hxx>
+#include <standard/vclxaccessibletextcomponent.hxx>
 
 
 //  class VCLXAccessibleFixedHyperlink
@@ -42,6 +42,6 @@ public:
     virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
 };
 
-#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLEFIXEDHYPERLINK_HXX
+#endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEFIXEDHYPERLINK_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblefixedtext.hxx b/accessibility/inc/standard/vclxaccessiblefixedtext.hxx
similarity index 84%
rename from accessibility/inc/accessibility/standard/vclxaccessiblefixedtext.hxx
rename to accessibility/inc/standard/vclxaccessiblefixedtext.hxx
index fc2616e..c5a52e9 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblefixedtext.hxx
+++ b/accessibility/inc/standard/vclxaccessiblefixedtext.hxx
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLEFIXEDTEXT_HXX
-#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLEFIXEDTEXT_HXX
+#ifndef INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEFIXEDTEXT_HXX
+#define INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEFIXEDTEXT_HXX
 
-#include <accessibility/standard/vclxaccessibletextcomponent.hxx>
+#include <standard/vclxaccessibletextcomponent.hxx>
 
 
 //  class VCLXAccessibleFixedText
@@ -42,6 +42,6 @@ public:
     virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
 };
 
-#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLEFIXEDTEXT_HXX
+#endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEFIXEDTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx b/accessibility/inc/standard/vclxaccessiblelist.hxx
similarity index 96%
rename from accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx
rename to accessibility/inc/standard/vclxaccessiblelist.hxx
index 86b3a04..7476f86 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx
+++ b/accessibility/inc/standard/vclxaccessiblelist.hxx
@@ -17,13 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLELIST_HXX
-#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLELIST_HXX
+#ifndef INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLELIST_HXX
+#define INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLELIST_HXX
 
 #include <vector>
 #include <functional>
-#include "accessibility/standard/vclxaccessiblelistitem.hxx"
-#include <accessibility/standard/vclxaccessibleedit.hxx>
+#include "standard/vclxaccessiblelistitem.hxx"
+#include <standard/vclxaccessibleedit.hxx>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/accessibility/XAccessibleAction.hpp>
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblelistbox.hxx b/accessibility/inc/standard/vclxaccessiblelistbox.hxx
similarity index 86%
rename from accessibility/inc/accessibility/standard/vclxaccessiblelistbox.hxx
rename to accessibility/inc/standard/vclxaccessiblelistbox.hxx
index d015b4b..22d24ee 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblelistbox.hxx
+++ b/accessibility/inc/standard/vclxaccessiblelistbox.hxx
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLELISTBOX_HXX
-#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLELISTBOX_HXX
+#ifndef INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLELISTBOX_HXX
+#define INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLELISTBOX_HXX
 
-#include <accessibility/standard/vclxaccessiblebox.hxx>
+#include <standard/vclxaccessiblebox.hxx>
 #include <com/sun/star/accessibility/XAccessibleAction.hpp>
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
 #include <com/sun/star/accessibility/XAccessibleSelection.hpp>
@@ -51,6 +51,6 @@ protected:
     virtual void ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent) override;
 };
 
-#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLELISTBOX_HXX
+#endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLELISTBOX_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblelistitem.hxx b/accessibility/inc/standard/vclxaccessiblelistitem.hxx
similarity index 98%
rename from accessibility/inc/accessibility/standard/vclxaccessiblelistitem.hxx
rename to accessibility/inc/standard/vclxaccessiblelistitem.hxx
index f851060..1a1e2f9 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblelistitem.hxx
+++ b/accessibility/inc/standard/vclxaccessiblelistitem.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLELISTITEM_HXX
-#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLELISTITEM_HXX
+#ifndef INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLELISTITEM_HXX
+#define INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLELISTITEM_HXX
 
 #include <com/sun/star/accessibility/XAccessible.hpp>
 #include <com/sun/star/accessibility/XAccessibleComponent.hpp>
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblemenu.hxx b/accessibility/inc/standard/vclxaccessiblemenu.hxx
similarity index 92%
rename from accessibility/inc/accessibility/standard/vclxaccessiblemenu.hxx
rename to accessibility/inc/standard/vclxaccessiblemenu.hxx
index 58484db..98ba4ec 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblemenu.hxx
+++ b/accessibility/inc/standard/vclxaccessiblemenu.hxx
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLEMENU_HXX
-#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLEMENU_HXX
+#ifndef INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEMENU_HXX
+#define INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEMENU_HXX
 
-#include <accessibility/standard/vclxaccessiblemenuitem.hxx>
+#include <standard/vclxaccessiblemenuitem.hxx>
 #include <com/sun/star/accessibility/XAccessibleSelection.hpp>
 
 #include <cppuhelper/implbase1.hxx>
@@ -74,6 +74,6 @@ public:
     virtual ::rtl::OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
 };
 
-#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLEMENU_HXX
+#endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEMENU_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblemenubar.hxx b/accessibility/inc/standard/vclxaccessiblemenubar.hxx
similarity index 87%
rename from accessibility/inc/accessibility/standard/vclxaccessiblemenubar.hxx
rename to accessibility/inc/standard/vclxaccessiblemenubar.hxx
index 261256a..9ea5c58 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblemenubar.hxx
+++ b/accessibility/inc/standard/vclxaccessiblemenubar.hxx
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLEMENUBAR_HXX
-#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLEMENUBAR_HXX
+#ifndef INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEMENUBAR_HXX
+#define INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEMENUBAR_HXX
 
-#include <accessibility/standard/accessiblemenucomponent.hxx>
+#include <standard/accessiblemenucomponent.hxx>
 #include <vcl/vclptr.hxx>
 
 class VclSimpleEvent;
@@ -61,6 +61,6 @@ public:
     virtual sal_Int32 SAL_CALL getBackground(  ) throw (css::uno::RuntimeException, std::exception) override;
 };
 
-#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLEMENUBAR_HXX
+#endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEMENUBAR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblemenuitem.hxx b/accessibility/inc/standard/vclxaccessiblemenuitem.hxx
similarity index 95%
rename from accessibility/inc/accessibility/standard/vclxaccessiblemenuitem.hxx
rename to accessibility/inc/standard/vclxaccessiblemenuitem.hxx
index 19d39f5..df2249a 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblemenuitem.hxx
+++ b/accessibility/inc/standard/vclxaccessiblemenuitem.hxx
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLEMENUITEM_HXX
-#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLEMENUITEM_HXX
+#ifndef INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEMENUITEM_HXX
+#define INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEMENUITEM_HXX
 
-#include <accessibility/standard/accessiblemenuitemcomponent.hxx>
+#include <standard/accessiblemenuitemcomponent.hxx>
 
 #include <com/sun/star/accessibility/XAccessibleAction.hpp>
 #include <com/sun/star/accessibility/XAccessibleValue.hpp>
@@ -104,6 +104,6 @@ public:
     virtual css::uno::Any SAL_CALL getMinimumValue(  ) throw (css::uno::RuntimeException, std::exception) override;
 };
 
-#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLEMENUITEM_HXX
+#endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEMENUITEM_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblemenuseparator.hxx b/accessibility/inc/standard/vclxaccessiblemenuseparator.hxx
similarity index 82%
rename from accessibility/inc/accessibility/standard/vclxaccessiblemenuseparator.hxx
rename to accessibility/inc/standard/vclxaccessiblemenuseparator.hxx
index 4e3250b..065740c 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblemenuseparator.hxx
+++ b/accessibility/inc/standard/vclxaccessiblemenuseparator.hxx
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLEMENUSEPARATOR_HXX
-#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLEMENUSEPARATOR_HXX
+#ifndef INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEMENUSEPARATOR_HXX
+#define INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEMENUSEPARATOR_HXX
 
-#include <accessibility/standard/accessiblemenuitemcomponent.hxx>
+#include <standard/accessiblemenuitemcomponent.hxx>
 
 
 //  class VCLXAccessibleMenuSeparator
@@ -41,6 +41,6 @@ public:
 };
 
 
-#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLEMENUSEPARATOR_HXX
+#endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEMENUSEPARATOR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblepopupmenu.hxx b/accessibility/inc/standard/vclxaccessiblepopupmenu.hxx
similarity index 85%
rename from accessibility/inc/accessibility/standard/vclxaccessiblepopupmenu.hxx
rename to accessibility/inc/standard/vclxaccessiblepopupmenu.hxx
index d91ed83..bae0881 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblepopupmenu.hxx
+++ b/accessibility/inc/standard/vclxaccessiblepopupmenu.hxx
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLEPOPUPMENU_HXX
-#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLEPOPUPMENU_HXX
+#ifndef INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEPOPUPMENU_HXX
+#define INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEPOPUPMENU_HXX
 
-#include <accessibility/standard/accessiblemenucomponent.hxx>
+#include <standard/accessiblemenucomponent.hxx>
 
 
 //  class VCLXAccessiblePopupMenu
@@ -47,6 +47,6 @@ public:
     virtual sal_Int32 SAL_CALL getBackground(  ) throw (css::uno::RuntimeException, std::exception) override;
 };
 
-#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLEPOPUPMENU_HXX
+#endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEPOPUPMENU_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/standard/vclxaccessibleradiobutton.hxx b/accessibility/inc/standard/vclxaccessibleradiobutton.hxx
similarity index 91%
rename from accessibility/inc/accessibility/standard/vclxaccessibleradiobutton.hxx
rename to accessibility/inc/standard/vclxaccessibleradiobutton.hxx
index ed0ac66..8a13c7e 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessibleradiobutton.hxx
+++ b/accessibility/inc/standard/vclxaccessibleradiobutton.hxx
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLERADIOBUTTON_HXX
-#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLERADIOBUTTON_HXX
+#ifndef INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLERADIOBUTTON_HXX
+#define INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLERADIOBUTTON_HXX
 
-#include <accessibility/standard/vclxaccessibletextcomponent.hxx>
+#include <standard/vclxaccessibletextcomponent.hxx>
 
 #include <com/sun/star/accessibility/XAccessibleAction.hpp>
 #include <com/sun/star/accessibility/XAccessibleValue.hpp>
@@ -71,6 +71,6 @@ public:
     virtual css::uno::Any SAL_CALL getMinimumValue(  ) throw (css::uno::RuntimeException, std::exception) override;
 };
 
-#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLERADIOBUTTON_HXX
+#endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLERADIOBUTTON_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblescrollbar.hxx b/accessibility/inc/standard/vclxaccessiblescrollbar.hxx
similarity index 93%
rename from accessibility/inc/accessibility/standard/vclxaccessiblescrollbar.hxx
rename to accessibility/inc/standard/vclxaccessiblescrollbar.hxx
index 6b8617f..40f51cc 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblescrollbar.hxx
+++ b/accessibility/inc/standard/vclxaccessiblescrollbar.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLESCROLLBAR_HXX
-#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLESCROLLBAR_HXX
+#ifndef INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLESCROLLBAR_HXX
+#define INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLESCROLLBAR_HXX
 
 #include <toolkit/awt/vclxaccessiblecomponent.hxx>
 
@@ -74,6 +74,6 @@ public:
 
 };
 
-#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLESCROLLBAR_HXX
+#endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLESCROLLBAR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblestatusbar.hxx b/accessibility/inc/standard/vclxaccessiblestatusbar.hxx
similarity index 91%
rename from accessibility/inc/accessibility/standard/vclxaccessiblestatusbar.hxx
rename to accessibility/inc/standard/vclxaccessiblestatusbar.hxx
index 65c9e10..24fd96e 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblestatusbar.hxx
+++ b/accessibility/inc/standard/vclxaccessiblestatusbar.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLESTATUSBAR_HXX
-#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLESTATUSBAR_HXX
+#ifndef INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLESTATUSBAR_HXX
+#define INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLESTATUSBAR_HXX
 
 #include <toolkit/awt/vclxaccessiblecomponent.hxx>
 #include <vcl/vclptr.hxx>
@@ -69,6 +69,6 @@ public:
 };
 
 
-#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLESTATUSBAR_HXX
+#endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLESTATUSBAR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblestatusbaritem.hxx b/accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx
similarity index 96%
rename from accessibility/inc/accessibility/standard/vclxaccessiblestatusbaritem.hxx
rename to accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx
index 6e4b56f..fb919df 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblestatusbaritem.hxx
+++ b/accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLESTATUSBARITEM_HXX
-#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLESTATUSBARITEM_HXX
+#ifndef INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLESTATUSBARITEM_HXX
+#define INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLESTATUSBARITEM_HXX
 
 #include <com/sun/star/accessibility/XAccessible.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -129,6 +129,6 @@ public:
     virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
 };
 
-#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLESTATUSBARITEM_HXX
+#endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLESTATUSBARITEM_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletabcontrol.hxx b/accessibility/inc/standard/vclxaccessibletabcontrol.hxx
similarity index 94%
rename from accessibility/inc/accessibility/standard/vclxaccessibletabcontrol.hxx
rename to accessibility/inc/standard/vclxaccessibletabcontrol.hxx
index bfcbab4..d024176 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessibletabcontrol.hxx
+++ b/accessibility/inc/standard/vclxaccessibletabcontrol.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLETABCONTROL_HXX
-#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLETABCONTROL_HXX
+#ifndef INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLETABCONTROL_HXX
+#define INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLETABCONTROL_HXX
 
 #include <toolkit/awt/vclxaccessiblecomponent.hxx>
 #include <com/sun/star/accessibility/XAccessibleSelection.hpp>
@@ -91,6 +91,6 @@ public:
 };
 
 
-#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLETABCONTROL_HXX
+#endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLETABCONTROL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletabpage.hxx b/accessibility/inc/standard/vclxaccessibletabpage.hxx
similarity index 96%
rename from accessibility/inc/accessibility/standard/vclxaccessibletabpage.hxx
rename to accessibility/inc/standard/vclxaccessibletabpage.hxx
index 4749e6d..4ea0d27 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessibletabpage.hxx
+++ b/accessibility/inc/standard/vclxaccessibletabpage.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLETABPAGE_HXX
-#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLETABPAGE_HXX
+#ifndef INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLETABPAGE_HXX
+#define INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLETABPAGE_HXX
 
 #include <com/sun/star/accessibility/XAccessible.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -134,6 +134,6 @@ public:
     virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
 };
 
-#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLETABPAGE_HXX
+#endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLETABPAGE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletabpagewindow.hxx b/accessibility/inc/standard/vclxaccessibletabpagewindow.hxx
similarity index 87%
rename from accessibility/inc/accessibility/standard/vclxaccessibletabpagewindow.hxx
rename to accessibility/inc/standard/vclxaccessibletabpagewindow.hxx
index 391b14d3..b485f08 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessibletabpagewindow.hxx
+++ b/accessibility/inc/standard/vclxaccessibletabpagewindow.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLETABPAGEWINDOW_HXX
-#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLETABPAGEWINDOW_HXX
+#ifndef INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLETABPAGEWINDOW_HXX
+#define INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLETABPAGEWINDOW_HXX
 
 #include <toolkit/awt/vclxaccessiblecomponent.hxx>
 #include <vcl/vclptr.hxx>
@@ -55,6 +55,6 @@ public:
 };
 
 
-#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLETABPAGEWINDOW_HXX
+#endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLETABPAGEWINDOW_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletextcomponent.hxx b/accessibility/inc/standard/vclxaccessibletextcomponent.hxx
similarity index 95%
rename from accessibility/inc/accessibility/standard/vclxaccessibletextcomponent.hxx
rename to accessibility/inc/standard/vclxaccessibletextcomponent.hxx
index 10390f5..24cc9c3 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessibletextcomponent.hxx
+++ b/accessibility/inc/standard/vclxaccessibletextcomponent.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLETEXTCOMPONENT_HXX
-#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLETEXTCOMPONENT_HXX
+#ifndef INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLETEXTCOMPONENT_HXX
+#define INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLETEXTCOMPONENT_HXX
 
 #include <toolkit/awt/vclxaccessiblecomponent.hxx>
 #include <comphelper/accessibletexthelper.hxx>
@@ -80,6 +80,6 @@ public:
 };
 
 
-#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLETEXTCOMPONENT_HXX
+#endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLETEXTCOMPONENT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletextfield.hxx b/accessibility/inc/standard/vclxaccessibletextfield.hxx
similarity index 93%
rename from accessibility/inc/accessibility/standard/vclxaccessibletextfield.hxx
rename to accessibility/inc/standard/vclxaccessibletextfield.hxx
index 58ec93b..d71b7c2 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessibletextfield.hxx
+++ b/accessibility/inc/standard/vclxaccessibletextfield.hxx
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLETEXTFIELD_HXX
-#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLETEXTFIELD_HXX
+#ifndef INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLETEXTFIELD_HXX
+#define INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLETEXTFIELD_HXX
 
-#include <accessibility/standard/vclxaccessibletextcomponent.hxx>
+#include <standard/vclxaccessibletextcomponent.hxx>
 
 #include <cppuhelper/implbase1.hxx>
 
diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletoolbox.hxx b/accessibility/inc/standard/vclxaccessibletoolbox.hxx
similarity index 95%
rename from accessibility/inc/accessibility/standard/vclxaccessibletoolbox.hxx
rename to accessibility/inc/standard/vclxaccessibletoolbox.hxx
index c5a5b4d..63dfa10 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessibletoolbox.hxx
+++ b/accessibility/inc/standard/vclxaccessibletoolbox.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 INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLETOOLBOX_HXX
-#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLETOOLBOX_HXX
+#ifndef INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLETOOLBOX_HXX
+#define INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLETOOLBOX_HXX
 
 #include <map>
 #include <toolkit/awt/vclxaccessiblecomponent.hxx>
@@ -100,6 +100,6 @@ private:
         );
 };
 
-#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLETOOLBOX_HXX
+#endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLETOOLBOX_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx b/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx
similarity index 97%
rename from accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx
rename to accessibility/inc/standard/vclxaccessibletoolboxitem.hxx
index 714d458..3411640 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx
+++ b/accessibility/inc/standard/vclxaccessibletoolboxitem.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 INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLETOOLBOXITEM_HXX
-#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLETOOLBOXITEM_HXX
+#ifndef INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLETOOLBOXITEM_HXX
+#define INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLETOOLBOXITEM_HXX
 
 #include <com/sun/star/accessibility/XAccessible.hpp>
 #include <com/sun/star/accessibility/XAccessibleAction.hpp>
@@ -149,6 +149,6 @@ public:
     virtual css::uno::Any SAL_CALL getMinimumValue(  ) throw (css::uno::RuntimeException, std::exception) override;
 };
 
-#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLETOOLBOXITEM_HXX
+#endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLETOOLBOXITEM_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/extended/AccessibleBrowseBox.cxx b/accessibility/source/extended/AccessibleBrowseBox.cxx
index c1edec8..70b7c17 100644
--- a/accessibility/source/extended/AccessibleBrowseBox.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBox.cxx
@@ -17,9 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "accessibility/extended/AccessibleBrowseBox.hxx"
-#include "accessibility/extended/AccessibleBrowseBoxTable.hxx"
-#include "accessibility/extended/AccessibleBrowseBoxHeaderBar.hxx"
+#include "extended/AccessibleBrowseBox.hxx"
+#include "extended/AccessibleBrowseBoxTable.hxx"
+#include "extended/AccessibleBrowseBoxHeaderBar.hxx"
 #include <svtools/accessibletableprovider.hxx>
 #include <comphelper/types.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
@@ -72,7 +72,7 @@ void AccessibleBrowseBox::setCreator( const css::uno::Reference< css::accessibil
 {
 #if OSL_DEBUG_LEVEL > 0
     css::uno::Reference< css::accessibility::XAccessible > xCreator(m_xImpl->m_aCreator);
-    OSL_ENSURE( !xCreator.is(), "accessibility/extended/AccessibleBrowseBox::setCreator: creator already set!" );
+    OSL_ENSURE( !xCreator.is(), "extended/AccessibleBrowseBox::setCreator: creator already set!" );
 #endif
     m_xImpl->m_aCreator = _rxCreator;
 }
@@ -281,7 +281,7 @@ AccessibleBrowseBox::implGetFixedChild( sal_Int32 nChildIndex )
 AccessibleBrowseBoxTable* AccessibleBrowseBox::createAccessibleTable()
 {
     css::uno::Reference< css::accessibility::XAccessible > xCreator(m_xImpl->m_aCreator);
-    OSL_ENSURE( xCreator.is(), "accessibility/extended/AccessibleBrowseBox::createAccessibleTable: my creator died - how this?" );
+    OSL_ENSURE( xCreator.is(), "extended/AccessibleBrowseBox::createAccessibleTable: my creator died - how this?" );
     return new AccessibleBrowseBoxTable( xCreator, *mpBrowseBox );
 }
 
@@ -333,7 +333,7 @@ css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL Accessibl
     ::osl::MutexGuard aGuard( m_aMutex );
 
     OSL_ENSURE( ( m_pContext && m_xContext.is() ) || ( !m_pContext && !m_xContext.is() ),
-        "accessibility/extended/AccessibleBrowseBoxAccess::getAccessibleContext: inconsistency!" );
+        "extended/AccessibleBrowseBoxAccess::getAccessibleContext: inconsistency!" );
 
     // if the context died meanwhile (there is no listener, so it won't tell us explicitily when this happens),
     // then reset and re-create.
diff --git a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
index 3387cbb..1ff3c75 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "accessibility/extended/AccessibleBrowseBoxBase.hxx"
+#include "extended/AccessibleBrowseBoxBase.hxx"
 #include <svtools/accessibletableprovider.hxx>
 #include <comphelper/servicehelper.hxx>
 #include <cppuhelper/supportsservice.hxx>
diff --git a/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx
index cd805ae..da37ca0 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx>
+#include <extended/AccessibleBrowseBoxCheckBoxCell.hxx>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <svtools/accessibletableprovider.hxx>
 
diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
index 07225c23..7cdefc5 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "accessibility/extended/AccessibleBrowseBoxHeaderBar.hxx"
+#include "extended/AccessibleBrowseBoxHeaderBar.hxx"
 #include <svtools/accessibletableprovider.hxx>
 #include <comphelper/servicehelper.hxx>
 
@@ -43,7 +43,7 @@ AccessibleBrowseBoxHeaderBar::AccessibleBrowseBoxHeaderBar(
     AccessibleBrowseBoxTableBase( rxParent, rBrowseBox,eObjType )
 {
     OSL_ENSURE( isRowBar() || isColumnBar(),
-        "accessibility/extended/AccessibleBrowseBoxHeaderBar - invalid object type" );
+        "extended/AccessibleBrowseBoxHeaderBar - invalid object type" );
 }
 
 AccessibleBrowseBoxHeaderBar::~AccessibleBrowseBoxHeaderBar()
diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx
index c7332aa..c40b798 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx
@@ -18,9 +18,9 @@
  */
 
 
-#include "accessibility/extended/AccessibleBrowseBoxHeaderCell.hxx"
+#include "extended/AccessibleBrowseBoxHeaderCell.hxx"
 #include <svtools/accessibletableprovider.hxx>
-#include "accessibility/extended/AccessibleBrowseBox.hxx"
+#include "extended/AccessibleBrowseBox.hxx"
 
 namespace accessibility
 {
diff --git a/accessibility/source/extended/AccessibleBrowseBoxTable.cxx b/accessibility/source/extended/AccessibleBrowseBoxTable.cxx
index f8ba710..4123dd8 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxTable.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxTable.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "accessibility/extended/AccessibleBrowseBoxTable.hxx"
+#include "extended/AccessibleBrowseBoxTable.hxx"
 #include <svtools/accessibletableprovider.hxx>
 
 
diff --git a/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx
index 43faaca..0abc93b 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "accessibility/extended/AccessibleBrowseBoxTableBase.hxx"
+#include "extended/AccessibleBrowseBoxTableBase.hxx"
 #include <svtools/accessibletableprovider.hxx>
 #include <tools/multisel.hxx>
 #include <comphelper/sequence.hxx>
diff --git a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
index bcfe905..a8b5a53 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include "accessibility/extended/AccessibleBrowseBoxTableCell.hxx"
+#include "extended/AccessibleBrowseBoxTableCell.hxx"
 #include <svtools/accessibletableprovider.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
diff --git a/accessibility/source/extended/AccessibleGridControl.cxx b/accessibility/source/extended/AccessibleGridControl.cxx
index 5c32dcf..d647bc8 100644
--- a/accessibility/source/extended/AccessibleGridControl.cxx
+++ b/accessibility/source/extended/AccessibleGridControl.cxx
@@ -17,9 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "accessibility/extended/AccessibleGridControl.hxx"
-#include "accessibility/extended/AccessibleGridControlTable.hxx"
-#include "accessibility/extended/AccessibleGridControlHeader.hxx"
+#include "extended/AccessibleGridControl.hxx"
+#include "extended/AccessibleGridControlTable.hxx"
+#include "extended/AccessibleGridControlHeader.hxx"
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <com/sun/star/accessibility/AccessibleTableModelChange.hpp>
 #include <com/sun/star/accessibility/AccessibleTableModelChangeType.hpp>
@@ -305,7 +305,7 @@ AccessibleGridControl::implGetFixedChild( sal_Int32 nChildIndex )
 AccessibleGridControlTable* AccessibleGridControl::createAccessibleTable()
 {
     css::uno::Reference< css::accessibility::XAccessible > xCreator(m_xImpl->m_aCreator);
-    OSL_ENSURE( xCreator.is(), "accessibility/extended/AccessibleGridControl::createAccessibleTable: my creator died - how this?" );
+    OSL_ENSURE( xCreator.is(), "extended/AccessibleGridControl::createAccessibleTable: my creator died - how this?" );
     return new AccessibleGridControlTable( xCreator, m_aTable, TCTYPE_TABLE );
 }
 
@@ -418,7 +418,7 @@ css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL Accessibl
     SolarMutexGuard g;
 
     OSL_ENSURE( ( m_pContext && m_xContext.is() ) || ( !m_pContext && !m_xContext.is() ),
-        "accessibility/extended/AccessibleGridControlAccess::getAccessibleContext: inconsistency!" );
+        "extended/AccessibleGridControlAccess::getAccessibleContext: inconsistency!" );
 
     // if the context died meanwhile (we're no listener, so it won't tell us explicitily when this happens),
     // then reset an re-create.
diff --git a/accessibility/source/extended/AccessibleGridControlBase.cxx b/accessibility/source/extended/AccessibleGridControlBase.cxx
index 3f858f6..088d56f 100644
--- a/accessibility/source/extended/AccessibleGridControlBase.cxx
+++ b/accessibility/source/extended/AccessibleGridControlBase.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <accessibility/extended/AccessibleGridControlBase.hxx>
+#include <extended/AccessibleGridControlBase.hxx>
 #include <svtools/accessibletable.hxx>
 #include <comphelper/servicehelper.hxx>
 #include <cppuhelper/supportsservice.hxx>
diff --git a/accessibility/source/extended/AccessibleGridControlHeader.cxx b/accessibility/source/extended/AccessibleGridControlHeader.cxx
index dd34536..c8d5c55 100644
--- a/accessibility/source/extended/AccessibleGridControlHeader.cxx
+++ b/accessibility/source/extended/AccessibleGridControlHeader.cxx
@@ -17,9 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "accessibility/extended/AccessibleGridControlHeader.hxx"
-#include "accessibility/extended/AccessibleGridControlHeaderCell.hxx"
-#include "accessibility/extended/AccessibleGridControlTableCell.hxx"
+#include "extended/AccessibleGridControlHeader.hxx"
+#include "extended/AccessibleGridControlHeaderCell.hxx"
+#include "extended/AccessibleGridControlTableCell.hxx"
 #include <svtools/accessibletable.hxx>
 #include <comphelper/servicehelper.hxx>
 
@@ -45,7 +45,7 @@ AccessibleGridControlHeader::AccessibleGridControlHeader(
         AccessibleGridControlTableBase( rxParent, rTable, eObjType )
 {
     OSL_ENSURE( isRowBar() || isColumnBar(),
-        "accessibility/extended/AccessibleGridControlHeaderBar - invalid object type" );
+        "extended/AccessibleGridControlHeaderBar - invalid object type" );
 }
 
 AccessibleGridControlHeader::~AccessibleGridControlHeader()
diff --git a/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx b/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx
index 0ce82c7..8d98259 100644
--- a/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx
+++ b/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx
@@ -18,9 +18,9 @@
  */
 
 
-#include "accessibility/extended/AccessibleGridControlHeaderCell.hxx"
+#include "extended/AccessibleGridControlHeaderCell.hxx"
 #include <svtools/accessibletable.hxx>
-#include "accessibility/extended/AccessibleGridControl.hxx"
+#include "extended/AccessibleGridControl.hxx"
 
 namespace accessibility
 {
diff --git a/accessibility/source/extended/AccessibleGridControlTable.cxx b/accessibility/source/extended/AccessibleGridControlTable.cxx
index faff58d..bdf7ea2 100644
--- a/accessibility/source/extended/AccessibleGridControlTable.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTable.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "accessibility/extended/AccessibleGridControlTable.hxx"
-#include "accessibility/extended/AccessibleGridControlTableCell.hxx"
+#include "extended/AccessibleGridControlTable.hxx"
+#include "extended/AccessibleGridControlTableCell.hxx"
 #include <svtools/accessibletable.hxx>
 
 

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list