Some refactoring so TargetRegistry.h no longer has to include any files