diff --git a/src/auth.c b/src/auth.c
index a272a3e9..09be95fa 100644
--- a/src/auth.c
+++ b/src/auth.c
@@ -471,7 +471,7 @@ static void auth_add_client(auth_t *auth, client_t *client, void (*on_no_match)(
      * CORS actually knows about non-CORS requests and assigned the "null"
      * location to them.
      */
-    origin = httpp_getvar(client->parser, "origin");
+    origin = igloo_httpp_getvar(client->parser, "origin");
     if (!origin)
         origin = "null";
 
diff --git a/src/client.c b/src/client.c
index 64d7500d..7a754e06 100644
--- a/src/client.c
+++ b/src/client.c
@@ -171,9 +171,7 @@ static inline void client_reuseconnection(client_t *client) {
     reuse = client->reuse;
 
     if (reuse == ICECAST_REUSE_UPGRADETLS) {
-        http_parser_t *parser = client->parser;
-
-        httpp_deletevar(parser, "upgrade");
+        igloo_httpp_deletevar(client->parser, "upgrade");
         client->reuse = ICECAST_REUSE_CLOSE;
 
         /* release the buffer now, as the buffer could be on the source queue
diff --git a/src/util.c b/src/util.c
index 791bff85..e224c454 100644
--- a/src/util.c
+++ b/src/util.c
@@ -625,7 +625,7 @@ static inline void   _build_headers_loop(char **ret, size_t *len, const ice_conf
             break;
             case HTTP_HEADER_TYPE_CORS:
                 if (name && client && client->parser) {
-                    const char *origin = httpp_getvar(client->parser, "origin");
+                    const char *origin = igloo_httpp_getvar(client->parser, "origin");
                     if (origin) {
                         value = header->value;
                         if (!value) {