Restored original internal.hpp ordering.