new loplugin: externalandnotdefined

Find "missing headers," where a function is declared directly in the
.cxx (as extern) and not defined, and should arguably instead be declared
in an include file.

Change-Id: I6d83ee432b2ab0cd050aec2b27c3658d32ac02a2

59 files changed, 314 insertions, 214 deletions

diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx
index b81dde872449..b76702822ab0 100644
--- a/sw/source/core/crsr/viscrs.cxx
+++ b/sw/source/core/crsr/viscrs.cxx
@@ -52,8 +52,7 @@
 #include <boost/scoped_ptr.hpp>
 
 #include <touch/touch.h>
-
-extern void SwCalcPixStatics( OutputDevice *pOut );
+#include <paintfrm.hxx>
 
 // Here static members are defined. They will get changed on alteration of the
 // MapMode. This is done so that on ShowCrsr the same size does not have to be
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index 9d552ef5892f..19bc35a6141b 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -45,6 +45,7 @@
 #include <docufld.hxx>
 #include <unoflatpara.hxx>
 #include <SwGrammarMarkUp.hxx>
+#include <docedt.hxx>
 
 #include <vector>
 
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index 9832b23912f7..df6bc19bafc6 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -63,9 +63,6 @@
 
 using namespace ::com::sun::star::uno;
 
-extern bool IsFrameBehind( const SwTxtNode& rMyNd, sal_Int32 nMySttPos,
-                        const SwTxtNode& rBehindNd, sal_Int32 nSttPos );
-
 /** Insert field types
  *
  * @param rFldTyp ???
diff --git a/sw/source/core/doc/htmltbl.cxx b/sw/source/core/doc/htmltbl.cxx
index c4c105d8290e..0ca2f70d0c8f 100644
--- a/sw/source/core/doc/htmltbl.cxx
+++ b/sw/source/core/doc/htmltbl.cxx
@@ -40,6 +40,9 @@
 #include "ndindex.hxx"
 #include "switerator.hxx"
 #include <boost/foreach.hpp>
+#ifdef DBG_UTIL
+#include "tblrwcl.hxx"
+#endif
 
 using namespace ::com::sun::star;
 
@@ -1676,9 +1679,6 @@ void SwHTMLTableLayout::SetWidths( bool bCallPass2, sal_uInt16 nAbsAvail,
 
 #ifdef DBG_UTIL
         {
-            // is located in tblrwcl.cxx
-            extern void _CheckBoxWidth( const SwTableLine&, SwTwips );
-
             // check if the tables have correct widths
             SwTwips nSize = pSwTable->GetFrmFmt()->GetFrmSize().GetWidth();
             const SwTableLines& rLines = pSwTable->GetTabLines();
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index e2cd1fcddca7..0f98c9c11493 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -74,11 +74,10 @@
 #include <drawinglayer/primitive2d/graphicprimitive2d.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 #include <drawinglayer/processor2d/processor2dtools.hxx>
+#include <txtfly.hxx>
 
 using namespace com::sun::star;
 
-extern void ClrContourCache( const SdrObject *pObj ); // TxtFly.Cxx
-
 inline bool GetRealURL( const SwGrfNode& rNd, OUString& rTxt )
 {
     bool bRet = rNd.GetFileFilterNms( &rTxt, 0 );
diff --git a/sw/source/core/docnode/ndsect.cxx b/sw/source/core/docnode/ndsect.cxx
index b0043669d943..970a7aac6a2a 100644
--- a/sw/source/core/docnode/ndsect.cxx
+++ b/sw/source/core/docnode/ndsect.cxx
@@ -53,6 +53,7 @@
 #include <viewsh.hxx>
 #include <txtfrm.hxx>
 #include <boost/scoped_ptr.hpp>
+#include <ndsect.hxx>
 
 // #i21457# - new implementation of local method <lcl_IsInSameTblBox(..)>.
 // Method now determines the previous/next on its own. Thus, it can be controlled,
diff --git a/sw/source/core/docnode/ndsect.hxx b/sw/source/core/docnode/ndsect.hxx
new file mode 100644
index 000000000000..9ca5f60ddf78
--- /dev/null
+++ b/sw/source/core/docnode/ndsect.hxx
@@ -0,0 +1,28 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   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_SW_SOURCE_CORE_DOCNODE_NDSECT_HXX
+#define INCLUDED_SW_SOURCE_CORE_DOCNODE_NDSECT_HXX
+
+void sw_DeleteFtn( SwSectionNode *pNd, sal_uLong nStt, sal_uLong nEnd );
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx
index 9bacecaa7ae4..32737f65eefc 100644
--- a/sw/source/core/docnode/section.cxx
+++ b/sw/source/core/docnode/section.cxx
@@ -57,6 +57,7 @@
 #include <switerator.hxx>
 #include <svl/smplhint.hxx>
 #include <algorithm>
+#include <ndsect.hxx>
 
 using namespace ::com::sun::star;
 
@@ -674,8 +675,6 @@ SwSection * SwSectionFmt::GetSection() const
     return SwIterator<SwSection,SwSectionFmt>::FirstElement( *this );
 }
 
-extern void sw_DeleteFtn( SwSectionNode *pNd, sal_uLong nStt, sal_uLong nEnd );
-
 // Do not destroy all Frms in aDepend (Frms are recognized with a PTR_CAST).
 void SwSectionFmt::DelFrms()
 {
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index ce33281b7031..fdf2d50a7966 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -68,6 +68,7 @@
 #include <switerator.hxx>
 #include <algorithm>
 #include <drawdoc.hxx>
+#include <txtfly.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx
index cb1c552b471e..36f15bf3a38a 100644
--- a/sw/source/core/frmedt/fefly1.cxx
+++ b/sw/source/core/frmedt/fefly1.cxx
@@ -67,6 +67,7 @@
 #include <fmtsrnd.hxx>
 #include <ndole.hxx>
 #include <editeng/opaqitem.hxx>
+#include <fefly.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/sw/source/core/inc/docedt.hxx b/sw/source/core/inc/docedt.hxx
new file mode 100644
index 000000000000..0d7513ecd6ed
--- /dev/null
+++ b/sw/source/core/inc/docedt.hxx
@@ -0,0 +1,29 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   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_SW_SOURCE_CORE_INC_DOCEDT_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_DOCEDT_HXX
+
+void sw_JoinText( SwPaM& rPam, bool bJoinPrev );
+
+void sw_GetJoinFlags( SwPaM& rPam, bool& rJoinTxt, bool& rJoinPrev );
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/fefly.hxx b/sw/source/core/inc/fefly.hxx
new file mode 100644
index 000000000000..0c51868d6773
--- /dev/null
+++ b/sw/source/core/inc/fefly.hxx
@@ -0,0 +1,28 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   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_SW_SOURCE_CORE_INC_FEFLY_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_FEFLY_HXX
+
+bool sw_ChkAndSetNewAnchor( SwEditShell& rEditShell, const SwFlyFrm& rFly, SfxItemSet& rSet );
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/finalthreadmanager.hxx b/sw/source/core/inc/finalthreadmanager.hxx
deleted file mode 100644
index 17e4c761012b..000000000000
--- a/sw/source/core/inc/finalthreadmanager.hxx
+++ /dev/null
@@ -1,96 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   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_SW_SOURCE_CORE_INC_FINALTHREADMANAGER_HXX
-#define INCLUDED_SW_SOURCE_CORE_INC_FINALTHREADMANAGER_HXX
-
-#include <sal/config.h>
-#include <cppuhelper/factory.hxx>
-#include <cppuhelper/implementationentry.hxx>
-#include <cppuhelper/implbase3.hxx>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/util/XJobManager.hpp>
-#include <com/sun/star/frame/XTerminateListener2.hpp>
-#include <osl/mutex.hxx>
-#include <list>
-
-class CancelJobsThread;
-class TerminateOfficeThread;
-class SwPauseThreadStarting;
-
-// service helper namespace
-namespace comp_FinalThreadManager {
-
-// component and service helper functions:
-OUString SAL_CALL _getImplementationName();
-com::sun::star::uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames();
-com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL _create(
-    com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const & context );
-
-} // closing service helper namespace
-
-class FinalThreadManager : public ::cppu::WeakImplHelper3< com::sun::star::lang::XServiceInfo,
-                                                           com::sun::star::util::XJobManager,
-                                                           com::sun::star::frame::XTerminateListener2 >
-{
-public:
-    explicit FinalThreadManager(com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const & context);
-
-    // ::com::sun::star::lang::XServiceInfo:
-    virtual OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual sal_Bool SAL_CALL supportsService(const OUString & ServiceName) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-
-    // ::com::sun::star::util::XJobManager:
-    virtual void SAL_CALL registerJob(const com::sun::star::uno::Reference< com::sun::star::util::XCancellable > & Job) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual void SAL_CALL releaseJob(const com::sun::star::uno::Reference< com::sun::star::util::XCancellable > & Job) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual void SAL_CALL cancelAllJobs() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-
-    // ::com::sun::star::frame::XTerminateListener2
-    virtual void SAL_CALL cancelTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-
-    // ::com::sun::star::frame::XTerminateListener (inherited via com::sun::star::frame::XTerminateListener2)
-    virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-
-    // ::com::sun:star::lang::XEventListener (inherited via com::sun::star::frame::XTerminateListener)
-    virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-
-private:
-    FinalThreadManager(FinalThreadManager &); // not defined
-    void operator =(FinalThreadManager &); // not defined
-
-    virtual ~FinalThreadManager();
-
-    void registerAsListenerAtDesktop();
-
-    com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > m_xContext;
-
-    osl::Mutex maMutex;
-
-    std::list< com::sun::star::uno::Reference< com::sun::star::util::XCancellable > > maThreads;
-    CancelJobsThread* mpCancelJobsThread;
-    TerminateOfficeThread* mpTerminateOfficeThread;
-    SwPauseThreadStarting* mpPauseThreadStarting;
-
-    bool mbRegisteredAtDesktop;
-};
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/fntcap.hxx b/sw/source/core/inc/fntcap.hxx
new file mode 100644
index 000000000000..fe1a564c5996
--- /dev/null
+++ b/sw/source/core/inc/fntcap.hxx
@@ -0,0 +1,32 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   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_SW_SOURCE_CORE_INC_FNTCAP_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_FNTCAP_HXX
+
+sal_Int32 sw_CalcCaseMap( const SwFont& rFnt,
+                          const OUString& rOrigString,
+                          sal_Int32 nOfst,
+                          sal_Int32 nLen,
+                          sal_Int32 nIdx );
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/frmtool.hxx b/sw/source/core/inc/frmtool.hxx
index 00cdf28b43d6..c836247ea786 100644
--- a/sw/source/core/inc/frmtool.hxx
+++ b/sw/source/core/inc/frmtool.hxx
@@ -43,6 +43,7 @@ class OutputDevice;
 class Graphic;
 class GraphicAttr;
 class SwPageDesc;
+class SwFrmFmts;
 
 #define FAR_AWAY LONG_MAX - 20000  // initial position of a Fly
 #define BROWSE_HEIGHT 56700L * 10L // 10 Meters
@@ -50,6 +51,9 @@ class SwPageDesc;
 #define GRFNUM_YES 1
 #define GRFNUM_REPLACE 2
 
+void AppendObjs( const SwFrmFmts *pTbl, sal_uLong nIndex,
+                       SwFrm *pFrm, SwPageFrm *pPage );
+
 // draw background with brush or graphics
 // The 6th parameter indicates that the method should consider background
 // transparency, saved in the color of the brush item.
diff --git a/sw/source/core/inc/ftnfrm.hxx b/sw/source/core/inc/ftnfrm.hxx
index 3f6ef0bdd719..f50ffdc6fdb8 100644
--- a/sw/source/core/inc/ftnfrm.hxx
+++ b/sw/source/core/inc/ftnfrm.hxx
@@ -27,6 +27,8 @@ class SwTxtFtn;
 class SwBorderAttrs;
 class SwFtnFrm;
 
+void sw_RemoveFtns( SwFtnBossFrm* pBoss, bool bPageOnly, bool bEndNotes );
+
 // There exists a special section on a page for footnotes. It's called
 // SwFtnContFrm. Each footnote is separated by a SwFtnFrm which contains
 // the paragraphs of a footnote. SwFtnFrm can be splitted and will then
diff --git a/sw/source/core/inc/paintfrm.hxx b/sw/source/core/inc/paintfrm.hxx
new file mode 100644
index 000000000000..941b60c29300
--- /dev/null
+++ b/sw/source/core/inc/paintfrm.hxx
@@ -0,0 +1,27 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   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_SW_SOURCE_CORE_INC_PAINTFRM_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_PAINTFRM_HXX
+
+void SwCalcPixStatics( OutputDevice *pOut );
+
+#endif // INCLUDED_SW_SOURCE_CORE_INC_PAINTFRM_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx
index bee664a32ad5..0c1bc28c0fb4 100644
--- a/sw/source/core/inc/swfont.hxx
+++ b/sw/source/core/inc/swfont.hxx
@@ -43,6 +43,8 @@ const sal_Unicode CH_TAB   = '\t';  // \t
 const sal_Unicode CH_PAR    = 0xB6;     // paragraph
 const sal_Unicode CH_BULLET = 0xB7;     // centered dot
 
+sal_uInt16 UnMapDirection( sal_uInt16 nDir, const bool bVertFormat );
+
 class SwSubFont : public SvxFont
 {
     friend class SwFont;
diff --git a/sw/source/core/text/txtfly.hxx b/sw/source/core/inc/txtfly.hxx
index 77bfe71de137..4ff7c5703573 100644
--- a/sw/source/core/text/txtfly.hxx
+++ b/sw/source/core/inc/txtfly.hxx
@@ -16,11 +16,14 @@
  *   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_SW_SOURCE_CORE_TEXT_TXTFLY_HXX
-#define INCLUDED_SW_SOURCE_CORE_TEXT_TXTFLY_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_TXTFLY_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_TXTFLY_HXX
 
 #include "swtypes.hxx"
 #include "swrect.hxx"
+#include <fmtsrndenum.hxx>
+#include <txttypes.hxx>
+#include <vector>
 
 class OutputDevice;
 class SwCntntFrm;
@@ -31,26 +34,25 @@ class SwTxtPaintInfo;
 class SwFmt;
 class TextRanger;
 class SwAnchoredObject;
+class SwTxtFrm;
+class SwDrawTextInfo;
+class SwContourCache;
 
-#include <fmtsrndenum.hxx>
-
-#include <vector>
 typedef std::vector< SwAnchoredObject* > SwAnchoredObjList;
 
 enum PAGESIDE { LEFT_SIDE, RIGHT_SIDE, DONTKNOW_SIDE };
 
-class SwDrawTextInfo;
-class SwContourCache;
 /** Contour-cache global variable, initialized/destroyed in txtinit.cxx
     and needed in txtfly.cxx by text wrapping.
   */
 extern SwContourCache *pContourCache;
