Do not prevent multiple includes. It causes random bugs with #ifdef __KERNEL__
Remove comments. We check for IA32 in main.h
Move targets to upper dir