Fix circular dependcies in header files.