Fixed build includes. Fixes #4556.
Updated builds.