Better preprocessor includes