GLUS header file reorganisation.