#i106421#: some missing header fixes

62 files changed, 69 insertions, 69 deletions

diff --git a/svx/inc/galctrl.hxx b/svx/inc/galctrl.hxx
index 3e56b4ea08b2..2a986ea60ba8 100644
--- a/svx/inc/galctrl.hxx
+++ b/svx/inc/galctrl.hxx
@@ -46,7 +46,7 @@
 #include <svtools/valueset.hxx>
 #include <svtools/brwbox.hxx>
 #include <goodies/grfmgr.hxx>
-#include "galmisc.hxx"
+#include "svx/galmisc.hxx"
 #include "svx/svxdllapi.h"
 
 // ------------
diff --git a/svx/inc/galobj.hxx b/svx/inc/galobj.hxx
index 76cc793c38c8..e2a5bee41dd6 100644
--- a/svx/inc/galobj.hxx
+++ b/svx/inc/galobj.hxx
@@ -33,7 +33,7 @@
 
 #include <tools/urlobj.hxx>
 #include <vcl/graph.hxx>
-#include "galmisc.hxx"
+#include "svx/galmisc.hxx"
 
 // -----------
 // - Defines -
diff --git a/svx/source/inc/fmtools.hxx b/svx/inc/svx/fmtools.hxx
index 02e063e0314d..02e063e0314d 100644
--- a/svx/source/inc/fmtools.hxx
+++ b/svx/inc/svx/fmtools.hxx
diff --git a/svx/inc/gallery1.hxx b/svx/inc/svx/gallery1.hxx
index 04ae4814c91d..04ae4814c91d 100644
--- a/svx/inc/gallery1.hxx
+++ b/svx/inc/svx/gallery1.hxx
diff --git a/svx/inc/galmisc.hxx b/svx/inc/svx/galmisc.hxx
index 752c7cc005d7..752c7cc005d7 100644
--- a/svx/inc/galmisc.hxx
+++ b/svx/inc/svx/galmisc.hxx
diff --git a/svx/inc/impgrf.hxx b/svx/inc/svx/impgrf.hxx
index d99bbd04d1ea..d99bbd04d1ea 100644
--- a/svx/inc/impgrf.hxx
+++ b/svx/inc/svx/impgrf.hxx
diff --git a/svx/inc/xlinjoit.hxx b/svx/inc/svx/xlinjoit.hxx
index 97b4bb2ac276..97b4bb2ac276 100644
--- a/svx/inc/xlinjoit.hxx
+++ b/svx/inc/svx/xlinjoit.hxx
diff --git a/svx/prj/d.lst b/svx/prj/d.lst
index 55203d1dc070..d219b75eea7b 100644
--- a/svx/prj/d.lst
+++ b/svx/prj/d.lst
@@ -24,11 +24,11 @@ mkdir: %_DEST%\inc%_EXT%\svx
 
 ..\source\inc\fmsrccfg.hxx %_DEST%\inc%_EXT%\svx\fmsrccfg.hxx
 ..\source\inc\fmsrcimp.hxx %_DEST%\inc%_EXT%\svx\fmsrcimp.hxx
-..\source\inc\fmtools.hxx %_DEST%\inc%_EXT%\svx\fmtools.hxx
 ..\inc\galtheme.hxx %_DEST%\inc%_EXT%\svx\galtheme.hxx
-..\inc\galmisc.hxx %_DEST%\inc%_EXT%\svx\galmisc.hxx
 ..\inc\galctrl.hxx %_DEST%\inc%_EXT%\svx\galctrl.hxx
-..\inc\gallery1.hxx %_DEST%\inc%_EXT%\svx\gallery1.hxx
+..\inc\svx\galmisc.hxx %_DEST%\inc%_EXT%\svx\galmisc.hxx
+..\inc\svx\gallery1.hxx %_DEST%\inc%_EXT%\svx\gallery1.hxx
+..\inc\svx\fmtools.hxx %_DEST%\inc%_EXT%\svx\fmtools.hxx
 
 ..\inc\flagsdef.hxx %_DEST%\inc%_EXT%\svx\flagsdef.hxx
 ..\%__SRC%\inc\svxslots.hxx %_DEST%\inc%_EXT%\svx\svxslots.hxx
@@ -88,7 +88,6 @@ mkdir: %_DEST%\inc%_EXT%\svx
 ..\inc\htmlmode.hxx %_DEST%\inc%_EXT%\svx\htmlmode.hxx
 ..\inc\hyperdlg.hxx %_DEST%\inc%_EXT%\svx\hyperdlg.hxx
 ..\inc\imapdlg.hxx %_DEST%\inc%_EXT%\svx\imapdlg.hxx
