Reduced number of warnings by including a few more header files.