Remove headers that have been moved to throw_exception.
Merge branch 'develop'