fixes Windows --disable-pch build after 5aa54f17
"break circular include"

Change-Id: I6e69dcf58d2f3b29ff1a7bbab1208ebdf1ed9f99