Made header files more consistent.