Added missing include and compilation fixes
Merge branch 'security' of github.com:STEllAR-GROUP/hpx into security