r5304: removed lib/socket/socket.h from includes.h