Revert "Workaround for compilation errors by gcc 4.7"

This reverts commit 06f671e61efb725439d27aa8ceb94218c7f3e601.
tcp.ctl,dns: Behave as more file-like