[headercheck] Fix headercheck and remove warnings related to ";;"

Merged Thomas Fetzer requested to merge fix/headercheck into master

Merge request reports