-..\inc\impgrf.hxx %_DEST%\inc%_EXT%\svx\impgrf.hxx
 ..\inc\opengrf.hxx %_DEST%\inc%_EXT%\svx\opengrf.hxx
 ..\inc\insctrl.hxx %_DEST%\inc%_EXT%\svx\insctrl.hxx
 ..\inc\layctrl.hxx %_DEST%\inc%_EXT%\svx\layctrl.hxx
@@ -159,7 +158,6 @@ mkdir: %_DEST%\inc%_EXT%\svx
 ..\inc\verttexttbxctrl.hxx %_DEST%\inc%_EXT%\svx\verttexttbxctrl.hxx
 ..\inc\wrapfield.hxx %_DEST%\inc%_EXT%\svx\wrapfield.hxx
 ..\inc\xexch.hxx %_DEST%\inc%_EXT%\svx\xexch.hxx
-..\inc\xlinjoit.hxx %_DEST%\inc%_EXT%\svx\xlinjoit.hxx
 ..\inc\xmlcnitm.hxx %_DEST%\inc%_EXT%\svx\xmlcnitm.hxx
 ..\inc\xmleohlp.hxx %_DEST%\inc%_EXT%\svx\xmleohlp.hxx
 ..\inc\xmlexchg.hxx %_DEST%\inc%_EXT%\svx\xmlexchg.hxx
@@ -170,6 +168,8 @@ mkdir: %_DEST%\inc%_EXT%\svx
 ..\inc\zoom_def.hxx %_DEST%\inc%_EXT%\svx\zoom_def.hxx
 ..\inc\zoomctrl.hxx %_DEST%\inc%_EXT%\svx\zoomctrl.hxx
 
+..\inc\svx\xlinjoit.hxx %_DEST%\inc%_EXT%\svx\xlinjoit.hxx
+..\inc\svx\impgrf.hxx %_DEST%\inc%_EXT%\svx\impgrf.hxx
 ..\inc\svx\dstribut_enum.hxx %_DEST%\inc%_EXT%\svx\dstribut_enum.hxx
 ..\inc\svx\svdfield.hxx %_DEST%\inc%_EXT%\svx\svdfield.hxx
 ..\inc\svx\svxitems.hrc %_DEST%\inc%_EXT%\svx\svxitems.hrc
diff --git a/svx/source/dialog/impgrf.cxx b/svx/source/dialog/impgrf.cxx
index 5eb1dde2cd8b..b29671d6b36b 100644
--- a/svx/source/dialog/impgrf.cxx
+++ b/svx/source/dialog/impgrf.cxx
@@ -55,7 +55,7 @@ using namespace com::sun::star::uno;
 #include "impgrf.hrc"
 
 #define _SVX_IMPGRF_CXX
-#include "impgrf.hxx"
+#include "svx/impgrf.hxx"
 
 #include <svx/dialmgr.hxx>
 #include "svxerr.hxx"
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index 0bfc7c768973..7a0c7c0378bb 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -34,7 +34,7 @@
 #include "fmgridif.hxx"
 #include "fmprop.hrc"
 #include "fmservs.hxx"
-#include "fmtools.hxx"
+#include "svx/fmtools.hxx"
 #include "fmurl.hxx"
 #include "formcontrolfactory.hxx"
 #include "gridcell.hxx"
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index a4318682de5e..1b98cea4da55 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -34,7 +34,7 @@
 
 #include "fmprop.hrc"
 #include "fmresids.hrc"
-#include "fmtools.hxx"
+#include "svx/fmtools.hxx"
 #include "gridcell.hxx"
 #include "gridcols.hxx"
 #include "sdbdatacolumn.hxx"
diff --git a/svx/source/fmcomp/gridcols.cxx b/svx/source/fmcomp/gridcols.cxx
index da7fe3447b0a..f56f8e0c7e86 100644
--- a/svx/source/fmcomp/gridcols.cxx
+++ b/svx/source/fmcomp/gridcols.cxx
@@ -34,7 +34,7 @@
 #include <tools/debug.hxx>
 #include <comphelper/types.hxx>
 #include "fmservs.hxx"
-#include "fmtools.hxx"
+#include "svx/fmtools.hxx"
 
 //------------------------------------------------------------------------------
 const ::comphelper::StringSequence& getColumnTypes()
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index afff309168ac..49f0bdfafda0 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -37,7 +37,7 @@
 #include <svx/gridctrl.hxx>
 #include "gridcell.hxx"
 #include "svx/dbtoolsclient.hxx"