-class SwTxtFrm;
 
 #define POLY_CNT 20
 #define POLY_MIN 5
 #define POLY_MAX 4000
 
+void ClrContourCache( const SdrObject *pObj );
+
 class SwContourCache
 {
     friend void ClrContourCache();
diff --git a/sw/source/core/layout/anchoreddrawobject.cxx b/sw/source/core/layout/anchoreddrawobject.cxx
index 4138f0160104..09451a5a1448 100644
--- a/sw/source/core/layout/anchoreddrawobject.cxx
+++ b/sw/source/core/layout/anchoreddrawobject.cxx
@@ -28,6 +28,7 @@
 #include <vector>
 #include <svx/svdogrp.hxx>
 #include <DocumentSettingManager.hxx>
+#include <txtfly.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index 3237455d77ac..0135ee88516d 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -24,6 +24,7 @@
 #include <svtools/unoimap.hxx>
 #include <svtools/imap.hxx>
 #include <svtools/imapobj.hxx>
+#include <unocoll.hxx>
 #include <unosett.hxx>
 #include <unostyle.hxx>
 #include <fmtclds.hxx>
@@ -1691,8 +1692,6 @@ void SwFmtURL::SetMap( const ImageMap *pM )
     pMap = pM ? new ImageMap( *pM ) : 0;
 }
 
