--- vcl/unx/inc/dtint.hxx 2010-11-12 10:55:51.076691980 +0000 +++ vcl/unx/inc/dtint.hxx 2010-11-12 10:56:09.867692000 +0000 @@ -36,7 +36,7 @@ class SalDisplay; class AllSettings; -#ifndef _XLIB_H_ +#if !defined(_XLIB_H_) && !defined(_X11_XLIB_H_) // forwards from X struct Display; struct XEvent;