diff --git a/src/daemon/https/lgl/Makefile.am b/src/daemon/https/lgl/Makefile.am
index 4383dfdf..654a774f 100644
--- a/src/daemon/https/lgl/Makefile.am
+++ b/src/daemon/https/lgl/Makefile.am
@@ -27,4 +27,4 @@ memmem.c \
 strverscmp.c \
 md5.c \
 des.c 
-  
+
diff --git a/src/daemon/https/minitasn1/Makefile.am b/src/daemon/https/minitasn1/Makefile.am
index 6c58730d..4cd9f34e 100644
--- a/src/daemon/https/minitasn1/Makefile.am
+++ b/src/daemon/https/minitasn1/Makefile.am
@@ -2,8 +2,7 @@
 AM_CPPFLAGS = \
 -I$(top_srcdir)/src/include \
 -I$(top_srcdir)/src/daemon/https/lgl \
--I$(top_srcdir)/src/daemon/https/tls \
--I$(top_srcdir)/src/daemon/https/includes 
+-I$(top_srcdir)/src/daemon/https/tls 
 
 noinst_LTLIBRARIES = libasn1.la
 
diff --git a/src/daemon/https/tls/Makefile.am b/src/daemon/https/tls/Makefile.am
index 406852da..fb2393f4 100644
--- a/src/daemon/https/tls/Makefile.am
+++ b/src/daemon/https/tls/Makefile.am
@@ -8,8 +8,6 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/daemon/https/lgl \
 -I$(top_srcdir)/src/daemon/https/minitasn1 \
 -I$(top_srcdir)/src/daemon/https/x509 \
--I$(top_srcdir)/src/daemon/https/openpgp \
--I$(top_srcdir)/src/daemon/https/opencdk \
 -I$(GCRYPT_CPPFLAGS)
 
 noinst_LTLIBRARIES = libtls.la
diff --git a/src/daemon/https/tls/gnutls_priority.c b/src/daemon/https/tls/gnutls_priority.c
index 709f5515..bbdce41c 100644
--- a/src/daemon/https/tls/gnutls_priority.c
+++ b/src/daemon/https/tls/gnutls_priority.c
@@ -66,22 +66,16 @@ MHD_gnutls_cipher_set_priority (mhd_gtls_session_t session, const int *list)
   return 0;
 }
 
-inline static int
+static int
 _set_priority (mhd_gtls_priority_st * st, const int *list)
 {
-  int num = 0, i;
+  int num = 0;
 
-  while (list[num] != 0)
+  while ( (list[num] != 0) &&
+	  (num < MAX_ALGOS) )
     num++;
-  if (num > MAX_ALGOS)
-    num = MAX_ALGOS;
   st->num_algorithms = num;
-
-  for (i = 0; i < num; i++)
-    {
-      st->priority[i] = list[i];
-    }
-
+  memcpy(st->priority, list, num * sizeof(int));
   return 0;
 }