From e0b2a7b4ac0a700d5828f6b6fe7492da69065897 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Fillod=2C=20F8CFE?=
 <fillods@users.sourceforge.net>
Date: Mon, 7 Apr 2003 22:42:11 +0000
Subject: [PATCH] fix headers

git-svn-id: https://hamlib.svn.sourceforge.net/svnroot/hamlib/trunk@1435 7ae35d74-ebe9-4afe-98af-79ac388436b8
---
 alinco/alinco.c         |  7 +------
 aor/aor.c               | 13 ++++---------
 drake/drake.c           | 12 ++++--------
 dummy/dummy.c           | 17 ++++++-----------
 dummy/rot_dummy.c       | 15 +++++----------
 easycomm/easycomm.c     | 15 +++++----------
 fodtrack/fodtrack.c     | 16 +++++++---------
 icom/frame.c            | 16 +++++-----------
 icom/icom.c             |  7 +------
 icom/optoscan.c         | 19 +++++++------------
 jrc/jrc.c               | 21 +++++++--------------
 kachina/kachina.c       | 17 ++++++-----------
 kenwood/kenwood.c       | 13 ++++---------
 kenwood/th.c            | 12 +++---------
 pcr/pcr.c               | 15 +++++----------
 rotorez/rotorez.c       | 13 ++++---------
 rpcrig/rpcrig_backend.c | 17 ++++++-----------
 rpcrot/rpcrot_backend.c | 15 +++++----------
 src/iofunc.c            |  7 +++----
 tentec/tentec.c         | 17 ++++++-----------
 uniden/uniden.c         | 15 +++++----------
 winradio/winradio.c     | 16 +++++++---------
 yaesu/ft100.c           | 14 ++++++--------
 yaesu/ft1000mp.c        | 17 ++++++++---------
 yaesu/ft747.c           | 14 ++++++--------
 yaesu/ft817.c           | 14 ++++++--------
 yaesu/ft847.c           | 14 ++++++--------
 yaesu/ft890.c           | 15 ++++++---------
 yaesu/ft920.c           | 15 ++++++---------
 yaesu/yaesu.c           | 12 +++++-------
 30 files changed, 155 insertions(+), 275 deletions(-)

diff --git a/alinco/alinco.c b/alinco/alinco.c
index 57512cb9e..d64d1710c 100644
--- a/alinco/alinco.c
+++ b/alinco/alinco.c
@@ -2,7 +2,7 @@
  *  Hamlib Alinco backend - main file
  *  Copyright (c) 2001-2003 by Stephane Fillod
  *
- *	$Id: alinco.c,v 1.14 2003-04-06 18:40:35 fillods Exp $
+ *	$Id: alinco.c,v 1.15 2003-04-07 22:41:44 fillods Exp $
  *
  *   This library is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library General Public License as
@@ -25,13 +25,8 @@
 #endif
 
 #include <stdlib.h>
-#include <stdio.h>   /* Standard input/output definitions */
 #include <string.h>  /* String function definitions */
 #include <unistd.h>  /* UNIX standard function definitions */
-#include <fcntl.h>   /* File control definitions */
-#include <errno.h>   /* Error number definitions */
-#include <termios.h> /* POSIX terminal control definitions */
-#include <sys/ioctl.h>
 #include <math.h>
 
 #include <hamlib/rig.h>
diff --git a/aor/aor.c b/aor/aor.c
index 390b8b868..d77334e62 100644
--- a/aor/aor.c
+++ b/aor/aor.c
@@ -2,7 +2,7 @@
  *  Hamlib AOR backend - main file
  *  Copyright (c) 2000-2003 by Stephane Fillod
  *
- *	$Id: aor.c,v 1.22 2003-02-24 22:27:40 fillods Exp $
+ *	$Id: aor.c,v 1.23 2003-04-07 22:41:44 fillods Exp $
  *
  *   This library is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library General Public License as
@@ -25,18 +25,13 @@
 #endif
 
 #include <stdlib.h>
-#include <stdio.h>   /* Standard input/output definitions */
 #include <string.h>  /* String function definitions */
 #include <unistd.h>  /* UNIX standard function definitions */
-#include <fcntl.h>   /* File control definitions */
-#include <errno.h>   /* Error number definitions */
-#include <termios.h> /* POSIX terminal control definitions */
-#include <sys/ioctl.h>
 #include <math.h>
 
-#include <hamlib/rig.h>
-#include <serial.h>
-#include <misc.h>
+#include "hamlib/rig.h"
+#include "serial.h"
+#include "misc.h"
 
 #include "aor.h"
 
diff --git a/drake/drake.c b/drake/drake.c
index 16b0780d9..009fd5c12 100644
--- a/drake/drake.c
+++ b/drake/drake.c
@@ -2,7 +2,7 @@
  *  Hamlib Drake backend - main file
  *  Copyright (c) 2001-2003 by Stephane Fillod
  *
- *	$Id: drake.c,v 1.3 2003-03-10 08:26:08 fillods Exp $
+ *	$Id: drake.c,v 1.4 2003-04-07 22:41:56 fillods Exp $
  *
  *   This library is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library General Public License as
@@ -25,17 +25,13 @@
 #endif
 
 #include <stdlib.h>
-#include <stdio.h>   /* Standard input/output definitions */
 #include <string.h>  /* String function definitions */
 #include <unistd.h>  /* UNIX standard function definitions */
