Various linux fixes and missing includes
p4#: 20976