diff -urN kdebe.orig/kdebecdef.cxx kdebe/kdebecdef.cxx --- kdebe.orig/kdebecdef.cxx 2006-07-20 13:20:11.000000000 +0200 +++ kdebe/kdebecdef.cxx 2006-07-20 13:28:50.000000000 +0200 @@ -49,7 +49,7 @@ #include #endif -#include +#include "kdewrapper.h" #include "uno/current_context.hxx" diff -urN kdebe.orig/kdecommonlayer.cxx kdebe/kdecommonlayer.cxx --- kdebe.orig/kdecommonlayer.cxx 2006-07-20 13:20:11.000000000 +0200 +++ kdebe/kdecommonlayer.cxx 2006-07-20 13:28:50.000000000 +0200 @@ -37,9 +37,7 @@ #include "kdecommonlayer.hxx" #endif -#ifndef _KEMAILSETTINGS_H -#include "kemailsettings.h" -#endif +#include "kdewrapper.h" #ifndef _COM_SUN_STAR_CONFIGURATION_BACKEND_PROPERTYINFO_HPP_ #include diff -urN kdebe.orig/kdeinetlayer.cxx kdebe/kdeinetlayer.cxx --- kdebe.orig/kdeinetlayer.cxx 2006-07-20 13:20:11.000000000 +0200 +++ kdebe/kdeinetlayer.cxx 2006-07-20 13:28:50.000000000 +0200 @@ -48,9 +48,7 @@ #include #endif -#ifndef __kprotocolmanager_h__ -#include -#endif +#include "kdewrapper.h" #define COMMA ',' #define SEMI_COLON ';' diff -urN kdebe.orig/kdepathslayer.cxx kdebe/kdepathslayer.cxx --- kdebe.orig/kdepathslayer.cxx 2006-07-20 13:20:11.000000000 +0200 +++ kdebe/kdepathslayer.cxx 2006-07-20 13:28:50.000000000 +0200 @@ -37,9 +37,7 @@ #include "kdepathslayer.hxx" #endif -#ifndef _KGLOBALSETTINGS_H -#include "kglobalsettings.h" -#endif +#include "kdewrapper.h" #ifndef _COM_SUN_STAR_CONFIGURATION_BACKEND_PROPERTYINFO_HPP_ #include diff -urN kdebe.orig/kdevcllayer.cxx kdebe/kdevcllayer.cxx --- kdebe.orig/kdevcllayer.cxx 2006-07-20 13:20:11.000000000 +0200 +++ kdebe/kdevcllayer.cxx 2006-07-20 13:28:50.000000000 +0200 @@ -51,9 +51,7 @@ #ifndef QGLOBAL_H #include "qglobal.h" #endif -#ifndef QACCESSIBLE_H -#include "qaccessible.h" -#endif +#include "kdewrapper.h" //============================================================================== diff -urN kdebe.orig/kdewrapper.h kdebe/kdewrapper.h --- kdebe.orig/kdewrapper.h 1970-01-01 01:00:00.000000000 +0100 +++ kdebe/kdewrapper.h 2006-07-20 13:28:50.000000000 +0200 @@ -0,0 +1,52 @@ +/************************************************************************* + * + * 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_SHELL_SOURCE_BACKENDS_KDEBE_KDEWRAPPER_H +#define INCLUDED_SHELL_SOURCE_BACKENDS_KDEBE_KDEWRAPPER_H + +#if defined __GNUC__ +#pragma GCC system_header +#endif + +#include +#include "kemailsettings.h" +#include +#include "kglobalsettings.h" + +#include "qaccessible.h" + + + +#endif