Changed how includes work