Added include-guards to headerfiles where it was missing