Done, along with the other similar ones BUT, as regards future work:

I cannot really accomplish task for the framework itself unless we standardize on a single header (it would be too much human effort to debug the creation days etc). More generally, since this is GPL code it should be irrelevant (think of it as code incorporation, that's it)!