Fixed more compile errors and further tidied up Firewall, Forwarding, ForwardingBase modules.