Correct issue with cyclic includes and some simple type declarations.