kennytm Fixes to allow all headers to be compilable, except those requiring M…

Users who have contributed to this file

• kennytm