Bugfix: adding missing headers