-#include <fcntl.h>   /* File control definitions */
-#include <errno.h>   /* Error number definitions */
-#include <sys/ioctl.h>
 #include <math.h>
 
-#include <hamlib/rig.h>
-#include <serial.h>
-#include <misc.h>
+#include "hamlib/rig.h"
+#include "serial.h"
+#include "misc.h"
 
 #include "drake.h"
 
diff --git a/dummy/dummy.c b/dummy/dummy.c
index 38629c2a1..4e6061e59 100644
--- a/dummy/dummy.c
+++ b/dummy/dummy.c
@@ -2,7 +2,7 @@
  *  Hamlib Dummy backend - main file
  *  Copyright (c) 2001-2003 by Stephane Fillod
  *
- *	$Id: dummy.c,v 1.32 2003-04-06 18:40:35 fillods Exp $
+ *	$Id: dummy.c,v 1.33 2003-04-07 22:41:46 fillods Exp $
  *
  *   This library is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library General Public License as
@@ -25,20 +25,15 @@
 #endif
 
 #include <stdlib.h>
-#include <stdio.h>   /* Standard input/output definitions */
 #include <string.h>  /* String function definitions */
 #include <unistd.h>  /* UNIX standard function definitions */
-#include <fcntl.h>   /* File control definitions */
-#include <errno.h>   /* Error number definitions */
-#include <termios.h> /* POSIX terminal control definitions */
-#include <sys/ioctl.h>
 #include <math.h>
 
-#include <hamlib/rig.h>
-#include <serial.h>
-#include <misc.h>
-#include <tones.h>
-#include <idx_builtin.h>
+#include "hamlib/rig.h"
+#include "serial.h"
+#include "misc.h"
+#include "tones.h"
+#include "idx_builtin.h"
 
 #include "dummy.h"
 
diff --git a/dummy/rot_dummy.c b/dummy/rot_dummy.c
index 90d9b0934..3fcaeaa0b 100644
--- a/dummy/rot_dummy.c
+++ b/dummy/rot_dummy.c
@@ -1,8 +1,8 @@
 /*
  *  Hamlib Dummy backend - main file
- *  Copyright (c) 2001,2002 by Stephane Fillod
+ *  Copyright (c) 2001-2003 by Stephane Fillod
  *
- *	$Id: rot_dummy.c,v 1.4 2002-08-16 17:43:01 fillods Exp $
+ *	$Id: rot_dummy.c,v 1.5 2003-04-07 22:41:47 fillods Exp $
  *
  *   This library is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library General Public License as
@@ -25,18 +25,13 @@
 #endif
 
 #include <stdlib.h>
-#include <stdio.h>   /* Standard input/output definitions */
 #include <string.h>  /* String function definitions */
 #include <unistd.h>  /* UNIX standard function definitions */
-#include <fcntl.h>   /* File control definitions */
-#include <errno.h>   /* Error number definitions */
-#include <termios.h> /* POSIX terminal control definitions */
-#include <sys/ioctl.h>
 #include <math.h>
 
-#include <hamlib/rotator.h>
-#include <serial.h>
-#include <misc.h>
+#include "hamlib/rotator.h"
+#include "serial.h"
+#include "misc.h"
 
 #include "rot_dummy.h"
 
diff --git a/easycomm/easycomm.c b/easycomm/easycomm.c
index 0d93e7fc0..96f00b66e 100644
--- a/easycomm/easycomm.c
+++ b/easycomm/easycomm.c
@@ -1,9 +1,9 @@
 /*
  *  Hamlib Rotator backend - Easycom
- *  Copyright (c) 2001,2002 by Stephane Fillod
+ *  Copyright (c) 2001-2003 by Stephane Fillod
  *  Contributed by Francois Retief <fgretief@sun.ac.za>
  *
- *	$Id: easycomm.c,v 1.3 2002-08-16 17:43:01 fillods Exp $
+ *	$Id: easycomm.c,v 1.4 2003-04-07 22:41:48 fillods Exp $
  *
  *   This library is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library General Public License as
@@ -26,18 +26,13 @@
 #endif
 
 #include <stdlib.h>
-#include <stdio.h>   /* Standard input/output definitions */
 #include <string.h>  /* String function definitions */
 #include <unistd.h>  /* UNIX standard function definitions */
-#include <fcntl.h>   /* File control definitions */
-#include <errno.h>   /* Error number definitions */
-#include <termios.h> /* POSIX terminal control definitions */
-#include <sys/ioctl.h>
 #include <math.h>
 
-#include <hamlib/rotator.h>
-#include <serial.h>
-#include <misc.h>
+#include "hamlib/rotator.h"
+#include "serial.h"
+#include "misc.h"
 
 #include "easycomm.h"
 
diff --git a/fodtrack/fodtrack.c b/fodtrack/fodtrack.c
index 12a17cbb2..257545d49 100644
--- a/fodtrack/fodtrack.c
+++ b/fodtrack/fodtrack.c
@@ -1,8 +1,8 @@
 /*
  *  Hamlib Rotator backend - Fodtrack parallel port
- *  Copyright (c) 2001,2002 by Stephane Fillod
+ *  Copyright (c) 2001-2003 by Stephane Fillod
  *
- *	$Id: fodtrack.c,v 1.1 2002-11-28 22:24:10 fillods Exp $
+ *	$Id: fodtrack.c,v 1.2 2003-04-07 22:41:49 fillods Exp $
  *
  *   This library is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library General Public License as
@@ -25,13 +25,11 @@
 #endif
 
 #include <stdlib.h>
-#include <stdio.h>   /* Standard input/output definitions */
 #include <string.h>  /* String function definitions */
 #include <unistd.h>  /* UNIX standard function definitions */
