#46: Add includes, needed on Scientific Linux, gcc 4.4.7
Merge branch '46-add-niftk-socket' into test-upstream-tickets-merged2