added several missing #include config.h