Cleaned up include/style/{bits,config}.