4 files changed, 18 insertions, 18 deletions
diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx
index 7c25b9144f19..e54bc68dceb6 100644
--- a/vcl/android/androidinst.cxx
+++ b/vcl/android/androidinst.cxx
@@ -19,6 +19,7 @@
 #include <osl/detail/android-bootstrap.h>
 #include <rtl/strbuf.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/layout.hxx>
 
 #define LOGTAG "LibreOffice/androidinst"
 #define LOGI(...) ((void)__android_log_print(ANDROID_LOG_INFO, LOGTAG, __VA_ARGS__))
@@ -204,8 +205,6 @@ void DestroySalInstance( SalInstance *pInst )
     delete pInst;
 }
 
-#include <vcl/layout.hxx>
-
 int AndroidSalSystem::ShowNativeDialog( const OUString& rTitle,
                                         const OUString& rMessage,
                                         const std::list< OUString >& rButtons,
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx
index d6139c8728fb..4cd82d66bd94 100644
--- a/vcl/osx/salinst.cxx
+++ b/vcl/osx/salinst.cxx
@@ -64,6 +64,10 @@
 #include "apple_remote/RemoteControl.h"
 #include "postmac.h"
 
+extern "C" {
+#include <crt_externs.h>
+}
+
 using namespace std;
 using namespace ::com::sun::star;
 
@@ -251,10 +255,6 @@ void DeInitSalData()
     SetSalData( nullptr );
 }
 
-extern "C" {
-#include <crt_externs.h>
-}
-
 void InitSalMain()
 {
 }
diff --git a/vcl/unx/generic/gdi/cairo_xlib_cairo.cxx b/vcl/unx/generic/gdi/cairo_xlib_cairo.cxx
index 7814e188381e..4ee1eec061cc 100644
--- a/vcl/unx/generic/gdi/cairo_xlib_cairo.cxx
+++ b/vcl/unx/generic/gdi/cairo_xlib_cairo.cxx
@@ -31,6 +31,9 @@
 #include <vcl/window.hxx>
 #include <basegfx/vector/b2isize.hxx>
 
+#include <cairo-xlib.h>
+#include <cairo-xlib-xrender.h>
+
 namespace
 {
     Pixmap limitXCreatePixmap(Display *display, Drawable d, unsigned int width, unsigned int height, unsigned int depth)
@@ -53,9 +56,6 @@ namespace
 namespace cairo
 {
 
-#include <cairo-xlib.h>
-#include <cairo-xlib-xrender.h>
-
     X11SysData::X11SysData() :
         pDisplay(nullptr),
         hDrawable(0),
diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx
index c8ed78025a66..bf366ab551f8 100644
--- a/vcl/unx/kde4/KDE4FilePicker.cxx
+++ b/vcl/unx/kde4/KDE4FilePicker.cxx
@@ -61,15 +61,6 @@
 
 #include "svids.hrc"
 
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::ui::dialogs;
-using namespace ::com::sun::star::ui::dialogs::TemplateDescription;
-using namespace ::com::sun::star::ui::dialogs::ExtendedFilePickerElementIds;
-using namespace ::com::sun::star::ui::dialogs::CommonFilePickerElementIds;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::uno;
-
 // The dialog should check whether LO also supports the protocol
 // provided by KIO, and KFileWidget::dirOperator() is only 4.3+ .
 // Moreover it's only in this somewhat internal KFileWidget class,
@@ -85,6 +76,16 @@ using namespace ::com::sun::star::uno;
 
 #include <QtCore/QDebug>
 
+
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::ui::dialogs;
+using namespace ::com::sun::star::ui::dialogs::TemplateDescription;
+using namespace ::com::sun::star::ui::dialogs::ExtendedFilePickerElementIds;
+using namespace ::com::sun::star::ui::dialogs::CommonFilePickerElementIds;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::uno;
+
 namespace
 {
     uno::Sequence<OUString> SAL_CALL FilePicker_getSupportedServiceNames()