diff --git a/winixd/Makefile b/winixd/Makefile
index b9f824b..4d20d8e 100644
--- a/winixd/Makefile
+++ b/winixd/Makefile
@@ -34,7 +34,7 @@ ifndef AR
 AR = ar
 endif
 
-winix_include_paths = -I$(global_relative_working_dir)/winix/winixd -I$(global_relative_working_dir)/ezc/src -I$(global_relative_working_dir)/tito/src -I$(global_relative_working_dir)/pikotools
+winix_include_paths = -I$(global_relative_working_dir)/winix/winixd -I$(global_relative_working_dir)/ezc/src -I$(global_relative_working_dir)/tito/src -I$(global_relative_working_dir)/morm/src -I$(global_relative_working_dir)/pikotools
 
 ifndef LDFLAGS
 LDFLAGS = -L/usr/local/lib
diff --git a/winixd/core/Makefile b/winixd/core/Makefile
index 43d5b0b..aff497a 100644
--- a/winixd/core/Makefile
+++ b/winixd/core/Makefile
@@ -3,7 +3,7 @@ include Makefile.o.dep
 current_path := $(shell pwd)
 global_relative_working_dir := $(shell relative_path $(current_path) $(GLOBAL_WORKING_DIR))
 
-winix_include_paths = -I$(global_relative_working_dir)/winix/winixd -I$(global_relative_working_dir)/ezc/src -I$(global_relative_working_dir)/tito/src -I$(global_relative_working_dir)/pikotools
+winix_include_paths = -I$(global_relative_working_dir)/winix/winixd -I$(global_relative_working_dir)/ezc/src -I$(global_relative_working_dir)/tito/src -I$(global_relative_working_dir)/morm/src -I$(global_relative_working_dir)/pikotools
 
 
 all: $(o)
diff --git a/winixd/core/plugin.h b/winixd/core/plugin.h
index c9b59fb..e97215c 100644
--- a/winixd/core/plugin.h
+++ b/winixd/core/plugin.h
@@ -77,7 +77,7 @@ class WinixRequest;
 
 
 class Plugin;
-class Session;
+struct Session;
 
 
 // move me to a different file
diff --git a/winixd/db/Makefile b/winixd/db/Makefile
index 43d5b0b..aff497a 100644
--- a/winixd/db/Makefile
+++ b/winixd/db/Makefile
@@ -3,7 +3,7 @@ include Makefile.o.dep
 current_path := $(shell pwd)
 global_relative_working_dir := $(shell relative_path $(current_path) $(GLOBAL_WORKING_DIR))
 
-winix_include_paths = -I$(global_relative_working_dir)/winix/winixd -I$(global_relative_working_dir)/ezc/src -I$(global_relative_working_dir)/tito/src -I$(global_relative_working_dir)/pikotools
+winix_include_paths = -I$(global_relative_working_dir)/winix/winixd -I$(global_relative_working_dir)/ezc/src -I$(global_relative_working_dir)/tito/src -I$(global_relative_working_dir)/morm/src -I$(global_relative_working_dir)/pikotools
 
 
 all: $(o)
diff --git a/winixd/functions/Makefile b/winixd/functions/Makefile
index 43d5b0b..aff497a 100644
--- a/winixd/functions/Makefile
+++ b/winixd/functions/Makefile
@@ -3,7 +3,7 @@ include Makefile.o.dep
 current_path := $(shell pwd)
 global_relative_working_dir := $(shell relative_path $(current_path) $(GLOBAL_WORKING_DIR))
 
-winix_include_paths = -I$(global_relative_working_dir)/winix/winixd -I$(global_relative_working_dir)/ezc/src -I$(global_relative_working_dir)/tito/src -I$(global_relative_working_dir)/pikotools
+winix_include_paths = -I$(global_relative_working_dir)/winix/winixd -I$(global_relative_working_dir)/ezc/src -I$(global_relative_working_dir)/tito/src -I$(global_relative_working_dir)/morm/src -I$(global_relative_working_dir)/pikotools
 
 
 all: $(o)
diff --git a/winixd/main/Makefile b/winixd/main/Makefile
index 43d5b0b..aff497a 100644
--- a/winixd/main/Makefile
+++ b/winixd/main/Makefile
@@ -3,7 +3,7 @@ include Makefile.o.dep
 current_path := $(shell pwd)
 global_relative_working_dir := $(shell relative_path $(current_path) $(GLOBAL_WORKING_DIR))
 
-winix_include_paths = -I$(global_relative_working_dir)/winix/winixd -I$(global_relative_working_dir)/ezc/src -I$(global_relative_working_dir)/tito/src -I$(global_relative_working_dir)/pikotools
+winix_include_paths = -I$(global_relative_working_dir)/winix/winixd -I$(global_relative_working_dir)/ezc/src -I$(global_relative_working_dir)/tito/src -I$(global_relative_working_dir)/morm/src -I$(global_relative_working_dir)/pikotools
 
 
 all: $(o)
