Moving common includes to Util.
Fixing some build errors.