I had read over this when I reviewed the code.
If they are macros it is correct to put them in the translated C header.
The pull request has a pretty confusing diff. I think it would be better to split it and submit several smaller changes, e.g. LDC, FreeBSD, Cosmetic fixes...