diff -urN ooo_SRC680_m163_src.orig/psprint/source/printergfx/printerjob.cxx ooo_SRC680_m163_src/psprint/source/printergfx/printerjob.cxx --- ooo_SRC680_m163_src.orig/psprint/source/printergfx/printerjob.cxx 2006-01-17 09:43:18.000000000 +0100 +++ ooo_SRC680_m163_src/psprint/source/printergfx/printerjob.cxx 2006-04-14 10:50:02.000000000 +0200 @@ -63,9 +63,6 @@ #ifndef _OSL_THREAD_H_ #include #endif -#ifdef MACOSX -#include -#endif #include #include diff -urN ooo_SRC680_m163_src.orig/rsc/source/tools/rsctools.cxx ooo_SRC680_m163_src/rsc/source/tools/rsctools.cxx --- ooo_SRC680_m163_src.orig/rsc/source/tools/rsctools.cxx 2005-12-16 09:07:46.000000000 +0100 +++ ooo_SRC680_m163_src/rsc/source/tools/rsctools.cxx 2006-04-14 10:50:14.000000000 +0200 @@ -45,12 +45,6 @@ #endif #include #include -#ifdef MAC -#include -#endif -#ifdef MACOSX -#include -#endif #include diff -urN ooo_SRC680_m163_src.orig/sal/osl/unx/nlsupport.c ooo_SRC680_m163_src/sal/osl/unx/nlsupport.c --- ooo_SRC680_m163_src.orig/sal/osl/unx/nlsupport.c 2006-04-10 15:15:44.000000000 +0200 +++ ooo_SRC680_m163_src/sal/osl/unx/nlsupport.c 2006-04-14 10:50:39.000000000 +0200 @@ -46,7 +46,6 @@ #else #include #include -#include #endif /* !MACOSX */ #endif /* LINUX || SOLARIS || IRIX || NETBSD || MACOSX */ diff -urN ooo_SRC680_m163_src.orig/solenv/inc/unxmacxp_protos.h ooo_SRC680_m163_src/solenv/inc/unxmacxp_protos.h --- ooo_SRC680_m163_src.orig/solenv/inc/unxmacxp_protos.h 2006-02-25 13:30:27.000000000 +0100 +++ ooo_SRC680_m163_src/solenv/inc/unxmacxp_protos.h 2006-04-14 10:51:15.000000000 +0200 @@ -1,26 +0,0 @@ - -#ifndef __MACXPPROTOS_H__ -#define __MACXPPROTOS_H__ - -#include -#include -#include -#include - -#ifdef __cplusplus -extern "C" { -#endif - -/* Random prototypes for functions that override broken OS ones. */ -int readdir_r( DIR *dirp, struct dirent *entry, struct dirent **result ); -char *asctime_r( const struct tm *tm, char *buffer ); -char *macxp_tempnam( const char *tmpdir, const char *prefix ); -struct tm *localtime_r(const time_t *timep, struct tm *buffer); -int getpwuid_r(uid_t uid, struct passwd *pwd, char *buffer, size_t buflen, struct passwd **result); -void macxp_getSystemVersion( unsigned int *isDarwin, unsigned int *majorVersion, unsigned int *minorVersion, unsigned int *minorMinorVersion ); - -#ifdef __cplusplus -} -#endif - -#endif \ No newline at end of file diff -urN ooo_SRC680_m163_src.orig/vcl/unx/inc/salunx.h ooo_SRC680_m163_src/vcl/unx/inc/salunx.h --- ooo_SRC680_m163_src.orig/vcl/unx/inc/salunx.h 2005-12-16 09:07:44.000000000 +0100 +++ ooo_SRC680_m163_src/vcl/unx/inc/salunx.h 2006-04-14 10:50:23.000000000 +0200 @@ -51,10 +51,6 @@ #include #endif -#ifdef MACOSX -#include -#endif - #ifndef _SVUNX_H #include #endif