diff --git a/g13/Makefile.am b/g13/Makefile.am
index 5a2ffb252..34d5baf4b 100644
--- a/g13/Makefile.am
+++ b/g13/Makefile.am
@@ -36,7 +36,7 @@ g13_SOURCES = \
 	g13.c g13.h \
 	g13-common.c g13-common.h \
 	keyblob.h \
-	utils.c utils.h \
+	g13tuple.c g13tuple.h \
 	server.c server.h \
 	create.c create.h \
 	mount.c mount.h \
@@ -56,7 +56,7 @@ g13_syshelp_SOURCES = \
 	g13-syshelp.c g13-syshelp.h \
 	g13-common.c g13-common.h \
 	keyblob.h \
-	utils.c utils.h \
+	g13tuple.c g13tuple.h \
 	sh-cmd.c \
 	sh-blockdev.c \
 	sh-dmcrypt.c
@@ -66,12 +66,12 @@ g13_syshelp_LDADD = $(libcommon) \
 	$(GPG_ERROR_LIBS) $(LIBINTL) $(LIBICONV)
 
 
-module_tests = t-utils
+module_tests = t-g13tuple
 t_common_ldadd = $(libcommon) $(LIBGCRYPT_LIBS) \
 	         $(LIBASSUAN_LIBS)
 
-t_utils_SOURCES = t-utils.c utils.c
-t_utils_LDADD = $(t_common_ldadd)
+t_g13tuple_SOURCES = t-g13tuple.c g13tuple.c
+t_g13tuple_LDADD = $(t_common_ldadd)
 
 
 $(PROGRAMS) : $(libcommon) $(libcommonpth)
diff --git a/g13/backend.h b/g13/backend.h
index be81a04d5..0f391d0ab 100644
--- a/g13/backend.h
+++ b/g13/backend.h
@@ -21,7 +21,7 @@
 #define G13_BACKEND_H
 
 #include "../common/membuf.h"
-#include "utils.h"  /* For tupledesc_t */
+#include "g13tuple.h"
 
 int be_parse_conttype_name (const char *name);
 int be_is_supported_conttype (int conttype);
diff --git a/g13/call-syshelp.c b/g13/call-syshelp.c
index 545bc1ab5..0e227ab16 100644
--- a/g13/call-syshelp.c
+++ b/g13/call-syshelp.c
@@ -29,7 +29,11 @@
 #include "g13.h"
 #include <assuan.h>
 #include "i18n.h"
-#include "utils.h"
+#include "g13tuple.h"
+#include "keyblob.h"
+#include "membuf.h"
+#include "create.h"
+
 
 /* Local data for this module.  A pointer to this is stored in the
    CTRL object of each connection.  */
diff --git a/g13/create.c b/g13/create.c
index 3dac903df..fc2761877 100644
--- a/g13/create.c
+++ b/g13/create.c
@@ -32,7 +32,7 @@
 
 #include "keyblob.h"
 #include "backend.h"
-#include "utils.h"
+#include "g13tuple.h"
 #include "../common/call-gpg.h"
 
 /* Create a new blob with all the session keys and other meta
diff --git a/g13/utils.c b/g13/g13tuple.c
similarity index 99%
rename from g13/utils.c
rename to g13/g13tuple.c
index dbbaa0d8b..b90d81769 100644
--- a/g13/utils.c
+++ b/g13/g13tuple.c
@@ -1,4 +1,4 @@
-/* utils.c - Utility functions
+/* g13tuple.c - Tuple handling
  * Copyright (C) 2009 Free Software Foundation, Inc.
  * Copyright (C) 2009, 2015, 2016  Werner Koch
  *
@@ -26,7 +26,7 @@
 #include <assert.h>
 
 #include "g13.h"
-#include "utils.h"
+#include "g13tuple.h"
 
 
 /* Definition of the tuple descriptor object.  */
diff --git a/g13/utils.h b/g13/g13tuple.h
similarity index 92%
rename from g13/utils.h
rename to g13/g13tuple.h
index 6c3902b90..59cb6372d 100644
--- a/g13/utils.h
+++ b/g13/g13tuple.h
@@ -1,4 +1,4 @@
-/* utils.h - Defs for utility fucthe dispatcher to the various backends.ntions
+/* g13tuple.h - Tuple handling
  * Copyright (C) 2009 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef G13_UTILS_H
-#define G13_UTILS_H
+#ifndef G13_G13TUPLE_H
+#define G13_G13TUPLE_H
 
 #include "../common/membuf.h"
 
@@ -44,4 +44,4 @@ const void *next_tuple (tupledesc_t tupledesc,
                         unsigned int *r_tag, size_t *r_length);
 
 
-#endif /*G13_UTILS_H*/
+#endif /*G13_G13TUPLE_H*/
diff --git a/g13/mount.c b/g13/mount.c
index e9b9c1be7..a80f28d5e 100644
--- a/g13/mount.c
+++ b/g13/mount.c
@@ -32,7 +32,7 @@
 
 #include "keyblob.h"
 #include "backend.h"
-#include "utils.h"
+#include "g13tuple.h"
 #include "../common/sysutils.h"
 #include "../common/call-gpg.h"
 #include "mountinfo.h"
diff --git a/g13/mountinfo.c b/g13/mountinfo.c
index 085fb86fe..1c4894dac 100644
--- a/g13/mountinfo.c
+++ b/g13/mountinfo.c
@@ -31,7 +31,7 @@
 #include "mountinfo.h"
 
 #include "keyblob.h"
-#include "utils.h"
+#include "g13tuple.h"
 
 
 
diff --git a/g13/sh-dmcrypt.c b/g13/sh-dmcrypt.c
index a9aed0cc6..20eea2350 100644
--- a/g13/sh-dmcrypt.c
+++ b/g13/sh-dmcrypt.c
@@ -33,7 +33,7 @@
 #include "g13-syshelp.h"
 #include <assuan.h>
 #include "i18n.h"
-#include "utils.h"
+#include "g13tuple.h"
 #include "exectool.h"
 #include "keyblob.h"
 
diff --git a/g13/t-utils.c b/g13/t-g13tuple.c
similarity index 98%
rename from g13/t-utils.c
rename to g13/t-g13tuple.c
index 5605216ec..f986efab8 100644
--- a/g13/t-utils.c
+++ b/g13/t-g13tuple.c
@@ -1,4 +1,4 @@
-/* t-utils.c - Module test for utils.c
+/* t-g13tuple.c - Module test for g13tuple.c
  * Copyright (C) 2016 Werner Koch
  *
  * This file is part of GnuPG.
@@ -25,9 +25,9 @@
 
 #include "util.h"
 #include "keyblob.h"
-#include "utils.h"
+#include "g13tuple.h"
 
-#define PGM "t-utils"
+#define PGM "t-g13tuple"
 
 static int verbose;
 static int debug;