Merge pull request #3257
379778b core: remove includes in .cpp, if header is already in .h (Philip Kaufmann)