diff --git a/server/modules/filter/luafilter/luafilter.c b/server/modules/filter/luafilter/luafilter.c
index 67a8fed86..cf38af3f9 100644
--- a/server/modules/filter/luafilter/luafilter.c
+++ b/server/modules/filter/luafilter/luafilter.c
@@ -56,7 +56,7 @@
  * The filter entry points
  */
 static MXS_FILTER *createInstance(const char *name, char **options, CONFIG_PARAMETER *);
-static MXS_FILTER_SESSION *newSession(MXS_FILTER *instance, SESSION *session);
+static MXS_FILTER_SESSION *newSession(MXS_FILTER *instance, MXS_SESSION *session);
 static void closeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
 static void freeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
 static void setDownstream(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession,  MXS_DOWNSTREAM *downstream);
@@ -182,7 +182,7 @@ typedef struct
  */
 typedef struct
 {
-    SESSION* session;
+    MXS_SESSION* session;
     lua_State* lua_state;
     GWBUF* current_query;
     SPINLOCK lock;
@@ -279,7 +279,7 @@ createInstance(const char *name, char **options, CONFIG_PARAMETER *params)
  * @param session The session itself
  * @return Session specific data for this session
  */
-static MXS_FILTER_SESSION *newSession(MXS_FILTER *instance, SESSION *session)
+static MXS_FILTER_SESSION *newSession(MXS_FILTER *instance, MXS_SESSION *session)
 {
     LUA_SESSION *my_session;
     LUA_INSTANCE *my_instance = (LUA_INSTANCE*) instance;
diff --git a/server/modules/filter/mqfilter/mqfilter.c b/server/modules/filter/mqfilter/mqfilter.c
index 8b2e86782..724cc563f 100644
--- a/server/modules/filter/mqfilter/mqfilter.c
+++ b/server/modules/filter/mqfilter/mqfilter.c
@@ -87,7 +87,7 @@ static int hktask_id = 0;
  * The filter entry points
  */
 static MXS_FILTER *createInstance(const char *name, char **options, CONFIG_PARAMETER *);
-static MXS_FILTER_SESSION *newSession(MXS_FILTER *instance, SESSION *session);
+static MXS_FILTER_SESSION *newSession(MXS_FILTER *instance, MXS_SESSION *session);
 static void closeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
 static void freeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
 static void setDownstream(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, MXS_DOWNSTREAM *downstream);
@@ -234,7 +234,7 @@ typedef struct
     char* db; /**The currently active database*/
     MXS_DOWNSTREAM down;
     MXS_UPSTREAM up;
-    SESSION* session;
+    MXS_SESSION* session;
     bool was_query; /**True if the previous routeQuery call had valid content*/
 } MQ_SESSION;
 
@@ -803,7 +803,7 @@ void pushMessage(MQ_INSTANCE *instance, amqp_basic_properties_t* prop, char* msg
  * @return Session specific data for this session
  */
 static MXS_FILTER_SESSION *
-newSession(MXS_FILTER *instance, SESSION *session)
+newSession(MXS_FILTER *instance, MXS_SESSION *session)
 {
     MYSQL_session *sessauth = session->client_dcb->data;
     char *db = sessauth->db;
diff --git a/server/modules/routing/avrorouter/avro.c b/server/modules/routing/avrorouter/avro.c
index 5b8d2e802..ae3c984eb 100644
--- a/server/modules/routing/avrorouter/avro.c
+++ b/server/modules/routing/avrorouter/avro.c
@@ -72,7 +72,7 @@ static const char* alter_table_regex =
 
 /* The router entry points */
 static ROUTER *createInstance(SERVICE *service, char **options);
-static void *newSession(ROUTER *instance, SESSION *session);
+static void *newSession(ROUTER *instance, MXS_SESSION *session);
 static void closeSession(ROUTER *instance, void *router_session);
 static void freeSession(ROUTER *instance, void *router_session);
 static int routeQuery(ROUTER *instance, void *router_session, GWBUF *queue);
@@ -620,7 +620,7 @@ createInstance(SERVICE *service, char **options)
  * @return Session specific data for this session
  */
 static void *
-newSession(ROUTER *instance, SESSION *session)
+newSession(ROUTER *instance, MXS_SESSION *session)
 {
     AVRO_INSTANCE *inst = (AVRO_INSTANCE *) instance;
     AVRO_CLIENT *client;