Revert "header fixes round 1 + versioning"

This reverts commit a75db41b11e0d42c46f4e9e372154a2d032610e7.