Add CXX includes to depend target to remove spurious warning.
Removed needless headers.
Estimate delay in the queue in addition to delay of delivered packets.