CWS gnumake2: rebase to DEV300_m76; fix build problems

3 files changed, 93 insertions, 200 deletions

diff --git a/sfx2/prj/d.lst b/sfx2/prj/d.lst
index b36ec3fea06a..2b956707606a 100644
--- a/sfx2/prj/d.lst
+++ b/sfx2/prj/d.lst
@@ -23,114 +23,10 @@ mkdir: %_DEST%\inc%_EXT%\sfx2
 ..\util\sfx.xml %_DEST%\xml%_EXT%\sfx.xml
 ..\%__SRC%\misc\sfx2.csv %_DEST%\inc%_EXT%\sfx2.csv
 
+..\inc\sfx2\*.h %_DEST%\inc%_EXT%\sfx2\*.h
+..\inc\sfx2\*.hxx %_DEST%\inc%_EXT%\sfx2\*.hxx
+..\inc\sfx2\*.hrc %_DEST%\inc%_EXT%\sfx2\*.hrc
+
 ..\sdi\sfx.sdi %_DEST%\inc%_EXT%\sfx2\sfx.sdi
 ..\sdi\sfxitems.sdi %_DEST%\inc%_EXT%\sfx2\sfxitems.sdi
 
-..\inc\sfx2\brokenpackageint.hxx %_DEST%\inc%_EXT%\sfx2\brokenpackageint.hxx
-..\inc\sfx2\dinfedt.hxx %_DEST%\inc%_EXT%\sfx2\dinfedt.hxx
-..\inc\sfx2\imgmgr.hxx %_DEST%\inc%_EXT%\sfx2\imgmgr.hxx
-..\inc\sfx2\mieclip.hxx %_DEST%\inc%_EXT%\sfx2\mieclip.hxx
-..\inc\sfx2\minfitem.hxx %_DEST%\inc%_EXT%\sfx2\minfitem.hxx
-..\inc\sfx2\tplpitem.hxx %_DEST%\inc%_EXT%\sfx2\tplpitem.hxx
-..\inc\sfx2\basmgr.hxx %_DEST%\inc%_EXT%\sfx2\basmgr.hxx
-..\inc\sfx2\imagemgr.hxx %_DEST%\inc%_EXT%\sfx2\imagemgr.hxx
-..\inc\sfx2\QuerySaveDocument.hxx %_DEST%\inc%_EXT%\sfx2\QuerySaveDocument.hxx
-..\inc\sfx2\mailmodelapi.hxx %_DEST%\inc%_EXT%\sfx2\mailmodelapi.hxx
-..\inc\sfx2\docinsert.hxx %_DEST%\inc%_EXT%\sfx2\docinsert.hxx
-..\inc\sfx2\viewfac.hxx %_DEST%\inc%_EXT%\sfx2\viewfac.hxx
-..\inc\sfx2\sfxresid.hxx %_DEST%\inc%_EXT%\sfx2\sfxresid.hxx
-
-..\inc\sfx2\dllapi.h %_DEST%\inc%_EXT%\sfx2\dllapi.h
-..\inc\sfx2\app.hxx %_DEST%\inc%_EXT%\sfx2\app.hxx
-..\inc\sfx2\basedlgs.hxx %_DEST%\inc%_EXT%\sfx2\basedlgs.hxx
-..\inc\sfx2\bindings.hxx %_DEST%\inc%_EXT%\sfx2\bindings.hxx
-..\inc\sfx2\chalign.hxx %_DEST%\inc%_EXT%\sfx2\chalign.hxx
-..\inc\sfx2\childwin.hxx %_DEST%\inc%_EXT%\sfx2\childwin.hxx
-..\inc\sfx2\ctrlitem.hxx %_DEST%\inc%_EXT%\sfx2\ctrlitem.hxx
-..\inc\sfx2\dispatch.hxx %_DEST%\inc%_EXT%\sfx2\dispatch.hxx
-..\inc\sfx2\dinfdlg.hxx %_DEST%\inc%_EXT%\sfx2\dinfdlg.hxx
-..\inc\sfx2\docinf.hxx %_DEST%\inc%_EXT%\sfx2\docinf.hxx
-..\inc\sfx2\docfac.hxx %_DEST%\inc%_EXT%\sfx2\docfac.hxx
-..\inc\sfx2\docfile.hxx %_DEST%\inc%_EXT%\sfx2\docfile.hxx
-..\inc\sfx2\docfilt.hxx %_DEST%\inc%_EXT%\sfx2\docfilt.hxx
-..\inc\sfx2\dockwin.hxx %_DEST%\inc%_EXT%\sfx2\dockwin.hxx
-..\inc\sfx2\doctempl.hxx %_DEST%\inc%_EXT%\sfx2\doctempl.hxx
-..\inc\sfx2\doctdlg.hxx %_DEST%\inc%_EXT%\sfx2\doctdlg.hxx
-..\inc\sfx2\event.hxx %_DEST%\inc%_EXT%\sfx2\event.hxx
-..\inc\sfx2\evntconf.hxx %_DEST%\inc%_EXT%\sfx2\evntconf.hxx
-..\inc\sfx2\filedlghelper.hxx %_DEST%\inc%_EXT%\sfx2\filedlghelper.hxx
-..\inc\sfx2\fcontnr.hxx %_DEST%\inc%_EXT%\sfx2\fcontnr.hxx
-..\inc\sfx2\frame.hxx %_DEST%\inc%_EXT%\sfx2\frame.hxx
-..\inc\sfx2\frmdescr.hxx %_DEST%\inc%_EXT%\sfx2\frmdescr.hxx
-..\inc\sfx2\frmhtml.hxx %_DEST%\inc%_EXT%\sfx2\frmhtml.hxx
-..\inc\sfx2\frmhtmlw.hxx %_DEST%\inc%_EXT%\sfx2\frmhtmlw.hxx
-..\inc\sfx2\genlink.hxx %_DEST%\inc%_EXT%\sfx2\genlink.hxx
-..\inc\sfx2\hintpost.hxx %_DEST%\inc%_EXT%\sfx2\hintpost.hxx
-..\inc\sfx2\imgdef.hxx %_DEST%\inc%_EXT%\sfx2\imgdef.hxx
-..\inc\sfx2\ipclient.hxx %_DEST%\inc%_EXT%\sfx2\ipclient.hxx
-..\inc\sfx2\macrconf.hxx %_DEST%\inc%_EXT%\sfx2\macrconf.hxx
-..\inc\sfx2\topfrm.hxx %_DEST%\inc%_EXT%\sfx2\topfrm.hxx
-..\inc\sfx2\mgetempl.hxx %_DEST%\inc%_EXT%\sfx2\mgetempl.hxx
-..\inc\sfx2\minarray.hxx %_DEST%\inc%_EXT%\sfx2\minarray.hxx
-..\inc\sfx2\minstack.hxx %_DEST%\inc%_EXT%\sfx2\minstack.hxx
-..\inc\sfx2\mnuitem.hxx %_DEST%\inc%_EXT%\sfx2\mnuitem.hxx
-..\inc\sfx2\module.hxx %_DEST%\inc%_EXT%\sfx2\module.hxx
-..\inc\sfx2\msg.hxx %_DEST%\inc%_EXT%\sfx2\msg.hxx
-..\inc\sfx2\mnumgr.hxx %_DEST%\inc%_EXT%\sfx2\mnumgr.hxx
-..\inc\sfx2\newstyle.hxx %_DEST%\inc%_EXT%\sfx2\newstyle.hxx
-..\inc\sfx2\new.hxx %_DEST%\inc%_EXT%\sfx2\new.hxx
-..\inc\sfx2\navigat.hxx %_DEST%\inc%_EXT%\sfx2\navigat.hxx
-..\inc\sfx2\msgpool.hxx %_DEST%\inc%_EXT%\sfx2\msgpool.hxx
-..\inc\sfx2\passwd.hxx %_DEST%\inc%_EXT%\sfx2\passwd.hxx
-..\inc\sfx2\prnmon.hxx %_DEST%\inc%_EXT%\sfx2\prnmon.hxx
-..\inc\sfx2\objface.hxx %_DEST%\inc%_EXT%\sfx2\objface.hxx
-..\inc\sfx2\objitem.hxx %_DEST%\inc%_EXT%\sfx2\objitem.hxx
-..\inc\sfx2\signaturestate.hxx %_DEST%\inc%_EXT%\sfx2\signaturestate.hxx
-..\inc\sfx2\docmacromode.hxx %_DEST%\inc%_EXT%\sfx2\docmacromode.hxx
-..\inc\sfx2\userinputinterception.hxx %_DEST%\inc%_EXT%\sfx2\userinputinterception.hxx
-..\inc\sfx2\docstoragemodifylistener.hxx %_DEST%\inc%_EXT%\sfx2\docstoragemodifylistener.hxx
-..\inc\sfx2\sfxmodelfactory.hxx %_DEST%\inc%_EXT%\sfx2\sfxmodelfactory.hxx
-..\inc\sfx2\objsh.hxx %_DEST%\inc%_EXT%\sfx2\objsh.hxx
-..\inc\sfx2\printer.hxx %_DEST%\inc%_EXT%\sfx2\printer.hxx
-..\inc\sfx2\printopt.hxx %_DEST%\inc%_EXT%\sfx2\printopt.hxx
-..\inc\sfx2\progress.hxx %_DEST%\inc%_EXT%\sfx2\progress.hxx
-..\inc\sfx2\request.hxx %_DEST%\inc%_EXT%\sfx2\request.hxx
-..\inc\sfx2\sfx.hrc %_DEST%\inc%_EXT%\sfx2\sfx.hrc
-..\inc\sfx2\sfxdefs.hxx %_DEST%\inc%_EXT%\sfx2\sfxdefs.hxx
-..\inc\sfxhelp.hxx %_DEST%\inc%_EXT%\sfx2\sfxhelp.hxx
-..\inc\sfx2\sfxhtml.hxx %_DEST%\inc%_EXT%\sfx2\sfxhtml.hxx
-..\inc\sfx2\sfxsids.hrc %_DEST%\inc%_EXT%\sfx2\sfxsids.hrc
-..\inc\sfx2\shell.hxx %_DEST%\inc%_EXT%\sfx2\shell.hxx
-..\inc\stbitem.hxx %_DEST%\inc%_EXT%\sfx2\stbitem.hxx
-..\inc\sfx2\styfitem.hxx %_DEST%\inc%_EXT%\sfx2\styfitem.hxx
-..\inc\sfx2\styledlg.hxx %_DEST%\inc%_EXT%\sfx2\styledlg.hxx
-..\inc\sfx2\tabdlg.hxx %_DEST%\inc%_EXT%\sfx2\tabdlg.hxx
-..\inc\sfx2\tbxctrl.hxx %_DEST%\inc%_EXT%\sfx2\tbxctrl.hxx
-..\inc\sfx2\templdlg.hxx %_DEST%\inc%_EXT%\sfx2\templdlg.hxx
-..\inc\sfx2\viewfrm.hxx %_DEST%\inc%_EXT%\sfx2\viewfrm.hxx
-..\inc\sfx2\viewsh.hxx %_DEST%\inc%_EXT%\sfx2\viewsh.hxx
-..\inc\sfx2\appuno.hxx %_DEST%\inc%_EXT%\sfx2\appuno.hxx
-..\inc\sfx2\sfxuno.hxx %_DEST%\inc%_EXT%\sfx2\sfxuno.hxx
-..\inc\sfx2\sfxbasemodel.hxx %_DEST%\inc%_EXT%\sfx2\sfxbasemodel.hxx
-..\inc\sfx2\sfxbasecontroller.hxx %_DEST%\inc%_EXT%\sfx2\sfxbasecontroller.hxx
-..\inc\sfx2\unoctitm.hxx %_DEST%\inc%_EXT%\sfx2\unoctitm.hxx
-..\inc\sfx2\srchitem.hxx %_DEST%\inc%_EXT%\sfx2\srchitem.hxx
-..\inc\sfx2\srchdefs.hxx %_DEST%\inc%_EXT%\sfx2\srchdefs.hxx
-..\inc\sfx2\cntids.hrc %_DEST%\inc%_EXT%\sfx2\cntids.hrc
-..\inc\sfx2\sfxdlg.hxx %_DEST%\inc%_EXT%\sfx2\sfxdlg.hxx
-..\inc\sfx2\dialogs.hrc %_DEST%\inc%_EXT%\sfx2\dialogs.hrc
-..\inc\sfx2\itemwrapper.hxx %_DEST%\inc%_EXT%\sfx2\itemwrapper.hxx
-..\inc\sfx2\controlwrapper.hxx %_DEST%\inc%_EXT%\sfx2\controlwrapper.hxx
-..\inc\sfx2\itemconnect.hxx %_DEST%\inc%_EXT%\sfx2\itemconnect.hxx
-..\inc\sfx2\lnkbase.hxx %_DEST%\inc%_EXT%\sfx2\lnkbase.hxx
-..\inc\sfx2\linkmgr.hxx %_DEST%\inc%_EXT%\sfx2\linkmgr.hxx
-..\inc\sfx2\linksrc.hxx %_DEST%\inc%_EXT%\sfx2\linksrc.hxx
-..\inc\sfx2\querystatus.hxx %_DEST%\inc%_EXT%\sfx2\querystatus.hxx
-..\inc\sfx2\sfxstatuslistener.hxx %_DEST%\inc%_EXT%\sfx2\sfxstatuslistener.hxx
-..\inc\sfx2\layout.hxx %_DEST%\inc%_EXT%\sfx2\layout.hxx
-..\inc\sfx2\layout-tabdlg.hxx %_DEST%\inc%_EXT%\sfx2\layout-tabdlg.hxx
-..\inc\sfx2\layout-post.hxx %_DEST%\inc%_EXT%\sfx2\layout-post.hxx
-..\inc\sfx2\layout-pre.hxx %_DEST%\inc%_EXT%\sfx2\layout-pre.hxx
-..\inc\sfx2\XmlIdRegistry.hxx %_DEST%\inc%_EXT%\sfx2\XmlIdRegistry.hxx
-..\inc\sfx2\DocumentMetadataAccess.hxx %_DEST%\inc%_EXT%\sfx2\DocumentMetadataAccess.hxx
-..\inc\sfx2\Metadatable.hxx %_DEST%\inc%_EXT%\sfx2\Metadatable.hxx
diff --git a/sfx2/prj/target_lib_sfx2.mk b/sfx2/prj/target_lib_sfx2.mk
index 7770abef5a28..c08f563d2827 100644
--- a/sfx2/prj/target_lib_sfx2.mk
+++ b/sfx2/prj/target_lib_sfx2.mk
@@ -87,52 +87,54 @@ $(eval $(call gb_Library_add_linked_system_libs,sfx,\
 ))
 
 $(eval $(call gb_Library_add_exception_objects,sfx,\
-    sfx2/source/appl/appcfg \
-    sfx2/source/appl/imagemgr \
-    sfx2/source/appl/appopen \
-    sfx2/source/appl/appmain \
-    sfx2/source/appl/appmisc \
-    sfx2/source/appl/appinit \
-    sfx2/source/appl/helpinterceptor \
-    sfx2/source/appl/newhelp \
-    sfx2/source/appl/sfxhelp \
-    sfx2/source/appl/shutdownicon \
-    sfx2/source/appl/shutdowniconw32 \
-    sfx2/source/appl/sfxpicklist \
-    sfx2/source/appl/helpdispatch \
-    sfx2/source/appl/xpackcreator \
     sfx2/source/appl/app \
     sfx2/source/appl/appbas \
+    sfx2/source/appl/appbaslib \
+    sfx2/source/appl/appcfg \
     sfx2/source/appl/appchild \
     sfx2/source/appl/appdata \
     sfx2/source/appl/appdde \
+    sfx2/source/appl/appinit \
+    sfx2/source/appl/appmain \
+    sfx2/source/appl/appmisc \
+    sfx2/source/appl/appopen \
     sfx2/source/appl/appquit \
     sfx2/source/appl/appreg \
     sfx2/source/appl/appserv \
     sfx2/source/appl/appuno \
-    sfx2/source/appl/appbaslib \
     sfx2/source/appl/childwin \
+    sfx2/source/appl/fileobj \
+    sfx2/source/appl/fwkhelper \
+    sfx2/source/appl/helpdispatch \
+    sfx2/source/appl/helpinterceptor \
+    sfx2/source/appl/imagemgr \
     sfx2/source/appl/imestatuswindow \
     sfx2/source/appl/impldde \
     sfx2/source/appl/linkmgr2 \
     sfx2/source/appl/linksrc \
     sfx2/source/appl/lnkbase2 \
     sfx2/source/appl/module \
+    sfx2/source/appl/newhelp \
+    sfx2/source/appl/opengrf \
     sfx2/source/appl/sfxdll \
+    sfx2/source/appl/sfxhelp \
+    sfx2/source/appl/sfxpicklist \
+    sfx2/source/appl/shutdownicon \
+    sfx2/source/appl/shutdowniconw32 \
     sfx2/source/appl/workwin \
-    sfx2/source/appl/fwkhelper \
-    sfx2/source/bastyp/sfxhtml \
+    sfx2/source/appl/xpackcreator \
+    sfx2/source/bastyp/bitset \
+    sfx2/source/bastyp/fltfnc \
+    sfx2/source/bastyp/fltlst \
     sfx2/source/bastyp/frmhtml \
     sfx2/source/bastyp/frmhtmlw \
+    sfx2/source/bastyp/helper \
+    sfx2/source/bastyp/mieclip \
+    sfx2/source/bastyp/minarray \
     sfx2/source/bastyp/misc \
     sfx2/source/bastyp/progress \
+    sfx2/source/bastyp/sfxhtml \
     sfx2/source/bastyp/sfxresid \
-    sfx2/source/bastyp/bitset \
-    sfx2/source/bastyp/minarray \
-    sfx2/source/bastyp/fltfnc \
-    sfx2/source/bastyp/mieclip \
-    sfx2/source/bastyp/fltlst \
-    sfx2/source/bastyp/helper \
     sfx2/source/config/evntconf \
     sfx2/source/control/bindings \
     sfx2/source/control/ctrlitem \
@@ -148,104 +150,99 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\
     sfx2/source/control/sfxstatuslistener \
     sfx2/source/control/shell \
     sfx2/source/control/sorgitm \
-    sfx2/source/control/srchitem \
     sfx2/source/control/statcach \
     sfx2/source/control/unoctitm \
+    sfx2/source/dialog/about \
+    sfx2/source/dialog/alienwarn \
+    sfx2/source/dialog/basedlgs \
+    sfx2/source/dialog/dinfedt \
+    sfx2/source/dialog/dinfdlg \
+    sfx2/source/dialog/dockwin \
     sfx2/source/dialog/filedlghelper \
     sfx2/source/dialog/filtergrouping \
+    sfx2/source/dialog/intro \
     sfx2/source/dialog/itemconnect \
     sfx2/source/dialog/mailmodel \
+    sfx2/source/dialog/mgetempl \
+    sfx2/source/dialog/navigat \
+    sfx2/source/dialog/newstyle \
     sfx2/source/dialog/partwnd \
+    sfx2/source/dialog/passwd \
+    sfx2/source/dialog/printopt \
     sfx2/source/dialog/recfloat \
+    sfx2/source/dialog/sfxdlg \
+    sfx2/source/dialog/sfxurl \
+    sfx2/source/dialog/splitwin \
+    sfx2/source/dialog/srchdlg \
+    sfx2/source/dialog/styfitem \
+    sfx2/source/dialog/styledlg \
+    sfx2/source/dialog/tabdlg \
     sfx2/source/dialog/templdlg \
-    sfx2/source/dialog/dinfdlg \
-    sfx2/source/dialog/dockwin \
-    sfx2/source/doc/printhelper \
-    sfx2/source/doc/docinf \
-    sfx2/source/doc/oleprops \
-    sfx2/source/doc/iframe \
-    sfx2/source/doc/plugin \
-    sfx2/source/doc/docfile \
-    sfx2/source/doc/objuno \
-    sfx2/source/doc/frmdescr \
-    sfx2/source/doc/objxtor \
-    sfx2/source/doc/objmisc \
-    sfx2/source/doc/objstor \
-    sfx2/source/doc/objcont \
-    sfx2/source/doc/objserv \
-    sfx2/source/doc/objitem \
-    sfx2/source/doc/ownsubfilterservice \
+    sfx2/source/dialog/tplcitem \
+    sfx2/source/dialog/tplpitem \
+    sfx2/source/dialog/versdlg \
     sfx2/source/doc/docfac \
+    sfx2/source/doc/docfile \
     sfx2/source/doc/docfilt \
+    sfx2/source/doc/docinf \
+    sfx2/source/doc/docinsert \
+    sfx2/source/doc/docmacromode \
+    sfx2/source/doc/docstoragemodifylistener \
     sfx2/source/doc/doctempl \
     sfx2/source/doc/doctemplates \
     sfx2/source/doc/doctemplateslocal \
-    sfx2/source/doc/docvor \
-    sfx2/source/doc/new \
     sfx2/source/doc/doctdlg \
-    sfx2/source/doc/sfxbasemodel \
+    sfx2/source/doc/DocumentMetadataAccess \
+    sfx2/source/doc/docvor \
+    sfx2/source/doc/frmdescr \
+    sfx2/source/doc/graphhelp \
     sfx2/source/doc/guisaveas \
+    sfx2/source/doc/iframe \
+    sfx2/source/doc/Metadatable \
+    sfx2/source/doc/new \
+    sfx2/source/doc/objcont \
     sfx2/source/doc/objembed \
-    sfx2/source/doc/graphhelp \
-    sfx2/source/doc/QuerySaveDocument \
+    sfx2/source/doc/objitem \
+    sfx2/source/doc/objmisc \
+    sfx2/source/doc/objserv \
+    sfx2/source/doc/objstor \
+    sfx2/source/doc/objuno \
+    sfx2/source/doc/objxtor \
+    sfx2/source/doc/oleprops \
     sfx2/source/doc/opostponedtruncationstream \
-    sfx2/source/doc/docinsert \
-    sfx2/source/doc/docmacromode \
+    sfx2/source/doc/ownsubfilterservice \
+    sfx2/source/doc/plugin \
+    sfx2/source/doc/printhelper \
+    sfx2/source/doc/QuerySaveDocument \
+    sfx2/source/doc/querytemplate \
+    sfx2/source/doc/sfxacldetect \
+    sfx2/source/doc/sfxbasemodel \
     sfx2/source/doc/SfxDocumentMetaData \
-    sfx2/source/doc/Metadatable \
-    sfx2/source/doc/DocumentMetadataAccess \
     sfx2/source/doc/sfxmodelfactory \
-    sfx2/source/doc/sfxacldetect \
-    sfx2/source/doc/docstoragemodifylistener \
-    sfx2/source/doc/querytemplate \
     sfx2/source/explorer/nochaos \
     sfx2/source/inet/inettbc \
     sfx2/source/menu/mnumgr \
-    sfx2/source/menu/virtmenu \
-    sfx2/source/menu/objmnctl \
     sfx2/source/menu/mnuitem \
+    sfx2/source/menu/objmnctl \
+    sfx2/source/menu/virtmenu \
     sfx2/source/notify/eventsupplier \
+    sfx2/source/notify/hintpost \
     sfx2/source/statbar/stbitem \
-    sfx2/source/toolbox/tbxitem \
     sfx2/source/toolbox/imgmgr \
-    sfx2/source/view/ipclient \
-    sfx2/source/view/viewsh \
-    sfx2/source/view/frmload \
+    sfx2/source/toolbox/tbxitem \
     sfx2/source/view/frame \
-    sfx2/source/view/printer \
-    sfx2/source/view/prnmon \
-    sfx2/source/view/viewprn \
-    sfx2/source/view/viewfac \
+    sfx2/source/view/frame2 \
+    sfx2/source/view/frmload \
+    sfx2/source/view/ipclient \
     sfx2/source/view/orgmgr \
-    sfx2/source/view/viewfrm \
-    sfx2/source/view/impframe \
-    sfx2/source/view/topfrm \
+    sfx2/source/view/printer \
     sfx2/source/view/sfxbasecontroller \
     sfx2/source/view/userinputinterception \
-))
-
-$(eval $(call gb_Library_add_noexception_objects,sfx,\
-    sfx2/source/dialog/about \
-    sfx2/source/dialog/alienwarn \
-    sfx2/source/dialog/basedlgs \
-    sfx2/source/dialog/dinfedt \
-    sfx2/source/dialog/intro \
-    sfx2/source/dialog/mgetempl \
-    sfx2/source/dialog/navigat \
-    sfx2/source/dialog/newstyle \
-    sfx2/source/dialog/passwd \
-    sfx2/source/dialog/printopt \
-    sfx2/source/dialog/sfxdlg \
-    sfx2/source/dialog/sfxurl \
-    sfx2/source/dialog/splitwin \
-    sfx2/source/dialog/srchdlg \
-    sfx2/source/dialog/styfitem \
-    sfx2/source/dialog/styledlg \
-    sfx2/source/dialog/tabdlg \
-    sfx2/source/dialog/tplcitem \
-    sfx2/source/dialog/tplpitem \
-    sfx2/source/dialog/versdlg \
-    sfx2/source/notify/hintpost \
+    sfx2/source/view/viewfac \
+    sfx2/source/view/viewprn \
+    sfx2/source/view/viewsh \
+    sfx2/source/view/viewfrm \
+    sfx2/source/view/viewfrm2 \
 ))
 
 $(eval $(call gb_SdiTarget_SdiTarget,sfx2/sdi/sfxslots,sfx2/sdi/sfx))
diff --git a/sfx2/prj/target_package_inc.mk b/sfx2/prj/target_package_inc.mk
index 9661439ce35c..aa369dde5e0b 100644
--- a/sfx2/prj/target_package_inc.mk
+++ b/sfx2/prj/target_package_inc.mk
@@ -90,11 +90,11 @@ $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/progress.hxx,sfx2/progress.h
 $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/request.hxx,sfx2/request.hxx))
 $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfx.hrc,sfx2/sfx.hrc))
 $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxdefs.hxx,sfx2/sfxdefs.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfxhelp.hxx,sfx2/sfxhelp.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxhelp.hxx,sfx2/sfxhelp.hxx))
 $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxhtml.hxx,sfx2/sfxhtml.hxx))
 $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxsids.hrc,sfx2/sfxsids.hrc))
 $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/shell.hxx,sfx2/shell.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/stbitem.hxx,sfx2/stbitem.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/stbitem.hxx,sfx2/stbitem.hxx))
 $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/styfitem.hxx,sfx2/styfitem.hxx))
 $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/styledlg.hxx,sfx2/styledlg.hxx))
 $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/tabdlg.hxx,sfx2/tabdlg.hxx))