Rename struct __res_params to res_params

The double-underscore prefixes are a leftover from when this code lived
in bionic. Now we're slowly getting rid of them...

Also cleanup transitive includes a bit.

Test: atest resolv_integration_test resolv_unit_test
Change-Id: I65ed8aed273be4af37a982a167f364a1f33f9a36
diff --git a/resolv/include/netd_resolv/resolv.h b/resolv/include/netd_resolv/resolv.h
index f79ec64..2e65370 100644
--- a/resolv/include/netd_resolv/resolv.h
+++ b/resolv/include/netd_resolv/resolv.h
@@ -28,15 +28,13 @@
 #ifndef NETD_RESOLV_RESOLV_H
 #define NETD_RESOLV_RESOLV_H
 
-/*
- * This header contains declarations related to per-network DNS server selection.
- * They are used by system/netd/ and should not be exposed by the public NDK headers.
- */
-#include <android/multinetwork.h>  // ResNsendFlags
+#include "params.h"
 
 #include <netinet/in.h>
 
-#include "params.h"
+struct addrinfo;
+struct hostent;
+struct res_params;
 
 typedef union sockaddr_union {
     struct sockaddr sa;
@@ -62,10 +60,6 @@
  */
 #define NETD_RESOLV_TIMEOUT 255  // consistent with RCODE_TIMEOUT
 
-struct __res_params;
-struct addrinfo;
-struct hostent;
-
 /*
  * A struct to capture context relevant to network operations.
  *
@@ -140,7 +134,7 @@
 // Set name servers for a network
 LIBNETD_RESOLV_PUBLIC int resolv_set_nameservers_for_net(unsigned netid, const char** servers,
                                                          int numservers, const char* domains,
-                                                         const __res_params* params);
+                                                         const res_params* params);
 
 LIBNETD_RESOLV_PUBLIC int resolv_set_private_dns_for_net(unsigned netid, uint32_t mark,
                                                          const char** servers, int numServers,