patch applied (hugs98): place extra header files in base/include instead of trying to mirror the GHC structure