diff --git a/simulators/simelecraft.c b/simulators/simelecraft.c
index a7740ac11..acc931d09 100644
--- a/simulators/simelecraft.c
+++ b/simulators/simelecraft.c
@@ -10,7 +10,6 @@
 #include "sim.h"
 #include "misc.h"
 
-#define BUFSIZE 256
 
 float freqA = 14074000;
 float freqB = 14074500;
diff --git a/simulators/simelecraftk4.c b/simulators/simelecraftk4.c
index 2b5e67e09..edd31061b 100644
--- a/simulators/simelecraftk4.c
+++ b/simulators/simelecraftk4.c
@@ -9,7 +9,6 @@
 #include "sim.h"
 #include "misc.h"
 
-#define BUFSIZE 256
 
 int freqA = 14074000;
 int freqB = 14074500;
diff --git a/simulators/simft450.c b/simulators/simft450.c
index 50b73f823..f97c6631f 100644
--- a/simulators/simft450.c
+++ b/simulators/simft450.c
@@ -8,7 +8,6 @@
 #include "hamlib/rig.h"
 #include "misc.h"
 
-#define BUFSIZE 256
 
 float freqA = 14074000;
 float freqB = 14074500;
diff --git a/simulators/simft710.c b/simulators/simft710.c
index d3f01e6f4..525f49bbb 100644
--- a/simulators/simft710.c
+++ b/simulators/simft710.c
@@ -8,7 +8,6 @@
 #include "hamlib/rig.h"
 #include "misc.h"
 
-#define BUFSIZE 256
 
 float freqA = 14074000;
 float freqB = 14074500;
diff --git a/simulators/simft818.c b/simulators/simft818.c
index e9843b2c8..79813b509 100644
--- a/simulators/simft818.c
+++ b/simulators/simft818.c
@@ -9,7 +9,6 @@
 #include "hamlib/rig.h"
 #include "misc.h"
 
-#define BUFSIZE 256
 
 float freqA = 14074000;
 float freqB = 14074500;
diff --git a/simulators/simft990.c b/simulators/simft990.c
index 9d1b1ab67..6f3a91256 100644
--- a/simulators/simft990.c
+++ b/simulators/simft990.c
@@ -7,7 +7,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#define BUFSIZE 256
 
 float freqA = 14074000;
 float freqB = 14074500;
diff --git a/simulators/simft991.c b/simulators/simft991.c
index 603007d85..fb1d9e829 100644
--- a/simulators/simft991.c
+++ b/simulators/simft991.c
@@ -8,7 +8,6 @@
 #include "hamlib/rig.h"
 #include "misc.h"
 
-#define BUFSIZE 256
 
 float freqA = 14074000;
 float freqB = 14074500;
diff --git a/simulators/simftdx101.c b/simulators/simftdx101.c
index 1304f7f40..eb240a300 100644
--- a/simulators/simftdx101.c
+++ b/simulators/simftdx101.c
@@ -8,7 +8,6 @@
 #include "hamlib/rig.h"
 #include "misc.h"
 
-#define BUFSIZE 256
 
 float freqA = 14074000;
 float freqB = 14074500;
diff --git a/simulators/simftdx1200.c b/simulators/simftdx1200.c
index a53c8e0c7..f6b56820f 100644
--- a/simulators/simftdx1200.c
+++ b/simulators/simftdx1200.c
@@ -8,7 +8,6 @@
 #include "hamlib/rig.h"
 #include "misc.h"
 
-#define BUFSIZE 256
 
 float freqA = 14074000;
 float freqB = 14074500;
diff --git a/simulators/simftdx3000.c b/simulators/simftdx3000.c
index 8e7917062..d4cd4f851 100644
--- a/simulators/simftdx3000.c
+++ b/simulators/simftdx3000.c
@@ -8,7 +8,6 @@
 #include "hamlib/rig.h"
 #include "misc.h"
 
-#define BUFSIZE 256
 
 float freqA = 14074000;
 float freqB = 14074500;
