Removed hardcoded include paths