MXS-2900 maxtest includes cleanup, part 2

maxscale-system-test/maxtest/include/maxtest/clustrix_nodes.h

@@ -21,10 +21,10 @@
  * TODO: move functionality of install_clustrix() to MDBCI
  */
 
-#include <errno.h>
+#include <cerrno>
 #include <string>
-#include <maxtest/nodes.hh>
 #include <maxtest/mariadb_nodes.h>
+#include <maxtest/nodes.hh>
 
 #define CLUSTRIX_DEPS_YUM "yum install -y bzip2 wget screen ntp ntpdate vim htop mdadm"
 #define WGET_CLUSTRIX     "wget http://files.clustrix.com/releases/software/clustrix-9.1.4.el7.tar.bz2"

maxscale-system-test/maxtest/include/maxtest/mariadb_nodes.h

@@ -12,10 +12,9 @@
  * @endverbatim
  */
 
-
-#include <maxtest/mariadb_func.h>
-#include <errno.h>
+#include <cerrno>
 #include <string>
+#include <maxtest/mariadb_func.h>
 #include <maxtest/nodes.hh>
 
 /**

maxscale-system-test/maxtest/include/maxtest/maxinfo_func.h

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <cstdlib>
+
 class TestConnections;
 
 int   create_tcp_socket();

maxscale-system-test/maxtest/include/maxtest/maxscales.hh

@@ -1,9 +1,9 @@
 #pragma once
 
 #include <string>
-#include <maxtest/nodes.hh>
 #include <maxtest/mariadb_func.h>
 #include <maxtest/mariadb_nodes.h>
+#include <maxtest/nodes.hh>
 
 class Maxscales: public Nodes
 {

maxscale-system-test/maxtest/include/maxtest/testconnections.h

@@ -1,19 +1,19 @@
 #pragma once
 
-#include <maxtest/mariadb_nodes.h>
-#include <maxtest/clustrix_nodes.h>
-#include <maxtest/maxscales.hh>
-#include <maxtest/test_dir.hh>
-#include <fcntl.h>
-#include <pthread.h>
-#include <sys/time.h>
 #include <set>
 #include <string>
 #include <vector>
 #include <thread>
 #include <functional>
+#include <fcntl.h>
+#include <pthread.h>
+#include <sys/time.h>
 
 #include <maxbase/ccdefs.hh>
+#include <maxtest/clustrix_nodes.h>
+#include <maxtest/mariadb_nodes.h>
+#include <maxtest/maxscales.hh>
+#include <maxtest/test_dir.hh>
 
 typedef std::set<std::string> StringSet;
 

maxscale-system-test/maxtest/src/maxinfo_func.cc

@@ -1,19 +1,17 @@
+#include <maxtest/maxinfo_func.h>
+
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <iostream>
 #include <unistd.h>
-#include <maxtest/testconnections.h>
-
-#include <stdio.h>
-#include <sys/socket.h>
 #include <arpa/inet.h>
-#include <stdlib.h>
-#include <netdb.h>
-#include <string.h>
-
-#include <openssl/sha.h>
-#include "maxinfo_func.h"
-#include <sys/epoll.h>
-#include <jansson.h>
 #include <fcntl.h>
+#include <netdb.h>
+#include <sys/socket.h>
+#include <jansson.h>
+#include <openssl/sha.h>
+#include <maxtest/testconnections.h>
 
 using namespace std;
 

maxscale-system-test/maxtest/src/maxrest.cc

@@ -11,7 +11,7 @@
  * Public License.
  */
 
-#include "maxrest.hh"
+#include <maxtest/maxrest.hh>
 
 using namespace std;
 

maxscale-system-test/maxtest/src/nodes.cc

@@ -1,12 +1,12 @@
 #include <maxtest/nodes.hh>
-#include <string>
+
+#include <algorithm>
 #include <cstring>
-#include <iostream>
 #include <future>
 #include <functional>
-#include <algorithm>
-#include <signal.h>
-
+#include <iostream>
+#include <string>
+#include <csignal>
 #include <maxtest/envv.hh>
 
 Nodes::Nodes(const char* pref,

maxscale-system-test/maxtest/src/rds_vpc.cc

@@ -1,5 +1,5 @@
+#include <maxtest/rds_vpc.h>
 #include <maxtest/execute_cmd.hh>
-#include "rds_vpc.h"
 
 RDS::RDS(char* cluster)
 {

maxscale-system-test/maxtest/src/tcp_connection.cc

@@ -1,13 +1,11 @@
-#include "tcp_connection.hh"
+#include <maxtest/tcp_connection.hh>
 
-#include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <unistd.h>
 #include <string.h>
 #include <netdb.h>
 
-
 namespace
 {
 

maxscale-system-test/maxtest/src/test_binlog_fnc.cc

@@ -1,9 +1,8 @@
 #include <iostream>
-#include <maxtest/testconnections.h>
-#include "maxadmin_operations.h"
+#include <maxtest/maxadmin_operations.h>
 #include <maxtest/sql_t1.h>
-
-#include "test_binlog_fnc.h"
+#include <maxtest/test_binlog_fnc.h>
+#include <maxtest/testconnections.h>
 
 int check_sha1(TestConnections* Test)
 {