[master]Merge branch 'trac1644'

src/lib/asiodns/dns_service.cc

@@ -14,10 +14,9 @@
 
 #include <config.h>
 
-#include <sys/types.h>
+#include <unistd.h>             // for some IPC/network system calls
 #include <netinet/in.h>
 #include <sys/socket.h>
-#include <unistd.h>             // for some IPC/network system calls
 
 #include <boost/lexical_cast.hpp>
 

src/lib/asiodns/io_fetch.cc

@@ -14,11 +14,10 @@
 
 #include <config.h>
 
-#include <sys/types.h>
+#include <unistd.h>             // for some IPC/network system calls
 #include <netinet/in.h>
 #include <stdint.h>
 #include <sys/socket.h>
-#include <unistd.h>             // for some IPC/network system calls
 
 #include <boost/bind.hpp>
 #include <boost/scoped_ptr.hpp>

src/lib/asiodns/tcp_server.cc

@@ -14,10 +14,9 @@
 
 #include <config.h>
 
-#include <sys/types.h>
+#include <unistd.h>             // for some IPC/network system calls
 #include <netinet/in.h>
 #include <sys/socket.h>
-#include <unistd.h>             // for some IPC/network system calls
 #include <errno.h>
 
 #include <boost/shared_array.hpp>

src/lib/asiodns/udp_server.cc

@@ -12,10 +12,9 @@
 // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 // PERFORMANCE OF THIS SOFTWARE.
 
-#include <sys/types.h>
+#include <unistd.h>             // for some IPC/network system calls
 #include <netinet/in.h>
 #include <sys/socket.h>
-#include <unistd.h>             // for some IPC/network system calls
 #include <errno.h>
 
 #include <boost/shared_array.hpp>

src/lib/asiolink/io_service.cc

@@ -14,10 +14,9 @@
 
 #include <config.h>
 
-#include <sys/types.h>
+#include <unistd.h>             // for some IPC/network system calls
 #include <netinet/in.h>
 #include <sys/socket.h>
-#include <unistd.h>             // for some IPC/network system calls
 
 #include <asio.hpp>
 #include <asiolink/io_service.h>

src/lib/resolve/recursive_query.cc

@@ -14,9 +14,8 @@
 
 #include <config.h>
 
-#include <sys/types.h>
-#include <netinet/in.h>
 #include <stdlib.h>
+#include <netinet/in.h>
 #include <sys/socket.h>
 #include <unistd.h>             // for some IPC/network system calls
 #include <string>