-#include "fmtools.hxx"
+#include "svx/fmtools.hxx"
 #include <svtools/stringtransfer.hxx>
 
 #ifndef _SVX_FMPROP_HRC
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index 7ac8f8afbe29..b9ef8224a9ef 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -64,7 +64,7 @@
 #include <svx/fmshell.hxx>
 #include <fmshimp.hxx>
 #include <fmservs.hxx>
-#include <fmtools.hxx>
+#include <svx/fmtools.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <comphelper/property.hxx>
 #include <comphelper/uno3.hxx>
diff --git a/svx/source/form/fmctrler.cxx b/svx/source/form/fmctrler.cxx
index 48db5acbb01e..af2a103c5d03 100644
--- a/svx/source/form/fmctrler.cxx
+++ b/svx/source/form/fmctrler.cxx
@@ -41,7 +41,7 @@
 #include "fmresids.hrc"
 #include "fmservs.hxx"
 #include "fmshimp.hxx"
-#include "fmtools.hxx"
+#include "svx/fmtools.hxx"
 #include "fmurl.hxx"
 #include "svx/dialmgr.hxx"
 #include "svx/fmshell.hxx"
diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx
index f2773b7350fa..1b03be62d019 100644
--- a/svx/source/form/fmobj.cxx
+++ b/svx/source/form/fmobj.cxx
@@ -45,7 +45,7 @@
 #include <com/sun/star/awt/XControlContainer.hpp>
 /** === end UNO includes === **/
 #include <svx/fmmodel.hxx>
-#include "fmtools.hxx"
+#include "svx/fmtools.hxx"
 #include <tools/shl.hxx>
 #include <svx/dialmgr.hxx>
 
diff --git a/svx/source/form/fmobjfac.cxx b/svx/source/form/fmobjfac.cxx
index e2c9101b718c..c2d2fe10b956 100644
--- a/svx/source/form/fmobjfac.cxx
+++ b/svx/source/form/fmobjfac.cxx
@@ -32,7 +32,7 @@
 #include "precompiled_svx.hxx"
 #include <comphelper/stl_types.hxx>
 #include <svx/svdobj.hxx>
-#include "fmtools.hxx"
+#include "svx/fmtools.hxx"
 #include "fmservs.hxx"
 
 #ifndef _FM_FMOBJFAC_HXX
diff --git a/svx/source/form/fmpage.cxx b/svx/source/form/fmpage.cxx
index 0ead41eb87bc..658afe14e1ad 100644
--- a/svx/source/form/fmpage.cxx
+++ b/svx/source/form/fmpage.cxx
@@ -78,7 +78,7 @@
 #include "fmprop.hrc"
 #endif
 #include "fmundo.hxx"
-#include "fmtools.hxx"
+#include "svx/fmtools.hxx"
 using namespace ::svxform;
 #endif
 #include <comphelper/property.hxx>
diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx
index ed4cd890ec9e..547334114716 100644
--- a/svx/source/form/fmpgeimp.cxx
+++ b/svx/source/form/fmpgeimp.cxx
@@ -34,7 +34,7 @@
 #include "svxerr.hxx"
 #include "fmpgeimp.hxx"
 #include "fmundo.hxx"
-#include "fmtools.hxx"
+#include "svx/fmtools.hxx"
 #include "fmprop.hrc"
 #include "fmservs.hxx"
 #include "fmobj.hxx"
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index 7ccf63d064cc..2819045c237d 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -32,7 +32,7 @@
 #include "precompiled_svx.hxx"
 #include "fmvwimp.hxx"
 #include <svx/fmshell.hxx>
-#include "fmtools.hxx"
+#include "svx/fmtools.hxx"
 #include "fmservs.hxx"
 #ifndef _SVX_FMPROP_HRC
 #include "fmprop.hrc"
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 8a1e3c212d4c..13060a11279b 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -48,7 +48,7 @@
 #include "svditer.hxx"
 #include "fmservs.hxx"
 #include "fmpgeimp.hxx"
-#include "fmtools.hxx"
+#include "svx/fmtools.hxx"
 #ifndef _SVX_FMPROP_HRC
 #include "fmprop.hrc"
 #endif
diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx
index 182be11ba42f..4e2b8ba20fd2 100644
--- a/svx/source/form/fmsrcimp.cxx
+++ b/svx/source/form/fmsrcimp.cxx
@@ -34,7 +34,7 @@
 #ifndef _SVX_FMRESIDS_HRC
 #include "fmresids.hrc"
 #endif
