Fixed search paths and includes/imports