diff --git a/winixd/notify/Makefile b/winixd/notify/Makefile
index 43d5b0b..aff497a 100644
--- a/winixd/notify/Makefile
+++ b/winixd/notify/Makefile
@@ -3,7 +3,7 @@ include Makefile.o.dep
 current_path := $(shell pwd)
 global_relative_working_dir := $(shell relative_path $(current_path) $(GLOBAL_WORKING_DIR))
 
-winix_include_paths = -I$(global_relative_working_dir)/winix/winixd -I$(global_relative_working_dir)/ezc/src -I$(global_relative_working_dir)/tito/src -I$(global_relative_working_dir)/pikotools
+winix_include_paths = -I$(global_relative_working_dir)/winix/winixd -I$(global_relative_working_dir)/ezc/src -I$(global_relative_working_dir)/tito/src -I$(global_relative_working_dir)/morm/src -I$(global_relative_working_dir)/pikotools
 
 
 all: $(o)
diff --git a/winixd/plugins/export/Makefile b/winixd/plugins/export/Makefile
index 7bb37b2..094299d 100644
--- a/winixd/plugins/export/Makefile
+++ b/winixd/plugins/export/Makefile
@@ -3,7 +3,7 @@ include Makefile.o.dep
 current_path := $(shell pwd)
 global_relative_working_dir := $(shell relative_path $(current_path) $(GLOBAL_WORKING_DIR))
 
-winix_include_paths = -I$(global_relative_working_dir)/winix/winixd -I$(global_relative_working_dir)/ezc/src -I$(global_relative_working_dir)/tito/src -I$(global_relative_working_dir)/pikotools
+winix_include_paths = -I$(global_relative_working_dir)/winix/winixd -I$(global_relative_working_dir)/ezc/src -I$(global_relative_working_dir)/tito/src -I$(global_relative_working_dir)/morm/src -I$(global_relative_working_dir)/pikotools
 
 name = export.so
 
diff --git a/winixd/plugins/gallery/Makefile b/winixd/plugins/gallery/Makefile
index 2b874b4..0fc20f5 100644
--- a/winixd/plugins/gallery/Makefile
+++ b/winixd/plugins/gallery/Makefile
@@ -3,7 +3,7 @@ include Makefile.o.dep
 current_path := $(shell pwd)
 global_relative_working_dir := $(shell relative_path $(current_path) $(GLOBAL_WORKING_DIR))
 
-winix_include_paths = -I$(global_relative_working_dir)/winix/winixd -I$(global_relative_working_dir)/ezc/src -I$(global_relative_working_dir)/tito/src -I$(global_relative_working_dir)/pikotools
+winix_include_paths = -I$(global_relative_working_dir)/winix/winixd -I$(global_relative_working_dir)/ezc/src -I$(global_relative_working_dir)/tito/src -I$(global_relative_working_dir)/morm/src -I$(global_relative_working_dir)/pikotools
 
 name = gallery.so
 
diff --git a/winixd/plugins/group/Makefile b/winixd/plugins/group/Makefile
index 7979e4d..3cfeffb 100644
--- a/winixd/plugins/group/Makefile
+++ b/winixd/plugins/group/Makefile
@@ -3,7 +3,7 @@ include Makefile.o.dep
 current_path := $(shell pwd)
 global_relative_working_dir := $(shell relative_path $(current_path) $(GLOBAL_WORKING_DIR))
 
-winix_include_paths = -I$(global_relative_working_dir)/winix/winixd -I$(global_relative_working_dir)/ezc/src -I$(global_relative_working_dir)/tito/src -I$(global_relative_working_dir)/pikotools
+winix_include_paths = -I$(global_relative_working_dir)/winix/winixd -I$(global_relative_working_dir)/ezc/src -I$(global_relative_working_dir)/tito/src -I$(global_relative_working_dir)/morm/src -I$(global_relative_working_dir)/pikotools
 
 name = group.so
 
diff --git a/winixd/plugins/mailregister/Makefile b/winixd/plugins/mailregister/Makefile
index 95ba5ea..53301a1 100644
--- a/winixd/plugins/mailregister/Makefile
+++ b/winixd/plugins/mailregister/Makefile
@@ -3,7 +3,7 @@ include Makefile.o.dep
 current_path := $(shell pwd)
 global_relative_working_dir := $(shell relative_path $(current_path) $(GLOBAL_WORKING_DIR))
 
-winix_include_paths = -I$(global_relative_working_dir)/winix/winixd -I$(global_relative_working_dir)/ezc/src -I$(global_relative_working_dir)/tito/src -I$(global_relative_working_dir)/pikotools
+winix_include_paths = -I$(global_relative_working_dir)/winix/winixd -I$(global_relative_working_dir)/ezc/src -I$(global_relative_working_dir)/tito/src -I$(global_relative_working_dir)/morm/src -I$(global_relative_working_dir)/pikotools
 
 name = mailregister.so
 
