Merge pull request #283 from antmicro/headers-cleanup

Headers cleanup