diff --git a/bin/mbus-serial-request-data-multi-reply.c b/bin/mbus-serial-request-data-multi-reply.c
index 787a651..91a2642 100755
--- a/bin/mbus-serial-request-data-multi-reply.c
+++ b/bin/mbus-serial-request-data-multi-reply.c
@@ -8,10 +8,6 @@
 //
 //------------------------------------------------------------------------------
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
 #include <string.h>
 
 #include <stdio.h>
diff --git a/bin/mbus-serial-request-data.c b/bin/mbus-serial-request-data.c
index c65e54f..f1eaaf0 100755
--- a/bin/mbus-serial-request-data.c
+++ b/bin/mbus-serial-request-data.c
@@ -8,10 +8,6 @@
 //
 //------------------------------------------------------------------------------
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
 #include <string.h>
 
 #include <stdio.h>
diff --git a/bin/mbus-serial-scan-secondary.c b/bin/mbus-serial-scan-secondary.c
index a5b6ed2..e85355e 100755
--- a/bin/mbus-serial-scan-secondary.c
+++ b/bin/mbus-serial-scan-secondary.c
@@ -8,10 +8,6 @@
 //
 //------------------------------------------------------------------------------
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
 #include <string.h>
 
 #include <stdio.h>
@@ -90,7 +86,7 @@ main(int argc, char **argv)
         device = argv[3];   
         addr_mask = strdup("FFFFFFFFFFFFFFFF");
     }
-    else if (argc == 5 && strcmp(argv[1], "-d") == 0)
+    else if (argc == 5 && strcmp(argv[1], "-d") == 0 && strcmp(argv[2], "-b") == 0)
     {
         baudrate = atoi(argv[3]);
         device = argv[4];   
diff --git a/bin/mbus-serial-scan.c b/bin/mbus-serial-scan.c
index 2509e89..f4bae6b 100755
--- a/bin/mbus-serial-scan.c
+++ b/bin/mbus-serial-scan.c
@@ -8,10 +8,6 @@
 //
 //------------------------------------------------------------------------------
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
 #include <string.h>
 
 #include <stdio.h>
diff --git a/bin/mbus-serial-select-secondary.c b/bin/mbus-serial-select-secondary.c
index ccb16b9..628d45b 100755
--- a/bin/mbus-serial-select-secondary.c
+++ b/bin/mbus-serial-select-secondary.c
@@ -8,10 +8,6 @@
 //
 //------------------------------------------------------------------------------
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
 #include <string.h>
 
 #include <stdio.h>
diff --git a/bin/mbus-serial-switch-baudrate.c b/bin/mbus-serial-switch-baudrate.c
index 49cc969..b9186c4 100755
--- a/bin/mbus-serial-switch-baudrate.c
+++ b/bin/mbus-serial-switch-baudrate.c
@@ -11,10 +11,6 @@
 //
 //------------------------------------------------------------------------------
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
 #include <string.h>
 
 #include <stdio.h>
diff --git a/mbus/mbus-protocol.h b/mbus/mbus-protocol.h
index f23d72c..0f4b006 100755
--- a/mbus/mbus-protocol.h
+++ b/mbus/mbus-protocol.h
@@ -19,7 +19,6 @@
 #define _MBUS_PROTOCOL_H_
 
 #include <stdlib.h>
-#include <sys/types.h>
 #include <time.h>
 
 //