-#include "fmtools.hxx"
+#include "svx/fmtools.hxx"
 #include "fmsrccfg.hxx"
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx
index 0d963ef905db..0a97bdd981b7 100644
--- a/svx/source/form/fmtools.cxx
+++ b/svx/source/form/fmtools.cxx
@@ -36,7 +36,7 @@
 #include <com/sun/star/sdb/XCompletedConnection.hpp>
 #include <com/sun/star/sdbcx/Privilege.hpp>
 #include <com/sun/star/lang/Locale.hpp>
-#include "fmtools.hxx"
+#include "svx/fmtools.hxx"
 #include "svx/dbtoolsclient.hxx"
 #include "fmservs.hxx"
 #include <svx/fmglob.hxx>
diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx
index 88f15756a233..b88bf659418c 100644
--- a/svx/source/form/fmundo.cxx
+++ b/svx/source/form/fmundo.cxx
@@ -47,7 +47,7 @@
 #ifndef _FM_FMMODEL_HXX
 #include <svx/fmmodel.hxx>
 #endif
-#include "fmtools.hxx"
+#include "svx/fmtools.hxx"
 #include <svx/fmpage.hxx>
 #ifndef _SVX_FMRESIDS_HRC
 #include "fmresids.hrc"
diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx
index d5e7992bc8e9..fff345413296 100644
--- a/svx/source/form/fmview.cxx
+++ b/svx/source/form/fmview.cxx
@@ -61,7 +61,7 @@
 #include <svx/fmpage.hxx>
 #include <svx/fmshell.hxx>
 #include "fmpgeimp.hxx"
-#include "fmtools.hxx"
+#include "svx/fmtools.hxx"
 #include "fmshimp.hxx"
 #include "fmservs.hxx"
 #include "fmprop.hrc"
diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index f3cc71721401..0e7592d4b3a0 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -39,7 +39,7 @@
 #include "fmresids.hrc"
 #include "fmservs.hxx"
 #include "fmshimp.hxx"
-#include "fmtools.hxx"
+#include "svx/fmtools.hxx"
 #include "fmundo.hxx"
 #include "fmvwimp.hxx"
 #include "formcontrolfactory.hxx"
diff --git a/svx/source/form/formcontrolling.cxx b/svx/source/form/formcontrolling.cxx
index 104d2f423eb5..454bdef5d8bf 100644
--- a/svx/source/form/formcontrolling.cxx
+++ b/svx/source/form/formcontrolling.cxx
@@ -35,7 +35,7 @@
 #include "fmurl.hxx"
 #include <svx/svxids.hrc>
 #include "fmprop.hrc"
-#include "fmtools.hxx"
+#include "svx/fmtools.hxx"
 
 /** === begin UNO includes === **/
 #include <com/sun/star/form/runtime/FormOperations.hpp>
diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx
index 4ad118418981..50736536bfd0 100644
--- a/svx/source/form/tabwin.cxx
+++ b/svx/source/form/tabwin.cxx
@@ -32,7 +32,7 @@
 #include "precompiled_svx.hxx"
 
 #include "tabwin.hxx"
-#include "fmtools.hxx"
+#include "svx/fmtools.hxx"
 #include "fmservs.hxx"
 #include "stringlistresource.hxx"
 
diff --git a/svx/source/gallery2/galbrws.cxx b/svx/source/gallery2/galbrws.cxx
index 91aab0b4e6bf..bf0cfb22748c 100644
--- a/svx/source/gallery2/galbrws.cxx
+++ b/svx/source/gallery2/galbrws.cxx
@@ -37,8 +37,8 @@
 #include <sfx2/app.hxx>
 #include <sfx2/sfxsids.hrc>
 #include "gallery.hrc"
-#include "galmisc.hxx"
-#include "gallery1.hxx"
+#include "svx/galmisc.hxx"
+#include "svx/gallery1.hxx"
 #include "galbrws1.hxx"
 #include "galbrws2.hxx"
 #include "galbrws.hxx"
diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx
index 915f8f84b1b4..57fd3a07513e 100644
--- a/svx/source/gallery2/galbrws1.cxx
+++ b/svx/source/gallery2/galbrws1.cxx
@@ -37,9 +37,9 @@
 #include <ucbhelper/content.hxx>
 #include <sfx2/app.hxx>
 #include "helpid.hrc"
-#include "gallery1.hxx"
+#include "svx/gallery1.hxx"
 #include "galtheme.hxx"
-#include "galmisc.hxx"
+#include "svx/galmisc.hxx"
 #include "galbrws1.hxx"
 #include <com/sun/star/util/DateTime.hpp>
 #include "gallery.hrc"
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index a9ae8efa0050..d2797f66b9d0 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -44,15 +44,15 @@
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/sfxsids.hrc>
-#include "impgrf.hxx"
+#include "svx/impgrf.hxx"
 #include <svx/brshitem.hxx>
 #include "helpid.hrc"
 #include "gallery.hxx"
 #include "galobj.hxx"
