1 files changed, 12 insertions, 8 deletions
diff --git a/vcl/source/window/syschild.cxx b/vcl/source/window/syschild.cxx
index 3ff21826ff0c..9bdbfd970ed7 100644..100755
--- a/vcl/source/window/syschild.cxx
+++ b/vcl/source/window/syschild.cxx
@@ -29,21 +29,26 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include <svsys.h>
 #include <rtl/process.h>
 #include <rtl/ref.hxx>
+
 #include <tools/rc.h>
-#include <vcl/window.h>
-#include <vcl/salinst.hxx>
-#include <vcl/salframe.hxx>
+
+// declare system types in sysdata.hxx
+#include <svsys.h>
+
 #include <vcl/window.hxx>
-#include <vcl/salobj.hxx>
-#include <vcl/svdata.hxx>
 #include <vcl/sysdata.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/syschild.hxx>
 #include <vcl/unohelp.hxx>
 
+#include <window.h>
+#include <salinst.hxx>
+#include <salframe.hxx>
+#include <salobj.hxx>
+#include <svdata.hxx>
+
 #ifdef SOLAR_JAVA
 #include <jni.h>
 #endif
@@ -54,8 +59,6 @@
 #include <com/sun/star/java/XJavaThreadRegister_11.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
-#include <vcl/syschild.hxx>
-
 using namespace ::com::sun::star;
 
 // =======================================================================
@@ -249,6 +252,7 @@ sal_IntPtr SystemChildWindow::GetParentWindowHandle( sal_Bool bUseJava )
 {
     sal_IntPtr nRet = 0;
 
+    (void)bUseJava;
 #if defined WNT
     nRet = reinterpret_cast< sal_IntPtr >( GetSystemData()->hWnd );
 #elif defined QUARTZ