Including headers in core.h was not a good idea