Add double includes as workaround for cyclic include problem and individual settings overwriting