bug4366 145 B

1234
  1. o Code simplifications and refactoring:
  2. - Remove some redundant #include directives throughout the code.
  3. Patch from Andrea Gelmini.