Smallfix track prod

pure technical changes to reduce dependencies

Dear Chris, coding standard were written long ago.
World as evolved, computing as well.
Any rule needs to be interpreted in the spirit of the authors.
The spirit of a header guard is to guarantee uniqueness.
What best of a machine generated uuid?
I am ready to defend what I consider an advancement in quality in whatever forum CMS will decide to discuss it.
As I wish to defend my rights to propose and introduce innovation in CMS.