Bettered include directives

Next step: Preprocessor