All remaining headers that changed in X6 or X7.

Also normalize various type definitions to match sys_types.ini (now that
there is a sys_types.ini), and fix [fn_macros] to handle void return type.