diff --git a/atom_pubsub/ebin/.keepme b/atom_pubsub/ebin/.keepme
new file mode 100644
index 0000000..e69de29
diff --git a/atom_pubsub/src/atom_microblog.erl b/atom_pubsub/src/atom_microblog.erl
index c00cb58..7819c26 100644
--- a/atom_pubsub/src/atom_microblog.erl
+++ b/atom_pubsub/src/atom_microblog.erl
@@ -7,8 +7,9 @@
 -author('eric@ohmforce.com').
 -include("ejabberd.hrl").
 -include("jlib.hrl").
--include("mod_pubsub/pubsub.hrl").
--include("web/ejabberd_http.hrl").
+-include("pubsub.hrl").
+-include("ejabberd_http.hrl").
+-include("logger.hrl").
 -export([process/2]).
  
 process([Domain,User|_]=LocalPath,  #request{auth = Auth} = Request)->
diff --git a/atom_pubsub/src/atom_pubsub.erl b/atom_pubsub/src/atom_pubsub.erl
index a7d8bec..d518931 100644
--- a/atom_pubsub/src/atom_pubsub.erl
+++ b/atom_pubsub/src/atom_pubsub.erl
@@ -7,8 +7,9 @@
 -author('eric@ohmforce.com').
 -include("ejabberd.hrl").
 -include("jlib.hrl").
--include("mod_pubsub/pubsub.hrl").
--include("web/ejabberd_http.hrl").
+-include("pubsub.hrl").
+-include("ejabberd_http.hrl").
+-include("logger.hrl").
 -export([process/2]).
  
 process([Domain,User|_]=LocalPath,  #request{auth = Auth} = Request)->
diff --git a/ircd/src/ejabberd_ircd.erl b/ircd/src/ejabberd_ircd.erl
index 3f6e203..21482e5 100644
--- a/ircd/src/ejabberd_ircd.erl
+++ b/ircd/src/ejabberd_ircd.erl
@@ -24,6 +24,7 @@
 
 -include("ejabberd.hrl").
 -include("jlib.hrl").
+-include("logger.hrl").
 
 -define(DICT, dict).
 
diff --git a/mod_archive/src/mod_archive_odbc.erl b/mod_archive/src/mod_archive_odbc.erl
index d25ab19..c91784f 100644
--- a/mod_archive/src/mod_archive_odbc.erl
+++ b/mod_archive/src/mod_archive_odbc.erl
@@ -84,6 +84,7 @@
 
 -include("ejabberd.hrl").
 -include("jlib.hrl").
+-include("logger.hrl").
 
 -record(state, {host,
                 sessions,
diff --git a/mod_archive/src/mod_archive_webview.erl b/mod_archive/src/mod_archive_webview.erl
index d8a5fa2..3aa18c8 100644
--- a/mod_archive/src/mod_archive_webview.erl
+++ b/mod_archive/src/mod_archive_webview.erl
@@ -15,8 +15,9 @@
 
 -include("ejabberd.hrl").
 -include("jlib.hrl").
--include("web/ejabberd_http.hrl").
--include("web/ejabberd_web_admin.hrl"). %for all the defines
+-include("logger.hrl").
+-include("ejabberd_http.hrl").
+-include("ejabberd_web_admin.hrl"). %for all the defines
 
 -define(LINK(L) , "/archive/" ++ L).
 %-define(P(Els), ?XE("p", Els)).
diff --git a/mod_cron/src/mod_cron.erl b/mod_cron/src/mod_cron.erl
index 107200d..2b80909 100644
--- a/mod_cron/src/mod_cron.erl
+++ b/mod_cron/src/mod_cron.erl
@@ -20,8 +20,10 @@
 
 -include("ejabberd_commands.hrl").
 -include("ejabberd.hrl").
--include("web/ejabberd_http.hrl").
--include("web/ejabberd_web_admin.hrl").
+-include("ejabberd_http.hrl").
+-include("ejabberd_web_admin.hrl").
+-include("logger.hrl").
+-include("xml.hrl").
 
 -record(task, {taskid, timerref, host, task}).
 
diff --git a/mod_muc_log_http/src/mod_muc_log_http.erl b/mod_muc_log_http/src/mod_muc_log_http.erl
index f6b52ee..50f0b17 100644
--- a/mod_muc_log_http/src/mod_muc_log_http.erl
+++ b/mod_muc_log_http/src/mod_muc_log_http.erl
@@ -19,8 +19,9 @@
 
 -include("ejabberd.hrl").
 -include("jlib.hrl").
--include("web/ejabberd_http.hrl").
--include("mod_muc/mod_muc_room.hrl").
+-include("ejabberd_http.hrl").
+-include("mod_muc_room.hrl").
+-include("logger.hrl").
 -include_lib("kernel/include/file.hrl").
 
 -define(PROCNAME, mod_muc_log_http).
diff --git a/mod_profile/src/mod_profile.erl b/mod_profile/src/mod_profile.erl
index 600b15f..a0e9866 100644
--- a/mod_profile/src/mod_profile.erl
+++ b/mod_profile/src/mod_profile.erl
@@ -87,6 +87,7 @@
 
 -include("ejabberd.hrl").
 -include("jlib.hrl").
+-include("logger.hrl").
 
 -record(profile, {us, fields}).