Move CBlockLocator to core.h