This should remove the previous FIXME because it's no longer an open issue. I would personally be ok with just copy-pasting all of the attributes/include statements in each of the files using this macro (it's a big step forward in having reasonable documentation for these modules)