diff --git a/simulators/simftdx5000.c b/simulators/simftdx5000.c
index 034e528d1..121542f4c 100644
--- a/simulators/simftdx5000.c
+++ b/simulators/simftdx5000.c
@@ -8,7 +8,6 @@
 #include "hamlib/rig.h"
 #include "misc.h"
 
-#define BUFSIZE 256
 
 float freqA = 14074000;
 float freqB = 14074500;
diff --git a/simulators/simic2730.c b/simulators/simic2730.c
index fa044eefe..441fa311a 100644
--- a/simulators/simic2730.c
+++ b/simulators/simic2730.c
@@ -14,7 +14,6 @@
 #include "sim.h"
 
 
-#define BUFSIZE 256
 #define X25
 
 int civ_731_mode = 0;
diff --git a/simulators/simic275.c b/simulators/simic275.c
index 11023c0a9..9b5abe810 100644
--- a/simulators/simic275.c
+++ b/simulators/simic275.c
@@ -14,7 +14,6 @@
 #include "sim.h"
 
 
-#define BUFSIZE 256
 #define X25
 
 int civ_731_mode = 0;
diff --git a/simulators/simic7000.c b/simulators/simic7000.c
index d02aa2142..cb4ff005a 100644
--- a/simulators/simic7000.c
+++ b/simulators/simic7000.c
@@ -13,7 +13,6 @@
 #include "misc.h"
 #include "sim.h"
 
-#define BUFSIZE 256
 #define X25
 
 int civ_731_mode = 0;
diff --git a/simulators/simic705.c b/simulators/simic705.c
index 47abe673f..277af171e 100644
--- a/simulators/simic705.c
+++ b/simulators/simic705.c
@@ -19,7 +19,6 @@
  */
 #include "../rigs/icom/icom_defs.h"
 
-#define BUFSIZE 256
 #define X25
 #undef SATMODE
 
diff --git a/simulators/simic7100.c b/simulators/simic7100.c
index e2502f52e..368fc0dc5 100644
--- a/simulators/simic7100.c
+++ b/simulators/simic7100.c
@@ -15,7 +15,6 @@
 
 #undef ECHO
 
-#define BUFSIZE 256
 #define X25
 
 int civ_731_mode = 0;
diff --git a/simulators/simic7200.c b/simulators/simic7200.c
index e33c22543..c717cb9d2 100644
--- a/simulators/simic7200.c
+++ b/simulators/simic7200.c
@@ -14,7 +14,6 @@
 #include "sim.h"
 
 
-#define BUFSIZE 256
 #define X25
 
 int civ_731_mode = 0;
diff --git a/simulators/simic7300.c b/simulators/simic7300.c
index f6f0b8687..89c4d4238 100644
--- a/simulators/simic7300.c
+++ b/simulators/simic7300.c
@@ -14,7 +14,6 @@
 #include "sim.h"
 
 
-#define BUFSIZE 256
 #define X25
 
 int civ_731_mode = 0;
diff --git a/simulators/simic7600.c b/simulators/simic7600.c
index eb9232e00..f72390d80 100644
--- a/simulators/simic7600.c
+++ b/simulators/simic7600.c
@@ -14,7 +14,6 @@
 #include "sim.h"
 
 
-#define BUFSIZE 256
 //#define X25
 
 int civ_731_mode = 0;
diff --git a/simulators/simic7610.c b/simulators/simic7610.c
index f38f36cf3..65d294bae 100644
--- a/simulators/simic7610.c
+++ b/simulators/simic7610.c
@@ -12,7 +12,6 @@
 #include "misc.h"
 #include "sim.h"
 
-#define BUFSIZE 256
 #define X25
 
 int civ_731_mode = 0;
diff --git a/simulators/simic7700.c b/simulators/simic7700.c
index bf69128af..88faef544 100644
--- a/simulators/simic7700.c
+++ b/simulators/simic7700.c
@@ -14,7 +14,6 @@
 #include "sim.h"
 
 
-#define BUFSIZE 256
 #define X25
 
 int civ_731_mode = 0;
