Restructuring internal headers.