make these files more eclipse-friendly too