Add missing includes, GCC 6.3 errored out