diff --git a/simulators/simic7851.c b/simulators/simic7851.c
index 031febe46..04202ccc5 100644
--- a/simulators/simic7851.c
+++ b/simulators/simic7851.c
@@ -13,7 +13,6 @@
 #include "sim.h"
 
 
-#define BUFSIZE 256
 #define X25
 
 int civ_731_mode = 0;
diff --git a/simulators/simic905.c b/simulators/simic905.c
index d439b2419..c39a67e00 100644
--- a/simulators/simic905.c
+++ b/simulators/simic905.c
@@ -14,7 +14,6 @@
 #include "misc.h"
 #include "sim.h"
 
-#define BUFSIZE 256
 #define X25
 
 int civ_731_mode = 0;
diff --git a/simulators/simic910.c b/simulators/simic910.c
index 38fec3e08..3d04e3091 100644
--- a/simulators/simic910.c
+++ b/simulators/simic910.c
@@ -15,7 +15,6 @@
 #include "sim.h"
 
 
-#define BUFSIZE 256
 //#define X25
 
 int civ_731_mode = 0;
diff --git a/simulators/simic9100.c b/simulators/simic9100.c
index 1fbb23b1d..0329fe1b5 100644
--- a/simulators/simic9100.c
+++ b/simulators/simic9100.c
@@ -13,7 +13,6 @@
 #include "sim.h"
 #include "misc.h"
 
-#define BUFSIZE 256
 //#define X25
 
 int civ_731_mode = 0;
diff --git a/simulators/simic9700.c b/simulators/simic9700.c
index 88113a902..5f6c3165e 100644
--- a/simulators/simic9700.c
+++ b/simulators/simic9700.c
@@ -14,7 +14,6 @@
 #include "sim.h"
 
 
-#define BUFSIZE 256
 #define X25
 
 int civ_731_mode = 0;
diff --git a/simulators/simicgeneric.c b/simulators/simicgeneric.c
index 91e584796..98996f6ea 100644
--- a/simulators/simicgeneric.c
+++ b/simulators/simicgeneric.c
@@ -13,7 +13,6 @@
 #include "misc.h"
 #include "sim.h"
 
-#define BUFSIZE 256
 //#define X25
 
 int civ_731_mode = 0;
diff --git a/simulators/simicr8600.c b/simulators/simicr8600.c
index d2b6a8e32..5ab35dbe1 100644
--- a/simulators/simicr8600.c
+++ b/simulators/simicr8600.c
@@ -13,7 +13,6 @@
 #include "misc.h"
 #include "sim.h"
 
-#define BUFSIZE 256
 //#define X25
 
 int civ_731_mode = 0;
diff --git a/simulators/simid5100.c b/simulators/simid5100.c
index a3aaf7da1..262ecc362 100644
--- a/simulators/simid5100.c
+++ b/simulators/simid5100.c
@@ -14,7 +14,6 @@
 #include "sim.h"
 
 
-#define BUFSIZE 256
 
 int civ_731_mode = 0;
 vfo_t current_vfo = RIG_VFO_A;
diff --git a/simulators/simkenwood.c b/simulators/simkenwood.c
index bdf1b780f..fd9e6d4ba 100644
--- a/simulators/simkenwood.c
+++ b/simulators/simkenwood.c
@@ -8,7 +8,6 @@
 #include "hamlib/rig.h"
 #include "misc.h"
 
-#define BUFSIZE 256
 
 int mysleep = 20;
 
diff --git a/simulators/simpowersdr.c b/simulators/simpowersdr.c
index d38276929..8c7d8ca38 100644
--- a/simulators/simpowersdr.c
+++ b/simulators/simpowersdr.c
@@ -8,7 +8,6 @@
 #include "hamlib/rig.h"
 #include "misc.h"
 
-#define BUFSIZE 256
 
 float freqA = 14074000;
 float freqB = 14074500;
diff --git a/simulators/simqrplabs.c b/simulators/simqrplabs.c
index be177e2e3..f9f44e5a4 100644
--- a/simulators/simqrplabs.c
+++ b/simulators/simqrplabs.c
@@ -9,7 +9,6 @@
 #include "hamlib/rig.h"
 #include "misc.h"
 
