gh-201: cpuid.h is gplv3. Prepare for removal of cpuid.h