-#include "gallery1.hxx"
+#include "svx/gallery1.hxx"
 #include "galtheme.hxx"
 #include "galctrl.hxx"
-#include "galmisc.hxx"
+#include "svx/galmisc.hxx"
 #include "galbrws2.hxx"
 #include "gallery.hrc"
 #include <vcl/svapp.hxx>
diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx
index b72346fa3d65..09a95bec67a2 100644
--- a/svx/source/gallery2/galctrl.cxx
+++ b/svx/source/gallery2/galctrl.cxx
@@ -38,7 +38,7 @@
 #include "helpid.hrc"
 #include "galbrws2.hxx"
 #include "galtheme.hxx"
-#include "galmisc.hxx"
+#include "svx/galmisc.hxx"
 #include "galctrl.hxx"
 #include "AccessibleStringWrap.hxx"
 #include <svx/svxfont.hxx>
diff --git a/svx/source/gallery2/galexpl.cxx b/svx/source/gallery2/galexpl.cxx
index 121040ab9b63..c0c58f32b74e 100644
--- a/svx/source/gallery2/galexpl.cxx
+++ b/svx/source/gallery2/galexpl.cxx
@@ -33,7 +33,7 @@
 
 #include <unotools/pathoptions.hxx>
 #include <sfx2/viewfrm.hxx>
-#include "gallery1.hxx"
+#include "svx/gallery1.hxx"
 #include "galtheme.hxx"
 #include "galbrws.hxx"
 #include "gallery.hxx"
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx
index ebc6ff78a213..a71a72e64c21 100644
--- a/svx/source/gallery2/gallery1.cxx
+++ b/svx/source/gallery2/gallery1.cxx
@@ -40,9 +40,9 @@
 #include <sfx2/docfile.hxx>
 #include "gallery.hxx"
 #include "gallery.hrc"
-#include "galmisc.hxx"
+#include "svx/galmisc.hxx"
 #include "galtheme.hxx"
-#include "gallery1.hxx"
+#include "svx/gallery1.hxx"
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <com/sun/star/ucb/XContentAccess.hpp>
 
diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx
index b91fb1cfb882..bbf0771c65de 100644
--- a/svx/source/gallery2/galmisc.cxx
+++ b/svx/source/gallery2/galmisc.cxx
@@ -45,7 +45,7 @@
 #include <avmedia/mediawindow.hxx>
 #include <vcl/svapp.hxx>
 
-#include "impgrf.hxx"
+#include "svx/impgrf.hxx"
 #include <svx/svdpage.hxx>
 #include <svx/svdograf.hxx>
 #include <svx/fmmodel.hxx>
@@ -53,9 +53,9 @@
 #include <svx/unomodel.hxx>
 #include "codec.hxx"
 #include "gallery.hrc"
-#include "gallery1.hxx"
+#include "svx/gallery1.hxx"
 #include "galtheme.hxx"
-#include "galmisc.hxx"
+#include "svx/galmisc.hxx"
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <com/sun/star/ucb/XContentAccess.hpp>
 #include <com/sun/star/ucb/TransferInfo.hpp>
diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx
index d0b1e68460a6..5aeb1a80fea5 100644
--- a/svx/source/gallery2/galobj.cxx
+++ b/svx/source/gallery2/galobj.cxx
@@ -48,7 +48,7 @@
 #include <svx/fmview.hxx>
 #include <svx/fmpage.hxx>
 #include "gallery.hrc"
-#include "galmisc.hxx"
+#include "svx/galmisc.hxx"
 #include "galobj.hxx"
 #include <vcl/salbtype.hxx>     // FRound
 #include <vcl/svapp.hxx>
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index d508cb412075..2c792070c646 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -54,7 +54,7 @@
 #include <svx/unomodel.hxx>
 #include <svx/fmmodel.hxx>
 #include <svx/fmview.hxx>
-#include "galmisc.hxx"
+#include "svx/galmisc.hxx"
 #include "galtheme.hxx"
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <com/sun/star/ucb/XContentAccess.hpp>
diff --git a/svx/source/gengal/gengal.cxx b/svx/source/gengal/gengal.cxx
index f420e8f7680e..e5d35df22fdd 100644
--- a/svx/source/gengal/gengal.cxx
+++ b/svx/source/gengal/gengal.cxx
@@ -71,7 +71,7 @@
 #include <rtl/bootstrap.hxx>
 
 #include <galtheme.hxx>
