the srv headers are now in /sys/include/srv

This makes it easier to find in the overall mess. Obviously, the code has been
updated as well to reflect this change.