-extern const SvEventDescription* sw_GetSupportedMacroItems();
-
 bool SwFmtURL::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     // here we convert always!
diff --git a/sw/source/core/layout/colfrm.cxx b/sw/source/core/layout/colfrm.cxx
index c5c9ebe4654d..c35553baccfc 100644
--- a/sw/source/core/layout/colfrm.cxx
+++ b/sw/source/core/layout/colfrm.cxx
@@ -28,9 +28,7 @@
 #include "rootfrm.hxx"
 #include "sectfrm.hxx"
 #include "switerator.hxx"
-
-// ftnfrm.cxx:
-void sw_RemoveFtns( SwFtnBossFrm* pBoss, bool bPageOnly, bool bEndNotes );
+#include "ftnfrm.hxx"
 
 SwColumnFrm::SwColumnFrm( SwFrmFmt *pFmt, SwFrm* pSib ):
     SwFtnBossFrm( pFmt, pSib )
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index c87d0cb67b7b..f4c01f43d1b9 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -61,6 +61,7 @@
 #include "switerator.hxx"
 #include <IDocumentSettingAccess.hxx>
 #include <textboxhelper.hxx>
+#include <txtfly.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index 0d0e8cee58a5..f3cd126ba531 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -67,9 +67,6 @@
 #include <svx/sdr/attribute/sdrallfillattributeshelper.hxx>
 #include <drawdoc.hxx>
 