-#include <gallery1.hxx>
+#include <svx/gallery1.hxx>
 
 using namespace ::vos;
 using namespace ::com::sun::star::uno;
diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx
index 9809010c901c..ce382a1986bc 100644
--- a/svx/source/inc/filtnav.hxx
+++ b/svx/source/inc/filtnav.hxx
@@ -46,7 +46,7 @@
 #include <vcl/dialog.hxx>
 #include <vcl/group.hxx>
 #include <vcl/dockwin.hxx>
-#include "fmtools.hxx"
+#include "svx/fmtools.hxx"
 #include "fmexch.hxx"
 #include <connectivity/sqlparse.hxx>
 #include "fmexch.hxx"
diff --git a/svx/source/inc/fmPropBrw.hxx b/svx/source/inc/fmPropBrw.hxx
index 285cb90320d2..70072a0fe7de 100644
--- a/svx/source/inc/fmPropBrw.hxx
+++ b/svx/source/inc/fmPropBrw.hxx
@@ -40,7 +40,7 @@
 #include <sfx2/basedlgs.hxx>
 #include <sfx2/ctrlitem.hxx>
 #include <sfx2/childwin.hxx>
-#include "fmtools.hxx"
+#include "svx/fmtools.hxx"
 
 //========================================================================
 class FmPropBrwMgr : public SfxChildWindow
diff --git a/svx/source/inc/fmctrler.hxx b/svx/source/inc/fmctrler.hxx
index 7a973e129280..060f1fdb04db 100644
--- a/svx/source/inc/fmctrler.hxx
+++ b/svx/source/inc/fmctrler.hxx
@@ -30,7 +30,7 @@
 #ifndef _SVX_FMCTRLER_HXX
 #define _SVX_FMCTRLER_HXX
 
-#include "fmtools.hxx"
+#include "svx/fmtools.hxx"
 #include "formcontrolling.hxx"
 #include "sqlparserclient.hxx"
 #include "delayedevent.hxx"
diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx
index bc1da6d2a59c..6f2ced3c98ca 100644
--- a/svx/source/inc/fmexpl.hxx
+++ b/svx/source/inc/fmexpl.hxx
@@ -57,7 +57,7 @@
 #include <svx/fmview.hxx>
 
 #include "fmexch.hxx"
-#include "fmtools.hxx"
+#include "svx/fmtools.hxx"
 
 class SdrObjListIter;
 class FmFormShell;
diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx
index 98d6c5c6ed27..89c384dd2648 100644
--- a/svx/source/inc/fmshimp.hxx
+++ b/svx/source/inc/fmshimp.hxx
@@ -67,7 +67,7 @@
 #define _SVSTDARR_USHORTS
 #include <svl/svstdarr.hxx>
 #include <sfx2/mnuitem.hxx>
-#include "fmtools.hxx"
+#include "svx/fmtools.hxx"
 #include "fmsrccfg.hxx"
 #include <osl/mutex.hxx>
 #include <vos/thread.hxx>
diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx
index cb747e3a894c..504aaff7acf3 100644
--- a/svx/source/inc/gridcell.hxx
+++ b/svx/source/inc/gridcell.hxx
@@ -35,7 +35,7 @@
 
 #include "sqlparserclient.hxx"
 #include "typeconversionclient.hxx"
-#include "fmtools.hxx"
+#include "svx/fmtools.hxx"
 
 /** === begin UNO includes === **/
 #include <com/sun/star/sdb/XColumn.hpp>
diff --git a/svx/source/inc/tabwin.hxx b/svx/source/inc/tabwin.hxx
index be46c05a58d5..8feda5ef6b68 100644
--- a/svx/source/inc/tabwin.hxx
+++ b/svx/source/inc/tabwin.hxx
@@ -38,7 +38,7 @@
 #include <com/sun/star/form/XForm.hpp>
 
 //#ifndef _SVX_FMTOOLS_HXX
-//#include "fmtools.hxx"
+//#include "svx/fmtools.hxx"
 //#endif
 #include <comphelper/propmultiplex.hxx>
 #include <svtools/transfer.hxx>
diff --git a/svx/source/sdr/attribute/sdrformtextattribute.cxx b/svx/source/sdr/attribute/sdrformtextattribute.cxx
index 09ec874c9ebd..a33ee3f7dfe4 100644
--- a/svx/source/sdr/attribute/sdrformtextattribute.cxx
+++ b/svx/source/sdr/attribute/sdrformtextattribute.cxx
@@ -52,7 +52,7 @@
 #include <svx/sdshcitm.hxx>
 #include <svx/xlnclit.hxx>
 #include <svx/xlnwtit.hxx>
