Remove obsolete includes. Prefer GDB methods and definitions over
system definitions.