Move a load of config.h controlled header to use Base.h

Signed-off-by: Rick Taylor <rick@tropicalstormsoftware.com>