--- /dev/null	24 Jul 2006 19:35:45 -0000
+++ vcl/inc/kde_headers.h	24 Jul 2006 19:35:45 -0000
+/*************************************************************************
+ *
+ *  OpenOffice.org - a multi-platform office productivity suite
+ *
+ *  $RCSfile: kde_headers.h,v $
+ *
+ *  $Revision: 1.1 $
+ *
+ *  last change: $Author: ebischoff $ $Date: 2006/07/21 12:44:00 $
+ *
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 2.1.
+ *
+ *
+ *    GNU Lesser General Public License Version 2.1
+ *    =============================================
+ *    Copyright 2006 by Sun Microsystems, Inc.
+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
+ *
+ *    This library is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *    Lesser General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
+ *
+ ************************************************************************/
+
+#ifndef INCLUDED_VCL_KDE_HEADERS_H
+#define INCLUDED_VCL_KDE_HEADERS_H
+
+// ********* Suppress warnings if needed
+#ifndef _SAL_CONFIG_H_
+#include <sal/config.h>
+#endif
+
+#if defined __GNUC__
+#pragma GCC system_header
+#endif
+
+
+// ********* Hack, but needed because of conflicting types...
+#define Region QtXRegion
+
+
+// ********* KDE base headers
+#include <kaboutdata.h>
+#include <kapplication.h>
+#include <kcmdlineargs.h>
+#include <kconfig.h>
+#include <kdeversion.h>
+#include <kemailsettings.h>
+#include <kglobal.h>
+#include <kglobalsettings.h>
+#include <klocale.h>
+#include <kmainwindow.h>
+#include <kmenubar.h>
+#include <kprotocolmanager.h>
+#include <kstartupinfo.h>
+#include <kstyle.h>
+
+
+// ********* KDE address book connectivity headers
+#include <kabc/addressbook.h>
+#include <kabc/addressee.h>
+#include <kabc/field.h>
+#include <kabc/stdaddressbook.h>
+
+
+// ********* Qt headers
+#include <qaccessible.h>
+#include <qcheckbox.h>
+#include <qcombobox.h>
+#include <qframe.h>
+#include <qlineedit.h>
+#include <qlistview.h>
+#include <qmainwindow.h>
+
+// Ugly hack to be able to access QMenuItem::is_enabled
+#define private public
+#include <qmenudata.h>
+#undef private
+
+#include <qpaintdevice.h>
+#include <qpainter.h>
+#include <qpushbutton.h>
+#include <qradiobutton.h>
+#include <qrangecontrol.h>
+#include <qstring.h>
+#include <qtabbar.h>
+#include <qtabwidget.h>
+#include <qtoolbar.h>
+#include <qtoolbutton.h>
+#include <qwidget.h>
+
+
+// ********* See hack on top of this file
+#undef Region
+
+
+#endif
--- vcl/prj/d.lst	20 Apr 2006 14:18:33 -0000	1.47
+++ vcl/prj/d.lst	24 Jul 2006 19:35:45 -0000
@@ -78,6 +78,7 @@
 hedabu: ..\inc\inputctx.hxx %_DEST%\inc%_EXT%\vcl\inputctx.hxx
 hedabu: ..\inc\javachild.hxx %_DEST%\inc%_EXT%\vcl\javachild.hxx
 hedabu: ..\inc\jobset.hxx %_DEST%\inc%_EXT%\vcl\jobset.hxx
+hedabu: ..\unx\inc\kde_headers.h %_DEST%\inc%_EXT%\vcl\kde_headers.h
 hedabu: ..\inc\keycod.hxx %_DEST%\inc%_EXT%\vcl\keycod.hxx
 hedabu: ..\inc\keycodes.hxx %_DEST%\inc%_EXT%\vcl\keycodes.hxx
 hedabu: ..\inc\lineinfo.hxx %_DEST%\inc%_EXT%\vcl\lineinfo.hxx
--- vcl/unx/kde/kdewrapper.h	6 Jul 2006 14:32:09 -0000	1.2
+++ /dev/null	24 Jul 2006 19:35:45 -0000
@@ -1,84 +0,0 @@
-/*************************************************************************
- *
- *  OpenOffice.org - a multi-platform office productivity suite
- *
- *  $RCSfile: kdewrapper.h,v $
- *
- *  $Revision: 1.2 $
- *
- *  last change: $Author: kz $ $Date: 2006/07/06 14:32:09 $
- *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
- *
- *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2006 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
- *
- ************************************************************************/
-
-#ifndef INCLUDED_VCL_UNX_KDE_KDEWRAPPER_H
-#define INCLUDED_VCL_UNX_KDE_KDEWRAPPER_H
-
-#ifndef _SAL_CONFIG_H_
-#include "sal/config.h"
-#endif
-
-#if defined __GNUC__
-#pragma GCC system_header
-#endif
-
-// Hack, but needed because of conflicting types...
-#define Region QtXRegion
-
-#include <qcheckbox.h>
-#include <qcombobox.h>
-#include <qframe.h>
-#include <qlineedit.h>
-#include <qlistview.h>
-#include <qmainwindow.h>
-#include <qpaintdevice.h>
-#include <qpainter.h>
-#include <qpushbutton.h>
-#include <qradiobutton.h>
-#include <qrangecontrol.h>
-#include <qtabbar.h>
-#include <qtabwidget.h>
-#include <qtoolbar.h>
-#include <qtoolbutton.h>
-#include <qwidget.h>
-
-// Ugly hack to be able to access QMenuItem::is_enabled
-#define private public
-#include <qmenudata.h>
-#undef private
-
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
-#include <kconfig.h>
-#include <kglobal.h>
-#include <kmainwindow.h>
-#include <kmenubar.h>
-#include <kstartupinfo.h>
-#include <kstyle.h>
-
-#undef Region
-
-#endif
--- vcl/unx/kde/salnativewidgets-kde.cxx	19 Jul 2006 15:01:13 -0000	1.15
+++ vcl/unx/kde/salnativewidgets-kde.cxx	24 Jul 2006 19:35:46 -0000
@@ -35,7 +35,9 @@
 
 #define _SV_SALNATIVEWIDGETS_KDE_CXX
 
-#include "kdewrapper.h"
+#ifndef INCLUDED_VCL_KDE_HEADERS_H
+#include <vcl/kde_headers.h>
+#endif
 
 #include <salunx.h>