Made all header files idempotent and moved incorrect common data from