140929-iss003: modify includes