include: net: cleanup from merge