[tests] Fix includes

tests/ampctl.c

@@ -29,7 +29,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <ctype.h>
 #include <errno.h>
 #include <getopt.h>
 
@@ -63,9 +62,10 @@ extern int read_history();
 
 
 #include <hamlib/amplifier.h>
-#include "misc.h"
 
 #include "ampctl_parse.h"
+#include "amplist.h"
+#include "rig.h"
 
 /*
  * Prototypes

tests/ampctl_parse.c

@@ -27,12 +27,14 @@
 
 #include <hamlib/config.h>
 
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
+#include <strings.h>
 #include <ctype.h>
 #include <errno.h>
+#include <getopt.h>
 
 #ifdef HAVE_LIBREADLINE
 #  if defined(HAVE_READLINE_READLINE_H)
@@ -60,7 +62,8 @@ extern int read_history();
 #endif                              /* HAVE_READLINE_HISTORY */
 
 #include <hamlib/amplifier.h>
-#include "serial.h"
+#include "amplist.h"
+#include "iofunc.h"
 #include "misc.h"
 #include "sprintflst.h"
 

tests/ampctld.c

@@ -28,7 +28,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <ctype.h>
 
 #include <getopt.h>
 #include <errno.h>
@@ -60,9 +59,10 @@
 #endif
 
 #include <hamlib/amplifier.h>
-#include "misc.h"
 
 #include "ampctl_parse.h"