diff --git a/winixd/plugins/menu/Makefile b/winixd/plugins/menu/Makefile
index d494a5e..77b54e5 100644
--- a/winixd/plugins/menu/Makefile
+++ b/winixd/plugins/menu/Makefile
@@ -3,7 +3,7 @@ include Makefile.o.dep
 current_path := $(shell pwd)
 global_relative_working_dir := $(shell relative_path $(current_path) $(GLOBAL_WORKING_DIR))
 
-winix_include_paths = -I$(global_relative_working_dir)/winix/winixd -I$(global_relative_working_dir)/ezc/src -I$(global_relative_working_dir)/tito/src -I$(global_relative_working_dir)/pikotools
+winix_include_paths = -I$(global_relative_working_dir)/winix/winixd -I$(global_relative_working_dir)/ezc/src -I$(global_relative_working_dir)/tito/src -I$(global_relative_working_dir)/morm/src -I$(global_relative_working_dir)/pikotools
 
 name = menu.so
 
diff --git a/winixd/plugins/stats/Makefile b/winixd/plugins/stats/Makefile
index c42bccb..1ec39e9 100644
--- a/winixd/plugins/stats/Makefile
+++ b/winixd/plugins/stats/Makefile
@@ -3,7 +3,7 @@ include Makefile.o.dep
 current_path := $(shell pwd)
 global_relative_working_dir := $(shell relative_path $(current_path) $(GLOBAL_WORKING_DIR))
 
-winix_include_paths = -I$(global_relative_working_dir)/winix/winixd -I$(global_relative_working_dir)/ezc/src -I$(global_relative_working_dir)/tito/src -I$(global_relative_working_dir)/pikotools
+winix_include_paths = -I$(global_relative_working_dir)/winix/winixd -I$(global_relative_working_dir)/ezc/src -I$(global_relative_working_dir)/tito/src -I$(global_relative_working_dir)/morm/src -I$(global_relative_working_dir)/pikotools
 
 name = stats.so
 
diff --git a/winixd/plugins/thread/Makefile b/winixd/plugins/thread/Makefile
index 5654e05..e2b670e 100644
--- a/winixd/plugins/thread/Makefile
+++ b/winixd/plugins/thread/Makefile
@@ -3,7 +3,7 @@ include Makefile.o.dep
 current_path := $(shell pwd)
 global_relative_working_dir := $(shell relative_path $(current_path) $(GLOBAL_WORKING_DIR))
 
-winix_include_paths = -I$(global_relative_working_dir)/winix/winixd -I$(global_relative_working_dir)/ezc/src -I$(global_relative_working_dir)/tito/src -I$(global_relative_working_dir)/pikotools
+winix_include_paths = -I$(global_relative_working_dir)/winix/winixd -I$(global_relative_working_dir)/ezc/src -I$(global_relative_working_dir)/tito/src -I$(global_relative_working_dir)/morm/src -I$(global_relative_working_dir)/pikotools
 
 name = thread.so
 
diff --git a/winixd/plugins/ticket/Makefile b/winixd/plugins/ticket/Makefile
index 46cf68c..8a7edc1 100644
--- a/winixd/plugins/ticket/Makefile
+++ b/winixd/plugins/ticket/Makefile
@@ -3,7 +3,7 @@ include Makefile.o.dep
 current_path := $(shell pwd)
 global_relative_working_dir := $(shell relative_path $(current_path) $(GLOBAL_WORKING_DIR))
 
-winix_include_paths = -I$(global_relative_working_dir)/winix/winixd -I$(global_relative_working_dir)/ezc/src -I$(global_relative_working_dir)/tito/src -I$(global_relative_working_dir)/pikotools
+winix_include_paths = -I$(global_relative_working_dir)/winix/winixd -I$(global_relative_working_dir)/ezc/src -I$(global_relative_working_dir)/tito/src -I$(global_relative_working_dir)/morm/src -I$(global_relative_working_dir)/pikotools
 
 name = ticket.so
 
diff --git a/winixd/templates/Makefile b/winixd/templates/Makefile
index 43d5b0b..aff497a 100644
--- a/winixd/templates/Makefile
+++ b/winixd/templates/Makefile
@@ -3,7 +3,7 @@ include Makefile.o.dep
 current_path := $(shell pwd)
 global_relative_working_dir := $(shell relative_path $(current_path) $(GLOBAL_WORKING_DIR))
 
-winix_include_paths = -I$(global_relative_working_dir)/winix/winixd -I$(global_relative_working_dir)/ezc/src -I$(global_relative_working_dir)/tito/src -I$(global_relative_working_dir)/pikotools
+winix_include_paths = -I$(global_relative_working_dir)/winix/winixd -I$(global_relative_working_dir)/ezc/src -I$(global_relative_working_dir)/tito/src -I$(global_relative_working_dir)/morm/src -I$(global_relative_working_dir)/pikotools
 
 
 all: $(o)