-// ftnfrm.cxx:
-void sw_RemoveFtns( SwFtnBossFrm* pBoss, bool bPageOnly, bool bEndNotes );
-
 using namespace ::com::sun::star;
 
 bool bObjsDirect = true;
diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx
index 5846f3f56ab4..34b348811609 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -70,6 +70,7 @@
 #include <sortedobjs.hxx>
 #include <switerator.hxx>
 #include <vcl/svapp.hxx>
+#include <txtfly.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index 8858b4cdb585..162c7a9a4489 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -84,10 +84,6 @@
 #include <ndtxt.hxx>
 #include <drawdoc.hxx>
 
-#define COL_NOTES_SIDEPANE                  RGB_COLORDATA(230,230,230)
-#define COL_NOTES_SIDEPANE_BORDER           RGB_COLORDATA(200,200,200)
-#define COL_NOTES_SIDEPANE_SCROLLAREA       RGB_COLORDATA(230,230,220)
-
 #include <svtools/borderhelper.hxx>
 
 #include "pagefrm.hrc"
@@ -108,6 +104,11 @@
 #include <wrtsh.hxx>
 #include <edtwin.hxx>
 #include <view.hxx>
+#include <paintfrm.hxx>
+
+#define COL_NOTES_SIDEPANE                  RGB_COLORDATA(230,230,230)
+#define COL_NOTES_SIDEPANE_BORDER           RGB_COLORDATA(200,200,200)
+#define COL_NOTES_SIDEPANE_SCROLLAREA       RGB_COLORDATA(230,230,220)
 
 using namespace ::editeng;
 using namespace ::com::sun::star;
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 00ac6a280a26..bf81545323c4 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -66,9 +66,6 @@
 #include <switerator.hxx>
 #include <DocumentSettingManager.hxx>
 
-extern void AppendObjs( const SwFrmFmts *pTbl, sal_uLong nIndex,
-                        SwFrm *pFrm, SwPageFrm *pPage );
-
 using namespace ::com::sun::star;
 
 SwTabFrm::SwTabFrm( SwTable &rTab, SwFrm* pSib ):
diff --git a/sw/source/core/tox/txmsrt.cxx b/sw/source/core/tox/txmsrt.cxx
index ff7bc61234f4..88814ec3dde4 100644
--- a/sw/source/core/tox/txmsrt.cxx
+++ b/sw/source/core/tox/txmsrt.cxx
@@ -41,9 +41,7 @@
 
 #include <comcore.hrc>
 #include <numrule.hxx>
-
-extern bool IsFrameBehind( const SwTxtNode& rMyNd, sal_Int32 nMySttPos,
-                           const SwTxtNode& rBehindNd, sal_Int32 nSttPos );
+#include <reffld.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx
index 1aec6e54285d..a4584df57668 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -52,6 +52,7 @@
 #include <editeng/fhgtitem.hxx>
 #include <docsh.hxx>
 #include <poolfmt.hrc>
