bugfix header reinclusion