-#define BUFSIZE 256
 
 int mysleep = 20;
 
diff --git a/simulators/simtrusdx.c b/simulators/simtrusdx.c
index ac51c0bbf..58241c19a 100644
--- a/simulators/simtrusdx.c
+++ b/simulators/simtrusdx.c
@@ -9,7 +9,6 @@
 #include "hamlib/rig.h"
 #include "misc.h"
 
-#define BUFSIZE 256
 
 int mysleep = 20;
 
diff --git a/simulators/simts450.c b/simulators/simts450.c
index 6d159eafc..be89a2398 100644
--- a/simulators/simts450.c
+++ b/simulators/simts450.c
@@ -9,7 +9,6 @@
 #include "hamlib/rig.h"
 #include "misc.h"
 
-#define BUFSIZE 256
 
 int mysleep = 20;
 
diff --git a/simulators/simts590.c b/simulators/simts590.c
index 316eb0c27..5a51e309b 100644
--- a/simulators/simts590.c
+++ b/simulators/simts590.c
@@ -10,7 +10,6 @@
 #include "sim.h"
 #include "misc.h"
 
-#define BUFSIZE 256
 
 int mysleep = 20;
 
diff --git a/simulators/simts890.c b/simulators/simts890.c
index a022cd357..d7e6a81a2 100644
--- a/simulators/simts890.c
+++ b/simulators/simts890.c
@@ -44,8 +44,6 @@
  *   app is only using the latest-and-greatest, comment out the next define.
  */
 #define LEGACY
-// Size of command buffer
-#define BUFSIZE 256
 // Number of selectable bands
 #define NBANDS 11
 /* Type we're emulating - K=The Americas(default), E=Europe */
diff --git a/simulators/simts950.c b/simulators/simts950.c
index 50cc626af..70ace6062 100644
--- a/simulators/simts950.c
+++ b/simulators/simts950.c
@@ -9,7 +9,6 @@
 #include "hamlib/rig.h"
 #include "misc.h"
 
-#define BUFSIZE 256
 
 int mysleep = 20;
 
diff --git a/simulators/simts990.c b/simulators/simts990.c
index a65aea203..d2b96b5af 100644
--- a/simulators/simts990.c
+++ b/simulators/simts990.c
@@ -9,7 +9,6 @@
 #include "hamlib/rig.h"
 #include "misc.h"
 
-#define BUFSIZE 256
 
 int mysleep = 20;
 
diff --git a/simulators/simxiegug90.c b/simulators/simxiegug90.c
index 7530b46c6..755ff2ebf 100644
--- a/simulators/simxiegug90.c
+++ b/simulators/simxiegug90.c
@@ -12,7 +12,6 @@
 #include "misc.h"
 #include "sim.h"
 
-#define BUFSIZE 256
 #define X25
 
 int civ_731_mode = 0;
diff --git a/simulators/simxiegux108g.c b/simulators/simxiegux108g.c
index d9aff1763..501e56b46 100644
--- a/simulators/simxiegux108g.c
+++ b/simulators/simxiegux108g.c
@@ -12,7 +12,6 @@
 #include "misc.h"
 #include "sim.h"
 
-#define BUFSIZE 256
 #define X25
 
 int civ_731_mode = 0;
diff --git a/simulators/simxiegux6100.c b/simulators/simxiegux6100.c
index c4c01a492..9d0726d89 100644
--- a/simulators/simxiegux6100.c
+++ b/simulators/simxiegux6100.c
@@ -12,7 +12,6 @@
 #include "misc.h"
 #include "sim.h"
 
-#define BUFSIZE 256
 #define X25
 
 int civ_731_mode = 0;
diff --git a/simulators/simyaesu.c b/simulators/simyaesu.c
index 9a79ee759..40b179c6e 100644
--- a/simulators/simyaesu.c
+++ b/simulators/simyaesu.c
@@ -8,7 +8,6 @@
 #include "hamlib/rig.h"
 #include "misc.h"
 
-#define BUFSIZE 256
 
 float freqA = 14074000;
 float freqB = 14074500;