+#include <fntcap.hxx>
 
 using namespace ::com::sun::star;
 
@@ -69,7 +70,6 @@ long SwFntObj::nPixWidth;
 MapMode* SwFntObj::pPixMap = NULL;
 OutputDevice* SwFntObj::pPixOut = NULL;
 
-extern sal_uInt16 UnMapDirection( sal_uInt16 nDir, const bool bVertFormat );
 sal_uInt16 GetDefaultFontHeight( SwDrawTextInfo &rInf )
 {
     SwDocShell* pDocShell = rInf.GetShell()->GetDoc()->GetDocShell();
@@ -2279,12 +2279,6 @@ SwCacheObj *SwFntAccess::NewObj( )
     return new SwFntObj( *(SwSubFont *)pOwner, ++pMagicNo, pShell );
 }
 
-extern sal_Int32 sw_CalcCaseMap( const SwFont& rFnt,
-                                   const OUString& rOrigString,
-                                   sal_Int32 nOfst,
-                                   sal_Int32 nLen,
-                                   sal_Int32 nIdx );
-
 sal_Int32 SwFont::GetTxtBreak( SwDrawTextInfo& rInf, long nTextWidth )
 {
     ChgFnt( rInf.GetShell(), rInf.GetOut() );
diff --git a/sw/source/core/txtnode/fntcap.cxx b/sw/source/core/txtnode/fntcap.cxx
index 0a173ed208be..0f6e535a3e2a 100644
--- a/sw/source/core/txtnode/fntcap.cxx
+++ b/sw/source/core/txtnode/fntcap.cxx
@@ -31,6 +31,7 @@
 #include <breakit.hxx>
 #include <txtfrm.hxx>
 #include <scriptinfo.hxx>
+#include <fntcap.hxx>
 
 using namespace ::com::sun::star::i18n;
 
diff --git a/sw/source/core/undo/unredln.cxx b/sw/source/core/undo/unredln.cxx
index 4c31ca31b2f0..75468c17c32a 100644
--- a/sw/source/core/undo/unredln.cxx
+++ b/sw/source/core/undo/unredln.cxx
@@ -30,9 +30,7 @@
 #include <redline.hxx>
 #include <docary.hxx>
 #include <sortopt.hxx>
-
-extern void sw_JoinText( SwPaM& rPam, bool bJoinPrev );
-extern void sw_GetJoinFlags( SwPaM& rPam, bool& rJoinTxt, bool& rJoinPrev );
+#include <docedt.hxx>
 
 SwUndoRedline::SwUndoRedline( SwUndoId nUsrId, const SwPaM& rRange )
     : SwUndo( UNDO_REDLINE ), SwUndRng( rRange ),
diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx
index 0a34baf37207..3d520784b9ca 100644
--- a/sw/source/core/unocore/unochart.cxx
+++ b/sw/source/core/unocore/unochart.cxx
@@ -49,11 +49,6 @@
 
 using namespace ::com::sun::star;
 
-// from unotbl.cxx
-extern void sw_GetCellPosition( const OUString &rCellName, sal_Int32 &rColumn, sal_Int32 &rRow);
-extern OUString sw_GetCellName( sal_Int32 nColumn, sal_Int32 nRow );
-extern int sw_CompareCellsByColFirst( const OUString &rCellName1, const OUString &rCellName2 );
-
 //static
 void SwChartHelper::DoUpdateAllCharts( SwDoc* pDoc )
 {
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index f77b8af02cab..b2636827aa26 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -137,9 +137,7 @@
 #include <svx/xfltrit.hxx>
 #include <swunohelper.hxx>
 #include <drawdoc.hxx>
-
-// from fefly1.cxx
-extern bool sw_ChkAndSetNewAnchor( SwEditShell& rEditShell, const SwFlyFrm& rFly, SfxItemSet& rSet );
+#include <fefly.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index c7215a8a4b35..fe5fb6dd106a 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -95,13 +95,11 @@
 #include <comphelper/string.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <comphelper/sequenceashashmap.hxx>
+#include <swtable.hxx>
 
 using namespace ::com::sun::star;
 using ::editeng::SvxBorderLine;
 
-// from swtable.cxx
-extern void sw_GetTblBoxColStr( sal_uInt16 nCol, OUString& rNm );
-
 #define UNO_TABLE_COLUMN_SUM    10000
 
 static void lcl_SendChartEvent(::cppu::OWeakObject & rSource,
diff --git a/sw/source/core/view/pagepreviewlayout.cxx b/sw/source/core/view/pagepreviewlayout.cxx
index f4d41ff0d9b3..94e98d1aa57a 100644
--- a/sw/source/core/view/pagepreviewlayout.cxx
+++ b/sw/source/core/view/pagepreviewlayout.cxx
@@ -36,13 +36,10 @@
 #include <frmtool.hxx>
 #include <sfx2/zoomitem.hxx>
 #include <printdata.hxx>
+#include <paintfrm.hxx>
 
 #include <IDocumentDeviceAccess.hxx>
 
-// OD 20.02.2003 #107369# - method to update statics for paint
-// Note: method defined in '/sw/source/core/layout/paintfrm.cxx'
-extern void SwCalcPixStatics( OutputDevice *pOut );
-
 // methods to initialize page preview layout
 
 SwPagePreviewLayout::SwPagePreviewLayout( SwViewShell& _rParentViewShell,
diff --git a/sw/source/core/view/viewpg.cxx b/sw/source/core/view/viewpg.cxx
index ba58d63f9e24..601c710b54c1 100644
--- a/sw/source/core/view/viewpg.cxx
+++ b/sw/source/core/view/viewpg.cxx
@@ -42,12 +42,10 @@
 
 #include <IDocumentFieldsAccess.hxx>
 #include <IDocumentDeviceAccess.hxx>
+#include <vprint.hxx>
 
 using namespace ::com::sun::star;
 
-SwPageFrm const*
-sw_getPage(SwRootFrm const& rLayout, sal_Int32 const nPage); // vprint.cxx
-
 // OD 12.12.2002 #103492#
 SwPagePreviewLayout* SwViewShell::PagePreviewLayout()
 {
diff --git a/sw/source/core/view/vprint.cxx b/sw/source/core/view/vprint.cxx
index 392eec5f6cb5..c58e00a2e6a5 100644
--- a/sw/source/core/view/vprint.cxx
+++ b/sw/source/core/view/vprint.cxx
@@ -70,6 +70,7 @@
 #include <fmtpdsc.hxx>
 #include <globals.hrc>
 #include "PostItMgr.hxx"
+#include <vprint.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/sw/source/core/view/vprint.hxx b/sw/source/core/view/vprint.hxx
new file mode 100644
index 000000000000..38e1bd98f4bc
--- /dev/null
+++ b/sw/source/core/view/vprint.hxx
@@ -0,0 +1,28 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   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_SW_SOURCE_CORE_VIEW_VPRINT_HXX
+#define INCLUDED_SW_SOURCE_CORE_VIEW_VPRINT_HXX
+
+SwPageFrm const* sw_getPage(SwRootFrm const& rLayout, sal_Int32 const nPage);
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index 2874ffd26d41..b9cc4c687b4d 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -86,6 +86,7 @@
 #include "css1kywd.hxx"
 #include "wrthtml.hxx"
 #include "htmlnum.hxx"
+#include "css1atr.hxx"
 
 #include <IDocumentStylePoolAccess.hxx>
 #include <numrule.hxx>
diff --git a/sw/source/filter/html/css1atr.hxx b/sw/source/filter/html/css1atr.hxx
new file mode 100644
index 000000000000..ea07dec5cf30
--- /dev/null
+++ b/sw/source/filter/html/css1atr.hxx
@@ -0,0 +1,28 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   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_SW_SOURCE_FILTER_HTML_CSS1ATR_HXX
+#define INCLUDED_SW_SOURCE_FILTER_HTML_CSS1ATR_HXX
+
+bool swhtml_css1atr_equalFontItems( const SfxPoolItem& r1, const SfxPoolItem& r2 );
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx
index 0631e70846d6..ebdcd0d09e52 100644
--- a/sw/source/filter/html/htmlcss1.cxx
+++ b/sw/source/filter/html/htmlcss1.cxx
@@ -59,6 +59,7 @@
 #include "htmlnum.hxx"
 #include "swhtml.hxx"
 #include <numrule.hxx>
+#include <css1atr.hxx>
 
 using namespace ::com::sun::star;
 
@@ -646,8 +647,6 @@ static CSS1SelectorType GetTokenAndClass( const CSS1Selector *pSelector,
     return eType;
 }
 
-extern bool swhtml_css1atr_equalFontItems( const SfxPoolItem& r1, const SfxPoolItem& r2 );
-
 static void RemoveScriptItems( SfxItemSet& rItemSet, sal_uInt16 nScript,
                                const SfxItemSet *pParentItemSet = 0 )
 {
diff --git a/sw/source/filter/html/htmlfldw.cxx b/sw/source/filter/html/htmlfldw.cxx
index e0d37e3bef54..000b16d7bd58 100644
--- a/sw/source/filter/html/htmlfldw.cxx
+++ b/sw/source/filter/html/htmlfldw.cxx
@@ -33,6 +33,7 @@
 #include "htmlfld.hxx"
 #include "wrthtml.hxx"
 #include <rtl/strbuf.hxx>
+#include <css1atr.hxx>
 
 using namespace nsSwDocInfoSubType;
 
@@ -59,7 +60,6 @@ const sal_Char *SwHTMLWriter::GetNumFormat( sal_uInt16 nFmt )
     return pFmtStr;
 }
 
-extern bool swhtml_css1atr_equalFontItems( const SfxPoolItem& r1, const SfxPoolItem& r2 );
 static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld,
                                  const SwTxtNode& rTxtNd, sal_Int32 nFldPos )
 {
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index f2469a39e2e4..f8226b12664c 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -103,6 +103,7 @@
 
 #include <statstr.hrc>
 #include <swerror.h>
+#include <css1atr.hxx>
 
 #define FONTSIZE_MASK           7
 
@@ -2034,8 +2035,6 @@ void SwHTMLParser::NextToken( int nToken )
         aParaAttrs.clear();
 }
 
-extern bool swhtml_css1atr_equalFontItems( const SfxPoolItem& r1, const SfxPoolItem& r2 );
-
 static void lcl_swhtml_getItemInfo( const _HTMLAttr& rAttr,
                                  bool& rScriptDependent, bool& rFont,
                                  sal_uInt16& rScriptType )
diff --git a/sw/source/filter/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx
index 924481cc537e..2065d98cefa5 100644
--- a/sw/source/filter/xml/xmltble.cxx
+++ b/sw/source/filter/xml/xmltble.cxx
@@ -289,7 +289,6 @@ bool SwXMLTableFrmFmtsSort_Impl::AddRow( SwFrmFmt& rFrmFmt,
     return bInsert;
 }
 
-void sw_GetTblBoxColStr( sal_uInt16 nCol, OUString& rNm );
 static OUString lcl_xmltble_appendBoxPrefix(const OUString& rNamePrefix,
                                   sal_uInt32 nCol, sal_uInt32 nRow, bool bTop )
 {
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index e61d7736757d..38df859ee57c 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -92,11 +92,7 @@
 
 #include <boost/noncopyable.hpp>
 #include <boost/scoped_ptr.hpp>
-
-namespace swui
-{
-    SwAbstractDialogFactory * GetFactory();
-}
+#include <swuiexp.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::beans;
diff --git a/sw/source/ui/dialog/swuiexp.cxx b/sw/source/ui/dialog/swuiexp.cxx
index f2139afa2467..f90812fa4681 100644
--- a/sw/source/ui/dialog/swuiexp.cxx
+++ b/sw/source/ui/dialog/swuiexp.cxx
@@ -19,6 +19,7 @@
 
 #include "swdlgfact.hxx"
 #include "dialmgr.hxx"
+#include <swuiexp.hxx>
 
 namespace swui
 {
diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx
index bdc199278157..4025f3703b8f 100644
--- a/sw/source/ui/envelp/envfmt.cxx
+++ b/sw/source/ui/envelp/envfmt.cxx
@@ -49,6 +49,7 @@
 
 #include "swabstdlg.hxx"
 #include "chrdlg.hrc"
+#include <swuiexp.hxx>
 
 namespace {
     /// Converts a ranges array to a list containing one entry for each
@@ -112,11 +113,6 @@ namespace {
 
 }
 
-namespace swui
-{
-    SwAbstractDialogFactory * GetFactory();
-}
-
 static long lUserW = 5669; // 10 cm
 static long lUserH = 5669; // 10 cm
 
diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx
index 784ecdb8c6f9..e09c0141a40e 100644
--- a/sw/source/ui/envelp/label1.cxx
+++ b/sw/source/ui/envelp/label1.cxx
@@ -34,9 +34,7 @@
 #include <helpid.h>
 #include <globals.hrc>
 #include <../../uibase/envelp/label.hrc>
-
-//impl in envimg.cxx
-extern SW_DLLPUBLIC OUString MakeSender();
+#include <envimg.hxx>
 
 void SwLabRec::SetFromItem( const SwLabItem& rItem )
 {
diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx
index 4e94a7775b82..26a28cfd866e 100644
--- a/sw/source/ui/fldui/fldedt.cxx
+++ b/sw/source/ui/fldui/fldedt.cxx
@@ -47,11 +47,8 @@
 #include <com/sun/star/document/XDocumentProperties.hpp>
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
 #include <boost/scoped_ptr.hpp>
+#include <swuiexp.hxx>
 
-namespace swui
-{
-    SwAbstractDialogFactory * GetFactory();
-}
 
 SwFldEditDlg::SwFldEditDlg(SwView& rVw)
     : SfxSingleTabDialog(&rVw.GetViewFrame()->GetWindow(), 0,
diff --git a/sw/source/ui/inc/swuiexp.hxx b/sw/source/ui/inc/swuiexp.hxx
new file mode 100644
index 000000000000..6e9993b0717f
--- /dev/null
+++ b/sw/source/ui/inc/swuiexp.hxx
@@ -0,0 +1,29 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   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_SW_SOURCE_UI_INC_SWUIEXP_HXX
+#define INCLUDED_SW_SOURCE_UI_INC_SWUIEXP_HXX
+
+namespace swui
+{
+    SwAbstractDialogFactory * GetFactory();
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/table/convert.cxx b/sw/source/ui/table/convert.cxx
index 3c52e34cde2e..c0af214b553b 100644
--- a/sw/source/ui/table/convert.cxx
+++ b/sw/source/ui/table/convert.cxx
@@ -35,11 +35,7 @@
 #include "table.hrc"
 #include "swabstdlg.hxx"
 #include <boost/scoped_ptr.hpp>
-
-namespace swui
-{
-    SwAbstractDialogFactory * GetFactory();
-}
+#include <swuiexp.hxx>
 
 //keep the state of the buttons on runtime
 static int nSaveButtonState = -1; // 0: tab, 1: semicolon, 2: paragraph, 3: other, -1: not yet used
diff --git a/sw/source/ui/table/instable.cxx b/sw/source/ui/table/instable.cxx
index 6cfe91602781..c291cd8dd571 100644
--- a/sw/source/ui/table/instable.cxx
+++ b/sw/source/ui/table/instable.cxx
@@ -33,11 +33,7 @@
 
 #include "swabstdlg.hxx"
 #include <boost/scoped_ptr.hpp>
-
-namespace swui
-{
-    SwAbstractDialogFactory * GetFactory();
-}
+#include <swuiexp.hxx>
 
 #define ROW_COL_PROD 16384
 
diff --git a/sw/source/uibase/app/appenv.cxx b/sw/source/uibase/app/appenv.cxx
index afce13a19041..23c2e45e449f 100644
--- a/sw/source/uibase/app/appenv.cxx
+++ b/sw/source/uibase/app/appenv.cxx
@@ -67,6 +67,7 @@
 #include "swabstdlg.hxx"
 #include "envelp.hrc"
 #include "envimg.hxx"
+#include <appenv.hxx>
 
 #include <boost/scoped_ptr.hpp>
 
diff --git a/sw/source/uibase/app/appenv.hxx b/sw/source/uibase/app/appenv.hxx
new file mode 100644
index 000000000000..f319178132f2
--- /dev/null
+++ b/sw/source/uibase/app/appenv.hxx
@@ -0,0 +1,18 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_SW_SOURCE_UIBASE_APP_APPENV_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_APP_APPENV_HXX
+
+OUString InsertLabEnvText( SwWrtShell& , SwFldMgr& , const OUString& );
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/app/applab.cxx b/sw/source/uibase/app/applab.cxx
index 7093574fdf16..ab606712eeb8 100644
--- a/sw/source/uibase/app/applab.cxx
+++ b/sw/source/uibase/app/applab.cxx
@@ -75,12 +75,10 @@
 #include <IDocumentDeviceAccess.hxx>
 
 #include <boost/scoped_ptr.hpp>
+#include <appenv.hxx>
 
 using namespace ::com::sun::star;
 
-// is in appenv.cxx
-extern OUString InsertLabEnvText( SwWrtShell& , SwFldMgr& , const OUString& );
-
 const char MASTER_LABEL[] = "MasterLabel";
 
 static const SwFrmFmt *lcl_InsertBCText( SwWrtShell& rSh, const SwLabItem& rItem,
diff --git a/sw/source/uibase/app/swdllimpl.hxx b/sw/source/uibase/app/swdllimpl.hxx
index f5d7e2dcc19a..294156f293dd 100644
--- a/sw/source/uibase/app/swdllimpl.hxx
+++ b/sw/source/uibase/app/swdllimpl.hxx
@@ -34,3 +34,5 @@ private:
 };
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/textsh.hxx b/sw/source/uibase/inc/textsh.hxx
index 9e799585f27f..8ac0722f5201 100644
--- a/sw/source/uibase/inc/textsh.hxx
+++ b/sw/source/uibase/inc/textsh.hxx
@@ -83,6 +83,8 @@ public:
     virtual ~SwTextShell();
 };
 
+void sw_CharDialog( SwWrtShell &rWrtSh, bool bUseDialog, sal_uInt16 nSlot,const SfxItemSet *pArgs, SfxRequest *pReq );
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/lingu/olmenu.cxx b/sw/source/uibase/lingu/olmenu.cxx
index 62731cfbf3fb..e67752dec51b 100644
--- a/sw/source/uibase/lingu/olmenu.cxx
+++ b/sw/source/uibase/lingu/olmenu.cxx
@@ -41,6 +41,7 @@
 #include "viewopt.hxx"
 #include "wrtsh.hxx"
 #include "wview.hxx"
+#include "textsh.hxx"
 
 #include <comphelper/anytostring.hxx>
 #include <comphelper/processfactory.hxx>
@@ -95,8 +96,6 @@
 
 using namespace ::com::sun::star;
 
-extern void sw_CharDialog( SwWrtShell &rWrtSh, bool bUseDialog, sal_uInt16 nSlot,const SfxItemSet *pArgs, SfxRequest *pReq );
-
 /// @returns : the language for the selected text that is set for the
 ///     specified attribute (script type).
 ///     If there are more than one languages used LANGUAGE_DONTKNOW will be returned.
diff --git a/sw/source/uibase/uno/unofreg.cxx b/sw/source/uibase/uno/unofreg.cxx
index 985e3ee1c94e..46d8810ed37c 100644
--- a/sw/source/uibase/uno/unofreg.cxx
+++ b/sw/source/uibase/uno/unofreg.cxx
@@ -33,20 +33,10 @@ using namespace ::com::sun::star::lang;
 
 // #i73788#
 #include <cppuhelper/implementationentry.hxx>
-namespace comp_FinalThreadManager {
+#include <finalthreadmanager.hxx>
 
-// component and service helper functions:
-OUString SAL_CALL _getImplementationName();
-com::sun::star::uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames();
-com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL _create(
-    com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const & context );
-
-}
-
-#ifdef __cplusplus
 extern "C"
 {
-#endif
 
 static ::cppu::ImplementationEntry const entries[] = {
     { &comp_FinalThreadManager::_create,
@@ -280,8 +270,6 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL sw_component_getFactory(
     return pRet;
 }
 
-#ifdef __cplusplus
-}
-#endif
+} // extern "C"
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */