--- connectivity/source/drivers/kab/KConnection.cxx	6 Jul 2006 14:09:41 -0000	1.5
+++ connectivity/source/drivers/kab/KConnection.cxx	24 Jul 2006 19:02:35 -0000
@@ -57,8 +57,9 @@
 #include <com/sun/star/sdbc/TransactionIsolation.hpp>
 #endif
 
-#define KDE_HEADERS_WANT_KABC_STDADDRESSBOOK
-#include "kde_headers.hxx"
+#ifndef INCLUDED_VCL_KDE_HEADERS_H
+#include <vcl/kde_headers.h>
+#endif
 
 using namespace connectivity::kab;
 using namespace com::sun::star::uno;
--- connectivity/source/drivers/kab/KDEInit.cxx	6 Jul 2006 14:10:11 -0000	1.3
+++ connectivity/source/drivers/kab/KDEInit.cxx	24 Jul 2006 19:02:35 -0000
@@ -44,12 +44,9 @@
 #include <osl/process.h>
 #endif
 
-#define KDE_HEADERS_WANT_KAPPLICATION
-#define KDE_HEADERS_WANT_KCMDLINEARGS
-#define KDE_HEADERS_WANT_KGLOBAL
-#define KDE_HEADERS_WANT_KLOCALE
-#define KDE_HEADERS_WANT_KDEVERSION
-#include "kde_headers.hxx"
+#ifndef INCLUDED_VCL_KDE_HEADERS_H
+#include <vcl/kde_headers.h>
+#endif
 
 namespace connectivity
 {
--- connectivity/source/drivers/kab/KDatabaseMetaData.cxx	6 Jul 2006 14:14:45 -0000	1.5
+++ connectivity/source/drivers/kab/KDatabaseMetaData.cxx	24 Jul 2006 19:02:36 -0000
@@ -41,7 +41,10 @@
 #ifndef CONNECTIVITY_KAB_KDEINIT_H
 #include "KDEInit.h"
 #endif
-#include <klocale.h>
+
+#ifndef INCLUDED_VCL_KDE_HEADERS_H
+#include <vcl/kde_headers.h>
+#endif
 
 #ifndef _CONNECTIVITY_FDATABASEMETADATARESULTSET_HXX_
 #include "FDatabaseMetaDataResultSet.hxx"
--- connectivity/source/drivers/kab/KResultSet.cxx	6 Jul 2006 14:19:01 -0000	1.4
+++ connectivity/source/drivers/kab/KResultSet.cxx	24 Jul 2006 19:02:36 -0000
@@ -50,11 +50,6 @@
 #include "kfields.hxx"
 #endif
 
-#define KDE_HEADERS_WANT_KABC_ADDRESSBOOK
-#include "kde_headers.hxx"
-
-#include <qdatetime.h>
-
 #ifndef _COM_SUN_STAR_BEANS_PROPERTYATTRIBUTE_HPP_
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #endif
--- connectivity/source/drivers/kab/KResultSet.hxx	6 Jul 2006 14:19:48 -0000	1.4
+++ connectivity/source/drivers/kab/KResultSet.hxx	24 Jul 2006 19:02:36 -0000
@@ -43,8 +43,9 @@
 #include "KResultSetMetaData.hxx"
 #endif
 
-#define KDE_HEADERS_WANT_KABC_ADDRESSEE
-#include "kde_headers.hxx"
+#ifndef INCLUDED_VCL_KDE_HEADERS_H
+#include <vcl/kde_headers.h>
+#endif
 
 #ifndef _COM_SUN_STAR_SDBC_XROW_HPP_
 #include <com/sun/star/sdbc/XRow.hpp>
--- connectivity/source/drivers/kab/kcondition.hxx	6 Jul 2006 14:23:11 -0000	1.3
+++ connectivity/source/drivers/kab/kcondition.hxx	24 Jul 2006 19:02:36 -0000
@@ -40,8 +40,9 @@
 #include <comphelper/types.hxx>
 #endif
 
-#define KDE_HEADERS_WANT_KABC_ADDRESSEE
-#include "kde_headers.hxx"
+#ifndef INCLUDED_VCL_KDE_HEADERS_H
+#include <vcl/kde_headers.h>
+#endif
 
 #ifndef _DBHELPER_DBEXCEPTION_HXX_
 #include <connectivity/dbexception.hxx>
--- connectivity/source/drivers/kab/kde_headers.hxx	6 Jul 2006 14:23:21 -0000	1.2
+++ /dev/null      	24 Jul 2006 19:02:36 -0000
@@ -1,80 +0,0 @@
-/*************************************************************************
- *
- *  OpenOffice.org - a multi-platform office productivity suite
- *
- *  $RCSfile: kde_headers.hxx,v $
- *
- *  $Revision: 1.2 $
- *
- *  last change: $Author: kz $ $Date: 2006/07/06 14:23:21 $
- *
- *  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 _SAL_CONFIG_H_
-#include "sal/config.h"
-#endif
-
-// Suppress warnings:
-#if defined __GNUC__
-#pragma GCC system_header
-#endif
-
-#ifdef KDE_HEADERS_WANT_KAPPLICATION
-#include <kapplication.h>
-#endif
-
-#ifdef KDE_HEADERS_WANT_KCMDLINEARGS
-#include <kcmdlineargs.h>
-#endif
-
-#ifdef KDE_HEADERS_WANT_KGLOBAL
-#include <kglobal.h>
-#endif
-
-#ifdef KDE_HEADERS_WANT_KLOCALE
-#include <klocale.h>
-#endif
-
-#ifdef KDE_HEADERS_WANT_KDEVERSION
-#include <kdeversion.h>
-#endif
-
-#ifdef KDE_HEADERS_WANT_KABC_ADDRESSBOOK
-#include <kabc/addressbook.h>
-#endif
-
-#ifdef KDE_HEADERS_WANT_KABC_STDADDRESSBOOK
-#include <kabc/stdaddressbook.h>
-#endif
-
-#ifdef KDE_HEADERS_WANT_KABC_FIELD
-#include <kabc/field.h>
-#endif
-
-#ifdef KDE_HEADERS_WANT_KABC_ADDRESSEE
-#include <kabc/addressee.h>
-#endif
-
--- connectivity/source/drivers/kab/kfields.hxx	6 Jul 2006 14:23:42 -0000	1.3
+++ connectivity/source/drivers/kab/kfields.hxx	24 Jul 2006 19:02:36 -0000
@@ -36,8 +36,9 @@
 #ifndef _CONNECTIVITY_KAB_FIELDS_HXX_
 #define _CONNECTIVITY_KAB_FIELDS_HXX_
 
-#define KDE_HEADERS_WANT_KABC_FIELD
-#include "kde_headers.hxx"
+#ifndef INCLUDED_VCL_KDE_HEADERS_H
+#include <vcl/kde_headers.h>
+#endif
 
 #ifndef _DBHELPER_DBEXCEPTION_HXX_
 #include <connectivity/dbexception.hxx>
--- connectivity/source/drivers/kab/korder.hxx	6 Jul 2006 14:24:04 -0000	1.4
+++ connectivity/source/drivers/kab/korder.hxx	24 Jul 2006 19:02:36 -0000
@@ -40,8 +40,9 @@
 #include "rtl/ustring.hxx"
 #endif
 
-#define KDE_HEADERS_WANT_KABC_ADDRESSEE
-#include "kde_headers.hxx"
+#ifndef INCLUDED_VCL_KDE_HEADERS_H
+#include <vcl/kde_headers.h>
+#endif
 
 #include <vector>