Only include intrinsics header where needed.
Move defines to the only file that uses them.
Fix usage of alignment defines.