-#include <fcntl.h>   /* File control definitions */
-#include <errno.h>   /* Error number definitions */
-#include <termios.h> /* POSIX terminal control definitions */
+#ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
+#endif
 
 /*
  * So far, only supported on Linux platforms
@@ -41,9 +39,9 @@
 #include <linux/ppdev.h>
 #endif
 
-#include <hamlib/rotator.h>
-#include <serial.h>
-#include <misc.h>
+#include "hamlib/rotator.h"
+#include "serial.h"
+#include "misc.h"
 
 #include "fodtrack.h"
 
diff --git a/icom/frame.c b/icom/frame.c
index 7da13473a..1a9cf2d19 100644
--- a/icom/frame.c
+++ b/icom/frame.c
@@ -1,8 +1,8 @@
 /*
  *  Hamlib CI-V backend - low level communication routines
- *  Copyright (c) 2000-2002 by Stephane Fillod
+ *  Copyright (c) 2000-2003 by Stephane Fillod
  *
- *		$Id: frame.c,v 1.19 2003-01-06 22:04:58 fillods Exp $
+ *	$Id: frame.c,v 1.20 2003-04-07 22:41:50 fillods Exp $
  *
  *   This library is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library General Public License as
@@ -25,18 +25,12 @@
 #endif
 
 #include <stdlib.h>
-#include <stdio.h>   /* Standard input/output definitions */
 #include <string.h>  /* String function definitions */
 #include <unistd.h>  /* UNIX standard function definitions */
-#include <fcntl.h>   /* File control definitions */
-#include <errno.h>   /* Error number definitions */
-#include <termios.h> /* POSIX terminal control definitions */
-#include <sys/ioctl.h>
 
-#include <hamlib/rig.h>
-#include <hamlib/riglist.h>
-#include <serial.h>
-#include <misc.h>
+#include "hamlib/rig.h"
+#include "serial.h"
+#include "misc.h"
 #include "icom.h"
 #include "icom_defs.h"
 #include "frame.h"
diff --git a/icom/icom.c b/icom/icom.c
index 8ba9896df..52cea8179 100644
--- a/icom/icom.c
+++ b/icom/icom.c
@@ -2,7 +2,7 @@
  *  Hamlib CI-V backend - main file
  *  Copyright (c) 2000-2003 by Stephane Fillod
  *
- *	$Id: icom.c,v 1.73 2003-04-06 18:40:35 fillods Exp $
+ *	$Id: icom.c,v 1.74 2003-04-07 22:41:50 fillods Exp $
  *
  *   This library is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library General Public License as
@@ -25,13 +25,8 @@
 #endif
 
 #include <stdlib.h>
-#include <stdio.h>   /* Standard input/output definitions */
 #include <string.h>  /* String function definitions */
 #include <unistd.h>  /* UNIX standard function definitions */
-#include <fcntl.h>   /* File control definitions */
-#include <errno.h>   /* Error number definitions */
-#include <termios.h> /* POSIX terminal control definitions */
-#include <sys/ioctl.h>
 #include <math.h>
 
 #include <hamlib/rig.h>
diff --git a/icom/optoscan.c b/icom/optoscan.c
index 768b68797..47d9c541e 100644
--- a/icom/optoscan.c
+++ b/icom/optoscan.c
@@ -1,8 +1,8 @@
 /*
  *  Hamlib CI-V backend - OptoScan extensions
- *  Copyright (c) 2000-2002 by Stephane Fillod
+ *  Copyright (c) 2000-2003 by Stephane Fillod
  *
- *		$Id: optoscan.c,v 1.2 2002-03-07 22:58:47 fillods Exp $
+ *	$Id: optoscan.c,v 1.3 2003-04-07 22:41:51 fillods Exp $
  *
  *   This library is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library General Public License as
@@ -25,20 +25,15 @@
 #endif
 
 #include <stdlib.h>
-#include <stdio.h>   /* Standard input/output definitions */
 #include <string.h>  /* String function definitions */
 #include <unistd.h>  /* UNIX standard function definitions */
-#include <fcntl.h>   /* File control definitions */
-#include <errno.h>   /* Error number definitions */
-#include <termios.h> /* POSIX terminal control definitions */
-#include <sys/ioctl.h>
 #include <math.h>
 
-#include <hamlib/rig.h>
-#include <serial.h>
-#include <misc.h>
-#include <cal.h>
-#include <token.h>
+#include "hamlib/rig.h"
+#include "serial.h"
+#include "misc.h"
+#include "cal.h"
+#include "token.h"
 
 #include "icom.h"
 #include "icom_defs.h"
