Move unnecessary include from header to source file.
Merge pull request #2219 from iglesias/develop

Move unnecessary include from header to source file.