Correcting classpath and includes