Issue #474:
- Moved parallel headers