Geometry files and forward declaration in core.h