Refactoring headers to external euler/