Move id field from specific header entries to enclosing struct.

* This will enable functions in pio_interface later to be written
  without regard for header specifics.