Cleaning TCP code

I took the code that was uploaded and cleaned it up a little to make it
easier to read.

Also changed the library additions so that Eclipse doesn't show the
libraries as having inherent errors. Fortunately the WAF script takes
care of the library inconsistencies.