diff -Nurd gphoto2-2.5.5.orig/gphoto2/actions.c gphoto2-2.5.5/gphoto2/actions.c
--- gphoto2-2.5.5.orig/gphoto2/actions.c	2014-08-16 10:53:44.000000000 -0400
+++ gphoto2-2.5.5/gphoto2/actions.c	2021-05-30 12:59:57.000000000 -0400
@@ -36,6 +36,8 @@
 # include <sys/time.h>
 #endif
 
+#include <libgen.h>
+
 #include "actions.h"
 #include "i18n.h"
 #include "main.h"
diff -Nurd gphoto2-2.5.5.orig/gphoto2/gp-params.c gphoto2-2.5.5/gphoto2/gp-params.c
--- gphoto2-2.5.5.orig/gphoto2/gp-params.c	2014-01-10 14:14:23.000000000 -0500
+++ gphoto2-2.5.5/gphoto2/gp-params.c	2021-05-30 13:02:21.000000000 -0400
@@ -19,6 +19,7 @@
  */
 
 #include "config.h"
+#include <string.h>
 #include "gp-params.h"
 #include "i18n.h"
 
@@ -26,7 +27,6 @@
 #include "globals.h"
 
 #include <stdlib.h>
-#include <string.h>
 #include <stdio.h>
 #include <errno.h>
 
diff -Nurd gphoto2-2.5.5.orig/gphoto2/main.c gphoto2-2.5.5/gphoto2/main.c
--- gphoto2-2.5.5.orig/gphoto2/main.c	2014-08-17 12:58:49.000000000 -0400
+++ gphoto2-2.5.5/gphoto2/main.c	2021-05-30 12:56:23.000000000 -0400
@@ -19,6 +19,7 @@
  */
 
 #include "config.h"
+#include <string.h>
 #include "actions.h"
 #include "foreach.h"
 #include <gphoto2/gphoto2-port-info-list.h>
@@ -37,7 +38,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdarg.h>
-#include <string.h>
 #include <unistd.h>
 #include <ctype.h>
 #include <locale.h>
diff -Nurd gphoto2-2.5.5.orig/gphoto2/shell.c gphoto2-2.5.5/gphoto2/shell.c
--- gphoto2-2.5.5.orig/gphoto2/shell.c	2014-08-16 09:37:05.000000000 -0400
+++ gphoto2-2.5.5/gphoto2/shell.c	2021-05-30 12:48:28.000000000 -0400
@@ -19,6 +19,7 @@
  */
 
 #include "config.h"
+#include <string.h>
 #include "actions.h"
 #include "globals.h"
 #include "i18n.h"
@@ -28,7 +29,6 @@
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>