diff --git a/clients/lcdexec/lcdexec.c b/clients/lcdexec/lcdexec.c
index c2a7ff4..2e2b358 100644
--- a/clients/lcdexec/lcdexec.c
+++ b/clients/lcdexec/lcdexec.c
@@ -14,6 +14,7 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>
+#include <strings.h>
 #include <errno.h>
 #include <sys/utsname.h>
 #include <signal.h>
diff --git a/clients/lcdexec/menu.c b/clients/lcdexec/menu.c
index 6e48434..e883702 100644
--- a/clients/lcdexec/menu.c
+++ b/clients/lcdexec/menu.c
@@ -14,6 +14,7 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>
+#include <strings.h>
 
 #include "shared/str.h"
 #include "shared/report.h"
diff --git a/clients/lcdproc/iface.c b/clients/lcdproc/iface.c
index ea10ad9..a430344 100644
--- a/clients/lcdproc/iface.c
+++ b/clients/lcdproc/iface.c
@@ -27,6 +27,7 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>
 #include <time.h>
 
 #include "shared/sockets.h"
diff --git a/clients/lcdproc/main.c b/clients/lcdproc/main.c
index 7aec954..7ae7229 100644
--- a/clients/lcdproc/main.c
+++ b/clients/lcdproc/main.c
@@ -1,9 +1,8 @@
-#include "getopt.h"
-
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>
 #include <fcntl.h>
 #include <termios.h>
 #include <errno.h>
@@ -25,6 +24,7 @@
 #include "shared/debug.h"
 #include "shared/report.h"
 #include "shared/configfile.h"
+#include "getopt.h"
 
 #include "batt.h"
 #include "chrono.h"
diff --git a/server/drivers/MtxOrb.c b/server/drivers/MtxOrb.c
index aa6db19..32c837b 100644
--- a/server/drivers/MtxOrb.c
+++ b/server/drivers/MtxOrb.c
@@ -44,6 +44,7 @@
 #include <termios.h>
 #include <fcntl.h>
 #include <string.h>
+#include <strings.h>
 #include <errno.h>
 #include <syslog.h>
 #include <ctype.h>
diff --git a/server/drivers/curses_drv.c b/server/drivers/curses_drv.c
index bd42243..103a108 100644
--- a/server/drivers/curses_drv.c
+++ b/server/drivers/curses_drv.c
@@ -55,6 +55,7 @@ Different implementations of (n)curses available on:
 #include <termios.h>
 #include <fcntl.h>
 #include <string.h>
+#include <strings.h>
 #include <sys/errno.h>
 #include <ctype.h>
 #ifdef HAVE_NCURSES_H
diff --git a/server/drivers/hd44780.c b/server/drivers/hd44780.c
index 23ebb1e..62314d2 100644
--- a/server/drivers/hd44780.c
+++ b/server/drivers/hd44780.c
@@ -67,12 +67,13 @@
 #define KEYPAD_AUTOREPEAT_DELAY 500
 #define KEYPAD_AUTOREPEAT_FREQ 15
 
-
+	
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <string.h>
+#include <strings.h>
 #include <errno.h>
 
 #ifdef HAVE_CONFIG_H
diff --git a/server/drivers/serialPOS.c b/server/drivers/serialPOS.c
index 5ed4522..360d229 100644
--- a/server/drivers/serialPOS.c
+++ b/server/drivers/serialPOS.c
@@ -64,6 +64,7 @@ get_info	Implemented.
 #include <termios.h>
 #include <fcntl.h>
 #include <string.h>
+#include <strings.h>
 #include <errno.h>
 #include <syslog.h>
 #include <ctype.h>
diff --git a/server/main.c b/server/main.c
index 2941b2f..b4659d9 100644
--- a/server/main.c
+++ b/server/main.c
@@ -31,6 +31,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <strings.h>
 #include <signal.h>
 #include <unistd.h>
 #ifndef WIN32
diff --git a/server/widget.c b/server/widget.c
index 80a8642..c3bb6f2 100644
--- a/server/widget.c
+++ b/server/widget.c
@@ -15,6 +15,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <strings.h>
 
 #include "shared/sockets.h"
 #include "shared/report.h"
diff --git a/shared/configfile.c b/shared/configfile.c
index afa8983..bab209c 100644
--- a/shared/configfile.c
+++ b/shared/configfile.c
@@ -15,6 +15,7 @@
 
 #include <stdio.h>
 #include <string.h>
+#include <strings.h>
 #include <unistd.h>
 #include <stdlib.h>