Partially revert "update_pch"

This partially reverts commit 8f7a1111abb35bbb25daf6ace2add902f98361fc

One of those headers seems to produce the windows build trouble.

Change-Id: Id7e3c39f4c9134ce8de6f5d6dc865afd3f322fd2