SERVER-13637: remove some header files leaking
Merge remote-tracking branch 'upstream/master'