diff --git a/bindings/perl/lang.py b/bindings/perl/lang.py
index 7390ecb4..133db50c 100644
--- a/bindings/perl/lang.py
+++ b/bindings/perl/lang.py
@@ -161,9 +161,9 @@ static inline void lasso_log(GLogLevelFlags level, const char *filename,
 #define lasso_log lasso_log
 #endif
 
-#include "./gobject_handling.c"
-#include "./glist_handling.c"
-#include "./ghashtable_handling.c"
+#include "gobject_handling.c"
+#include "glist_handling.c"
+#include "ghashtable_handling.c"
 
 
 #define lasso_assign_simple(a,b) a = b;
diff --git a/lasso/errors.h b/lasso/errors.h
index 10d91818..5537e9e9 100644
--- a/lasso/errors.h
+++ b/lasso/errors.h
@@ -36,7 +36,7 @@
  * <para><emphasis>Beware that this convention is not always well followed.</emphasis></para>
  */
 
-#include "./export.h"
+#include "export.h"
 
 LASSO_EXPORT const char* lasso_strerror(int error_code);
 
diff --git a/lasso/export.h b/lasso/export.h
index 31071410..d55cadb7 100644
--- a/lasso/export.h
+++ b/lasso/export.h
@@ -29,7 +29,7 @@
 extern "C" {
 #endif /* __cplusplus */
 
-#include "./ctypes.h"
+#include "ctypes.h"
 
 /* Now, the export orgy begins. The following we must do for the
  * Windows platform with MSVC compiler. */
diff --git a/lasso/id-ff/profile.c b/lasso/id-ff/profile.c
index 749fb119..bc9a65d1 100644
--- a/lasso/id-ff/profile.c
+++ b/lasso/id-ff/profile.c
@@ -40,7 +40,7 @@
 #include "profile.h"
 #include "profileprivate.h"
 #include "providerprivate.h"
-#include "./sessionprivate.h"
+#include "sessionprivate.h"
 
 #include "../saml-2.0/profileprivate.h"
 #include "../xml/saml-2.0/saml2_name_id.h"
diff --git a/lasso/id-ff/profileprivate.h b/lasso/id-ff/profileprivate.h
index 2aeefad0..25b64d1f 100644
--- a/lasso/id-ff/profileprivate.h
+++ b/lasso/id-ff/profileprivate.h
@@ -30,7 +30,7 @@ extern "C" {
 
 #endif /* __cplusplus */
 
-#include "./profile.h"
+#include "profile.h"
 
 struct _LassoProfilePrivate
 {
diff --git a/lasso/id-ff/serverprivate.h b/lasso/id-ff/serverprivate.h
index 4c56b42c..7ebf865f 100644
--- a/lasso/id-ff/serverprivate.h
+++ b/lasso/id-ff/serverprivate.h
@@ -25,7 +25,7 @@
 #ifndef __LASSO_SERVER_PRIVATE_H__
 #define __LASSO_SERVER_PRIVATE_H__
 
-#include "./server.h"
+#include "server.h"
 #include "../xml/private.h"
 
 #ifdef __cplusplus
diff --git a/lasso/id-wsf-2.0/data_service.c b/lasso/id-wsf-2.0/data_service.c
index 8f4012e6..3d46417f 100644
--- a/lasso/id-wsf-2.0/data_service.c
+++ b/lasso/id-wsf-2.0/data_service.c
@@ -34,7 +34,7 @@
 #include <libxml/xpath.h>
 #include <libxml/xpathInternals.h>
 
-#include "./data_service.h"
+#include "data_service.h"
 #include "../xml/id-wsf-2.0/idwsf2_strings.h"
 
 #include "../xml/id-wsf-2.0/disco_service_type.h"
@@ -54,9 +54,9 @@
 #include "../xml/soap-1.1/soap_fault.h"
 #include "../xml/private.h"
 #include "../utils.h"
-#include "./private.h"
-#include "./idwsf2_helper.h"
-#include "./soap_binding.h"
+#include "private.h"
+#include "idwsf2_helper.h"
+#include "soap_binding.h"
 
 struct _LassoIdWsf2DataServicePrivate
 {
diff --git a/lasso/id-wsf-2.0/discovery.c b/lasso/id-wsf-2.0/discovery.c
index bc8e58fe..be1bd7f4 100644
--- a/lasso/id-wsf-2.0/discovery.c
+++ b/lasso/id-wsf-2.0/discovery.c
@@ -82,11 +82,11 @@
 #include "../id-ff/provider.h"
 #include "../id-ff/providerprivate.h"
 
-#include "./discovery.h"
+#include "discovery.h"
 #include "../xml/id-wsf-2.0/idwsf2_strings.h"
-#include "./soap_binding.h"
-#include "./idwsf2_helper.h"
-#include "./saml2_login.h"
+#include "soap_binding.h"
+#include "idwsf2_helper.h"
+#include "saml2_login.h"
 #include "../utils.h"
 
 struct _LassoIdWsf2DiscoveryPrivate
diff --git a/lasso/id-wsf-2.0/idwsf2_helper.c b/lasso/id-wsf-2.0/idwsf2_helper.c
index f8577ed9..0c656370 100644
--- a/lasso/id-wsf-2.0/idwsf2_helper.c
+++ b/lasso/id-wsf-2.0/idwsf2_helper.c
@@ -22,7 +22,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "./idwsf2_helper.h"
+#include "idwsf2_helper.h"
 #include "../xml/id-wsf-2.0/idwsf2_strings.h"
 #include "../xml/id-wsf-2.0/disco_abstract.h"
 #include "../xml/id-wsf-2.0/disco_service_type.h"
diff --git a/lasso/id-wsf-2.0/idwsf2_helper.h b/lasso/id-wsf-2.0/idwsf2_helper.h
index 98839a88..54e0e872 100644
--- a/lasso/id-wsf-2.0/idwsf2_helper.h
+++ b/lasso/id-wsf-2.0/idwsf2_helper.h
@@ -31,7 +31,7 @@ extern "C" {
 
 #include "../xml/ws/wsa_endpoint_reference.h"
 #include "../xml/id-wsf-2.0/disco_security_context.h"
-#include "./profile.h"
+#include "profile.h"
 
 
 const char* lasso_wsa_endpoint_reference_get_idwsf2_service_type(
diff --git a/lasso/id-wsf-2.0/profile.c b/lasso/id-wsf-2.0/profile.c
index 34b94de3..69fc268c 100644
--- a/lasso/id-wsf-2.0/profile.c
+++ b/lasso/id-wsf-2.0/profile.c
@@ -57,8 +57,8 @@
 #include "../xml/saml-2.0/saml2_assertion.h"
 #include "../xml/misc_text_node.h"
 #include "../utils.h"
-#include "./idwsf2_helper.h"
-#include "./soap_binding.h"
+#include "idwsf2_helper.h"
+#include "soap_binding.h"
 #include "../id-wsf/wsf_utils.h"
 #include "../saml-2.0/saml2_helper.h"
 
diff --git a/lasso/id-wsf-2.0/saml2_login.c b/lasso/id-wsf-2.0/saml2_login.c
index 6f86ff8e..80346557 100644
--- a/lasso/id-wsf-2.0/saml2_login.c
+++ b/lasso/id-wsf-2.0/saml2_login.c
@@ -22,7 +22,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "./saml2_login.h"
+#include "saml2_login.h"
 #include "../xml/id-wsf-2.0/idwsf2_strings.h"
 #include "identity.h"
 #include "server.h"
@@ -44,7 +44,7 @@
 #include "../xml/saml-2.0/saml2_attribute_statement.h"
 #include "../xml/saml-2.0/saml2_attribute_value.h"
 #include "../xml/saml-2.0/samlp2_response.h"
-#include "./idwsf2_helper.h"
+#include "idwsf2_helper.h"
 #include "../xml/private.h"
 
 
diff --git a/lasso/id-wsf-2.0/soap_binding.c b/lasso/id-wsf-2.0/soap_binding.c
index 347a1513..5e54b036 100644
--- a/lasso/id-wsf-2.0/soap_binding.c
+++ b/lasso/id-wsf-2.0/soap_binding.c
@@ -22,7 +22,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "./soap_binding.h"
+#include "soap_binding.h"
 #include "../xml/idwsf_strings.h"
 #include "../xml/id-wsf-2.0/idwsf2_strings.h"
 #include "../xml/id-wsf-2.0/sb2_sender.h"
diff --git a/lasso/id-wsf/authentication.c b/lasso/id-wsf/authentication.c
index c922f368..5d997f4b 100644
--- a/lasso/id-wsf/authentication.c
+++ b/lasso/id-wsf/authentication.c
@@ -23,7 +23,7 @@
  */
 
 #include "../utils.h"
-#include "./authentication.h"
+#include "authentication.h"
 #include "../xml/idwsf_strings.h"
 #include "../xml/private.h"
 #include "../xml/sa_sasl_request.h"
diff --git a/lasso/id-wsf/data_service.c b/lasso/id-wsf/data_service.c
index 3a404e03..bbed73b5 100644
--- a/lasso/id-wsf/data_service.c
+++ b/lasso/id-wsf/data_service.c
@@ -61,8 +61,8 @@
 #include <libxml/xpath.h>
 #include <libxml/xpathInternals.h>
 
-#include "./discovery.h"
-#include "./data_service.h"
+#include "discovery.h"
+#include "data_service.h"
 #include "../xml/idwsf_strings.h"
 #include "../xml/dst_query.h"
 #include "../xml/dst_query_response.h"
@@ -76,7 +76,7 @@
 #include <xmlsec/xmldsig.h>
 #include <xmlsec/templates.h>
 #include <xmlsec/crypto.h>
-#include "./wsf_profile_private.h"
+#include "wsf_profile_private.h"
 
 extern GHashTable *dst_services_by_prefix; /* cf xml/xml.c */
 
diff --git a/lasso/id-wsf/discovery.c b/lasso/id-wsf/discovery.c
index 9ff59fa8..f30a00e9 100644
--- a/lasso/id-wsf/discovery.c
+++ b/lasso/id-wsf/discovery.c
@@ -82,11 +82,11 @@
 #include "../id-ff/providerprivate.h"
 #include "../id-ff/sessionprivate.h"
 
-#include "./id_wsf.h"
-#include "./wsf_profile_private.h"
-#include "./wsf_utils.h"
+#include "id_wsf.h"
+#include "wsf_profile_private.h"
+#include "wsf_utils.h"
 #include "../utils.h"
-#include "./discovery.h"
+#include "discovery.h"
 
 struct _LassoDiscoveryPrivate
 {
diff --git a/lasso/id-wsf/id_wsf.h b/lasso/id-wsf/id_wsf.h
index 16c4a119..44513be2 100644
--- a/lasso/id-wsf/id_wsf.h
+++ b/lasso/id-wsf/id_wsf.h
@@ -25,14 +25,14 @@
 #ifndef __LASSO_IDSWF_H__
 #define __LASSO_IDSWF_H__
 
-#include "./authentication.h"
-#include "./data_service.h"
-#include "./discovery.h"
-#include "./id_ff_extensions.h"
-#include "./id_wsf.h"
-#include "./interaction_profile_service.h"
-#include "./personal_profile_service.h"
-#include "./wsf_utils.h"
-#include "./wsf_profile.h"
+#include "authentication.h"
+#include "data_service.h"
+#include "discovery.h"
+#include "id_ff_extensions.h"
+#include "id_wsf.h"
+#include "interaction_profile_service.h"
+#include "personal_profile_service.h"
+#include "wsf_utils.h"
+#include "wsf_profile.h"
 
 #endif /* __LASSO_IDSWF_H__ */
diff --git a/lasso/id-wsf/interaction_profile_service.c b/lasso/id-wsf/interaction_profile_service.c
index 206bc7ab..46c4018e 100644
--- a/lasso/id-wsf/interaction_profile_service.c
+++ b/lasso/id-wsf/interaction_profile_service.c
@@ -22,9 +22,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "./interaction_profile_service.h"
+#include "interaction_profile_service.h"
 #include "../xml/idwsf_strings.h"
-#include "./wsf_profile.h"
+#include "wsf_profile.h"
 #include "../xml/soap-1.1/soap_detail.h"
 #include "../xml/soap-1.1/soap_fault.h"
 #include "../xml/is_redirect_request.h"
diff --git a/lasso/id-wsf/personal_profile_service.c b/lasso/id-wsf/personal_profile_service.c
index 3aa558c8..ec6539c9 100644
--- a/lasso/id-wsf/personal_profile_service.c
+++ b/lasso/id-wsf/personal_profile_service.c
@@ -23,11 +23,11 @@
  */
 
 #include "../xml/private.h"
-#include "./personal_profile_service.h"
+#include "personal_profile_service.h"
 #include "../xml/idwsf_strings.h"
-#include "./data_service.h"
-#include "./wsf_profile_private.h"
-#include "./discovery.h"
+#include "data_service.h"
+#include "wsf_profile_private.h"
+#include "discovery.h"
 #include "../utils.h"
 
 /**
diff --git a/lasso/id-wsf/wsf_profile.c b/lasso/id-wsf/wsf_profile.c
index f1840bb7..72fc866a 100644
--- a/lasso/id-wsf/wsf_profile.c
+++ b/lasso/id-wsf/wsf_profile.c
@@ -34,11 +34,11 @@
 
 #include "../utils.h"
 
-#include "./wsf_profile.h"
+#include "wsf_profile.h"
 #include "../xml/idwsf_strings.h"
-#include "./wsf_profile_private.h"
-#include "./discovery.h"
-#include "./wsf_utils.h"
+#include "wsf_profile_private.h"
+#include "discovery.h"
+#include "wsf_utils.h"
 #include "../xml/disco_modify.h"
 #include "../xml/soap-1.1/soap_fault.h"
 #include "../xml/soap_binding_correlation.h"
diff --git a/lasso/key.c b/lasso/key.c
index e62efe1d..b75352b5 100644
--- a/lasso/key.c
+++ b/lasso/key.c
@@ -21,9 +21,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "./key.h"
-#include "./keyprivate.h"
-#include "./xml/private.h"
+#include "key.h"
+#include "keyprivate.h"
+#include "xml/private.h"
 
 /*****************************************************************************/
 /* private methods                                                           */
diff --git a/lasso/key.h b/lasso/key.h
index c459b20a..a225b0b4 100644
--- a/lasso/key.h
+++ b/lasso/key.h
@@ -28,7 +28,7 @@
 extern "C" {
 #endif /* __cplusplus */
 
-#include "./xml/xml.h"
+#include "xml/xml.h"
 
 #define LASSO_TYPE_KEY (lasso_key_get_type())
 #define LASSO_KEY(obj) \
diff --git a/lasso/keyprivate.h b/lasso/keyprivate.h
index 9d72f2b0..22361680 100644
--- a/lasso/keyprivate.h
+++ b/lasso/keyprivate.h
@@ -24,7 +24,7 @@
 #ifndef __LASSO_KEY_PRIVATE_H__
 #define __LASSO_KEY_PRIVATE_H__
 
-#include "./xml/private.h"
+#include "xml/private.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lasso/lasso.c b/lasso/lasso.c
index b00893da..98248dac 100644
--- a/lasso/lasso.c
+++ b/lasso/lasso.c
@@ -75,13 +75,13 @@
 #include <xmlsec/crypto.h>
 #include <libxslt/xslt.h>
 #include <config.h>
-#include "./lasso.h"
-#include "./lasso_config.h"
-#include "./debug.h"
-#include "./backward_comp.h"
-#include "./registry-private.h"
-#include "./xml/private.h"
-#include "./utils.h"
+#include "lasso.h"
+#include "lasso_config.h"
+#include "debug.h"
+#include "backward_comp.h"
+#include "registry-private.h"
+#include "xml/private.h"
+#include "utils.h"
 
 /* Set to true, it forces lasso_provider_verify_signature and lasso_query_verify_signature to always
  * return TRUE. */
diff --git a/lasso/logging.c b/lasso/logging.c
index 511e4985..0fb1e586 100644
--- a/lasso/logging.c
+++ b/lasso/logging.c
@@ -22,8 +22,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "./logging.h"
-#include "./lasso_config.h"
+#include "logging.h"
+#include "lasso_config.h"
 #include <glib.h>
 
 void
diff --git a/lasso/logging.h b/lasso/logging.h
index 9a483c34..5fe25ec9 100644
--- a/lasso/logging.h
+++ b/lasso/logging.h
@@ -26,7 +26,7 @@
 #define __LASSO_LOGGING_H__ 1
 
 #include <glib.h>
-#include "./errors.h"
+#include "errors.h"
 
 #ifndef lasso_log
 void lasso_log(GLogLevelFlags level, const char *filename, int line,
diff --git a/lasso/registry.c b/lasso/registry.c
index 0816c0c1..8eefd0cf 100644
--- a/lasso/registry.c
+++ b/lasso/registry.c
@@ -23,9 +23,9 @@
  */
 
 #include <glib.h>
-#include "./registry-private.h"
-#include "./errors.h"
-#include "./utils.h"
+#include "registry-private.h"
+#include "errors.h"
+#include "utils.h"
 
 
 /**
diff --git a/lasso/registry.h b/lasso/registry.h
index 07819b6e..c570e8d7 100644
--- a/lasso/registry.h
+++ b/lasso/registry.h
@@ -27,7 +27,7 @@
 #define __REGISTRY_H__
 
 #include <glib.h>
-#include "./export.h"
+#include "export.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lasso/saml-2.0/assertion_query.c b/lasso/saml-2.0/assertion_query.c
index 27cf0401..27288ccc 100644
--- a/lasso/saml-2.0/assertion_query.c
+++ b/lasso/saml-2.0/assertion_query.c
@@ -24,9 +24,9 @@
 
 #include "../id-ff/session.h"
 #include "../xml/private.h"
-#include "./assertion_query.h"
-#include "./providerprivate.h"
-#include "./profileprivate.h"
+#include "assertion_query.h"
+#include "providerprivate.h"
+#include "profileprivate.h"
 #include "../id-ff/providerprivate.h"
 #include "../id-ff/profileprivate.h"
 #include "../id-ff/identityprivate.h"
diff --git a/lasso/saml-2.0/login.c b/lasso/saml-2.0/login.c
index acc9125a..31343522 100644
--- a/lasso/saml-2.0/login.c
+++ b/lasso/saml-2.0/login.c
@@ -26,11 +26,11 @@
 #include <libxml/xpath.h>
 #include <libxml/xpathInternals.h>
 
-#include "./providerprivate.h"
-#include "./loginprivate.h"
-#include "./profileprivate.h"
-#include "./federationprivate.h"
-#include "./saml2_helper.h"
+#include "providerprivate.h"
+#include "loginprivate.h"
+#include "profileprivate.h"
+#include "federationprivate.h"
+#include "saml2_helper.h"
 
 #include "../id-ff/providerprivate.h"
 #include "../id-ff/serverprivate.h"
diff --git a/lasso/saml-2.0/profile.c b/lasso/saml-2.0/profile.c
index 466dd576..b98bb85e 100644
--- a/lasso/saml-2.0/profile.c
+++ b/lasso/saml-2.0/profile.c
@@ -26,10 +26,10 @@
 #include <xmlsec/base64.h>
 
 #include "../utils.h"
-#include "./providerprivate.h"
-#include "./profileprivate.h"
-#include "./profile.h"
-#include "./provider.h"
+#include "providerprivate.h"
+#include "profileprivate.h"
+#include "profile.h"
+#include "provider.h"
 
 #include "../id-ff/providerprivate.h"
 #include "../id-ff/profile.h"
diff --git a/lasso/saml-2.0/provider.c b/lasso/saml-2.0/provider.c
index 66293c3f..baccb174 100644
--- a/lasso/saml-2.0/provider.c
+++ b/lasso/saml-2.0/provider.c
@@ -35,7 +35,7 @@
 #include "../id-ff/server.h"
 #include "../id-ff/providerprivate.h"
 #include "../utils.h"
-#include "./provider.h"
+#include "provider.h"
 #include "../xml/saml-2.0/saml2_attribute.h"
 #include "../xml/saml-2.0/saml2_xsd.h"
 
diff --git a/lasso/saml-2.0/saml2_helper.c b/lasso/saml-2.0/saml2_helper.c
index f8d8c43a..7d160e56 100644
--- a/lasso/saml-2.0/saml2_helper.c
+++ b/lasso/saml-2.0/saml2_helper.c
@@ -22,7 +22,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "./saml2_helper.h"
+#include "saml2_helper.h"
 
 #include "../id-ff/server.h"
 #include "../id-ff/serverprivate.h"
@@ -34,7 +34,7 @@
 #include "../xml/saml-2.0/saml2_attribute_value.h"
 #include "../xml/private.h"
 #include "../utils.h"
-#include "./provider.h"
+#include "provider.h"
 #include <time.h>
 
 static GList* lasso_saml2_assertion_get_audience_restrictions(LassoSaml2Assertion *assertion);
diff --git a/lasso/utils.c b/lasso/utils.c
index 78e37bc9..7c81f650 100644
--- a/lasso/utils.c
+++ b/lasso/utils.c
@@ -26,7 +26,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <glib.h>
-#include "./utils.h"
+#include "utils.h"
 
 /**
  * SECTION:utilities
diff --git a/lasso/utils.h b/lasso/utils.h
index 465f4b6a..d62d3cdb 100644
--- a/lasso/utils.h
+++ b/lasso/utils.h
@@ -30,10 +30,10 @@
 #include <glib-object.h>
 #include <xmlsec/keys.h>
 #include "debug.h"
-#include "./backward_comp.h"
-#include "./xml/private.h"
-#include "./xml/tools.h"
-#include "./logging.h"
+#include "backward_comp.h"
+#include "xml/private.h"
+#include "xml/tools.h"
+#include "logging.h"
 
 #ifdef LASSO_DEBUG
 #ifdef __GNUC__
diff --git a/lasso/xml/disco_authenticate_requester.c b/lasso/xml/disco_authenticate_requester.c
index 4455e3d2..57849221 100644
--- a/lasso/xml/disco_authenticate_requester.c
+++ b/lasso/xml/disco_authenticate_requester.c
@@ -24,7 +24,7 @@
 
 #include "private.h"
 #include "disco_authenticate_requester.h"
-#include "./idwsf_strings.h"
+#include "idwsf_strings.h"
 
 /**
  * SECTION:disco_authenticate_requester
diff --git a/lasso/xml/disco_authenticate_session_context.c b/lasso/xml/disco_authenticate_session_context.c
index 0013f200..9434b858 100644
--- a/lasso/xml/disco_authenticate_session_context.c
+++ b/lasso/xml/disco_authenticate_session_context.c
@@ -24,7 +24,7 @@
 
 #include "private.h"
 #include "disco_authenticate_session_context.h"
-#include "./idwsf_strings.h"
+#include "idwsf_strings.h"
 
 /**
  * SECTION:disco_authenticate_session_context
diff --git a/lasso/xml/disco_authorize_requester.c b/lasso/xml/disco_authorize_requester.c
index 098fe33f..70daaaee 100644
--- a/lasso/xml/disco_authorize_requester.c
+++ b/lasso/xml/disco_authorize_requester.c
@@ -24,7 +24,7 @@
 
 #include "private.h"
 #include "disco_authorize_requester.h"
-#include "./idwsf_strings.h"
+#include "idwsf_strings.h"
 
 /**
  * SECTION:disco_authorize_requester
diff --git a/lasso/xml/disco_credentials.c b/lasso/xml/disco_credentials.c
index 89dd0017..6d8c8856 100644
--- a/lasso/xml/disco_credentials.c
+++ b/lasso/xml/disco_credentials.c
@@ -24,7 +24,7 @@
 
 #include "private.h"
 #include "disco_credentials.h"
-#include "./idwsf_strings.h"
+#include "idwsf_strings.h"
 
 /**
  * SECTION:disco_credentials
diff --git a/lasso/xml/disco_description.c b/lasso/xml/disco_description.c
index 37f3410c..30af079b 100644
--- a/lasso/xml/disco_description.c
+++ b/lasso/xml/disco_description.c
@@ -24,7 +24,7 @@
 
 #include "private.h"
 #include "disco_description.h"
-#include "./idwsf_strings.h"
+#include "idwsf_strings.h"
 #include "../id-wsf/wsf_utils.h"
 #include "../utils.h"
 
diff --git a/lasso/xml/disco_encrypt_resource_id.c b/lasso/xml/disco_encrypt_resource_id.c
index f0409a09..3707635b 100644
--- a/lasso/xml/disco_encrypt_resource_id.c
+++ b/lasso/xml/disco_encrypt_resource_id.c
@@ -24,7 +24,7 @@
 
 #include "private.h"
 #include "disco_encrypt_resource_id.h"
-#include "./idwsf_strings.h"
+#include "idwsf_strings.h"
 
 /**
  * SECTION:disco_encrypt_resource_id
diff --git a/lasso/xml/disco_encrypted_resource_id.c b/lasso/xml/disco_encrypted_resource_id.c
index e38e476d..0c40aace 100644
--- a/lasso/xml/disco_encrypted_resource_id.c
+++ b/lasso/xml/disco_encrypted_resource_id.c
@@ -24,7 +24,7 @@
 
 #include "private.h"
 #include "disco_encrypted_resource_id.h"
-#include "./idwsf_strings.h"
+#include "idwsf_strings.h"
 
 /**
  * SECTION:disco_encrypted_resource_id
diff --git a/lasso/xml/disco_generate_bearer_token.c b/lasso/xml/disco_generate_bearer_token.c
index b35e9600..e5e17c8a 100644
--- a/lasso/xml/disco_generate_bearer_token.c
+++ b/lasso/xml/disco_generate_bearer_token.c
@@ -24,7 +24,7 @@
 
 #include "private.h"
 #include "disco_generate_bearer_token.h"
-#include "./idwsf_strings.h"
+#include "idwsf_strings.h"
 
 /**
  * SECTION:disco_generate_bearer_token
diff --git a/lasso/xml/disco_insert_entry.c b/lasso/xml/disco_insert_entry.c
index acd861fd..d2da5707 100644
--- a/lasso/xml/disco_insert_entry.c
+++ b/lasso/xml/disco_insert_entry.c
@@ -24,7 +24,7 @@
 
 #include "private.h"
 #include "disco_insert_entry.h"
-#include "./idwsf_strings.h"
+#include "idwsf_strings.h"
 #include "../utils.h"
 
 /**
diff --git a/lasso/xml/disco_modify.c b/lasso/xml/disco_modify.c
index a7b2d1a3..7618dc93 100644
--- a/lasso/xml/disco_modify.c
+++ b/lasso/xml/disco_modify.c
@@ -24,7 +24,7 @@
 
 #include "private.h"
 #include "disco_modify.h"
-#include "./idwsf_strings.h"
+#include "idwsf_strings.h"
 
 /**
  * SECTION:disco_modify
diff --git a/lasso/xml/disco_modify_response.c b/lasso/xml/disco_modify_response.c
index 15d5b015..63a876bc 100644
--- a/lasso/xml/disco_modify_response.c
+++ b/lasso/xml/disco_modify_response.c
@@ -24,7 +24,7 @@
 
 #include "private.h"
 #include "disco_modify_response.h"
-#include "./idwsf_strings.h"
+#include "idwsf_strings.h"
 
 /**
  * SECTION:disco_modify_response
diff --git a/lasso/xml/disco_options.c b/lasso/xml/disco_options.c
index 23d04d6d..d91f340b 100644
--- a/lasso/xml/disco_options.c
+++ b/lasso/xml/disco_options.c
@@ -24,7 +24,7 @@
 
 #include "private.h"
 #include "disco_options.h"
-#include "./idwsf_strings.h"
+#include "idwsf_strings.h"
 
 /**
  * SECTION:disco_options
diff --git a/lasso/xml/disco_query.c b/lasso/xml/disco_query.c
index c364ce45..fe9e57b2 100644
--- a/lasso/xml/disco_query.c
+++ b/lasso/xml/disco_query.c
@@ -24,7 +24,7 @@
 
 #include "private.h"
 #include "disco_query.h"
-#include "./idwsf_strings.h"
+#include "idwsf_strings.h"
 
 /**
  * SECTION:disco_query
diff --git a/lasso/xml/disco_query_response.c b/lasso/xml/disco_query_response.c
index e11eeccc..0d9c45b2 100644
--- a/lasso/xml/disco_query_response.c
+++ b/lasso/xml/disco_query_response.c
@@ -24,7 +24,7 @@
 
 #include "private.h"
 #include "disco_query_response.h"
-#include "./idwsf_strings.h"
+#include "idwsf_strings.h"
 
 /**
  * SECTION:disco_query_response
diff --git a/lasso/xml/disco_remove_entry.c b/lasso/xml/disco_remove_entry.c
index f833c8af..c146b118 100644
--- a/lasso/xml/disco_remove_entry.c
+++ b/lasso/xml/disco_remove_entry.c
@@ -24,7 +24,7 @@
 
 #include "private.h"
 #include "disco_remove_entry.h"
-#include "./idwsf_strings.h"
+#include "idwsf_strings.h"
 
 /**
  * SECTION:disco_remove_entry
diff --git a/lasso/xml/disco_requested_service_type.c b/lasso/xml/disco_requested_service_type.c
index 054793cb..79d9eb77 100644
--- a/lasso/xml/disco_requested_service_type.c
+++ b/lasso/xml/disco_requested_service_type.c
@@ -24,7 +24,7 @@
 
 #include "private.h"
 #include "disco_requested_service_type.h"
-#include "./idwsf_strings.h"
+#include "idwsf_strings.h"
 
 /**
  * SECTION:disco_requested_service_type
diff --git a/lasso/xml/disco_resource_id.c b/lasso/xml/disco_resource_id.c
index 61e89e8f..7831f32f 100644
--- a/lasso/xml/disco_resource_id.c
+++ b/lasso/xml/disco_resource_id.c
@@ -24,7 +24,7 @@
 
 #include "private.h"
 #include "disco_resource_id.h"
-#include "./idwsf_strings.h"
+#include "idwsf_strings.h"
 
 /**
  * SECTION:disco_resource_id
diff --git a/lasso/xml/disco_resource_offering.c b/lasso/xml/disco_resource_offering.c
index c46f953c..d18d6946 100644
--- a/lasso/xml/disco_resource_offering.c
+++ b/lasso/xml/disco_resource_offering.c
@@ -24,7 +24,7 @@
 
 #include "private.h"
 #include "disco_resource_offering.h"
-#include "./idwsf_strings.h"
+#include "idwsf_strings.h"
 #include "../utils.h"
 
 /**
diff --git a/lasso/xml/disco_send_single_logout.c b/lasso/xml/disco_send_single_logout.c
index 155c5939..0c58fca6 100644
--- a/lasso/xml/disco_send_single_logout.c
+++ b/lasso/xml/disco_send_single_logout.c
@@ -24,7 +24,7 @@
 
 #include "private.h"
 #include "disco_send_single_logout.h"
-#include "./idwsf_strings.h"
+#include "idwsf_strings.h"
 #include "../registry.h"
 
 /**
diff --git a/lasso/xml/disco_service_instance.c b/lasso/xml/disco_service_instance.c
index 9dddb8f3..171fe167 100644
--- a/lasso/xml/disco_service_instance.c
+++ b/lasso/xml/disco_service_instance.c
@@ -24,7 +24,7 @@
 
 #include "private.h"
 #include "disco_service_instance.h"
-#include "./idwsf_strings.h"
+#include "idwsf_strings.h"
 
 /**
  * SECTION:disco_service_instance
diff --git a/lasso/xml/dsig/ds_key_info.c b/lasso/xml/dsig/ds_key_info.c
index b5009cb2..f4749489 100644
--- a/lasso/xml/dsig/ds_key_info.c
+++ b/lasso/xml/dsig/ds_key_info.c
@@ -23,7 +23,7 @@
  */
 
 #include "../private.h"
-#include "./ds_key_info.h"
+#include "ds_key_info.h"
 
 /**
  * SECTION:ds_key_info
diff --git a/lasso/xml/dsig/ds_key_info.h b/lasso/xml/dsig/ds_key_info.h
index 2e7359c6..003d1da2 100644
--- a/lasso/xml/dsig/ds_key_info.h
+++ b/lasso/xml/dsig/ds_key_info.h
@@ -30,7 +30,7 @@ extern "C" {
 #endif /* __cplusplus */
 
 #include "../xml.h"
-#include "./ds_key_value.h"
+#include "ds_key_value.h"
 
 #define LASSO_TYPE_DS_KEY_INFO (lasso_ds_key_info_get_type())
 #define LASSO_DS_KEY_INFO(obj) \
diff --git a/lasso/xml/dsig/ds_key_value.c b/lasso/xml/dsig/ds_key_value.c
index 86b66141..ab7b2cf4 100644
--- a/lasso/xml/dsig/ds_key_value.c
+++ b/lasso/xml/dsig/ds_key_value.c
@@ -23,7 +23,7 @@
  */
 
 #include "../private.h"
-#include "./ds_key_value.h"
+#include "ds_key_value.h"
 
 /**
  * SECTION:ds_key_value
diff --git a/lasso/xml/dsig/ds_key_value.h b/lasso/xml/dsig/ds_key_value.h
index e72a2141..bb5ff338 100644
--- a/lasso/xml/dsig/ds_key_value.h
+++ b/lasso/xml/dsig/ds_key_value.h
@@ -30,8 +30,8 @@ extern "C" {
 #endif /* __cplusplus */
 
 #include "../xml.h"
-#include "./ds_rsa_key_value.h"
-#include "./ds_x509_data.h"
+#include "ds_rsa_key_value.h"
+#include "ds_x509_data.h"
 
 #define LASSO_TYPE_DS_KEY_VALUE (lasso_ds_key_value_get_type())
 #define LASSO_DS_KEY_VALUE(obj) \
diff --git a/lasso/xml/dsig/ds_rsa_key_value.c b/lasso/xml/dsig/ds_rsa_key_value.c
index 790f5ce2..f6166652 100644
--- a/lasso/xml/dsig/ds_rsa_key_value.c
+++ b/lasso/xml/dsig/ds_rsa_key_value.c
@@ -23,7 +23,7 @@
  */
 
 #include "../private.h"
-#include "./ds_rsa_key_value.h"
+#include "ds_rsa_key_value.h"
 
 /*
  * SECTION:ds_rsa_key_value
diff --git a/lasso/xml/dsig/ds_x509_data.c b/lasso/xml/dsig/ds_x509_data.c
index c45a1c1b..ef3a88c7 100644
--- a/lasso/xml/dsig/ds_x509_data.c
+++ b/lasso/xml/dsig/ds_x509_data.c
@@ -23,7 +23,7 @@
  */
 
 #include "../private.h"
-#include "./ds_x509_data.h"
+#include "ds_x509_data.h"
 
 /**
  * SECTION:ds_x509_data
diff --git a/lasso/xml/dst_data.c b/lasso/xml/dst_data.c
index a8af8762..04cc53ff 100644
--- a/lasso/xml/dst_data.c
+++ b/lasso/xml/dst_data.c
@@ -24,7 +24,7 @@
 
 #include "private.h"
 #include "dst_data.h"
-#include "./idwsf_strings.h"
+#include "idwsf_strings.h"
 
 /**
  * SECTION:dst_data
diff --git a/lasso/xml/dst_modification.c b/lasso/xml/dst_modification.c
index 9329b3c4..8b0ce21a 100644
--- a/lasso/xml/dst_modification.c
+++ b/lasso/xml/dst_modification.c
@@ -24,7 +24,7 @@
 
 #include "private.h"
 #include "dst_modification.h"
-#include "./idwsf_strings.h"
+#include "idwsf_strings.h"
 
 /**
  * SECTION:dst_modification
diff --git a/lasso/xml/dst_modify.c b/lasso/xml/dst_modify.c
index 46d26dab..506ab344 100644
--- a/lasso/xml/dst_modify.c
+++ b/lasso/xml/dst_modify.c
@@ -24,7 +24,7 @@
 
 #include "private.h"
 #include "dst_modify.h"
-#include "./idwsf_strings.h"
+#include "idwsf_strings.h"
 
 /**
  * SECTION:dst_modify
diff --git a/lasso/xml/dst_modify_response.c b/lasso/xml/dst_modify_response.c
index 2d060c52..20b1c257 100644
--- a/lasso/xml/dst_modify_response.c
+++ b/lasso/xml/dst_modify_response.c
@@ -24,7 +24,7 @@
 
 #include "private.h"
 #include "dst_modify_response.h"
-#include "./idwsf_strings.h"
+#include "idwsf_strings.h"
 
 /**
  * SECTION:dst_modify_response
diff --git a/lasso/xml/dst_new_data.c b/lasso/xml/dst_new_data.c
index da264bda..64680cbb 100644
--- a/lasso/xml/dst_new_data.c
+++ b/lasso/xml/dst_new_data.c
@@ -24,7 +24,7 @@
 
 #include "private.h"
 #include "dst_new_data.h"
-#include "./idwsf_strings.h"
+#include "idwsf_strings.h"
 
 /**
  * SECTION:dst_new_data
diff --git a/lasso/xml/dst_query.c b/lasso/xml/dst_query.c
index e77b04cf..f6efd880 100644
--- a/lasso/xml/dst_query.c
+++ b/lasso/xml/dst_query.c
@@ -24,7 +24,7 @@
 
 #include "private.h"
 #include "dst_query.h"
-#include "./idwsf_strings.h"
+#include "idwsf_strings.h"
 
 /**
  * SECTION:dst_query
diff --git a/lasso/xml/dst_query_item.c b/lasso/xml/dst_query_item.c
index 8aee38dd..552b04ac 100644
--- a/lasso/xml/dst_query_item.c
+++ b/lasso/xml/dst_query_item.c
@@ -24,7 +24,7 @@
 
 #include "private.h"
 #include "dst_query_item.h"
-#include "./idwsf_strings.h"
+#include "idwsf_strings.h"
 
 /**
  * SECTION:dst_query_item
diff --git a/lasso/xml/dst_query_response.c b/lasso/xml/dst_query_response.c
index d1a80781..e4848bb6 100644
--- a/lasso/xml/dst_query_response.c
+++ b/lasso/xml/dst_query_response.c
@@ -24,7 +24,7 @@
 
 #include "private.h"
 #include "dst_query_response.h"
-#include "./idwsf_strings.h"
+#include "idwsf_strings.h"
 
 /**
  * SECTION:dst_query_response
diff --git a/lasso/xml/id-wsf-2.0/disco_abstract.c b/lasso/xml/id-wsf-2.0/disco_abstract.c
index 268f231f..9cf3019c 100644
--- a/lasso/xml/id-wsf-2.0/disco_abstract.c
+++ b/lasso/xml/id-wsf-2.0/disco_abstract.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "disco_abstract.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:disco_abstract
diff --git a/lasso/xml/id-wsf-2.0/disco_endpoint_context.c b/lasso/xml/id-wsf-2.0/disco_endpoint_context.c
index 09f40337..cf9aae6f 100644
--- a/lasso/xml/id-wsf-2.0/disco_endpoint_context.c
+++ b/lasso/xml/id-wsf-2.0/disco_endpoint_context.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "disco_endpoint_context.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 #include "sbf_framework.h"
 
 /**
diff --git a/lasso/xml/id-wsf-2.0/disco_keys.c b/lasso/xml/id-wsf-2.0/disco_keys.c
index ba69fc60..d6519c3a 100644
--- a/lasso/xml/id-wsf-2.0/disco_keys.c
+++ b/lasso/xml/id-wsf-2.0/disco_keys.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "disco_keys.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:disco_keys
diff --git a/lasso/xml/id-wsf-2.0/disco_options.c b/lasso/xml/id-wsf-2.0/disco_options.c
index f0eb1f3b..a82b1d1d 100644
--- a/lasso/xml/id-wsf-2.0/disco_options.c
+++ b/lasso/xml/id-wsf-2.0/disco_options.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "disco_options.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:disco_options
diff --git a/lasso/xml/id-wsf-2.0/disco_provider_id.c b/lasso/xml/id-wsf-2.0/disco_provider_id.c
index 30cc1211..edb2023e 100644
--- a/lasso/xml/id-wsf-2.0/disco_provider_id.c
+++ b/lasso/xml/id-wsf-2.0/disco_provider_id.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "disco_provider_id.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:disco_provider_id
diff --git a/lasso/xml/id-wsf-2.0/disco_query.c b/lasso/xml/id-wsf-2.0/disco_query.c
index 3cc347fe..5e72e417 100644
--- a/lasso/xml/id-wsf-2.0/disco_query.c
+++ b/lasso/xml/id-wsf-2.0/disco_query.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "disco_query.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:disco_query
diff --git a/lasso/xml/id-wsf-2.0/disco_query_response.c b/lasso/xml/id-wsf-2.0/disco_query_response.c
index 0faad04f..628ae26e 100644
--- a/lasso/xml/id-wsf-2.0/disco_query_response.c
+++ b/lasso/xml/id-wsf-2.0/disco_query_response.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "disco_query_response.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:disco_query_response
diff --git a/lasso/xml/id-wsf-2.0/disco_requested_service.c b/lasso/xml/id-wsf-2.0/disco_requested_service.c
index e49d84ca..0f79ce47 100644
--- a/lasso/xml/id-wsf-2.0/disco_requested_service.c
+++ b/lasso/xml/id-wsf-2.0/disco_requested_service.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "disco_requested_service.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:disco_requested_service
diff --git a/lasso/xml/id-wsf-2.0/disco_security_context.c b/lasso/xml/id-wsf-2.0/disco_security_context.c
index 66690cb4..ec81254e 100644
--- a/lasso/xml/id-wsf-2.0/disco_security_context.c
+++ b/lasso/xml/id-wsf-2.0/disco_security_context.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "disco_security_context.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:disco_security_context
diff --git a/lasso/xml/id-wsf-2.0/disco_service_context.c b/lasso/xml/id-wsf-2.0/disco_service_context.c
index 2515618a..ebb51cd1 100644
--- a/lasso/xml/id-wsf-2.0/disco_service_context.c
+++ b/lasso/xml/id-wsf-2.0/disco_service_context.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "disco_service_context.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:disco_service_context
diff --git a/lasso/xml/id-wsf-2.0/disco_service_type.c b/lasso/xml/id-wsf-2.0/disco_service_type.c
index 1c789bb0..23b4086b 100644
--- a/lasso/xml/id-wsf-2.0/disco_service_type.c
+++ b/lasso/xml/id-wsf-2.0/disco_service_type.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "disco_service_type.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:disco_service_type
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_association_add.c b/lasso/xml/id-wsf-2.0/disco_svc_md_association_add.c
index 9b9707b5..11422a62 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_association_add.c
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_association_add.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "disco_svc_md_association_add.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:disco_svc_md_association_add
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_association_add_response.c b/lasso/xml/id-wsf-2.0/disco_svc_md_association_add_response.c
index bdf9a298..262e4dd4 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_association_add_response.c
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_association_add_response.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "disco_svc_md_association_add_response.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:disco_svc_md_association_add_response
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_association_delete.c b/lasso/xml/id-wsf-2.0/disco_svc_md_association_delete.c
index 33328100..04042106 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_association_delete.c
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_association_delete.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "disco_svc_md_association_delete.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:disco_svc_md_association_delete
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_association_delete_response.c b/lasso/xml/id-wsf-2.0/disco_svc_md_association_delete_response.c
index 0e976c8d..287affc7 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_association_delete_response.c
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_association_delete_response.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "disco_svc_md_association_delete_response.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:disco_svc_md_association_delete_response
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_association_query.c b/lasso/xml/id-wsf-2.0/disco_svc_md_association_query.c
index 6236b37c..9b1918b6 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_association_query.c
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_association_query.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "disco_svc_md_association_query.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:disco_svc_md_association_query
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_association_query_response.c b/lasso/xml/id-wsf-2.0/disco_svc_md_association_query_response.c
index 8230ce7a..774820a1 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_association_query_response.c
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_association_query_response.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "disco_svc_md_association_query_response.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:disco_svc_md_association_query_response
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_delete.c b/lasso/xml/id-wsf-2.0/disco_svc_md_delete.c
index dbe6883d..580c98c2 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_delete.c
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_delete.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "disco_svc_md_delete.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:disco_svc_md_delete
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_delete_response.c b/lasso/xml/id-wsf-2.0/disco_svc_md_delete_response.c
index e1bd2469..bbb99930 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_delete_response.c
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_delete_response.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "disco_svc_md_delete_response.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:disco_svc_md_delete_response
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_query.c b/lasso/xml/id-wsf-2.0/disco_svc_md_query.c
index 7b607ac2..cbaef8d6 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_query.c
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_query.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "disco_svc_md_query.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:disco_svc_md_query
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_query_response.c b/lasso/xml/id-wsf-2.0/disco_svc_md_query_response.c
index 9757f7e5..e39b1686 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_query_response.c
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_query_response.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "disco_svc_md_query_response.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:disco_svc_md_query_response
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_register.c b/lasso/xml/id-wsf-2.0/disco_svc_md_register.c
index da02327c..c1193730 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_register.c
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_register.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "disco_svc_md_register.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 #include "disco_svc_metadata.h"
 
 /**
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_register_response.c b/lasso/xml/id-wsf-2.0/disco_svc_md_register_response.c
index 5bde5287..e89a94e7 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_register_response.c
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_register_response.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "disco_svc_md_register_response.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:disco_svc_md_register_response
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_replace.c b/lasso/xml/id-wsf-2.0/disco_svc_md_replace.c
index 197bbf7d..959ef868 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_replace.c
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_replace.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "disco_svc_md_replace.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:disco_svc_md_replace
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_replace_response.c b/lasso/xml/id-wsf-2.0/disco_svc_md_replace_response.c
index d1a8acf0..2fc3ca72 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_replace_response.c
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_replace_response.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "disco_svc_md_replace_response.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:disco_svc_md_replace_response
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_metadata.c b/lasso/xml/id-wsf-2.0/disco_svc_metadata.c
index cb2be49c..f56b328f 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_metadata.c
+++ b/lasso/xml/id-wsf-2.0/disco_svc_metadata.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "disco_svc_metadata.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 #include "disco_endpoint_context.h"
 #include "disco_service_context.h"
 
diff --git a/lasso/xml/id-wsf-2.0/dst_data_response_base.c b/lasso/xml/id-wsf-2.0/dst_data_response_base.c
index c0be1c9e..62fb4460 100644
--- a/lasso/xml/id-wsf-2.0/dst_data_response_base.c
+++ b/lasso/xml/id-wsf-2.0/dst_data_response_base.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "dst_data_response_base.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:dst_data_response_base
diff --git a/lasso/xml/id-wsf-2.0/dst_delete_item_base.c b/lasso/xml/id-wsf-2.0/dst_delete_item_base.c
index 853857d3..ea06ca6a 100644
--- a/lasso/xml/id-wsf-2.0/dst_delete_item_base.c
+++ b/lasso/xml/id-wsf-2.0/dst_delete_item_base.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "dst_delete_item_base.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:dst_delete_item_base
diff --git a/lasso/xml/id-wsf-2.0/dst_delete_response.c b/lasso/xml/id-wsf-2.0/dst_delete_response.c
index 1a75b324..03a901a8 100644
--- a/lasso/xml/id-wsf-2.0/dst_delete_response.c
+++ b/lasso/xml/id-wsf-2.0/dst_delete_response.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "dst_delete_response.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:dst_delete_response
diff --git a/lasso/xml/id-wsf-2.0/dst_request.c b/lasso/xml/id-wsf-2.0/dst_request.c
index 2419c471..e78318e9 100644
--- a/lasso/xml/id-wsf-2.0/dst_request.c
+++ b/lasso/xml/id-wsf-2.0/dst_request.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "dst_request.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:dst_request
diff --git a/lasso/xml/id-wsf-2.0/dst_result_query_base.c b/lasso/xml/id-wsf-2.0/dst_result_query_base.c
index 8c423654..e3c70e7f 100644
--- a/lasso/xml/id-wsf-2.0/dst_result_query_base.c
+++ b/lasso/xml/id-wsf-2.0/dst_result_query_base.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "dst_result_query_base.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:dst_result_query_base
diff --git a/lasso/xml/id-wsf-2.0/dst_test_item_base.c b/lasso/xml/id-wsf-2.0/dst_test_item_base.c
index 1e0c856c..8f3d68e2 100644
--- a/lasso/xml/id-wsf-2.0/dst_test_item_base.c
+++ b/lasso/xml/id-wsf-2.0/dst_test_item_base.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "dst_test_item_base.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:dst_test_item_base
diff --git a/lasso/xml/id-wsf-2.0/dstref_app_data.c b/lasso/xml/id-wsf-2.0/dstref_app_data.c
index 39e88306..769f3995 100644
--- a/lasso/xml/id-wsf-2.0/dstref_app_data.c
+++ b/lasso/xml/id-wsf-2.0/dstref_app_data.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "dstref_app_data.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:dstref_app_data
diff --git a/lasso/xml/id-wsf-2.0/dstref_create.c b/lasso/xml/id-wsf-2.0/dstref_create.c
index f1524c8d..6d09f097 100644
--- a/lasso/xml/id-wsf-2.0/dstref_create.c
+++ b/lasso/xml/id-wsf-2.0/dstref_create.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "dstref_create.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:dstref_create
diff --git a/lasso/xml/id-wsf-2.0/dstref_create_item.c b/lasso/xml/id-wsf-2.0/dstref_create_item.c
index d0f8fca5..928ce0d5 100644
--- a/lasso/xml/id-wsf-2.0/dstref_create_item.c
+++ b/lasso/xml/id-wsf-2.0/dstref_create_item.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "dstref_create_item.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:dstref_create_item
diff --git a/lasso/xml/id-wsf-2.0/dstref_create_response.c b/lasso/xml/id-wsf-2.0/dstref_create_response.c
index d5709257..cf459f57 100644
--- a/lasso/xml/id-wsf-2.0/dstref_create_response.c
+++ b/lasso/xml/id-wsf-2.0/dstref_create_response.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "dstref_create_response.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:dstref_create_response
diff --git a/lasso/xml/id-wsf-2.0/dstref_data.c b/lasso/xml/id-wsf-2.0/dstref_data.c
index 56c55a46..aa72912d 100644
--- a/lasso/xml/id-wsf-2.0/dstref_data.c
+++ b/lasso/xml/id-wsf-2.0/dstref_data.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "dstref_data.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:dstref_data
diff --git a/lasso/xml/id-wsf-2.0/dstref_data_response.c b/lasso/xml/id-wsf-2.0/dstref_data_response.c
index c93d3630..ce3a219d 100644
--- a/lasso/xml/id-wsf-2.0/dstref_data_response.c
+++ b/lasso/xml/id-wsf-2.0/dstref_data_response.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "dstref_data_response.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:dstref_data_response
diff --git a/lasso/xml/id-wsf-2.0/dstref_delete.c b/lasso/xml/id-wsf-2.0/dstref_delete.c
index 50e54d28..27b994cd 100644
--- a/lasso/xml/id-wsf-2.0/dstref_delete.c
+++ b/lasso/xml/id-wsf-2.0/dstref_delete.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "dstref_delete.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:dstref_delete
diff --git a/lasso/xml/id-wsf-2.0/dstref_delete_item.c b/lasso/xml/id-wsf-2.0/dstref_delete_item.c
index 6eb7099e..46fba314 100644
--- a/lasso/xml/id-wsf-2.0/dstref_delete_item.c
+++ b/lasso/xml/id-wsf-2.0/dstref_delete_item.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "dstref_delete_item.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:dstref_delete_item
diff --git a/lasso/xml/id-wsf-2.0/dstref_delete_response.c b/lasso/xml/id-wsf-2.0/dstref_delete_response.c
index 76d99b4a..6dd26d69 100644
--- a/lasso/xml/id-wsf-2.0/dstref_delete_response.c
+++ b/lasso/xml/id-wsf-2.0/dstref_delete_response.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "dstref_delete_response.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:dstref_delete_response
diff --git a/lasso/xml/id-wsf-2.0/dstref_item_data.c b/lasso/xml/id-wsf-2.0/dstref_item_data.c
index 112f35c3..4d85ae74 100644
--- a/lasso/xml/id-wsf-2.0/dstref_item_data.c
+++ b/lasso/xml/id-wsf-2.0/dstref_item_data.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "dstref_item_data.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:dstref_item_data
diff --git a/lasso/xml/id-wsf-2.0/dstref_modify.c b/lasso/xml/id-wsf-2.0/dstref_modify.c
index 0e74d2cf..8c798174 100644
--- a/lasso/xml/id-wsf-2.0/dstref_modify.c
+++ b/lasso/xml/id-wsf-2.0/dstref_modify.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "dstref_modify.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:dstref_modify
diff --git a/lasso/xml/id-wsf-2.0/dstref_modify_item.c b/lasso/xml/id-wsf-2.0/dstref_modify_item.c
index 77b62f16..66f77e32 100644
--- a/lasso/xml/id-wsf-2.0/dstref_modify_item.c
+++ b/lasso/xml/id-wsf-2.0/dstref_modify_item.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "dstref_modify_item.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:dstref_modify_item
diff --git a/lasso/xml/id-wsf-2.0/dstref_modify_response.c b/lasso/xml/id-wsf-2.0/dstref_modify_response.c
index 93c02e3a..a6c5e276 100644
--- a/lasso/xml/id-wsf-2.0/dstref_modify_response.c
+++ b/lasso/xml/id-wsf-2.0/dstref_modify_response.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "dstref_modify_response.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:dstref_modify_response
diff --git a/lasso/xml/id-wsf-2.0/dstref_query.c b/lasso/xml/id-wsf-2.0/dstref_query.c
index 5fef25d4..f1c9d712 100644
--- a/lasso/xml/id-wsf-2.0/dstref_query.c
+++ b/lasso/xml/id-wsf-2.0/dstref_query.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "dstref_query.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:dstref_query
diff --git a/lasso/xml/id-wsf-2.0/dstref_query_item.c b/lasso/xml/id-wsf-2.0/dstref_query_item.c
index 7e680e9a..29c7cce3 100644
--- a/lasso/xml/id-wsf-2.0/dstref_query_item.c
+++ b/lasso/xml/id-wsf-2.0/dstref_query_item.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "dstref_query_item.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:dstref_query_item
diff --git a/lasso/xml/id-wsf-2.0/dstref_query_response.c b/lasso/xml/id-wsf-2.0/dstref_query_response.c
index 81bfc378..77e70d3d 100644
--- a/lasso/xml/id-wsf-2.0/dstref_query_response.c
+++ b/lasso/xml/id-wsf-2.0/dstref_query_response.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "dstref_query_response.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:dstref_query_response
diff --git a/lasso/xml/id-wsf-2.0/dstref_result_query.c b/lasso/xml/id-wsf-2.0/dstref_result_query.c
index a2703e17..ba052b4c 100644
--- a/lasso/xml/id-wsf-2.0/dstref_result_query.c
+++ b/lasso/xml/id-wsf-2.0/dstref_result_query.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "dstref_result_query.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:dstref_result_query
diff --git a/lasso/xml/id-wsf-2.0/dstref_test_item.c b/lasso/xml/id-wsf-2.0/dstref_test_item.c
index 5302397a..27693c8a 100644
--- a/lasso/xml/id-wsf-2.0/dstref_test_item.c
+++ b/lasso/xml/id-wsf-2.0/dstref_test_item.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "dstref_test_item.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:dstref_test_item
diff --git a/lasso/xml/id-wsf-2.0/ims_identity_mapping_request.c b/lasso/xml/id-wsf-2.0/ims_identity_mapping_request.c
index 09950d0c..fd4c8866 100644
--- a/lasso/xml/id-wsf-2.0/ims_identity_mapping_request.c
+++ b/lasso/xml/id-wsf-2.0/ims_identity_mapping_request.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "ims_identity_mapping_request.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:ims_identity_mapping_request
diff --git a/lasso/xml/id-wsf-2.0/ims_identity_mapping_response.c b/lasso/xml/id-wsf-2.0/ims_identity_mapping_response.c
index 1033498f..6f2f0284 100644
--- a/lasso/xml/id-wsf-2.0/ims_identity_mapping_response.c
+++ b/lasso/xml/id-wsf-2.0/ims_identity_mapping_response.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "ims_identity_mapping_response.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:ims_identity_mapping_response
diff --git a/lasso/xml/id-wsf-2.0/ims_mapping_input.c b/lasso/xml/id-wsf-2.0/ims_mapping_input.c
index 3cd46d93..05d2f3f3 100644
--- a/lasso/xml/id-wsf-2.0/ims_mapping_input.c
+++ b/lasso/xml/id-wsf-2.0/ims_mapping_input.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "ims_mapping_input.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:ims_mapping_input
diff --git a/lasso/xml/id-wsf-2.0/ims_mapping_output.c b/lasso/xml/id-wsf-2.0/ims_mapping_output.c
index a2b2b71f..c12bf4b8 100644
--- a/lasso/xml/id-wsf-2.0/ims_mapping_output.c
+++ b/lasso/xml/id-wsf-2.0/ims_mapping_output.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "ims_mapping_output.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:ims_mapping_output
diff --git a/lasso/xml/id-wsf-2.0/is_help.c b/lasso/xml/id-wsf-2.0/is_help.c
index 60b1e8b4..8f1c3279 100644
--- a/lasso/xml/id-wsf-2.0/is_help.c
+++ b/lasso/xml/id-wsf-2.0/is_help.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "is_help.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:is_help
diff --git a/lasso/xml/id-wsf-2.0/is_inquiry.c b/lasso/xml/id-wsf-2.0/is_inquiry.c
index 5e841abc..7d9277f5 100644
--- a/lasso/xml/id-wsf-2.0/is_inquiry.c
+++ b/lasso/xml/id-wsf-2.0/is_inquiry.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "is_inquiry.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:is_inquiry
diff --git a/lasso/xml/id-wsf-2.0/is_inquiry_element.c b/lasso/xml/id-wsf-2.0/is_inquiry_element.c
index bf2a7b0e..c0220ca4 100644
--- a/lasso/xml/id-wsf-2.0/is_inquiry_element.c
+++ b/lasso/xml/id-wsf-2.0/is_inquiry_element.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "is_inquiry_element.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:is_inquiry_element
diff --git a/lasso/xml/id-wsf-2.0/is_interaction_request.c b/lasso/xml/id-wsf-2.0/is_interaction_request.c
index e79abb48..ab87a39c 100644
--- a/lasso/xml/id-wsf-2.0/is_interaction_request.c
+++ b/lasso/xml/id-wsf-2.0/is_interaction_request.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "is_interaction_request.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:is_interaction_request
diff --git a/lasso/xml/id-wsf-2.0/is_interaction_response.c b/lasso/xml/id-wsf-2.0/is_interaction_response.c
index 20f561b9..2dc6dc84 100644
--- a/lasso/xml/id-wsf-2.0/is_interaction_response.c
+++ b/lasso/xml/id-wsf-2.0/is_interaction_response.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "is_interaction_response.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:is_interaction_response
diff --git a/lasso/xml/id-wsf-2.0/is_interaction_statement.c b/lasso/xml/id-wsf-2.0/is_interaction_statement.c
index 2fdd2da3..938d007c 100644
--- a/lasso/xml/id-wsf-2.0/is_interaction_statement.c
+++ b/lasso/xml/id-wsf-2.0/is_interaction_statement.c
@@ -28,7 +28,7 @@
 #include <xmlsec/templates.h>
 
 #include "is_interaction_statement.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:is_interaction_statement
diff --git a/lasso/xml/id-wsf-2.0/is_item.c b/lasso/xml/id-wsf-2.0/is_item.c
index 6dc0eba7..41e80035 100644
--- a/lasso/xml/id-wsf-2.0/is_item.c
+++ b/lasso/xml/id-wsf-2.0/is_item.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "is_item.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:is_item
diff --git a/lasso/xml/id-wsf-2.0/is_parameter.c b/lasso/xml/id-wsf-2.0/is_parameter.c
index 4146fd4c..790db97f 100644
--- a/lasso/xml/id-wsf-2.0/is_parameter.c
+++ b/lasso/xml/id-wsf-2.0/is_parameter.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "is_parameter.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:is_parameter
diff --git a/lasso/xml/id-wsf-2.0/is_select.c b/lasso/xml/id-wsf-2.0/is_select.c
index bf0120e8..35a22272 100644
--- a/lasso/xml/id-wsf-2.0/is_select.c
+++ b/lasso/xml/id-wsf-2.0/is_select.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "is_select.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:is_select
diff --git a/lasso/xml/id-wsf-2.0/is_text.c b/lasso/xml/id-wsf-2.0/is_text.c
index a514ec85..5825ab61 100644
--- a/lasso/xml/id-wsf-2.0/is_text.c
+++ b/lasso/xml/id-wsf-2.0/is_text.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "is_text.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:is_text
diff --git a/lasso/xml/id-wsf-2.0/ps_add_collection_request.c b/lasso/xml/id-wsf-2.0/ps_add_collection_request.c
index ebaaba22..e5a93f0c 100644
--- a/lasso/xml/id-wsf-2.0/ps_add_collection_request.c
+++ b/lasso/xml/id-wsf-2.0/ps_add_collection_request.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "ps_add_collection_request.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:ps_add_collection_request
diff --git a/lasso/xml/id-wsf-2.0/ps_add_collection_response.c b/lasso/xml/id-wsf-2.0/ps_add_collection_response.c
index 0c6f7649..d5531cd6 100644
--- a/lasso/xml/id-wsf-2.0/ps_add_collection_response.c
+++ b/lasso/xml/id-wsf-2.0/ps_add_collection_response.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "ps_add_collection_response.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:ps_add_collection_response
diff --git a/lasso/xml/id-wsf-2.0/ps_add_entity_request.c b/lasso/xml/id-wsf-2.0/ps_add_entity_request.c
index 3fe7aae4..b83ca7ae 100644
--- a/lasso/xml/id-wsf-2.0/ps_add_entity_request.c
+++ b/lasso/xml/id-wsf-2.0/ps_add_entity_request.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "ps_add_entity_request.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:ps_add_entity_request
diff --git a/lasso/xml/id-wsf-2.0/ps_add_entity_response.c b/lasso/xml/id-wsf-2.0/ps_add_entity_response.c
index 490455b8..7dad158a 100644
--- a/lasso/xml/id-wsf-2.0/ps_add_entity_response.c
+++ b/lasso/xml/id-wsf-2.0/ps_add_entity_response.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "ps_add_entity_response.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:ps_add_entity_response
diff --git a/lasso/xml/id-wsf-2.0/ps_add_known_entity_request.c b/lasso/xml/id-wsf-2.0/ps_add_known_entity_request.c
index 12cff94a..a8bb9360 100644
--- a/lasso/xml/id-wsf-2.0/ps_add_known_entity_request.c
+++ b/lasso/xml/id-wsf-2.0/ps_add_known_entity_request.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "ps_add_known_entity_request.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:ps_add_known_entity_request
diff --git a/lasso/xml/id-wsf-2.0/ps_add_known_entity_response.c b/lasso/xml/id-wsf-2.0/ps_add_known_entity_response.c
index e586dac7..2c026357 100644
--- a/lasso/xml/id-wsf-2.0/ps_add_known_entity_response.c
+++ b/lasso/xml/id-wsf-2.0/ps_add_known_entity_response.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "ps_add_known_entity_response.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:ps_add_known_entity_response
diff --git a/lasso/xml/id-wsf-2.0/ps_add_to_collection_request.c b/lasso/xml/id-wsf-2.0/ps_add_to_collection_request.c
index e0f7b8c1..36801b49 100644
--- a/lasso/xml/id-wsf-2.0/ps_add_to_collection_request.c
+++ b/lasso/xml/id-wsf-2.0/ps_add_to_collection_request.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "ps_add_to_collection_request.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:ps_add_to_collection_request
diff --git a/lasso/xml/id-wsf-2.0/ps_get_object_info_request.c b/lasso/xml/id-wsf-2.0/ps_get_object_info_request.c
index e7b5eaee..4f725792 100644
--- a/lasso/xml/id-wsf-2.0/ps_get_object_info_request.c
+++ b/lasso/xml/id-wsf-2.0/ps_get_object_info_request.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "ps_get_object_info_request.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:ps_get_object_info_request
diff --git a/lasso/xml/id-wsf-2.0/ps_get_object_info_response.c b/lasso/xml/id-wsf-2.0/ps_get_object_info_response.c
index 17321d21..b58b45b8 100644
--- a/lasso/xml/id-wsf-2.0/ps_get_object_info_response.c
+++ b/lasso/xml/id-wsf-2.0/ps_get_object_info_response.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "ps_get_object_info_response.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:ps_get_object_info_response
diff --git a/lasso/xml/id-wsf-2.0/ps_item_data.c b/lasso/xml/id-wsf-2.0/ps_item_data.c
index c7e8903f..23c01c01 100644
--- a/lasso/xml/id-wsf-2.0/ps_item_data.c
+++ b/lasso/xml/id-wsf-2.0/ps_item_data.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "ps_item_data.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:ps_item_data
diff --git a/lasso/xml/id-wsf-2.0/ps_list_members_request.c b/lasso/xml/id-wsf-2.0/ps_list_members_request.c
index 83be47c1..f717d1b7 100644
--- a/lasso/xml/id-wsf-2.0/ps_list_members_request.c
+++ b/lasso/xml/id-wsf-2.0/ps_list_members_request.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "ps_list_members_request.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:ps_list_members_request
diff --git a/lasso/xml/id-wsf-2.0/ps_list_members_response.c b/lasso/xml/id-wsf-2.0/ps_list_members_response.c
index 1a2618d0..cb0c0f38 100644
--- a/lasso/xml/id-wsf-2.0/ps_list_members_response.c
+++ b/lasso/xml/id-wsf-2.0/ps_list_members_response.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "ps_list_members_response.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:ps_list_members_response
diff --git a/lasso/xml/id-wsf-2.0/ps_notification.c b/lasso/xml/id-wsf-2.0/ps_notification.c
index fbb4b718..e4c32409 100644
--- a/lasso/xml/id-wsf-2.0/ps_notification.c
+++ b/lasso/xml/id-wsf-2.0/ps_notification.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "ps_notification.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:ps_notification
diff --git a/lasso/xml/id-wsf-2.0/ps_notify.c b/lasso/xml/id-wsf-2.0/ps_notify.c
index 623a7ede..e13168c7 100644
--- a/lasso/xml/id-wsf-2.0/ps_notify.c
+++ b/lasso/xml/id-wsf-2.0/ps_notify.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "ps_notify.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:ps_notify
diff --git a/lasso/xml/id-wsf-2.0/ps_object.c b/lasso/xml/id-wsf-2.0/ps_object.c
index c0f9c6d9..553640fc 100644
--- a/lasso/xml/id-wsf-2.0/ps_object.c
+++ b/lasso/xml/id-wsf-2.0/ps_object.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "ps_object.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:ps_object
diff --git a/lasso/xml/id-wsf-2.0/ps_query_objects_request.c b/lasso/xml/id-wsf-2.0/ps_query_objects_request.c
index 017a1110..412078f1 100644
--- a/lasso/xml/id-wsf-2.0/ps_query_objects_request.c
+++ b/lasso/xml/id-wsf-2.0/ps_query_objects_request.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "ps_query_objects_request.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:ps_query_objects_request
diff --git a/lasso/xml/id-wsf-2.0/ps_query_objects_response.c b/lasso/xml/id-wsf-2.0/ps_query_objects_response.c
index 42d7efb6..0ede56d2 100644
--- a/lasso/xml/id-wsf-2.0/ps_query_objects_response.c
+++ b/lasso/xml/id-wsf-2.0/ps_query_objects_response.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "ps_query_objects_response.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:ps_query_objects_response
diff --git a/lasso/xml/id-wsf-2.0/ps_remove_collection_request.c b/lasso/xml/id-wsf-2.0/ps_remove_collection_request.c
index 05b88305..04a1616f 100644
--- a/lasso/xml/id-wsf-2.0/ps_remove_collection_request.c
+++ b/lasso/xml/id-wsf-2.0/ps_remove_collection_request.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "ps_remove_collection_request.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:ps_remove_collection_request
diff --git a/lasso/xml/id-wsf-2.0/ps_remove_entity_request.c b/lasso/xml/id-wsf-2.0/ps_remove_entity_request.c
index fb2c27ba..8ece01ff 100644
--- a/lasso/xml/id-wsf-2.0/ps_remove_entity_request.c
+++ b/lasso/xml/id-wsf-2.0/ps_remove_entity_request.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "ps_remove_entity_request.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:ps_remove_entity_request
diff --git a/lasso/xml/id-wsf-2.0/ps_remove_from_collection_request.c b/lasso/xml/id-wsf-2.0/ps_remove_from_collection_request.c
index 624c2671..2f438e80 100644
--- a/lasso/xml/id-wsf-2.0/ps_remove_from_collection_request.c
+++ b/lasso/xml/id-wsf-2.0/ps_remove_from_collection_request.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "ps_remove_from_collection_request.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:ps_remove_from_collection_request
diff --git a/lasso/xml/id-wsf-2.0/ps_request_abstract.c b/lasso/xml/id-wsf-2.0/ps_request_abstract.c
index a62e4e57..13a7efff 100644
--- a/lasso/xml/id-wsf-2.0/ps_request_abstract.c
+++ b/lasso/xml/id-wsf-2.0/ps_request_abstract.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "ps_request_abstract.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:ps_request_abstract
diff --git a/lasso/xml/id-wsf-2.0/ps_resolve_identifier_request.c b/lasso/xml/id-wsf-2.0/ps_resolve_identifier_request.c
index f2f70c90..7704b971 100644
--- a/lasso/xml/id-wsf-2.0/ps_resolve_identifier_request.c
+++ b/lasso/xml/id-wsf-2.0/ps_resolve_identifier_request.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "ps_resolve_identifier_request.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:ps_resolve_identifier_request
diff --git a/lasso/xml/id-wsf-2.0/ps_resolve_identifier_response.c b/lasso/xml/id-wsf-2.0/ps_resolve_identifier_response.c
index 038ae251..7e2280e2 100644
--- a/lasso/xml/id-wsf-2.0/ps_resolve_identifier_response.c
+++ b/lasso/xml/id-wsf-2.0/ps_resolve_identifier_response.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "ps_resolve_identifier_response.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:ps_resolve_identifier_response
diff --git a/lasso/xml/id-wsf-2.0/ps_resolve_input.c b/lasso/xml/id-wsf-2.0/ps_resolve_input.c
index d7512173..be50123f 100644
--- a/lasso/xml/id-wsf-2.0/ps_resolve_input.c
+++ b/lasso/xml/id-wsf-2.0/ps_resolve_input.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "ps_resolve_input.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:ps_resolve_input
diff --git a/lasso/xml/id-wsf-2.0/ps_response_abstract.c b/lasso/xml/id-wsf-2.0/ps_response_abstract.c
index da617268..3e825e68 100644
--- a/lasso/xml/id-wsf-2.0/ps_response_abstract.c
+++ b/lasso/xml/id-wsf-2.0/ps_response_abstract.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "ps_response_abstract.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:ps_response_abstract
diff --git a/lasso/xml/id-wsf-2.0/ps_set_object_info_request.c b/lasso/xml/id-wsf-2.0/ps_set_object_info_request.c
index 114be6fc..a8739ebc 100644
--- a/lasso/xml/id-wsf-2.0/ps_set_object_info_request.c
+++ b/lasso/xml/id-wsf-2.0/ps_set_object_info_request.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "ps_set_object_info_request.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:ps_set_object_info_request
diff --git a/lasso/xml/id-wsf-2.0/ps_test_membership_request.c b/lasso/xml/id-wsf-2.0/ps_test_membership_request.c
index 10d6ef67..6dfd1027 100644
--- a/lasso/xml/id-wsf-2.0/ps_test_membership_request.c
+++ b/lasso/xml/id-wsf-2.0/ps_test_membership_request.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "ps_test_membership_request.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:ps_test_membership_request
diff --git a/lasso/xml/id-wsf-2.0/ps_test_membership_response.c b/lasso/xml/id-wsf-2.0/ps_test_membership_response.c
index 68b80342..a30efab6 100644
--- a/lasso/xml/id-wsf-2.0/ps_test_membership_response.c
+++ b/lasso/xml/id-wsf-2.0/ps_test_membership_response.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "ps_test_membership_response.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:ps_test_membership_response
diff --git a/lasso/xml/id-wsf-2.0/sb2_consent.c b/lasso/xml/id-wsf-2.0/sb2_consent.c
index f8e64ba3..87f47937 100644
--- a/lasso/xml/id-wsf-2.0/sb2_consent.c
+++ b/lasso/xml/id-wsf-2.0/sb2_consent.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "sb2_consent.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:sb2_consent
diff --git a/lasso/xml/id-wsf-2.0/sb2_credentials_context.c b/lasso/xml/id-wsf-2.0/sb2_credentials_context.c
index 6100295c..7bcc89e7 100644
--- a/lasso/xml/id-wsf-2.0/sb2_credentials_context.c
+++ b/lasso/xml/id-wsf-2.0/sb2_credentials_context.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "sb2_credentials_context.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:sb2_credentials_context
diff --git a/lasso/xml/id-wsf-2.0/sb2_endpoint_update.c b/lasso/xml/id-wsf-2.0/sb2_endpoint_update.c
index 9835cfad..dd900ea9 100644
--- a/lasso/xml/id-wsf-2.0/sb2_endpoint_update.c
+++ b/lasso/xml/id-wsf-2.0/sb2_endpoint_update.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "sb2_endpoint_update.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:sb2_endpoint_update
diff --git a/lasso/xml/id-wsf-2.0/sb2_redirect_request.c b/lasso/xml/id-wsf-2.0/sb2_redirect_request.c
index 92ffb20d..07102d44 100644
--- a/lasso/xml/id-wsf-2.0/sb2_redirect_request.c
+++ b/lasso/xml/id-wsf-2.0/sb2_redirect_request.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "sb2_redirect_request.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:sb2_redirect_request
diff --git a/lasso/xml/id-wsf-2.0/sb2_sender.c b/lasso/xml/id-wsf-2.0/sb2_sender.c
index 49297ece..c61aaed1 100644
--- a/lasso/xml/id-wsf-2.0/sb2_sender.c
+++ b/lasso/xml/id-wsf-2.0/sb2_sender.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "sb2_sender.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:sb2_sender
diff --git a/lasso/xml/id-wsf-2.0/sb2_target_identity.c b/lasso/xml/id-wsf-2.0/sb2_target_identity.c
index 47a5a888..a0caec17 100644
--- a/lasso/xml/id-wsf-2.0/sb2_target_identity.c
+++ b/lasso/xml/id-wsf-2.0/sb2_target_identity.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "sb2_target_identity.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:sb2_target_identity
diff --git a/lasso/xml/id-wsf-2.0/sb2_timeout.c b/lasso/xml/id-wsf-2.0/sb2_timeout.c
index d8deead6..7690e766 100644
--- a/lasso/xml/id-wsf-2.0/sb2_timeout.c
+++ b/lasso/xml/id-wsf-2.0/sb2_timeout.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "sb2_timeout.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:sb2_timeout
diff --git a/lasso/xml/id-wsf-2.0/sb2_usage_directive.c b/lasso/xml/id-wsf-2.0/sb2_usage_directive.c
index 245c54ae..b1c676cb 100644
--- a/lasso/xml/id-wsf-2.0/sb2_usage_directive.c
+++ b/lasso/xml/id-wsf-2.0/sb2_usage_directive.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "sb2_usage_directive.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:sb2_usage_directive
diff --git a/lasso/xml/id-wsf-2.0/sb2_user_interaction_header.c b/lasso/xml/id-wsf-2.0/sb2_user_interaction_header.c
index fed08990..cd0e9b1b 100644
--- a/lasso/xml/id-wsf-2.0/sb2_user_interaction_header.c
+++ b/lasso/xml/id-wsf-2.0/sb2_user_interaction_header.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "sb2_user_interaction_header.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 #include "../../registry.h"
 
 /**
diff --git a/lasso/xml/id-wsf-2.0/sbf_framework.c b/lasso/xml/id-wsf-2.0/sbf_framework.c
index b8a77cf8..ab08828e 100644
--- a/lasso/xml/id-wsf-2.0/sbf_framework.c
+++ b/lasso/xml/id-wsf-2.0/sbf_framework.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "sbf_framework.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:sbf_framework
diff --git a/lasso/xml/id-wsf-2.0/sec_token.c b/lasso/xml/id-wsf-2.0/sec_token.c
index a9977080..472a739c 100644
--- a/lasso/xml/id-wsf-2.0/sec_token.c
+++ b/lasso/xml/id-wsf-2.0/sec_token.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "sec_token.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:sec_token
diff --git a/lasso/xml/id-wsf-2.0/sec_token_policy.c b/lasso/xml/id-wsf-2.0/sec_token_policy.c
index 936fcada..d163ee61 100644
--- a/lasso/xml/id-wsf-2.0/sec_token_policy.c
+++ b/lasso/xml/id-wsf-2.0/sec_token_policy.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "sec_token_policy.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:sec_token_policy
diff --git a/lasso/xml/id-wsf-2.0/sec_transited_provider_path.c b/lasso/xml/id-wsf-2.0/sec_transited_provider_path.c
index a51763d8..3b58ca6f 100644
--- a/lasso/xml/id-wsf-2.0/sec_transited_provider_path.c
+++ b/lasso/xml/id-wsf-2.0/sec_transited_provider_path.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "sec_transited_provider_path.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:sec_transited_provider_path
diff --git a/lasso/xml/id-wsf-2.0/subs_notification.c b/lasso/xml/id-wsf-2.0/subs_notification.c
index 459856ca..3ef4920c 100644
--- a/lasso/xml/id-wsf-2.0/subs_notification.c
+++ b/lasso/xml/id-wsf-2.0/subs_notification.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "subs_notification.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:subs_notification
diff --git a/lasso/xml/id-wsf-2.0/subs_notify_response.c b/lasso/xml/id-wsf-2.0/subs_notify_response.c
index 7d652565..40683a6a 100644
--- a/lasso/xml/id-wsf-2.0/subs_notify_response.c
+++ b/lasso/xml/id-wsf-2.0/subs_notify_response.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "subs_notify_response.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:subs_notify_response
diff --git a/lasso/xml/id-wsf-2.0/subs_ref_item.c b/lasso/xml/id-wsf-2.0/subs_ref_item.c
index d0d0db64..52b53ad0 100644
--- a/lasso/xml/id-wsf-2.0/subs_ref_item.c
+++ b/lasso/xml/id-wsf-2.0/subs_ref_item.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "subs_ref_item.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:subs_ref_item
diff --git a/lasso/xml/id-wsf-2.0/subs_subscription.c b/lasso/xml/id-wsf-2.0/subs_subscription.c
index bdb87de8..2ba65aa2 100644
--- a/lasso/xml/id-wsf-2.0/subs_subscription.c
+++ b/lasso/xml/id-wsf-2.0/subs_subscription.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "subs_subscription.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:subs_subscription
diff --git a/lasso/xml/id-wsf-2.0/subsref_app_data.c b/lasso/xml/id-wsf-2.0/subsref_app_data.c
index d19c0872..7607d44e 100644
--- a/lasso/xml/id-wsf-2.0/subsref_app_data.c
+++ b/lasso/xml/id-wsf-2.0/subsref_app_data.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "subsref_app_data.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 #include "../../registry.h"
 
 /**
diff --git a/lasso/xml/id-wsf-2.0/subsref_create.c b/lasso/xml/id-wsf-2.0/subsref_create.c
index a0351054..fe6512c0 100644
--- a/lasso/xml/id-wsf-2.0/subsref_create.c
+++ b/lasso/xml/id-wsf-2.0/subsref_create.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "subsref_create.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:subsref_create
diff --git a/lasso/xml/id-wsf-2.0/subsref_create_item.c b/lasso/xml/id-wsf-2.0/subsref_create_item.c
index 8c34ab6b..2d39f440 100644
--- a/lasso/xml/id-wsf-2.0/subsref_create_item.c
+++ b/lasso/xml/id-wsf-2.0/subsref_create_item.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "subsref_create_item.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:subsref_create_item
diff --git a/lasso/xml/id-wsf-2.0/subsref_create_response.c b/lasso/xml/id-wsf-2.0/subsref_create_response.c
index 027c6a7f..f80b6cb4 100644
--- a/lasso/xml/id-wsf-2.0/subsref_create_response.c
+++ b/lasso/xml/id-wsf-2.0/subsref_create_response.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "subsref_create_response.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:subsref_create_response
diff --git a/lasso/xml/id-wsf-2.0/subsref_data.c b/lasso/xml/id-wsf-2.0/subsref_data.c
index 5dd459ca..516301c5 100644
--- a/lasso/xml/id-wsf-2.0/subsref_data.c
+++ b/lasso/xml/id-wsf-2.0/subsref_data.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "subsref_data.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:subsref_data
diff --git a/lasso/xml/id-wsf-2.0/subsref_data_response.c b/lasso/xml/id-wsf-2.0/subsref_data_response.c
index e84ba41d..d3097d6a 100644
--- a/lasso/xml/id-wsf-2.0/subsref_data_response.c
+++ b/lasso/xml/id-wsf-2.0/subsref_data_response.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "subsref_data_response.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:subsref_data_response
diff --git a/lasso/xml/id-wsf-2.0/subsref_delete.c b/lasso/xml/id-wsf-2.0/subsref_delete.c
index 2de5c558..6bb77c02 100644
--- a/lasso/xml/id-wsf-2.0/subsref_delete.c
+++ b/lasso/xml/id-wsf-2.0/subsref_delete.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "subsref_delete.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:subsref_delete
diff --git a/lasso/xml/id-wsf-2.0/subsref_delete_item.c b/lasso/xml/id-wsf-2.0/subsref_delete_item.c
index 626de918..d4980599 100644
--- a/lasso/xml/id-wsf-2.0/subsref_delete_item.c
+++ b/lasso/xml/id-wsf-2.0/subsref_delete_item.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "subsref_delete_item.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:subsref_delete_item
diff --git a/lasso/xml/id-wsf-2.0/subsref_delete_response.c b/lasso/xml/id-wsf-2.0/subsref_delete_response.c
index 8f3c523d..bf2f0f58 100644
--- a/lasso/xml/id-wsf-2.0/subsref_delete_response.c
+++ b/lasso/xml/id-wsf-2.0/subsref_delete_response.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "subsref_delete_response.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:subsref_delete_response
diff --git a/lasso/xml/id-wsf-2.0/subsref_item_data.c b/lasso/xml/id-wsf-2.0/subsref_item_data.c
index b32f9816..32b17e3f 100644
--- a/lasso/xml/id-wsf-2.0/subsref_item_data.c
+++ b/lasso/xml/id-wsf-2.0/subsref_item_data.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "subsref_item_data.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:subsref_item_data
diff --git a/lasso/xml/id-wsf-2.0/subsref_modify.c b/lasso/xml/id-wsf-2.0/subsref_modify.c
index f5aa5094..7e1e1c75 100644
--- a/lasso/xml/id-wsf-2.0/subsref_modify.c
+++ b/lasso/xml/id-wsf-2.0/subsref_modify.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "subsref_modify.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:subsref_modify
diff --git a/lasso/xml/id-wsf-2.0/subsref_modify_item.c b/lasso/xml/id-wsf-2.0/subsref_modify_item.c
index 6edebd20..2fd87d00 100644
--- a/lasso/xml/id-wsf-2.0/subsref_modify_item.c
+++ b/lasso/xml/id-wsf-2.0/subsref_modify_item.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "subsref_modify_item.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:subsref_modify_item
diff --git a/lasso/xml/id-wsf-2.0/subsref_modify_response.c b/lasso/xml/id-wsf-2.0/subsref_modify_response.c
index 043bb748..2a10b9d9 100644
--- a/lasso/xml/id-wsf-2.0/subsref_modify_response.c
+++ b/lasso/xml/id-wsf-2.0/subsref_modify_response.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "subsref_modify_response.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:subsref_modify_response
diff --git a/lasso/xml/id-wsf-2.0/subsref_notification.c b/lasso/xml/id-wsf-2.0/subsref_notification.c
index 40d2a60e..7615a5d6 100644
--- a/lasso/xml/id-wsf-2.0/subsref_notification.c
+++ b/lasso/xml/id-wsf-2.0/subsref_notification.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "subsref_notification.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:subsref_notification
diff --git a/lasso/xml/id-wsf-2.0/subsref_notify.c b/lasso/xml/id-wsf-2.0/subsref_notify.c
index ad2af64e..793fb07c 100644
--- a/lasso/xml/id-wsf-2.0/subsref_notify.c
+++ b/lasso/xml/id-wsf-2.0/subsref_notify.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "subsref_notify.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:subsref_notify
diff --git a/lasso/xml/id-wsf-2.0/subsref_notify_response.c b/lasso/xml/id-wsf-2.0/subsref_notify_response.c
index 7f9873ce..55201c7f 100644
--- a/lasso/xml/id-wsf-2.0/subsref_notify_response.c
+++ b/lasso/xml/id-wsf-2.0/subsref_notify_response.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "subsref_notify_response.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:subsref_notify_response
diff --git a/lasso/xml/id-wsf-2.0/subsref_query.c b/lasso/xml/id-wsf-2.0/subsref_query.c
index 3fa66270..4f562410 100644
--- a/lasso/xml/id-wsf-2.0/subsref_query.c
+++ b/lasso/xml/id-wsf-2.0/subsref_query.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "subsref_query.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:subsref_query
diff --git a/lasso/xml/id-wsf-2.0/subsref_query_item.c b/lasso/xml/id-wsf-2.0/subsref_query_item.c
index d2fd60ec..beabd032 100644
--- a/lasso/xml/id-wsf-2.0/subsref_query_item.c
+++ b/lasso/xml/id-wsf-2.0/subsref_query_item.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "subsref_query_item.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:subsref_query_item
diff --git a/lasso/xml/id-wsf-2.0/subsref_query_response.c b/lasso/xml/id-wsf-2.0/subsref_query_response.c
index 741a946e..4aacb9d3 100644
--- a/lasso/xml/id-wsf-2.0/subsref_query_response.c
+++ b/lasso/xml/id-wsf-2.0/subsref_query_response.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "subsref_query_response.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:subsref_query_response
diff --git a/lasso/xml/id-wsf-2.0/subsref_result_query.c b/lasso/xml/id-wsf-2.0/subsref_result_query.c
index 5e927ac2..e858c042 100644
--- a/lasso/xml/id-wsf-2.0/subsref_result_query.c
+++ b/lasso/xml/id-wsf-2.0/subsref_result_query.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "subsref_result_query.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:subsref_result_query
diff --git a/lasso/xml/id-wsf-2.0/subsref_subscription.c b/lasso/xml/id-wsf-2.0/subsref_subscription.c
index cdee8528..5dcbd6a5 100644
--- a/lasso/xml/id-wsf-2.0/subsref_subscription.c
+++ b/lasso/xml/id-wsf-2.0/subsref_subscription.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "subsref_subscription.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:subsref_subscription
diff --git a/lasso/xml/id-wsf-2.0/subsref_test_item.c b/lasso/xml/id-wsf-2.0/subsref_test_item.c
index b6eb2b80..64554e97 100644
--- a/lasso/xml/id-wsf-2.0/subsref_test_item.c
+++ b/lasso/xml/id-wsf-2.0/subsref_test_item.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "subsref_test_item.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:subsref_test_item
diff --git a/lasso/xml/id-wsf-2.0/util_empty.c b/lasso/xml/id-wsf-2.0/util_empty.c
index 580218e0..9172f0b5 100644
--- a/lasso/xml/id-wsf-2.0/util_empty.c
+++ b/lasso/xml/id-wsf-2.0/util_empty.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "util_empty.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:util_empty
diff --git a/lasso/xml/id-wsf-2.0/util_extension.c b/lasso/xml/id-wsf-2.0/util_extension.c
index ce92a2c6..289641d1 100644
--- a/lasso/xml/id-wsf-2.0/util_extension.c
+++ b/lasso/xml/id-wsf-2.0/util_extension.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "util_extension.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 
 /**
  * SECTION:util_extension
diff --git a/lasso/xml/id-wsf-2.0/util_response.c b/lasso/xml/id-wsf-2.0/util_response.c
index 93146e90..79fd5807 100644
--- a/lasso/xml/id-wsf-2.0/util_response.c
+++ b/lasso/xml/id-wsf-2.0/util_response.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "util_response.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 #include "../../utils.h"
 
 /**
diff --git a/lasso/xml/id-wsf-2.0/util_status.c b/lasso/xml/id-wsf-2.0/util_status.c
index b0bf328b..a0bce663 100644
--- a/lasso/xml/id-wsf-2.0/util_status.c
+++ b/lasso/xml/id-wsf-2.0/util_status.c
@@ -24,7 +24,7 @@
 
 #include "../private.h"
 #include "util_status.h"
-#include "./idwsf2_strings.h"
+#include "idwsf2_strings.h"
 #include "../../utils.h"
 
 /**
diff --git a/lasso/xml/id-wsf-2.0/xml_idwsf2.h b/lasso/xml/id-wsf-2.0/xml_idwsf2.h
index 9c2e4845..d352a0e5 100644
--- a/lasso/xml/id-wsf-2.0/xml_idwsf2.h
+++ b/lasso/xml/id-wsf-2.0/xml_idwsf2.h
@@ -25,141 +25,141 @@
 #ifndef __LASSO_XML_IDWSF2_H__
 #define __LASSO_XML_IDWSF2_H__
 
-#include "./disco_abstract.h"
-#include "./disco_endpoint_context.h"
-#include "./disco_keys.h"
-#include "./disco_options.h"
-#include "./disco_provider_id.h"
-#include "./disco_query.h"
-#include "./disco_query_response.h"
-#include "./disco_requested_service.h"
-#include "./disco_security_context.h"
-#include "./disco_service_context.h"
-#include "./disco_service_type.h"
-#include "./disco_svc_md_association_add.h"
-#include "./disco_svc_md_association_add_response.h"
-#include "./disco_svc_md_association_delete.h"
-#include "./disco_svc_md_association_delete_response.h"
-#include "./disco_svc_md_association_query.h"
-#include "./disco_svc_md_association_query_response.h"
-#include "./disco_svc_md_delete.h"
-#include "./disco_svc_md_delete_response.h"
-#include "./disco_svc_md_query.h"
-#include "./disco_svc_md_query_response.h"
-#include "./disco_svc_md_register.h"
-#include "./disco_svc_md_register_response.h"
-#include "./disco_svc_md_replace.h"
-#include "./disco_svc_md_replace_response.h"
-#include "./disco_svc_metadata.h"
-#include "./dst_data_response_base.h"
-#include "./dst_delete_item_base.h"
-#include "./dst_delete_response.h"
-#include "./dstref_app_data.h"
-#include "./dstref_create.h"
-#include "./dstref_create_item.h"
-#include "./dstref_create_response.h"
-#include "./dstref_data.h"
-#include "./dstref_data_response.h"
-#include "./dstref_delete.h"
-#include "./dstref_delete_item.h"
-#include "./dstref_delete_response.h"
-#include "./dstref_item_data.h"
-#include "./dstref_modify.h"
-#include "./dstref_modify_item.h"
-#include "./dstref_modify_response.h"
-#include "./dstref_query.h"
-#include "./dstref_query_item.h"
-#include "./dstref_query_response.h"
-#include "./dstref_result_query.h"
-#include "./dstref_test_item.h"
-#include "./dst_request.h"
-#include "./dst_result_query_base.h"
-#include "./dst_test_item_base.h"
-#include "./ims_identity_mapping_request.h"
-#include "./ims_identity_mapping_response.h"
-#include "./ims_mapping_input.h"
-#include "./ims_mapping_output.h"
-#include "./is_help.h"
-#include "./is_inquiry_element.h"
-#include "./is_inquiry.h"
-#include "./is_interaction_request.h"
-#include "./is_interaction_response.h"
-#include "./is_interaction_statement.h"
-#include "./is_item.h"
-#include "./is_parameter.h"
-#include "./is_select.h"
-#include "./is_text.h"
-#include "./ps_add_collection_request.h"
-#include "./ps_add_collection_response.h"
-#include "./ps_add_entity_request.h"
-#include "./ps_add_entity_response.h"
-#include "./ps_add_known_entity_request.h"
-#include "./ps_add_known_entity_response.h"
-#include "./ps_add_to_collection_request.h"
-#include "./ps_get_object_info_request.h"
-#include "./ps_get_object_info_response.h"
-#include "./ps_item_data.h"
-#include "./ps_list_members_request.h"
-#include "./ps_list_members_response.h"
-#include "./ps_notification.h"
-#include "./ps_notify.h"
-#include "./ps_object.h"
-#include "./ps_query_objects_request.h"
-#include "./ps_query_objects_response.h"
-#include "./ps_remove_collection_request.h"
-#include "./ps_remove_entity_request.h"
-#include "./ps_remove_from_collection_request.h"
-#include "./ps_request_abstract.h"
-#include "./ps_resolve_identifier_request.h"
-#include "./ps_resolve_identifier_response.h"
-#include "./ps_resolve_input.h"
-#include "./ps_response_abstract.h"
-#include "./ps_set_object_info_request.h"
-#include "./ps_test_membership_request.h"
-#include "./ps_test_membership_response.h"
-#include "./sb2_consent.h"
-#include "./sb2_credentials_context.h"
-#include "./sb2_endpoint_update.h"
-#include "./sb2_redirect_request.h"
-#include "./sb2_sender.h"
-#include "./sb2_target_identity.h"
-#include "./sb2_timeout.h"
-#include "./sb2_usage_directive.h"
-#include "./sb2_user_interaction_header.h"
-#include "./sbf_framework.h"
-#include "./sec_token.h"
-#include "./sec_token_policy.h"
-#include "./sec_transited_provider_path.h"
-#include "./subs_notification.h"
-#include "./subs_notify_response.h"
-#include "./subsref_app_data.h"
-#include "./subsref_create.h"
-#include "./subsref_create_item.h"
-#include "./subsref_create_response.h"
-#include "./subsref_data.h"
-#include "./subsref_data_response.h"
-#include "./subsref_delete.h"
-#include "./subsref_delete_item.h"
-#include "./subsref_delete_response.h"
-#include "./subsref_item_data.h"
-#include "./subs_ref_item.h"
-#include "./subsref_modify.h"
-#include "./subsref_modify_item.h"
-#include "./subsref_modify_response.h"
-#include "./subsref_notification.h"
-#include "./subsref_notify.h"
-#include "./subsref_notify_response.h"
-#include "./subsref_query.h"
-#include "./subsref_query_item.h"
-#include "./subsref_query_response.h"
-#include "./subsref_result_query.h"
-#include "./subsref_subscription.h"
-#include "./subsref_test_item.h"
-#include "./subs_subscription.h"
-#include "./util_empty.h"
-#include "./util_extension.h"
-#include "./util_response.h"
-#include "./util_status.h"
-#include "./xml_idwsf2.h"
+#include "disco_abstract.h"
+#include "disco_endpoint_context.h"
+#include "disco_keys.h"
+#include "disco_options.h"
+#include "disco_provider_id.h"
+#include "disco_query.h"
+#include "disco_query_response.h"
+#include "disco_requested_service.h"
+#include "disco_security_context.h"
+#include "disco_service_context.h"
+#include "disco_service_type.h"
+#include "disco_svc_md_association_add.h"
+#include "disco_svc_md_association_add_response.h"
+#include "disco_svc_md_association_delete.h"
+#include "disco_svc_md_association_delete_response.h"
+#include "disco_svc_md_association_query.h"
+#include "disco_svc_md_association_query_response.h"
+#include "disco_svc_md_delete.h"
+#include "disco_svc_md_delete_response.h"
+#include "disco_svc_md_query.h"
+#include "disco_svc_md_query_response.h"
+#include "disco_svc_md_register.h"
+#include "disco_svc_md_register_response.h"
+#include "disco_svc_md_replace.h"
+#include "disco_svc_md_replace_response.h"
+#include "disco_svc_metadata.h"
+#include "dst_data_response_base.h"
+#include "dst_delete_item_base.h"
+#include "dst_delete_response.h"
+#include "dstref_app_data.h"
+#include "dstref_create.h"
+#include "dstref_create_item.h"
+#include "dstref_create_response.h"
+#include "dstref_data.h"
+#include "dstref_data_response.h"
+#include "dstref_delete.h"
+#include "dstref_delete_item.h"
+#include "dstref_delete_response.h"
+#include "dstref_item_data.h"
+#include "dstref_modify.h"
+#include "dstref_modify_item.h"
+#include "dstref_modify_response.h"
+#include "dstref_query.h"
+#include "dstref_query_item.h"
+#include "dstref_query_response.h"
+#include "dstref_result_query.h"
+#include "dstref_test_item.h"
+#include "dst_request.h"
+#include "dst_result_query_base.h"
+#include "dst_test_item_base.h"
+#include "ims_identity_mapping_request.h"
+#include "ims_identity_mapping_response.h"
+#include "ims_mapping_input.h"
+#include "ims_mapping_output.h"
+#include "is_help.h"
+#include "is_inquiry_element.h"
+#include "is_inquiry.h"
+#include "is_interaction_request.h"
+#include "is_interaction_response.h"
+#include "is_interaction_statement.h"
+#include "is_item.h"
+#include "is_parameter.h"
+#include "is_select.h"
+#include "is_text.h"
+#include "ps_add_collection_request.h"
+#include "ps_add_collection_response.h"
+#include "ps_add_entity_request.h"
+#include "ps_add_entity_response.h"
+#include "ps_add_known_entity_request.h"
+#include "ps_add_known_entity_response.h"
+#include "ps_add_to_collection_request.h"
+#include "ps_get_object_info_request.h"
+#include "ps_get_object_info_response.h"
+#include "ps_item_data.h"
+#include "ps_list_members_request.h"
+#include "ps_list_members_response.h"
+#include "ps_notification.h"
+#include "ps_notify.h"
+#include "ps_object.h"
+#include "ps_query_objects_request.h"
+#include "ps_query_objects_response.h"
+#include "ps_remove_collection_request.h"
+#include "ps_remove_entity_request.h"
+#include "ps_remove_from_collection_request.h"
+#include "ps_request_abstract.h"
+#include "ps_resolve_identifier_request.h"
+#include "ps_resolve_identifier_response.h"
+#include "ps_resolve_input.h"
+#include "ps_response_abstract.h"
+#include "ps_set_object_info_request.h"
+#include "ps_test_membership_request.h"
+#include "ps_test_membership_response.h"
+#include "sb2_consent.h"
+#include "sb2_credentials_context.h"
+#include "sb2_endpoint_update.h"
+#include "sb2_redirect_request.h"
+#include "sb2_sender.h"
+#include "sb2_target_identity.h"
+#include "sb2_timeout.h"
+#include "sb2_usage_directive.h"
+#include "sb2_user_interaction_header.h"
+#include "sbf_framework.h"
+#include "sec_token.h"
+#include "sec_token_policy.h"
+#include "sec_transited_provider_path.h"
+#include "subs_notification.h"
+#include "subs_notify_response.h"
+#include "subsref_app_data.h"
+#include "subsref_create.h"
+#include "subsref_create_item.h"
+#include "subsref_create_response.h"
+#include "subsref_data.h"
+#include "subsref_data_response.h"
+#include "subsref_delete.h"
+#include "subsref_delete_item.h"
+#include "subsref_delete_response.h"
+#include "subsref_item_data.h"
+#include "subs_ref_item.h"
+#include "subsref_modify.h"
+#include "subsref_modify_item.h"
+#include "subsref_modify_response.h"
+#include "subsref_notification.h"
+#include "subsref_notify.h"
+#include "subsref_notify_response.h"
+#include "subsref_query.h"
+#include "subsref_query_item.h"
+#include "subsref_query_response.h"
+#include "subsref_result_query.h"
+#include "subsref_subscription.h"
+#include "subsref_test_item.h"
+#include "subs_subscription.h"
+#include "util_empty.h"
+#include "util_extension.h"
+#include "util_response.h"
+#include "util_status.h"
+#include "xml_idwsf2.h"
 
 #endif
diff --git a/lasso/xml/is_help.c b/lasso/xml/is_help.c
index d93ae609..19072d6a 100644
--- a/lasso/xml/is_help.c
+++ b/lasso/xml/is_help.c
@@ -24,7 +24,7 @@
 
 #include "private.h"
 #include "is_help.h"
-#include "./idwsf_strings.h"
+#include "idwsf_strings.h"
 
 /**
  * SECTION:is_help
diff --git a/lasso/xml/is_inquiry.c b/lasso/xml/is_inquiry.c
index d6ee8a3b..94002c7f 100644
--- a/lasso/xml/is_inquiry.c
+++ b/lasso/xml/is_inquiry.c
@@ -24,7 +24,7 @@
 
 #include "private.h"
 #include "is_inquiry.h"
-#include "./idwsf_strings.h"
+#include "idwsf_strings.h"
 
 /**
  * SECTION:is_inquiry
diff --git a/lasso/xml/is_inquiry_element.c b/lasso/xml/is_inquiry_element.c
index 5eb8f7c7..47be92d7 100644
--- a/lasso/xml/is_inquiry_element.c
+++ b/lasso/xml/is_inquiry_element.c
@@ -24,7 +24,7 @@
 
 #include "private.h"
 #include "is_inquiry_element.h"
-#include "./idwsf_strings.h"
+#include "idwsf_strings.h"
 
 /**
  * SECTION:is_inquiry_element
diff --git a/lasso/xml/is_interaction_request.c b/lasso/xml/is_interaction_request.c
index ab1774c7..88047e86 100644
--- a/lasso/xml/is_interaction_request.c
+++ b/lasso/xml/is_interaction_request.c
@@ -24,7 +24,7 @@
 
 #include "private.h"
 #include "is_interaction_request.h"
-#include "./idwsf_strings.h"
+#include "idwsf_strings.h"
 
 /**
  * SECTION:is_interaction_request
diff --git a/lasso/xml/is_interaction_response.c b/lasso/xml/is_interaction_response.c
index f4f5c358..17806de8 100644
--- a/lasso/xml/is_interaction_response.c
+++ b/lasso/xml/is_interaction_response.c
@@ -24,7 +24,7 @@
 
 #include "private.h"
 #include "is_interaction_response.h"
-#include "./idwsf_strings.h"
+#include "idwsf_strings.h"
 
 /**
  * SECTION:is_interaction_response
diff --git a/lasso/xml/is_interaction_statement.c b/lasso/xml/is_interaction_statement.c
index a89f7736..623a9645 100644
--- a/lasso/xml/is_interaction_statement.c
+++ b/lasso/xml/is_interaction_statement.c
@@ -24,7 +24,7 @@
 
 #include "private.h"
 #include "is_interaction_statement.h"
-#include "./idwsf_strings.h"
+#include "idwsf_strings.h"
 
 /**
  * SECTION:is_interaction_statement
diff --git a/lasso/xml/is_item.c b/lasso/xml/is_item.c
index ab78e6bf..540714c7 100644
--- a/lasso/xml/is_item.c
+++ b/lasso/xml/is_item.c
@@ -24,7 +24,7 @@
 
 #include "private.h"
 #include "is_item.h"
-#include "./idwsf_strings.h"
+#include "idwsf_strings.h"
 
 /**
  * SECTION:is_item
diff --git a/lasso/xml/is_parameter.c b/lasso/xml/is_parameter.c
index 14f35e6d..43e017c9 100644
--- a/lasso/xml/is_parameter.c
+++ b/lasso/xml/is_parameter.c
@@ -24,7 +24,7 @@
 
 #include "private.h"
 #include "is_parameter.h"
-#include "./idwsf_strings.h"
+#include "idwsf_strings.h"
 
 /**
  * SECTION:is_parameter
diff --git a/lasso/xml/is_redirect_request.c b/lasso/xml/is_redirect_request.c
index e8936cfe..34112ce5 100644
--- a/lasso/xml/is_redirect_request.c
+++ b/lasso/xml/is_redirect_request.c
@@ -24,7 +24,7 @@
 
 #include "private.h"
 #include "is_redirect_request.h"
-#include "./idwsf_strings.h"
+#include "idwsf_strings.h"
 
 /**
  * SECTION:is_redirect_request
diff --git a/lasso/xml/is_select.c b/lasso/xml/is_select.c
index cf0523bf..f69aa3eb 100644
--- a/lasso/xml/is_select.c
+++ b/lasso/xml/is_select.c
@@ -24,7 +24,7 @@
 
 #include "private.h"
 #include "is_select.h"
-#include "./idwsf_strings.h"
+#include "idwsf_strings.h"
 
 /**
  * SECTION:is_select
diff --git a/lasso/xml/is_text.c b/lasso/xml/is_text.c
index 60087e03..2b77541f 100644
--- a/lasso/xml/is_text.c
+++ b/lasso/xml/is_text.c
@@ -24,7 +24,7 @@
 
 #include "private.h"
 #include "is_text.h"
-#include "./idwsf_strings.h"
+#include "idwsf_strings.h"
 
 /**
  * SECTION:is_text
diff --git a/lasso/xml/is_user_interaction.c b/lasso/xml/is_user_interaction.c
index 4f214192..312b5bc9 100644
--- a/lasso/xml/is_user_interaction.c
+++ b/lasso/xml/is_user_interaction.c
@@ -24,7 +24,7 @@
 
 #include "private.h"
 #include "is_user_interaction.h"
-#include "./idwsf_strings.h"
+#include "idwsf_strings.h"
 
 /**
  * SECTION:is_user_interaction
diff --git a/lasso/xml/lib_register_name_identifier_request.c b/lasso/xml/lib_register_name_identifier_request.c
index c3eece2a..61823324 100644
--- a/lasso/xml/lib_register_name_identifier_request.c
+++ b/lasso/xml/lib_register_name_identifier_request.c
@@ -22,8 +22,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "./private.h"
-#include "./lib_register_name_identifier_request.h"
+#include "private.h"
+#include "lib_register_name_identifier_request.h"
 #include "../utils.h"
 
 /**
diff --git a/lasso/xml/misc_text_node.c b/lasso/xml/misc_text_node.c
index 0d88ad5e..6d23046d 100644
--- a/lasso/xml/misc_text_node.c
+++ b/lasso/xml/misc_text_node.c
@@ -24,8 +24,8 @@
 
 #include <libxml/tree.h>
 #include "../utils.h"
-#include "./private.h"
-#include "./misc_text_node.h"
+#include "private.h"
+#include "misc_text_node.h"
 
 /*****************************************************************************/
 /* private methods                                                           */
diff --git a/lasso/xml/sa_credentials.c b/lasso/xml/sa_credentials.c
index ee7aefd1..1f33adb7 100644
--- a/lasso/xml/sa_credentials.c
+++ b/lasso/xml/sa_credentials.c
@@ -24,7 +24,7 @@
 
 #include "private.h"
 #include "sa_credentials.h"
-#include "./idwsf_strings.h"
+#include "idwsf_strings.h"
 
 /**
  * SECTION:sa_credentials
diff --git a/lasso/xml/sa_parameter.c b/lasso/xml/sa_parameter.c
index 147b8166..c90db61e 100644
--- a/lasso/xml/sa_parameter.c
+++ b/lasso/xml/sa_parameter.c
@@ -24,7 +24,7 @@
 
 #include "private.h"
 #include "sa_parameter.h"
-#include "./idwsf_strings.h"
+#include "idwsf_strings.h"
 
 /**
  * SECTION:sa_parameter
diff --git a/lasso/xml/sa_password_transforms.c b/lasso/xml/sa_password_transforms.c
index 4f09cf2e..daff1ded 100644
--- a/lasso/xml/sa_password_transforms.c
+++ b/lasso/xml/sa_password_transforms.c
@@ -24,7 +24,7 @@
 
 #include "private.h"
 #include "sa_password_transforms.h"
-#include "./idwsf_strings.h"
+#include "idwsf_strings.h"
 
 /**
  * SECTION:sa_password_transforms
diff --git a/lasso/xml/sa_sasl_request.c b/lasso/xml/sa_sasl_request.c
index dc9ceee3..453bc00f 100644
--- a/lasso/xml/sa_sasl_request.c
+++ b/lasso/xml/sa_sasl_request.c
@@ -24,7 +24,7 @@
 
 #include "private.h"
 #include "sa_sasl_request.h"
-#include "./idwsf_strings.h"
+#include "idwsf_strings.h"
 
 /**
  * SECTION:sa_sasl_request
diff --git a/lasso/xml/sa_sasl_response.c b/lasso/xml/sa_sasl_response.c
index f57ae5b3..dd7c2161 100644
--- a/lasso/xml/sa_sasl_response.c
+++ b/lasso/xml/sa_sasl_response.c
@@ -24,7 +24,7 @@
 
 #include "private.h"
 #include "sa_sasl_response.h"
-#include "./idwsf_strings.h"
+#include "idwsf_strings.h"
 
 /**
  * SECTION:sa_sasl_response
diff --git a/lasso/xml/sa_transform.c b/lasso/xml/sa_transform.c
index b27a5f88..6758fb23 100644
--- a/lasso/xml/sa_transform.c
+++ b/lasso/xml/sa_transform.c
@@ -24,7 +24,7 @@
 
 #include "private.h"
 #include "sa_transform.h"
-#include "./idwsf_strings.h"
+#include "idwsf_strings.h"
 
 /**
  * SECTION:sa_transform
diff --git a/lasso/xml/saml-2.0/saml2_key_info_confirmation_data_type.h b/lasso/xml/saml-2.0/saml2_key_info_confirmation_data_type.h
index f66235ab..24c2431d 100644
--- a/lasso/xml/saml-2.0/saml2_key_info_confirmation_data_type.h
+++ b/lasso/xml/saml-2.0/saml2_key_info_confirmation_data_type.h
@@ -31,7 +31,7 @@ extern "C" {
 
 #include "../xml.h"
 #include "../dsig/ds_key_info.h"
-#include "./saml2_subject_confirmation_data.h"
+#include "saml2_subject_confirmation_data.h"
 
 #define LASSO_TYPE_SAML2_KEY_INFO_CONFIRMATION_DATA_TYPE \
 	(lasso_saml2_key_info_confirmation_data_type_get_type())
diff --git a/lasso/xml/saml-2.0/samlp2_response.c b/lasso/xml/saml-2.0/samlp2_response.c
index bc8ab5b1..0ebc11ce 100644
--- a/lasso/xml/saml-2.0/samlp2_response.c
+++ b/lasso/xml/saml-2.0/samlp2_response.c
@@ -23,9 +23,9 @@
  */
 
 #include "../private.h"
-#include "./samlp2_response.h"
-#include "./saml2_assertion.h"
-#include "./saml2_encrypted_element.h"
+#include "samlp2_response.h"
+#include "saml2_assertion.h"
+#include "saml2_encrypted_element.h"
 #include "../../utils.h"
 
 /**
diff --git a/lasso/xml/saml-2.0/samlp2_status_response.c b/lasso/xml/saml-2.0/samlp2_status_response.c
index 216bb701..3bcc90af 100644
--- a/lasso/xml/saml-2.0/samlp2_status_response.c
+++ b/lasso/xml/saml-2.0/samlp2_status_response.c
@@ -25,8 +25,8 @@
 
 #include "../private.h"
 #include "../../utils.h"
-#include "./samlp2_status_response.h"
-#include "./saml2_strings.h"
+#include "samlp2_status_response.h"
+#include "saml2_strings.h"
 #include <xmlsec/xmldsig.h>
 #include <xmlsec/templates.h>
 
diff --git a/lasso/xml/saml-2.0/xml_saml2.h b/lasso/xml/saml-2.0/xml_saml2.h
index f68a40c5..d99d1d72 100644
--- a/lasso/xml/saml-2.0/xml_saml2.h
+++ b/lasso/xml/saml-2.0/xml_saml2.h
@@ -25,57 +25,57 @@
 #ifndef __LASSO_XML_SAML2_H__
 #define __LASSO_XML_SAML2_H__
 
-#include "./saml2_action.h"
-#include "./saml2_advice.h"
-#include "./saml2_assertion.h"
-#include "./saml2_attribute.h"
-#include "./saml2_attribute_statement.h"
-#include "./saml2_attribute_value.h"
-#include "./saml2_audience_restriction.h"
-#include "./saml2_authn_context.h"
-#include "./saml2_authn_statement.h"
-#include "./saml2_authz_decision_statement.h"
-#include "./saml2_base_idabstract.h"
-#include "./saml2_condition_abstract.h"
-#include "./saml2_conditions.h"
-#include "./saml2_encrypted_element.h"
-#include "./saml2_evidence.h"
-#include "./saml2_key_info_confirmation_data.h"
-#include "./saml2_key_info_confirmation_data_type.h"
-#include "./saml2_name_id.h"
-#include "./saml2_one_time_use.h"
-#include "./saml2_proxy_restriction.h"
-#include "./saml2_statement_abstract.h"
-#include "./saml2_subject_confirmation_data.h"
-#include "./saml2_subject_confirmation.h"
-#include "./saml2_subject.h"
-#include "./saml2_subject_locality.h"
-#include "./samlp2_artifact_resolve.h"
-#include "./samlp2_artifact_response.h"
-#include "./samlp2_assertion_id_request.h"
-#include "./samlp2_attribute_query.h"
-#include "./samlp2_authn_query.h"
-#include "./samlp2_authn_request.h"
-#include "./samlp2_authz_decision_query.h"
-#include "./samlp2_extensions.h"
-#include "./samlp2_idp_entry.h"
-#include "./samlp2_idp_list.h"
-#include "./samlp2_logout_request.h"
-#include "./samlp2_logout_response.h"
-#include "./samlp2_manage_name_id_request.h"
-#include "./samlp2_manage_name_id_response.h"
-#include "./samlp2_name_id_mapping_request.h"
-#include "./samlp2_name_id_mapping_response.h"
-#include "./samlp2_name_id_policy.h"
-#include "./samlp2_request_abstract.h"
-#include "./samlp2_requested_authn_context.h"
-#include "./samlp2_response.h"
-#include "./samlp2_scoping.h"
-#include "./samlp2_status_code.h"
-#include "./samlp2_status_detail.h"
-#include "./samlp2_status.h"
-#include "./samlp2_status_response.h"
-#include "./samlp2_subject_query_abstract.h"
-#include "./samlp2_terminate.h"
+#include "saml2_action.h"
+#include "saml2_advice.h"
+#include "saml2_assertion.h"
+#include "saml2_attribute.h"
+#include "saml2_attribute_statement.h"
+#include "saml2_attribute_value.h"
+#include "saml2_audience_restriction.h"
+#include "saml2_authn_context.h"
+#include "saml2_authn_statement.h"
+#include "saml2_authz_decision_statement.h"
+#include "saml2_base_idabstract.h"
+#include "saml2_condition_abstract.h"
+#include "saml2_conditions.h"
+#include "saml2_encrypted_element.h"
+#include "saml2_evidence.h"
+#include "saml2_key_info_confirmation_data.h"
+#include "saml2_key_info_confirmation_data_type.h"
+#include "saml2_name_id.h"
+#include "saml2_one_time_use.h"
+#include "saml2_proxy_restriction.h"
+#include "saml2_statement_abstract.h"
+#include "saml2_subject_confirmation_data.h"
+#include "saml2_subject_confirmation.h"
+#include "saml2_subject.h"
+#include "saml2_subject_locality.h"
+#include "samlp2_artifact_resolve.h"
+#include "samlp2_artifact_response.h"
+#include "samlp2_assertion_id_request.h"
+#include "samlp2_attribute_query.h"
+#include "samlp2_authn_query.h"
+#include "samlp2_authn_request.h"
+#include "samlp2_authz_decision_query.h"
+#include "samlp2_extensions.h"
+#include "samlp2_idp_entry.h"
+#include "samlp2_idp_list.h"
+#include "samlp2_logout_request.h"
+#include "samlp2_logout_response.h"
+#include "samlp2_manage_name_id_request.h"
+#include "samlp2_manage_name_id_response.h"
+#include "samlp2_name_id_mapping_request.h"
+#include "samlp2_name_id_mapping_response.h"
+#include "samlp2_name_id_policy.h"
+#include "samlp2_request_abstract.h"
+#include "samlp2_requested_authn_context.h"
+#include "samlp2_response.h"
+#include "samlp2_scoping.h"
+#include "samlp2_status_code.h"
+#include "samlp2_status_detail.h"
+#include "samlp2_status.h"
+#include "samlp2_status_response.h"
+#include "samlp2_subject_query_abstract.h"
+#include "samlp2_terminate.h"
 
 #endif /* __LASSO_XML_SAML2_H__ */
diff --git a/lasso/xml/saml_subject_confirmation.h b/lasso/xml/saml_subject_confirmation.h
index 648b961c..113e0e57 100644
--- a/lasso/xml/saml_subject_confirmation.h
+++ b/lasso/xml/saml_subject_confirmation.h
@@ -30,7 +30,7 @@ extern "C" {
 #endif /* __cplusplus */
 
 #include "xml.h"
-#include "./dsig/ds_key_info.h"
+#include "dsig/ds_key_info.h"
 
 #define LASSO_TYPE_SAML_SUBJECT_CONFIRMATION (lasso_saml_subject_confirmation_get_type())
 #define LASSO_SAML_SUBJECT_CONFIRMATION(obj) \
diff --git a/lasso/xml/sec_resource_access_statement.c b/lasso/xml/sec_resource_access_statement.c
index 6f1578d1..483ed844 100644
--- a/lasso/xml/sec_resource_access_statement.c
+++ b/lasso/xml/sec_resource_access_statement.c
@@ -24,7 +24,7 @@
 
 #include "private.h"
 #include "sec_resource_access_statement.h"
-#include "./idwsf_strings.h"
+#include "idwsf_strings.h"
 
 /*
  * <xs: element name="ResourceAccessStatement"
diff --git a/lasso/xml/soap-1.1/soap_body.c b/lasso/xml/soap-1.1/soap_body.c
index 4a1768d2..4385ad95 100644
--- a/lasso/xml/soap-1.1/soap_body.c
+++ b/lasso/xml/soap-1.1/soap_body.c
@@ -23,7 +23,7 @@
  */
 
 #include "../private.h"
-#include "./soap_body.h"
+#include "soap_body.h"
 
 /**
  * SECTION:soap_body
diff --git a/lasso/xml/soap-1.1/soap_detail.c b/lasso/xml/soap-1.1/soap_detail.c
index 1f5f423a..ad9c8032 100644
--- a/lasso/xml/soap-1.1/soap_detail.c
+++ b/lasso/xml/soap-1.1/soap_detail.c
@@ -22,7 +22,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "./soap_detail.h"
+#include "soap_detail.h"
 #include "../private.h"
 
 /*
diff --git a/lasso/xml/soap-1.1/soap_envelope.c b/lasso/xml/soap-1.1/soap_envelope.c
index 491c2ed6..b146c0d8 100644
--- a/lasso/xml/soap-1.1/soap_envelope.c
+++ b/lasso/xml/soap-1.1/soap_envelope.c
@@ -23,7 +23,7 @@
  */
 
 #include "../private.h"
-#include "./soap_envelope.h"
+#include "soap_envelope.h"
 #include "../../utils.h"
 
 /**
diff --git a/lasso/xml/soap-1.1/soap_envelope.h b/lasso/xml/soap-1.1/soap_envelope.h
index 18146112..3c783d41 100644
--- a/lasso/xml/soap-1.1/soap_envelope.h
+++ b/lasso/xml/soap-1.1/soap_envelope.h
@@ -30,8 +30,8 @@ extern "C" {
 #endif /* __cplusplus */
 
 #include "../xml.h"
-#include "./soap_body.h"
-#include "./soap_header.h"
+#include "soap_body.h"
+#include "soap_header.h"
 
 #define LASSO_TYPE_SOAP_ENVELOPE (lasso_soap_envelope_get_type())
 #define LASSO_SOAP_ENVELOPE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \
diff --git a/lasso/xml/soap-1.1/soap_fault.c b/lasso/xml/soap-1.1/soap_fault.c
index 166f8c6d..1fca2f4c 100644
--- a/lasso/xml/soap-1.1/soap_fault.c
+++ b/lasso/xml/soap-1.1/soap_fault.c
@@ -22,7 +22,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "./soap_fault.h"
+#include "soap_fault.h"
 #include "../private.h"
 #include "../../utils.h"
 
diff --git a/lasso/xml/soap-1.1/soap_fault.h b/lasso/xml/soap-1.1/soap_fault.h
index 12b6ed67..49541ffc 100644
--- a/lasso/xml/soap-1.1/soap_fault.h
+++ b/lasso/xml/soap-1.1/soap_fault.h
@@ -30,7 +30,7 @@ extern "C" {
 #endif /* __cplusplus */
 
 #include "../xml.h"
-#include "./soap_detail.h"
+#include "soap_detail.h"
 
 #define LASSO_TYPE_SOAP_FAULT (lasso_soap_fault_get_type())
 #define LASSO_SOAP_FAULT(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \
diff --git a/lasso/xml/soap-1.1/soap_header.c b/lasso/xml/soap-1.1/soap_header.c
index e0809cc6..53fb350a 100644
--- a/lasso/xml/soap-1.1/soap_header.c
+++ b/lasso/xml/soap-1.1/soap_header.c
@@ -23,7 +23,7 @@
  */
 
 #include "../private.h"
-#include "./soap_header.h"
+#include "soap_header.h"
 
 /**
  * SECTION:soap_header
diff --git a/lasso/xml/soap-1.1/xml_soap11.h b/lasso/xml/soap-1.1/xml_soap11.h
index 36a10b0a..ca980c2e 100644
--- a/lasso/xml/soap-1.1/xml_soap11.h
+++ b/lasso/xml/soap-1.1/xml_soap11.h
@@ -25,10 +25,10 @@
 #ifndef __LASSO_XML_SOAP11_H__
 #define __LASSO_XML_SOAP11_H__
 
-#include "./soap_body.h"
-#include "./soap_detail.h"
-#include "./soap_envelope.h"
-#include "./soap_fault.h"
-#include "./soap_header.h"
+#include "soap_body.h"
+#include "soap_detail.h"
+#include "soap_envelope.h"
+#include "soap_fault.h"
+#include "soap_header.h"
 
 #endif /* __LASSO_XML_SOAP11_H__ */
diff --git a/lasso/xml/soap_binding.h b/lasso/xml/soap_binding.h
index e4c8b12e..08b8e731 100644
--- a/lasso/xml/soap_binding.h
+++ b/lasso/xml/soap_binding.h
@@ -25,9 +25,9 @@
 #ifndef __LASSO_SOAP_BINDING_H__
 #define __LASSO_SOAP_BINDING_H__
 
-#include "./soap_binding_provider.h"
-#include "./soap_binding_correlation.h"
-#include "./soap-1.1/soap_envelope.h"
+#include "soap_binding_provider.h"
+#include "soap_binding_correlation.h"
+#include "soap-1.1/soap_envelope.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lasso/xml/soap_binding_consent.c b/lasso/xml/soap_binding_consent.c
index a45b5774..e684d1c5 100644
--- a/lasso/xml/soap_binding_consent.c
+++ b/lasso/xml/soap_binding_consent.c
@@ -24,7 +24,7 @@
 
 #include "private.h"
 #include "soap_binding_consent.h"
-#include "./idwsf_strings.h"
+#include "idwsf_strings.h"
 
 /**
  * SECTION:soap_binding_consent
diff --git a/lasso/xml/soap_binding_correlation.c b/lasso/xml/soap_binding_correlation.c
index 6d9cd64d..ce04ea9e 100644
--- a/lasso/xml/soap_binding_correlation.c
+++ b/lasso/xml/soap_binding_correlation.c
@@ -24,7 +24,7 @@
 
 #include "private.h"
 #include "soap_binding_correlation.h"
-#include "./idwsf_strings.h"
+#include "idwsf_strings.h"
 
 /**
  * SECTION:soap_binding_correlation
diff --git a/lasso/xml/soap_binding_ext_credential.c b/lasso/xml/soap_binding_ext_credential.c
index eca09d80..13d6573d 100644
--- a/lasso/xml/soap_binding_ext_credential.c
+++ b/lasso/xml/soap_binding_ext_credential.c
@@ -24,7 +24,7 @@
 
 #include "private.h"
 #include "soap_binding_ext_credential.h"
-#include "./idwsf_strings.h"
+#include "idwsf_strings.h"
 
 /**
  * SECTION:soap_binding_ext_credential
diff --git a/lasso/xml/soap_binding_ext_credentials_context.c b/lasso/xml/soap_binding_ext_credentials_context.c
index 7c704239..1d0f33b5 100644
--- a/lasso/xml/soap_binding_ext_credentials_context.c
+++ b/lasso/xml/soap_binding_ext_credentials_context.c
@@ -24,7 +24,7 @@
 
 #include "private.h"
 #include "soap_binding_ext_credentials_context.h"
-#include "./idwsf_strings.h"
+#include "idwsf_strings.h"
 
 /**
  * SECTION:soap_binding_ext_credentials_context
diff --git a/lasso/xml/soap_binding_ext_service_instance_update.c b/lasso/xml/soap_binding_ext_service_instance_update.c
index c17db8c6..c40121f4 100644
--- a/lasso/xml/soap_binding_ext_service_instance_update.c
+++ b/lasso/xml/soap_binding_ext_service_instance_update.c
@@ -24,7 +24,7 @@
 
 #include "private.h"
 #include "soap_binding_ext_service_instance_update.h"
-#include "./idwsf_strings.h"
+#include "idwsf_strings.h"
 
 /**
  * SECTION:soap_binding_ext_service_instance_update
diff --git a/lasso/xml/soap_binding_ext_timeout.c b/lasso/xml/soap_binding_ext_timeout.c
index d268c6ba..07dd823c 100644
--- a/lasso/xml/soap_binding_ext_timeout.c
+++ b/lasso/xml/soap_binding_ext_timeout.c
@@ -24,7 +24,7 @@
 
 #include "private.h"
 #include "soap_binding_ext_timeout.h"
-#include "./idwsf_strings.h"
+#include "idwsf_strings.h"
 
 /**
  * SECTION:soap_binding_ext_timeout
diff --git a/lasso/xml/soap_binding_processing_context.c b/lasso/xml/soap_binding_processing_context.c
index bb3436ec..312130a2 100644
--- a/lasso/xml/soap_binding_processing_context.c
+++ b/lasso/xml/soap_binding_processing_context.c
@@ -24,7 +24,7 @@
 
 #include "private.h"
 #include "soap_binding_processing_context.h"
-#include "./idwsf_strings.h"
+#include "idwsf_strings.h"
 
 /**
  * SECTION:soap_binding_processing_context
diff --git a/lasso/xml/soap_binding_provider.c b/lasso/xml/soap_binding_provider.c
index 42afad70..67cf9193 100644
--- a/lasso/xml/soap_binding_provider.c
+++ b/lasso/xml/soap_binding_provider.c
@@ -24,7 +24,7 @@
 
 #include "private.h"
 #include "soap_binding_provider.h"
-#include "./idwsf_strings.h"
+#include "idwsf_strings.h"
 
 /**
  * SECTION:soap_binding_provider
diff --git a/lasso/xml/soap_binding_usage_directive.c b/lasso/xml/soap_binding_usage_directive.c
index 759cc01a..d41228dd 100644
--- a/lasso/xml/soap_binding_usage_directive.c
+++ b/lasso/xml/soap_binding_usage_directive.c
@@ -24,7 +24,7 @@
 
 #include "private.h"
 #include "soap_binding_usage_directive.h"
-#include "./idwsf_strings.h"
+#include "idwsf_strings.h"
 
 /**
  * SECTION:soap_binding_usage_directive
diff --git a/lasso/xml/strings.h b/lasso/xml/strings.h
index 9263db43..391ffb67 100644
--- a/lasso/xml/strings.h
+++ b/lasso/xml/strings.h
@@ -42,8 +42,8 @@
 #ifndef __LASSO_STRINGS_H__
 #define __LASSO_STRINGS_H__
 
-#include "./saml-2.0/saml2_strings.h"
-#include "./dsig/strings.h"
+#include "saml-2.0/saml2_strings.h"
+#include "dsig/strings.h"
 
 /*****************************************************************************/
 /* SOAP 1.1                                                                  */
diff --git a/lasso/xml/ws/wsse_username_token.c b/lasso/xml/ws/wsse_username_token.c
index 26a72e9c..f411bbea 100644
--- a/lasso/xml/ws/wsse_username_token.c
+++ b/lasso/xml/ws/wsse_username_token.c
@@ -39,7 +39,7 @@
  *
  */
 
-#include "./wsse_username_token.h"
+#include "wsse_username_token.h"
 #include "../idwsf_strings.h"
 #include <xmlsec/xmltree.h>
 #include <openssl/sha.h>
diff --git a/lasso/xml/ws/xml_ws.h b/lasso/xml/ws/xml_ws.h
index 9ece48ef..df26f2c3 100644
--- a/lasso/xml/ws/xml_ws.h
+++ b/lasso/xml/ws/xml_ws.h
@@ -25,21 +25,21 @@
 #ifndef __LASSO_XML_WS_H__
 #define __LASSO_XML_WS_H__
 
-#include "./wsa_attributed_any.h"
-#include "./wsa_attributed_qname.h"
-#include "./wsa_attributed_unsigned_long.h"
-#include "./wsa_attributed_uri.h"
-#include "./wsa_endpoint_reference.h"
-#include "./wsa_metadata.h"
-#include "./wsa_problem_action.h"
-#include "./wsa_reference_parameters.h"
-#include "./wsa_relates_to.h"
-#include "./wsse_embedded.h"
-#include "./wsse_reference.h"
-#include "./wsse_security_header.h"
-#include "./wsse_security_token_reference.h"
-#include "./wsse_transformation_parameters.h"
-#include "./wsse_username_token.h"
-#include "./wsu_timestamp.h"
+#include "wsa_attributed_any.h"
+#include "wsa_attributed_qname.h"
+#include "wsa_attributed_unsigned_long.h"
+#include "wsa_attributed_uri.h"
+#include "wsa_endpoint_reference.h"
+#include "wsa_metadata.h"
+#include "wsa_problem_action.h"
+#include "wsa_reference_parameters.h"
+#include "wsa_relates_to.h"
+#include "wsse_embedded.h"
+#include "wsse_reference.h"
+#include "wsse_security_header.h"
+#include "wsse_security_token_reference.h"
+#include "wsse_transformation_parameters.h"
+#include "wsse_username_token.h"
+#include "wsu_timestamp.h"
 
 #endif
diff --git a/lasso/xml/xml.c b/lasso/xml/xml.c
index bc8111b9..53d733bd 100644
--- a/lasso/xml/xml.c
+++ b/lasso/xml/xml.c
@@ -50,13 +50,13 @@
 #include "../utils.h"
 #include "../registry.h"
 #include "../debug.h"
-#include "./soap-1.1/soap_envelope.h"
-#include "./soap-1.1/soap_body.h"
-#include "./misc_text_node.h"
+#include "soap-1.1/soap_envelope.h"
+#include "soap-1.1/soap_body.h"
+#include "misc_text_node.h"
 #include "../lasso_config.h"
 #ifdef LASSO_WSF_ENABLED
-#include "./idwsf_strings.h"
-#include "./id-wsf-2.0/idwsf2_strings.h"
+#include "idwsf_strings.h"
+#include "id-wsf-2.0/idwsf2_strings.h"
 #endif
 
 static void lasso_node_build_xmlNode_from_snippets(LassoNode *node, LassoNodeClass *class, xmlNode *xmlnode,
diff --git a/lasso/xml/xml_idff.h b/lasso/xml/xml_idff.h
index 6ae04e29..82785c07 100644
--- a/lasso/xml/xml_idff.h
+++ b/lasso/xml/xml_idff.h
@@ -25,58 +25,58 @@
 #ifndef __LASSO_XML_IDFF_H__
 #define __LASSO_XML_IDFF_H__
 
-#include "./xml.h"
-#include "./dsig/ds_key_info.h"
-#include "./dsig/ds_key_value.h"
-#include "./dsig/ds_rsa_key_value.h"
-#include "./dsig/ds_x509_data.h"
-#include "./lib_assertion.h"
-#include "./lib_authentication_statement.h"
-#include "./lib_authn_context.h"
-#include "./lib_authn_request_envelope.h"
-#include "./lib_authn_request.h"
-#include "./lib_authn_response_envelope.h"
-#include "./lib_authn_response.h"
-#include "./lib_federation_termination_notification.h"
-#include "./lib_idp_entries.h"
-#include "./lib_idp_entry.h"
-#include "./lib_idp_list.h"
-#include "./lib_logout_request.h"
-#include "./lib_logout_response.h"
-#include "./lib_name_identifier_mapping_request.h"
-#include "./lib_name_identifier_mapping_response.h"
-#include "./lib_register_name_identifier_request.h"
-#include "./lib_register_name_identifier_response.h"
-#include "./lib_request_authn_context.h"
-#include "./lib_scoping.h"
-#include "./lib_status_response.h"
-#include "./lib_subject.h"
-#include "./misc_text_node.h"
-#include "./saml_advice.h"
-#include "./saml_assertion.h"
-#include "./saml_attribute_designator.h"
-#include "./saml_attribute.h"
-#include "./saml_attribute_statement.h"
-#include "./saml_attribute_value.h"
-#include "./saml_audience_restriction_condition.h"
-#include "./saml_authentication_statement.h"
-#include "./saml_authority_binding.h"
-#include "./saml_condition_abstract.h"
-#include "./saml_conditions.h"
-#include "./saml_name_identifier.h"
-#include "./samlp_request_abstract.h"
-#include "./samlp_request.h"
-#include "./samlp_response_abstract.h"
-#include "./samlp_response.h"
-#include "./samlp_status_code.h"
-#include "./samlp_status.h"
-#include "./saml_statement_abstract.h"
-#include "./saml_subject_confirmation.h"
-#include "./saml_subject.h"
-#include "./saml_subject_locality.h"
-#include "./saml_subject_statement_abstract.h"
-#include "./saml_subject_statement.h"
-#include "./strings.h"
-#include "./xml_enc.h"
+#include "xml.h"
+#include "dsig/ds_key_info.h"
+#include "dsig/ds_key_value.h"
+#include "dsig/ds_rsa_key_value.h"
+#include "dsig/ds_x509_data.h"
+#include "lib_assertion.h"
+#include "lib_authentication_statement.h"
+#include "lib_authn_context.h"
+#include "lib_authn_request_envelope.h"
+#include "lib_authn_request.h"
+#include "lib_authn_response_envelope.h"
+#include "lib_authn_response.h"
+#include "lib_federation_termination_notification.h"
+#include "lib_idp_entries.h"
+#include "lib_idp_entry.h"
+#include "lib_idp_list.h"
+#include "lib_logout_request.h"
+#include "lib_logout_response.h"
+#include "lib_name_identifier_mapping_request.h"
+#include "lib_name_identifier_mapping_response.h"
+#include "lib_register_name_identifier_request.h"
+#include "lib_register_name_identifier_response.h"
+#include "lib_request_authn_context.h"
+#include "lib_scoping.h"
+#include "lib_status_response.h"
+#include "lib_subject.h"
+#include "misc_text_node.h"
+#include "saml_advice.h"
+#include "saml_assertion.h"
+#include "saml_attribute_designator.h"
+#include "saml_attribute.h"
+#include "saml_attribute_statement.h"
+#include "saml_attribute_value.h"
+#include "saml_audience_restriction_condition.h"
+#include "saml_authentication_statement.h"
+#include "saml_authority_binding.h"
+#include "saml_condition_abstract.h"
+#include "saml_conditions.h"
+#include "saml_name_identifier.h"
+#include "samlp_request_abstract.h"
+#include "samlp_request.h"
+#include "samlp_response_abstract.h"
+#include "samlp_response.h"
+#include "samlp_status_code.h"
+#include "samlp_status.h"
+#include "saml_statement_abstract.h"
+#include "saml_subject_confirmation.h"
+#include "saml_subject.h"
+#include "saml_subject_locality.h"
+#include "saml_subject_statement_abstract.h"
+#include "saml_subject_statement.h"
+#include "strings.h"
+#include "xml_enc.h"
 
 #endif /* __LASSO_XML_IDFF_H__ */
diff --git a/lasso/xml/xml_idwsf.h b/lasso/xml/xml_idwsf.h
index 68e17418..36f97793 100644
--- a/lasso/xml/xml_idwsf.h
+++ b/lasso/xml/xml_idwsf.h
@@ -25,63 +25,63 @@
 #ifndef __LASSO_XML_IDWSF_H__
 #define __LASSO_XML_IDWSF_H__
 
-#include "./dst_data.h"
-#include "./dst_modification.h"
-#include "./dst_modify.h"
-#include "./dst_modify_response.h"
-#include "./dst_new_data.h"
-#include "./dst_query.h"
-#include "./dst_query_item.h"
-#include "./dst_query_response.h"
-#include "./is_help.h"
-#include "./is_inquiry_element.h"
-#include "./is_inquiry.h"
-#include "./is_interaction_request.h"
-#include "./is_interaction_response.h"
-#include "./is_interaction_statement.h"
-#include "./is_item.h"
-#include "./disco_authenticate_requester.h"
-#include "./disco_authenticate_session_context.h"
-#include "./disco_authorize_requester.h"
-#include "./disco_credentials.h"
-#include "./disco_description.h"
-#include "./disco_encrypted_resource_id.h"
-#include "./disco_encrypt_resource_id.h"
-#include "./disco_generate_bearer_token.h"
-#include "./disco_insert_entry.h"
-#include "./disco_modify.h"
-#include "./disco_modify_response.h"
-#include "./disco_options.h"
-#include "./disco_query.h"
-#include "./disco_query_response.h"
-#include "./disco_remove_entry.h"
-#include "./disco_requested_service_type.h"
-#include "./disco_resource_id.h"
-#include "./disco_resource_offering.h"
-#include "./disco_send_single_logout.h"
-#include "./disco_service_instance.h"
-#include "./is_parameter.h"
-#include "./is_redirect_request.h"
-#include "./is_select.h"
-#include "./is_text.h"
-#include "./is_user_interaction.h"
-#include "./sa_credentials.h"
-#include "./sa_parameter.h"
-#include "./sa_password_transforms.h"
-#include "./sa_sasl_request.h"
-#include "./sa_sasl_response.h"
-#include "./sa_transform.h"
-#include "./sec_resource_access_statement.h"
-#include "./soap_binding_consent.h"
-#include "./soap_binding_correlation.h"
-#include "./soap_binding_ext_credential.h"
-#include "./soap_binding_ext_credentials_context.h"
-#include "./soap_binding_ext_service_instance_update.h"
-#include "./soap_binding_ext_timeout.h"
-#include "./soap_binding.h"
-#include "./soap_binding_processing_context.h"
-#include "./soap_binding_provider.h"
-#include "./soap_binding_usage_directive.h"
-#include "./utility_status.h"
+#include "dst_data.h"
+#include "dst_modification.h"
+#include "dst_modify.h"
+#include "dst_modify_response.h"
+#include "dst_new_data.h"
+#include "dst_query.h"
+#include "dst_query_item.h"
+#include "dst_query_response.h"
+#include "is_help.h"
+#include "is_inquiry_element.h"
+#include "is_inquiry.h"
+#include "is_interaction_request.h"
+#include "is_interaction_response.h"
+#include "is_interaction_statement.h"
+#include "is_item.h"
+#include "disco_authenticate_requester.h"
+#include "disco_authenticate_session_context.h"
+#include "disco_authorize_requester.h"
+#include "disco_credentials.h"
+#include "disco_description.h"
+#include "disco_encrypted_resource_id.h"
+#include "disco_encrypt_resource_id.h"
+#include "disco_generate_bearer_token.h"
+#include "disco_insert_entry.h"
+#include "disco_modify.h"
+#include "disco_modify_response.h"
+#include "disco_options.h"
+#include "disco_query.h"
+#include "disco_query_response.h"
+#include "disco_remove_entry.h"
+#include "disco_requested_service_type.h"
+#include "disco_resource_id.h"
+#include "disco_resource_offering.h"
+#include "disco_send_single_logout.h"
+#include "disco_service_instance.h"
+#include "is_parameter.h"
+#include "is_redirect_request.h"
+#include "is_select.h"
+#include "is_text.h"
+#include "is_user_interaction.h"
+#include "sa_credentials.h"
+#include "sa_parameter.h"
+#include "sa_password_transforms.h"
+#include "sa_sasl_request.h"
+#include "sa_sasl_response.h"
+#include "sa_transform.h"
+#include "sec_resource_access_statement.h"
+#include "soap_binding_consent.h"
+#include "soap_binding_correlation.h"
+#include "soap_binding_ext_credential.h"
+#include "soap_binding_ext_credentials_context.h"
+#include "soap_binding_ext_service_instance_update.h"
+#include "soap_binding_ext_timeout.h"
+#include "soap_binding.h"
+#include "soap_binding_processing_context.h"
+#include "soap_binding_provider.h"
+#include "soap_binding_usage_directive.h"
+#include "utility_status.h"
 
 #endif
diff --git a/tests/assertion_query_saml2.c b/tests/assertion_query_saml2.c
index f9de88b2..2a6c9731 100644
--- a/tests/assertion_query_saml2.c
+++ b/tests/assertion_query_saml2.c
@@ -33,7 +33,7 @@
 #include "../lasso/xml/saml-2.0/saml2_xsd.h"
 #include "../bindings/ghashtable.h"
 
-#include "./tests.h"
+#include "tests.h"
 
 inline static char*
 generateIdentityProviderContextDump()
diff --git a/tests/basic_tests.c b/tests/basic_tests.c
index a73cc882..4e3f77b1 100644
--- a/tests/basic_tests.c
+++ b/tests/basic_tests.c
@@ -37,7 +37,7 @@
 #include "../lasso/utils.h"
 #include "../lasso/xml/private.h"
 #include <libxml/tree.h>
-#include "./tests.h"
+#include "tests.h"
 
 START_TEST(test01_server_load_dump_empty_string)
 {
diff --git a/tests/idwsf2_tests.c b/tests/idwsf2_tests.c
index 2da7eaf8..6d27b462 100644
--- a/tests/idwsf2_tests.c
+++ b/tests/idwsf2_tests.c
@@ -26,22 +26,22 @@
 
 #include <check.h>
 
-#include <../lasso/lasso.h>
+#include "../lasso/lasso.h"
 #include <glib.h>
 #include "../lasso/utils.h"
 
-#include <../lasso/id-ff/login.h>
-#include <../lasso/id-ff/server.h>
-#include <../lasso/id-ff/identity.h>
-#include <../lasso/id-ff/session.h>
-#include <../lasso/id-wsf-2.0/discovery.h>
-#include <../lasso/id-wsf-2.0/data_service.h>
-#include <../lasso/id-wsf-2.0/saml2_login.h>
+#include "../lasso/id-ff/login.h"
+#include "../lasso/id-ff/server.h"
+#include "../lasso/id-ff/identity.h"
+#include "../lasso/id-ff/session.h"
+#include "../lasso/id-wsf-2.0/discovery.h"
+#include "../lasso/id-wsf-2.0/data_service.h"
+#include "../lasso/id-wsf-2.0/saml2_login.h"
 
-#include <../lasso/xml/saml-2.0/samlp2_authn_request.h>
-#include <../lasso/xml/idwsf_strings.h>
+#include "../lasso/xml/saml-2.0/samlp2_authn_request.h"
+#include "../lasso/xml/idwsf_strings.h"
 
-#include "./tests.h"
+#include "tests.h"
 
 static const char
 wsp_metadata[] = TESTSDATADIR "sp5-saml2/metadata.xml";
diff --git a/tests/login_tests.c b/tests/login_tests.c
index 90573afc..c432fe9f 100644
--- a/tests/login_tests.c
+++ b/tests/login_tests.c
@@ -26,11 +26,11 @@
 
 #include <check.h>
 
-#include <../lasso/lasso.h>
+#include "../lasso/lasso.h"
 #include <glib.h>
 #include "../lasso/utils.h"
 #include "../lasso/backward_comp.h"
-#include "./tests.h"
+#include "tests.h"
 #include "../bindings/ghashtable.h"
 
 
diff --git a/tests/login_tests_saml2.c b/tests/login_tests_saml2.c
index 1052c61a..624556d8 100644
--- a/tests/login_tests_saml2.c
+++ b/tests/login_tests_saml2.c
@@ -33,7 +33,7 @@
 #include "../lasso/backward_comp.h"
 #include "../lasso/xml/saml-2.0/samlp2_logout_request.h"
 #include "../bindings/ghashtable.h"
-#include "./tests.h"
+#include "tests.h"
 
 static char*
 generateIdentityProviderContextDump()
diff --git a/tests/metadata_tests.c b/tests/metadata_tests.c
index cb4c5154..019bfd4c 100644
--- a/tests/metadata_tests.c
+++ b/tests/metadata_tests.c
@@ -26,10 +26,10 @@
 
 #include <check.h>
 
-#include <../lasso/lasso.h>
-#include <../lasso/id-ff/provider.h>
+#include "../lasso/lasso.h"
+#include "../lasso/id-ff/provider.h"
 #include "../lasso/utils.h"
-#include "./tests.h"
+#include "tests.h"
 #include "../lasso/xml/saml-2.0/saml2_xsd.h"
 
 START_TEST(test01_metadata_load_der_certificate_from_x509_cert)
diff --git a/tests/non_regression_tests.c b/tests/non_regression_tests.c
index 64886e94..ed5e5788 100644
--- a/tests/non_regression_tests.c
+++ b/tests/non_regression_tests.c
@@ -26,14 +26,14 @@
 
 #include <check.h>
 
-#include <../lasso/lasso.h>
-#include "./tests.h"
-#include <../lasso/xml/lib_assertion.h>
-#include <../lasso/xml/lib_authentication_statement.h>
-#include <../lasso/xml/saml_name_identifier.h>
-#include <../lasso/xml/samlp_response.h>
-#include <../lasso/xml/saml-2.0/saml2_attribute.h>
-#include <../lasso/id-ff/provider.h>
+#include "../lasso/lasso.h"
+#include "tests.h"
+#include "../lasso/xml/lib_assertion.h"
+#include "../lasso/xml/lib_authentication_statement.h"
+#include "../lasso/xml/saml_name_identifier.h"
+#include "../lasso/xml/samlp_response.h"
+#include "../lasso/xml/saml-2.0/saml2_attribute.h"
+#include "../lasso/id-ff/provider.h"
 #include "../lasso/utils.h"
 #include <libxml/tree.h>
 #include <libxml/parser.h>
diff --git a/tests/perfs.c b/tests/perfs.c
index 80fc7dec..0f932c0d 100644
--- a/tests/perfs.c
+++ b/tests/perfs.c
@@ -25,9 +25,9 @@
 #include <time.h>
 #include <getopt.h>
 
-#include <../lasso/lasso.h>
-#include <../lasso/xml/saml-2.0/samlp2_response.h>
-#include <../lasso/xml/saml-2.0/samlp2_authn_request.h>
+#include "../lasso/lasso.h"
+#include "../lasso/xml/saml-2.0/samlp2_response.h"
+#include "../lasso/xml/saml-2.0/samlp2_authn_request.h"
 
 #define IDP_METADATA TESTSDATADIR "/idp%s/metadata.xml"
 #define IDP_PKEY TESTSDATADIR "/idp%s/private-key.pem"
diff --git a/tests/random_tests.c b/tests/random_tests.c
index cb2d4171..b70c6082 100644
--- a/tests/random_tests.c
+++ b/tests/random_tests.c
@@ -26,12 +26,12 @@
 
 #include <check.h>
 
-#include <../lasso/lasso.h>
+#include "../lasso/lasso.h"
 
-#include <../lasso/xml/lib_assertion.h>
-#include <../lasso/xml/lib_authentication_statement.h>
-#include <../lasso/xml/saml_name_identifier.h>
-#include <../lasso/xml/samlp_response.h>
+#include "../lasso/xml/lib_assertion.h"
+#include "../lasso/xml/lib_authentication_statement.h"
+#include "../lasso/xml/saml_name_identifier.h"
+#include "../lasso/xml/samlp_response.h"
 #include "../lasso/utils.h"