Add missing headers (Closes #91)