Fix indenting
Remove unnecessary header
Implement macro for cpusupport_arch_feature repetition