If you include something from the wiretap directory, always precede it
Fix some includes of files in the top-level directory to use a path
relative to the current directory, not relative to the wiretap
This makes it a bit clearer what's being included.
Petri-Dish: Guy Harris <email@example.com>
Tested-by: Petri Dish Buildbot <firstname.lastname@example.org>
Reviewed-by: Guy Harris <email@example.com>