Removing unnecessary X11 includes during the build, and making sure that all tests pass even in 'stable' builds.
Authored by: debug 2009-07-31
Parent: [r5580]
Child: [r5582]