+#include "amplist.h"
+#include "rig.h"
 
 struct handle_data
 {

tests/dumpcaps.c

@@ -24,7 +24,7 @@
 
 #include <hamlib/rig.h>
 #include "misc.h"
-
+#include "riglist.h"
 #include "sprintflst.h"
 #include "rigctl_parse.h"
 #include "../rigs/icom/icom.h"

tests/dumpcaps_amp.c

@@ -22,10 +22,10 @@
 #include <stdio.h>
 
 #include <hamlib/rig.h>
-#include "misc.h"
 
 #include "sprintflst.h"
 #include "ampctl_parse.h"
+#include "amplifier.h"
 
 
 /*

tests/dumpcaps_rot.c

@@ -23,9 +23,9 @@
 #include <string.h>
 
 #include <hamlib/rig.h>
-#include "misc.h"
 
 #include "sprintflst.h"
+#include "rotator.h"
 #include "rotctl_parse.h"
 
 

tests/memcsv.c

@@ -24,11 +24,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <ctype.h>
 
 #include <hamlib/rig.h>
 #include "misc.h"
-#include "sprintflst.h"
 
 
 /*

tests/memload.c

@@ -19,7 +19,6 @@
  */
 
 #include <hamlib/rig.h>
-#include "misc.h"
 
 #ifdef HAVE_XML2
 #  include <libxml/parser.h>

tests/memsave.c

@@ -18,10 +18,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
  */
-#include <ctype.h>
 
 #include <hamlib/rig.h>
-#include "misc.h"
 
 #ifdef HAVE_XML2
 #  include <libxml/parser.h>

tests/rigctl.c

@@ -28,7 +28,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <ctype.h>
 #include <errno.h>
 #include <getopt.h>
 
@@ -64,10 +63,8 @@ extern int read_history();
 
 #include <hamlib/rig.h>
 #include "misc.h"
-#include "iofunc.h"
-#include "serial.h"
-#include "sprintflst.h"
 #include "rigctl_parse.h"
+#include "riglist.h"
 
 #define MAXNAMSIZ 32
 #define MAXNBOPT 100    /* max number of different options */

tests/rigctl_parse.c

@@ -27,12 +27,15 @@
 
 #include <hamlib/config.h>
 
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>
 #include <unistd.h>
 #include <ctype.h>
 #include <errno.h>
+#include <getopt.h>
 
 // If true adds some debug statements to see flow of rigctl parsing
 int debugflow = 0;
@@ -66,6 +69,7 @@ extern int read_history();
 #include <hamlib/rig.h>
 #include "misc.h"
 #include "iofunc.h"
+#include "riglist.h"
 #include "sprintflst.h"
 
 #include "rigctl_parse.h"

tests/rigctlcom.c

@@ -35,6 +35,8 @@
 #include <windows.h>
 #endif
 
+// cppcheck-suppress *
+#include <stdint.h>
 // cppcheck-suppress *
 #include <stdio.h>
 // cppcheck-suppress *
@@ -42,9 +44,6 @@
 // cppcheck-suppress *
 #include <string.h>
 // cppcheck-suppress *
-// cppcheck-suppress *
-#include <ctype.h>
-// cppcheck-suppress *
 #include <errno.h>
 // cppcheck-suppress *
 #include <signal.h>
@@ -79,9 +78,8 @@
 #include <hamlib/rig.h>
 #include "misc.h"
 #include "iofunc.h"
-#include "serial.h"
-#include "sprintflst.h"
 #include "rigctl_parse.h"
+#include "riglist.h"
 
 /*
  * Reminder: when adding long options,

tests/rigctld.c

@@ -34,7 +34,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <ctype.h>
 #include <errno.h>
 #include <signal.h>
 
@@ -46,8 +45,8 @@
 #  include <netinet/in.h>
 #endif
 
-#ifdef HAVE_ARPA_INET_H
-#  include <arpa/inet.h>
+#ifdef HAVE_SYS_SELECT_H
+#  include <sys/select.h>
 #endif
 
 #ifdef HAVE_SYS_SOCKET_H
@@ -70,13 +69,10 @@
 
 #include <hamlib/rig.h>
 #include "misc.h"
-#include "iofunc.h"
-#include "serial.h"
-#include "sprintflst.h"
 #include "network.h"
 
 #include "rigctl_parse.h"
-
+#include "riglist.h"
 
 /*
  * Reminder: when adding long options,

tests/rigctlsync.c

@@ -39,11 +39,6 @@
 // cppcheck-suppress *
 #include <string.h>
 // cppcheck-suppress *
-// cppcheck-suppress *
-#include <ctype.h>
-// cppcheck-suppress *
-#include <errno.h>
-// cppcheck-suppress *
 #include <signal.h>
 
 // cppcheck-suppress *
@@ -74,11 +69,8 @@
 #endif
 
 #include <hamlib/rig.h>
-#include "misc.h"
-#include "iofunc.h"
-#include "serial.h"
-#include "sprintflst.h"
 #include "rigctl_parse.h"
+#include "riglist.h"
 #include "sleep.h"
 
 /*

tests/rigctltcp.c

@@ -34,7 +34,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <ctype.h>
 #include <errno.h>
 #include <signal.h>
 
@@ -50,6 +49,10 @@
 #  include <arpa/inet.h>
 #endif
 
+#ifdef HAVE_SYS_SELECT_H
+#  include <sys/select.h>
+#endif
+
 #ifdef HAVE_SYS_SOCKET_H
 #  include <sys/socket.h>
 #elif HAVE_WS2TCPIP_H
@@ -70,11 +73,8 @@
 
 #include <hamlib/rig.h>
 #include "misc.h"
-#include "iofunc.h"
-#include "serial.h"
-#include "sprintflst.h"
 #include "network.h"
-
+#include "riglist.h"
 #include "rigctl_parse.h"
 
 

tests/rigmem.c

@@ -25,13 +25,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <ctype.h>
 
 #include <getopt.h>
 
 #include <hamlib/rig.h>
-#include "misc.h"
-#include "sprintflst.h"
+#include "riglist.h"
 
 #define MAXNAMSIZ 32
 #define MAXNBOPT 100    /* max number of different options */

tests/rigsmtr.c

@@ -23,7 +23,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <ctype.h>
 #include <math.h>
 
 #include <getopt.h>
@@ -31,7 +30,8 @@
 #include <hamlib/rig.h>
 #include <hamlib/rotator.h>
 #include "misc.h"
-
+#include "riglist.h"
+#include "rotlist.h"
 
 /*
  * Prototypes

tests/rigswr.c

@@ -23,12 +23,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <ctype.h>
 
 #include <getopt.h>
 
 #include <hamlib/rig.h>
 #include "misc.h"
+#include "riglist.h"
 
 
 /*

tests/rigtestlibusb.c

@@ -22,6 +22,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
+#include <stdint.h>
 #include <stdio.h>
 #include <string.h>
 #include "config.h"

tests/rotctl.c

@@ -28,7 +28,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <ctype.h>
 #include <errno.h>
 #include <getopt.h>
 
@@ -63,9 +62,10 @@ extern int read_history();
 
 
 #include <hamlib/rotator.h>
-#include "misc.h"
 
+#include "rig.h"
 #include "rotctl_parse.h"
+#include "rotlist.h"
 
 /*
  * Prototypes

tests/rotctl_parse.c

@@ -31,9 +31,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>
 #include <unistd.h>
 #include <ctype.h>
 #include <errno.h>
+#include <getopt.h>
 
 #ifdef HAVE_LIBREADLINE
 #  if defined(HAVE_READLINE_READLINE_H)
@@ -61,7 +63,7 @@ extern int read_history();
 #endif                              /* HAVE_READLINE_HISTORY */
 
 #include <hamlib/rotator.h>
-#include "serial.h"
+#include "iofunc.h"
 #include "misc.h"
 
 
@@ -83,6 +85,7 @@ extern int read_history();
 #endif
 
 #include "rotctl_parse.h"
+#include "rotlist.h"
 #include "sprintflst.h"
 
 /* Hash table implementation See:  http://uthash.sourceforge.net/ */

tests/rotctld.c

@@ -28,7 +28,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <ctype.h>
 
 #include <getopt.h>
 #include <errno.h>
@@ -39,9 +38,6 @@
 #ifdef HAVE_NETINET_IN_H
 #  include <netinet/in.h>
 #endif
-#ifdef HAVE_ARPA_INET_H
-#  include <arpa/inet.h>
-#endif
 #ifdef HAVE_SYS_SOCKET_H
 #  include <sys/socket.h>
 #elif HAVE_WS2TCPIP_H
@@ -60,9 +56,10 @@
 #endif
 
 #include <hamlib/rotator.h>
-#include "misc.h"
 
+#include "rig.h"
 #include "rotctl_parse.h"
+#include "rotlist.h"
 
 struct handle_data
 {