Added header includes to common headers.