-#include <xlinjoit.hxx>
+#include <svx/xlinjoit.hxx>
 #include <svx/xlineit0.hxx>
 #include <svx/xdash.hxx>
 #include <svx/xlndsit.hxx>
diff --git a/svx/source/sdr/primitive2d/sdrattributecreator.cxx b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
index d9592124f916..f0441def1b0c 100644
--- a/svx/source/sdr/primitive2d/sdrattributecreator.cxx
+++ b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
@@ -38,7 +38,7 @@
 #include <svx/xfillit0.hxx>
 #include <svx/xlntrit.hxx>
 #include <svx/xlnwtit.hxx>
-#include <xlinjoit.hxx>
+#include <svx/xlinjoit.hxx>
 #include <svx/xlnclit.hxx>
 #include <svx/xlnstwit.hxx>
 #include <svx/xlnedwit.hxx>
diff --git a/svx/source/svdraw/svdoattr.cxx b/svx/source/svdraw/svdoattr.cxx
index 275548f93b51..a44d72c47123 100644
--- a/svx/source/svdraw/svdoattr.cxx
+++ b/svx/source/svdraw/svdoattr.cxx
@@ -87,7 +87,7 @@
 #include <svx/xlnstit.hxx>
 #include <svx/sdr/properties/attributeproperties.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
-#include "xlinjoit.hxx"
+#include "svx/xlinjoit.hxx"
 #include <svdoimp.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 7bf1ea90f221..013eaed311c6 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -86,7 +86,7 @@
 #include <svx/xfltrit.hxx>
 #include <svx/xfltrit.hxx>
 #include <svx/xflftrit.hxx>
-#include "xlinjoit.hxx"
+#include "svx/xlinjoit.hxx"
 #include <svx/unopage.hxx>
 #include <svx/eeitem.hxx>
 #include <svx/xenum.hxx>
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index bf68fe84adf0..84e571736328 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -58,7 +58,7 @@
 #include <svx/svdpagv.hxx>
 #include "svdviter.hxx"
 #include <svx/svdview.hxx>
-#include "impgrf.hxx"
+#include "svx/impgrf.hxx"
 #include <svx/svdograf.hxx>
 #include <svx/svdogrp.hxx>
 #include <svx/xbitmap.hxx>
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index ebb25344fc63..67505e12ba73 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -85,7 +85,7 @@
 #include <svx/svdetc.hxx>
 #include <svx/svdview.hxx>
 #include "unomlstr.hxx"
-#include "impgrf.hxx"
+#include "svx/impgrf.hxx"
 #include <svtools/chartprettypainter.hxx>
 #include <svx/sdr/contact/viewcontactofsdrole2obj.hxx>
 #include <svx/svdograf.hxx>
diff --git a/svx/source/svdraw/svdotextpathdecomposition.cxx b/svx/source/svdraw/svdotextpathdecomposition.cxx
index 365d6bafa70e..058d0c1a4513 100644
--- a/svx/source/svdraw/svdotextpathdecomposition.cxx
+++ b/svx/source/svdraw/svdotextpathdecomposition.cxx
@@ -63,7 +63,7 @@
 #include <svx/xlnclit.hxx>
 #include <svx/xlntrit.hxx>
 #include <svx/xlnwtit.hxx>
-#include <xlinjoit.hxx>
+#include <svx/xlinjoit.hxx>
 #include <svx/xlndsit.hxx>
 #include <drawinglayer/primitive2d/polygonprimitive2d.hxx>
 #include <drawinglayer/primitive2d/unifiedalphaprimitive2d.hxx>
diff --git a/svx/source/svrtf/rtfgrf.cxx b/svx/source/svrtf/rtfgrf.cxx
index 6ba88589cb0f..978f07f2acfa 100644
--- a/svx/source/svrtf/rtfgrf.cxx
+++ b/svx/source/svrtf/rtfgrf.cxx
@@ -40,7 +40,7 @@
 #include <svtools/rtftoken.h>
 #include <svtools/filter.hxx>
 
-#include "impgrf.hxx"
+#include "svx/impgrf.hxx"
 #include "svxrtf.hxx"
 
 
diff --git a/svx/source/svxlink/fileobj.cxx b/svx/source/svxlink/fileobj.cxx
index a5d466e36759..6e0925da2bb2 100644
--- a/svx/source/svxlink/fileobj.cxx
+++ b/svx/source/svxlink/fileobj.cxx
@@ -58,7 +58,7 @@
 #include <svx/dialogs.hrc>
 #include "xoutbmp.hxx"
 #include "opengrf.hxx"
-#include "impgrf.hxx"
+#include "svx/impgrf.hxx"
 
 namespace css = ::com::sun::star;
 
diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx
index c5f8497fba15..db8c2f2fc314 100644
--- a/svx/source/unodraw/UnoGraphicExporter.cxx
+++ b/svx/source/unodraw/UnoGraphicExporter.cxx
@@ -69,7 +69,7 @@
 #include <svx/svdpagv.hxx>
 #include <svx/svdograf.hxx>
 #include "xoutbmp.hxx"
-#include "impgrf.hxx"
+#include "svx/impgrf.hxx"
 #include "unoapi.hxx"
 #include <svx/svdpage.hxx>
 #include <svx/svdmodel.hxx>
diff --git a/svx/source/unodraw/unobtabl.cxx b/svx/source/unodraw/unobtabl.cxx
index f2b05f80ca7c..671de49dc4ba 100644
--- a/svx/source/unodraw/unobtabl.cxx
+++ b/svx/source/unodraw/unobtabl.cxx
@@ -45,7 +45,7 @@
 #include <svx/svdmodel.hxx>
 #include <svx/xflhtit.hxx>
 #include "unoapi.hxx"
-#include "impgrf.hxx"
+#include "svx/impgrf.hxx"
 #include <svx/unomid.hxx>
 #include <svx/unoprnms.hxx>
 #include "unofill.hxx"
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index d6d0913c4070..e6d7e1821435 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -47,7 +47,7 @@
 #include <vcl/svapp.hxx>
 #include <vos/mutex.hxx>
 #include <svtools/fltcall.hxx>
-#include "impgrf.hxx"
+#include "svx/impgrf.hxx"
 
 #include <boost/scoped_ptr.hpp>
 
diff --git a/svx/source/unogallery/unogalitem.cxx b/svx/source/unogallery/unogalitem.cxx
index 71cb0a5bff25..5a8f93423e27 100644
--- a/svx/source/unogallery/unogalitem.cxx
+++ b/svx/source/unogallery/unogalitem.cxx
@@ -34,7 +34,7 @@
 #include "unogalitem.hxx"
 #include "unogaltheme.hxx"
 #include "galtheme.hxx"
-#include "galmisc.hxx"
+#include "svx/galmisc.hxx"
 #include <svx/fmmodel.hxx>
 #include <rtl/uuid.h>
 #include <vos/mutex.hxx>
diff --git a/svx/source/unogallery/unogaltheme.cxx b/svx/source/unogallery/unogaltheme.cxx
index 99c1f13eebc4..6e3a16336f62 100644
--- a/svx/source/unogallery/unogaltheme.cxx
+++ b/svx/source/unogallery/unogaltheme.cxx
@@ -36,8 +36,8 @@
 #include "unogaltheme.hxx"
 #include "unogalitem.hxx"
 #include "galtheme.hxx"
-#include "gallery1.hxx"
-#include "galmisc.hxx"
+#include "svx/gallery1.hxx"
+#include "svx/galmisc.hxx"
 #include <svx/fmmodel.hxx>
 #include <rtl/uuid.h>
 #include <vos/mutex.hxx>
diff --git a/svx/source/unogallery/unogalthemeprovider.cxx b/svx/source/unogallery/unogalthemeprovider.cxx
index 9ccf7f978011..f9c9379989b5 100644
--- a/svx/source/unogallery/unogalthemeprovider.cxx
+++ b/svx/source/unogallery/unogalthemeprovider.cxx
@@ -33,7 +33,7 @@
 
 #include "unogalthemeprovider.hxx"
 #include "unogaltheme.hxx"
-#include "gallery1.hxx"
+#include "svx/gallery1.hxx"
 #include <rtl/uuid.h>
 #include <vos/mutex.hxx>
 #ifndef _SV_SVAPP_HXX_
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index 7ab6a44fd3fb..7f43bc2df269 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -49,7 +49,7 @@
 #include <vcl/metaact.hxx>
 #include <tools/zcodec.hxx>
 
-#include "impgrf.hxx"
+#include "svx/impgrf.hxx"
 #include "xmlgrhlp.hxx"
 
 #include <algorithm>
diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx
index 0277135c4136..0eda2eeb375f 100644
--- a/svx/source/xoutdev/_xoutbmp.cxx
+++ b/svx/source/xoutdev/_xoutbmp.cxx
@@ -41,7 +41,7 @@
 #include <svl/solar.hrc>
 #include <sfx2/docfile.hxx>
 #include <sfx2/app.hxx>
-#include "impgrf.hxx"
+#include "svx/impgrf.hxx"
 #include "xoutbmp.hxx"
 #include <svtools/FilterConfigItem.hxx>