diff --git a/jrc/jrc.c b/jrc/jrc.c
index 964900461..752d37bbd 100644
--- a/jrc/jrc.c
+++ b/jrc/jrc.c
@@ -1,8 +1,8 @@
 /*
  *  Hamlib JRC backend - main file
- *  Copyright (c) 2001,2002 by Stephane Fillod
+ *  Copyright (c) 2001-2003 by Stephane Fillod
  *
- *		$Id: jrc.c,v 1.6 2002-03-13 23:37:12 fillods Exp $
+ *	$Id: jrc.c,v 1.7 2003-04-07 22:41:52 fillods Exp $
  *
  *   This library is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library General Public License as
@@ -25,18 +25,13 @@
 #endif
 
 #include <stdlib.h>
-#include <stdio.h>   /* Standard input/output definitions */
 #include <string.h>  /* String function definitions */
 #include <unistd.h>  /* UNIX standard function definitions */
-#include <fcntl.h>   /* File control definitions */
-#include <errno.h>   /* Error number definitions */
-#include <termios.h> /* POSIX terminal control definitions */
-#include <sys/ioctl.h>
 
-#include <hamlib/rig.h>
-#include <serial.h>
-#include <misc.h>
-#include <cal.h>
+#include "hamlib/rig.h"
+#include "serial.h"
+#include "misc.h"
+#include "cal.h"
 
 #include "jrc.h"
 
@@ -827,9 +822,7 @@ int jrc_decode_event(RIG *rig)
 
 		count = read_string(&rs->rigport, buf, SETUP_STATUS_LEN, "", 0);
 		if (count < 0) {
-			rig_debug(RIG_DEBUG_ERR, "jrc: read_string failed: %s\n",
-							strerror(errno));
-			return -RIG_EIO;
+			return count;
 		}
 		buf[31] = '\0';	/* stop run away.. */
 
diff --git a/kachina/kachina.c b/kachina/kachina.c
index ee76b59e4..819a8b928 100644
--- a/kachina/kachina.c
+++ b/kachina/kachina.c
@@ -1,8 +1,8 @@
 /*
  *  Hamlib Kachina backend - main file
- *  Copyright (c) 2001,2002 by Stephane Fillod
+ *  Copyright (c) 2001-2003 by Stephane Fillod
  *
- *		$Id: kachina.c,v 1.4 2002-03-13 23:37:12 fillods Exp $
+ *	$Id: kachina.c,v 1.5 2003-04-07 22:41:52 fillods Exp $
  *
  *   This library is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library General Public License as
@@ -25,19 +25,14 @@
 #endif
 
 #include <stdlib.h>
-#include <stdio.h>   /* Standard input/output definitions */
 #include <string.h>  /* String function definitions */
 #include <unistd.h>  /* UNIX standard function definitions */
-#include <fcntl.h>   /* File control definitions */
-#include <errno.h>   /* Error number definitions */
-#include <termios.h> /* POSIX terminal control definitions */
-#include <sys/ioctl.h>
 #include <math.h>
 
-#include <hamlib/rig.h>
-#include <serial.h>
-#include <misc.h>
-#include <cal.h>
+#include "hamlib/rig.h"
+#include "serial.h"
+#include "misc.h"
+#include "cal.h"
 
 #include "kachina.h"
 
diff --git a/kenwood/kenwood.c b/kenwood/kenwood.c
index 442e19e8a..e100d8842 100644
--- a/kenwood/kenwood.c
+++ b/kenwood/kenwood.c
@@ -2,7 +2,7 @@
  *  Hamlib Kenwood backend - main file
  *  Copyright (c) 2000-2003 by Stephane Fillod and others
  *
- *	$Id: kenwood.c,v 1.59 2003-03-15 23:58:40 fillods Exp $
+ *	$Id: kenwood.c,v 1.60 2003-04-07 22:41:53 fillods Exp $
  *
  *   This library is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library General Public License as
@@ -25,18 +25,13 @@
 #endif
 
 #include <stdlib.h>
-#include <stdio.h>   /* Standard input/output definitions */
 #include <string.h>  /* String function definitions */
 #include <unistd.h>  /* UNIX standard function definitions */
-#include <fcntl.h>   /* File control definitions */
-#include <errno.h>   /* Error number definitions */
-#include <termios.h> /* POSIX terminal control definitions */
-#include <sys/ioctl.h>
 #include <math.h>
 
-#include <hamlib/rig.h>
-#include <serial.h>
-#include <misc.h>
+#include "hamlib/rig.h"
+#include "serial.h"
+#include "misc.h"
 
 #include "kenwood.h"
 
diff --git a/kenwood/th.c b/kenwood/th.c
index 5860cc5bd..b59d060f9 100644
--- a/kenwood/th.c
+++ b/kenwood/th.c
@@ -2,7 +2,7 @@
  *  Hamlib Kenwood backend - TH handheld primitives
  *  Copyright (c) 2001-2003 by Stephane Fillod
  *
- *	$Id: th.c,v 1.10 2003-03-24 23:08:28 fillods Exp $
+ *	$Id: th.c,v 1.11 2003-04-07 22:41:54 fillods Exp $
  *
  *   This library is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library General Public License as
@@ -25,19 +25,13 @@
 #endif
 
 #include <stdlib.h>
-#include <stdio.h>   /* Standard input/output definitions */
 #include <string.h>  /* String function definitions */
 #include <unistd.h>  /* UNIX standard function definitions */
-#include <fcntl.h>   /* File control definitions */
-#include <errno.h>   /* Error number definitions */
-#include <termios.h> /* POSIX terminal control definitions */
-#include <sys/ioctl.h>
 
-#include <hamlib/rig.h>
-#include <hamlib/riglist.h>
+#include "hamlib/rig.h"
 #include "kenwood.h"
 #include "th.h"
-#include <serial.h>
+#include "serial.h"
 
 const struct kenwood_priv_caps  th_priv_caps  = {
     .cmdtrm =  EOM_TH,
diff --git a/pcr/pcr.c b/pcr/pcr.c
index bb65ece45..77aca2911 100644
--- a/pcr/pcr.c
+++ b/pcr/pcr.c
@@ -1,8 +1,8 @@
 /*
  *  Hamlib PCR backend - main file
- *  Copyright (c) 2001-2002 by Stephane Fillod and Darren Hatcher
+ *  Copyright (c) 2001-2003 by Stephane Fillod and Darren Hatcher
  *
- *	$Id: pcr.c,v 1.16 2002-08-26 22:33:52 fillods Exp $
+ *	$Id: pcr.c,v 1.17 2003-04-07 22:41:55 fillods Exp $
  *
  *   This library is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library General Public License as
@@ -25,18 +25,13 @@
 #endif
 
 #include <stdlib.h>
-#include <stdio.h>   /* Standard input/output definitions */
 #include <string.h>  /* String function definitions */
 #include <unistd.h>  /* UNIX standard function definitions */
-#include <fcntl.h>   /* File control definitions */
-#include <errno.h>   /* Error number definitions */
-#include <termios.h> /* POSIX terminal control definitions */
-#include <sys/ioctl.h>
 #include <math.h>
 
-#include <hamlib/rig.h>
-#include <serial.h>
-#include <misc.h>
+#include "hamlib/rig.h"
+#include "serial.h"
+#include "misc.h"
 
 #include "pcr.h"
 
diff --git a/rotorez/rotorez.c b/rotorez/rotorez.c
index 4e74747d0..ab26de825 100644
--- a/rotorez/rotorez.c
+++ b/rotorez/rotorez.c
@@ -12,7 +12,7 @@
  * Hy-Gain is a trademark of MFJ Enterprises
  *
  *
- *    $Id: rotorez.c,v 1.5 2003-02-27 03:47:47 n0nb Exp $
+ *    $Id: rotorez.c,v 1.6 2003-04-07 22:41:55 fillods Exp $
  *
  *
  *  This library is free software; you can redistribute it and/or
@@ -36,17 +36,12 @@
 #endif
 
 #include <stdlib.h>             /* Standard library definitions */
-#include <stdio.h>              /* Standard input/output definitions */
 #include <string.h>             /* String function definitions */
 #include <unistd.h>             /* UNIX standard function definitions */
-#include <fcntl.h>              /* File control definitions */
-#include <errno.h>              /* Error number definitions */
-#include <termios.h>            /* POSIX terminal control definitions */
-#include <sys/ioctl.h>          /* System IO Control definitions */
 
-#include <hamlib/rotator.h>
-#include <serial.h>
-#include <misc.h>
+#include "hamlib/rotator.h"
+#include "serial.h"
+#include "misc.h"
 
 #include "rotorez.h"
 
diff --git a/rpcrig/rpcrig_backend.c b/rpcrig/rpcrig_backend.c
index 6f5bb9dfd..1c2b454e6 100644
--- a/rpcrig/rpcrig_backend.c
+++ b/rpcrig/rpcrig_backend.c
@@ -2,7 +2,7 @@
  *  Hamlib RPC backend - main file
  *  Copyright (c) 2001-2003 by Stephane Fillod
  *
- *	$Id: rpcrig_backend.c,v 1.12 2003-04-06 18:40:35 fillods Exp $
+ *	$Id: rpcrig_backend.c,v 1.13 2003-04-07 22:41:56 fillods Exp $
  *
  *   This library is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library General Public License as
@@ -25,22 +25,17 @@
 #endif
 
 #include <stdlib.h>
-#include <stdio.h>   /* Standard input/output definitions */
 #include <string.h>  /* String function definitions */
 #include <unistd.h>  /* UNIX standard function definitions */
-#include <fcntl.h>   /* File control definitions */
-#include <errno.h>   /* Error number definitions */
-#include <termios.h> /* POSIX terminal control definitions */
-#include <sys/ioctl.h>
 #include <math.h>
 #include <limits.h>
-
-#include <hamlib/rig.h>
-#include <serial.h>
-#include <misc.h>
-#include <token.h>
 #include <netdb.h>
 
+#include "hamlib/rig.h"
+#include "serial.h"
+#include "misc.h"
+#include "token.h"
+
 #include <rpc/rpc.h>
 #ifdef HAVE_RPC_RPCENT_H
 #include <rpc/rpcent.h>
diff --git a/rpcrot/rpcrot_backend.c b/rpcrot/rpcrot_backend.c
index d49a5bcef..815a4ae45 100644
--- a/rpcrot/rpcrot_backend.c
+++ b/rpcrot/rpcrot_backend.c
@@ -3,7 +3,7 @@
  *  Copyright (c) 2001,2002 by Stephane Fillod
  *  Contributed by Francois Retief <fgretief@sun.ac.za>
  *
- *	$Id: rpcrot_backend.c,v 1.5 2002-12-16 22:07:00 fillods Exp $
+ *	$Id: rpcrot_backend.c,v 1.6 2003-04-07 22:41:56 fillods Exp $
  *
  *   This library is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library General Public License as
@@ -26,21 +26,16 @@
 #endif
 
 #include <stdlib.h>
-#include <stdio.h>   /* Standard input/output definitions */
 #include <string.h>  /* String function definitions */
 #include <unistd.h>  /* UNIX standard function definitions */
-#include <fcntl.h>   /* File control definitions */
-#include <errno.h>   /* Error number definitions */
-#include <termios.h> /* POSIX terminal control definitions */
-#include <sys/ioctl.h>
 #include <math.h>
 #include <netdb.h>
 #include <limits.h>
 
-#include <hamlib/rotator.h>
-#include <serial.h>
-#include <misc.h>
-#include <token.h>
+#include "hamlib/rotator.h"
+#include "serial.h"
+#include "misc.h"
+#include "token.h"
 
 #include <rpc/rpc.h>
 #ifdef HAVE_RPC_RPCENT_H
diff --git a/src/iofunc.c b/src/iofunc.c
index 1d0beff29..3c1ad9157 100644
--- a/src/iofunc.c
+++ b/src/iofunc.c
@@ -1,8 +1,8 @@
 /*
  *  Hamlib Interface - generic file based io functions
- *  Copyright (c) 2000-2002 by Stephane Fillod and Frank Singleton
+ *  Copyright (c) 2000-2003 by Stephane Fillod and Frank Singleton
  *
- *	$Id: iofunc.c,v 1.6 2002-07-08 22:53:26 fillods Exp $
+ *	$Id: iofunc.c,v 1.7 2003-04-07 22:41:57 fillods Exp $
  *
  *   This library is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library General Public License as
@@ -33,9 +33,8 @@
 #include <sys/time.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <sys/ioctl.h>
 
-#include <hamlib/rig.h>
+#include "hamlib/rig.h"
 #include "iofunc.h"
 #include "misc.h"
 
diff --git a/tentec/tentec.c b/tentec/tentec.c
index e50217c1b..c2c865129 100644
--- a/tentec/tentec.c
+++ b/tentec/tentec.c
@@ -1,8 +1,8 @@
 /*
  *  Hamlib Tentec backend - main file
- *  Copyright (c) 2001,2002 by Stephane Fillod
+ *  Copyright (c) 2001-2003 by Stephane Fillod
  *
- *	$Id: tentec.c,v 1.6 2002-09-06 14:05:41 fillods Exp $
+ *	$Id: tentec.c,v 1.7 2003-04-07 22:41:58 fillods Exp $
  *
  *   This library is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library General Public License as
@@ -25,19 +25,14 @@
 #endif
 
 #include <stdlib.h>
-#include <stdio.h>   /* Standard input/output definitions */
 #include <string.h>  /* String function definitions */
 #include <unistd.h>  /* UNIX standard function definitions */
-#include <fcntl.h>   /* File control definitions */
-#include <errno.h>   /* Error number definitions */
-#include <termios.h> /* POSIX terminal control definitions */
-#include <sys/ioctl.h>
 #include <math.h>
 
-#include <hamlib/rig.h>
-#include <serial.h>
-#include <misc.h>
-#include <cal.h>
+#include "hamlib/rig.h"
+#include "serial.h"
+#include "misc.h"
+#include "cal.h"
 
 #include "tentec.h"
 
diff --git a/uniden/uniden.c b/uniden/uniden.c
index 9b9cccc11..21e5bf22c 100644
--- a/uniden/uniden.c
+++ b/uniden/uniden.c
@@ -1,8 +1,8 @@
 /*
  *  Hamlib Uniden backend - main file
- *  Copyright (c) 2001,2002 by Stephane Fillod
+ *  Copyright (c) 2001-2003 by Stephane Fillod
  *
- *		$Id: uniden.c,v 1.4 2002-03-13 23:37:13 fillods Exp $
+ *	$Id: uniden.c,v 1.5 2003-04-07 22:41:58 fillods Exp $
  *
  *   This library is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library General Public License as
@@ -25,18 +25,13 @@
 #endif
 
 #include <stdlib.h>
-#include <stdio.h>   /* Standard input/output definitions */
 #include <string.h>  /* String function definitions */
 #include <unistd.h>  /* UNIX standard function definitions */
-#include <fcntl.h>   /* File control definitions */
-#include <errno.h>   /* Error number definitions */
-#include <termios.h> /* POSIX terminal control definitions */
-#include <sys/ioctl.h>
 #include <math.h>
 
-#include <hamlib/rig.h>
-#include <serial.h>
-#include <misc.h>
+#include "hamlib/rig.h"
+#include "serial.h"
+#include "misc.h"
 
 #include "uniden.h"
 
diff --git a/winradio/winradio.c b/winradio/winradio.c
index 652f87286..48f16257f 100644
--- a/winradio/winradio.c
+++ b/winradio/winradio.c
@@ -1,9 +1,9 @@
 /*
  *  Hamlib WiNRADiO backend - main file for interface through /dev/winradio API
  *  Copyright (C) 2001 pab@users.sourceforge.net
- *  Derived from hamlib code (C) 2000,2001 Stephane Fillod.
+ *  Derived from hamlib code (C) 2000-2003 Stephane Fillod.
  *
- *		$Id: winradio.c,v 1.16 2001-12-28 20:28:04 fillods Exp $
+ *	$Id: winradio.c,v 1.17 2003-04-07 22:41:59 fillods Exp $
  *
  *   This library is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library General Public License as
@@ -26,18 +26,16 @@
 #endif
 
 #include <stdlib.h>
-#include <stdio.h>   /* Standard input/output definitions */
 #include <string.h>  /* String function definitions */
 #include <unistd.h>  /* UNIX standard function definitions */
-#include <fcntl.h>   /* File control definitions */
-#include <errno.h>   /* Error number definitions */
-#include <termios.h> /* POSIX terminal control definitions */
+#ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
+#endif
 #include <math.h>
 
-#include <hamlib/rig.h>
-#include <serial.h>
-#include <misc.h>
+#include "hamlib/rig.h"
+#include "serial.h"
+#include "misc.h"
 
 #include "winradio.h"
 
diff --git a/yaesu/ft100.c b/yaesu/ft100.c
index f8b9089af..7e5e7caa2 100644
--- a/yaesu/ft100.c
+++ b/yaesu/ft100.c
@@ -7,7 +7,7 @@
  * The starting point for this code was Frank's ft847 implementation.
  *
  *
- *    $Id: ft100.c,v 1.9 2003-04-06 18:40:35 fillods Exp $  
+ *    $Id: ft100.c,v 1.10 2003-04-07 22:42:00 fillods Exp $  
  *
  *
  *  This library is free software; you can redistribute it and/or
@@ -26,17 +26,15 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdlib.h>
-#include <stdio.h>   	/* Standard input/output definitions */
 #include <string.h>  	/* String function definitions */
 #include <unistd.h>  	/* UNIX standard function definitions */
-#include <fcntl.h>   	/* File control definitions */
-#include <errno.h>   	/* Error number definitions */
-#include <termios.h> 	/* POSIX terminal control definitions */
-#include <sys/ioctl.h>
 
-#include <hamlib/rig.h>
-#include <hamlib/riglist.h>
+#include "hamlib/rig.h"
 #include "serial.h"
 #include "yaesu.h"
 #include "ft100.h"
diff --git a/yaesu/ft1000mp.c b/yaesu/ft1000mp.c
index 5bc276f8d..30eb7855b 100644
--- a/yaesu/ft1000mp.c
+++ b/yaesu/ft1000mp.c
@@ -1,10 +1,10 @@
 /*
- * ft1000.c - (C) Stephane Fillod 2002 (fillods@users.sourceforge.net)
+ * ft1000.c - (C) Stephane Fillod 2002-2003 (fillods@users.sourceforge.net)
  *
  * This shared library provides an API for communicating
  * via serial interface to an FT-1000MP using the "CAT" interface
  *
- *	$Id: ft1000mp.c,v 1.1 2002-12-01 21:49:12 fillods Exp $
+ *	$Id: ft1000mp.c,v 1.2 2003-04-07 22:42:00 fillods Exp $
  *
  *   This library is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library General Public License as
@@ -32,17 +32,16 @@
  */
 
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdlib.h>
-#include <stdio.h>   /* Standard input/output definitions */
 #include <string.h>  /* String function definitions */
 #include <unistd.h>  /* UNIX standard function definitions */
-#include <fcntl.h>   /* File control definitions */
-#include <errno.h>   /* Error number definitions */
-#include <termios.h> /* POSIX terminal control definitions */
-#include <sys/ioctl.h>
 
-#include <hamlib/rig.h>
-#include <bandplan.h>
+#include "hamlib/rig.h"
+#include "bandplan.h"
 #include "serial.h"
 #include "misc.h"
 #include "cal.h"
diff --git a/yaesu/ft747.c b/yaesu/ft747.c
index 7964eadb2..2d89d3938 100644
--- a/yaesu/ft747.c
+++ b/yaesu/ft747.c
@@ -7,7 +7,7 @@
  * box (FIF-232C) or similar
  *
  *
- * $Id: ft747.c,v 1.18 2002-12-01 03:08:05 n0nb Exp $  
+ * $Id: ft747.c,v 1.19 2003-04-07 22:42:02 fillods Exp $  
  *
  *
  *  This library is free software; you can redistribute it and/or
@@ -38,17 +38,15 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdlib.h>
-#include <stdio.h>   /* Standard input/output definitions */
 #include <string.h>  /* String function definitions */
 #include <unistd.h>  /* UNIX standard function definitions */
-#include <fcntl.h>   /* File control definitions */
-#include <errno.h>   /* Error number definitions */
-#include <termios.h> /* POSIX terminal control definitions */
-#include <sys/ioctl.h>
 
-#include <hamlib/rig.h>
-#include <hamlib/riglist.h>
+#include "hamlib/rig.h"
 #include "serial.h"
 #include "misc.h"
 #include "yaesu.h"
diff --git a/yaesu/ft817.c b/yaesu/ft817.c
index 94fc7b99a..f021a9a80 100644
--- a/yaesu/ft817.c
+++ b/yaesu/ft817.c
@@ -7,7 +7,7 @@
  * The starting point for this code was Frank's ft847 implementation.
  *
  *
- *    $Id: ft817.c,v 1.7 2003-04-06 18:40:35 fillods Exp $  
+ *    $Id: ft817.c,v 1.8 2003-04-07 22:42:04 fillods Exp $  
  *
  *
  *  This library is free software; you can redistribute it and/or
@@ -26,17 +26,15 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdlib.h>
-#include <stdio.h>   	/* Standard input/output definitions */
 #include <string.h>  	/* String function definitions */
 #include <unistd.h>  	/* UNIX standard function definitions */
-#include <fcntl.h>   	/* File control definitions */
-#include <errno.h>   	/* Error number definitions */
-#include <termios.h> 	/* POSIX terminal control definitions */
-#include <sys/ioctl.h>
 
-#include <hamlib/rig.h>
-#include <hamlib/riglist.h>
+#include "hamlib/rig.h"
 #include "serial.h"
 #include "yaesu.h"
 #include "ft817.h"
diff --git a/yaesu/ft847.c b/yaesu/ft847.c
index dbf1c0766..b9811f325 100644
--- a/yaesu/ft847.c
+++ b/yaesu/ft847.c
@@ -6,7 +6,7 @@
  * via serial interface to an FT-847 using the "CAT" interface.
  *
  *
- * $Id: ft847.c,v 1.21 2002-12-01 03:08:05 n0nb Exp $  
+ * $Id: ft847.c,v 1.22 2003-04-07 22:42:05 fillods Exp $  
  *
  *
  *
@@ -45,17 +45,15 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdlib.h>
-#include <stdio.h>   /* Standard input/output definitions */
 #include <string.h>  /* String function definitions */
 #include <unistd.h>  /* UNIX standard function definitions */
-#include <fcntl.h>   /* File control definitions */
-#include <errno.h>   /* Error number definitions */
-#include <termios.h> /* POSIX terminal control definitions */
-#include <sys/ioctl.h>
 
-#include <hamlib/rig.h>
-#include <hamlib/riglist.h>
+#include "hamlib/rig.h"
 #include "serial.h"
 #include "yaesu.h"
 #include "ft847.h"
diff --git a/yaesu/ft890.c b/yaesu/ft890.c
index 17f1992af..a693db73d 100644
--- a/yaesu/ft890.c
+++ b/yaesu/ft890.c
@@ -9,7 +9,7 @@
  * via serial interface to an FT-890 using the "CAT" interface
  *
  *
- * $Id: ft890.c,v 1.4 2003-04-06 18:40:36 fillods Exp $
+ * $Id: ft890.c,v 1.5 2003-04-07 22:42:06 fillods Exp $
  *
  *
  *  This library is free software; you can redistribute it and/or
@@ -28,19 +28,16 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <stdlib.h>
-#include <stdio.h>   /* Standard input/output definitions */
 #include <string.h>  /* String function definitions */
 #include <unistd.h>  /* UNIX standard function definitions */
-#include <fcntl.h>   /* File control definitions */
-#include <errno.h>   /* Error number definitions */
-#include <termios.h> /* POSIX terminal control definitions */
-#include <sys/ioctl.h>
 
-#include <hamlib/rig.h>
-#include <hamlib/riglist.h>
-#include <bandplan.h>
+#include "hamlib/rig.h"
+#include "bandplan.h"
 #include "serial.h"
 #include "misc.h"
 #include "yaesu.h"
diff --git a/yaesu/ft920.c b/yaesu/ft920.c
index 2b1f7160b..fe68218c8 100644
--- a/yaesu/ft920.c
+++ b/yaesu/ft920.c
@@ -12,7 +12,7 @@
  * pages 86 to 90
  *
  *
- * $Id: ft920.c,v 1.15 2003-04-06 18:40:36 fillods Exp $
+ * $Id: ft920.c,v 1.16 2003-04-07 22:42:07 fillods Exp $
  *
  *
  *  This library is free software; you can redistribute it and/or
@@ -31,19 +31,16 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <stdlib.h>
-#include <stdio.h>   /* Standard input/output definitions */
 #include <string.h>  /* String function definitions */
 #include <unistd.h>  /* UNIX standard function definitions */
-#include <fcntl.h>   /* File control definitions */
-#include <errno.h>   /* Error number definitions */
-#include <termios.h> /* POSIX terminal control definitions */
-#include <sys/ioctl.h>
 
-#include <hamlib/rig.h>
-#include <hamlib/riglist.h>
-#include <bandplan.h>
+#include "hamlib/rig.h"
+#include "bandplan.h"
 #include "serial.h"
 #include "misc.h"
 #include "yaesu.h"
diff --git a/yaesu/yaesu.c b/yaesu/yaesu.c
index 18bedc5ef..937ce1cc6 100644
--- a/yaesu/yaesu.c
+++ b/yaesu/yaesu.c
@@ -7,7 +7,7 @@
  * via serial interface to a Yaesu rig
  *
  *
- *	$Id: yaesu.c,v 1.11 2003-03-09 04:43:38 n0nb Exp $  
+ *	$Id: yaesu.c,v 1.12 2003-04-07 22:42:11 fillods Exp $  
  *
  *
  *  This library is free software; you can redistribute it and/or
@@ -26,17 +26,15 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <stdlib.h>
-#include <stdio.h>   /* Standard input/output definitions */
 #include <string.h>  /* String function definitions */
 #include <unistd.h>  /* UNIX standard function definitions */
-#include <fcntl.h>   /* File control definitions */
-#include <errno.h>   /* Error number definitions */
-#include <termios.h> /* POSIX terminal control definitions */
-#include <sys/ioctl.h>
 
-#include <hamlib/rig.h>
+#include "hamlib/rig.h"
 #include "serial.h"
 #include "misc.h"