diff --git a/main/admin/calendar.php b/main/admin/calendar.php
index feeb061cad..0880e523b4 100644
--- a/main/admin/calendar.php
+++ b/main/admin/calendar.php
@@ -153,12 +153,6 @@ else
 	echo "<link rel=\"stylesheet\" type=\"text/css\" href=\"".$clarolineRepositoryWeb."css/default.css\"/>";
 }*/
 
-/* ==============================================================================
-  			TRACKING
-==============================================================================  */
-require_once('../inc/lib/events.lib.inc.php');
-//event_access_tool(TOOL_CALENDAR_EVENT);
-
 /* ==============================================================================
   			SETTING SOME VARIABLES
 ============================================================================== */
diff --git a/main/announcements/announcements.php b/main/announcements/announcements.php
index a15295b33b..14d2c4d20f 100644
--- a/main/announcements/announcements.php
+++ b/main/announcements/announcements.php
@@ -1,4 +1,4 @@
-<?php //$Id: announcements.php 21933 2009-07-09 06:08:22Z ivantcholakov $
+<?php //$Id: announcements.php 22201 2009-07-17 19:57:03Z cfasanando $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -135,7 +135,6 @@ if (!empty($_POST['addresources'])) // When the "Add Resource" button is clicked
 	Tracking
 -----------------------------------------------------------
 */
-include(api_get_path(LIBRARY_PATH).'events.lib.inc.php');
 event_access_tool(TOOL_ANNOUNCEMENT);
 
 /*
diff --git a/main/auth/inscription.php b/main/auth/inscription.php
index 2799756ce7..3551fab637 100644
--- a/main/auth/inscription.php
+++ b/main/auth/inscription.php
@@ -1,5 +1,5 @@
 <?php
-// $Id: inscription.php 22027 2009-07-13 11:03:41Z ivantcholakov $
+// $Id: inscription.php 22201 2009-07-17 19:57:03Z cfasanando $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -412,8 +412,7 @@ if ($form->validate()) {
 		api_session_register('_user');
 		api_session_register('is_allowedCreateCourse');
 
-		//stats
-		include (api_get_path(LIBRARY_PATH)."events.lib.inc.php");
+		//stats		
 		event_login();
 		// last user login date is now
 		$user_last_login_datetime = 0; // used as a unix timestamp it will correspond to : 1 1 1970
diff --git a/main/auth/ldap/login.php b/main/auth/ldap/login.php
index 0238ba3c79..b315a323e3 100644
--- a/main/auth/ldap/login.php
+++ b/main/auth/ldap/login.php
@@ -1,4 +1,4 @@
-<?php // $Id: login.php 16001 2008-08-15 14:46:02Z yannoo $
+<?php // $Id: login.php 22201 2009-07-17 19:57:03Z cfasanando $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -60,10 +60,7 @@ if ($loginLdapSucces)
 	$uidReset = true;
 	$_user['user_id'] = $uData['user_id'];
 	api_session_register('_uid');
-    // Jand: copied from event_login in events.lib.php to enable login statistics:
-    if(!function_exists('event_login')){
-        include(api_get_path(LIBRARY_PATH)."events.lib.inc.php");
-    }
+    // Jand: copied from event_login in events.lib.php to enable login statistics:    
     event_login(); 
 }
 else
diff --git a/main/blog/download.php b/main/blog/download.php
index 7a2b4ac501..8234207e77 100644
--- a/main/blog/download.php
+++ b/main/blog/download.php
@@ -58,8 +58,6 @@ $doc_url = str_replace('///', '&', $doc_url);
 $doc_url = str_replace(' ', '+', $doc_url);
 $doc_url = str_replace('/..', '', $doc_url); //echo $doc_url;
 
-include(api_get_path(LIBRARY_PATH).'events.lib.inc.php');
-
 if (! isset($_course))
 {
 	api_not_allowed(true);	
diff --git a/main/calendar/agenda.php b/main/calendar/agenda.php
index a07b9fce54..665181cd96 100644
--- a/main/calendar/agenda.php
+++ b/main/calendar/agenda.php
@@ -1,4 +1,4 @@
-<?php //$Id: agenda.php 21933 2009-07-09 06:08:22Z ivantcholakov $
+<?php //$Id: agenda.php 22201 2009-07-17 19:57:03Z cfasanando $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -193,7 +193,6 @@ if (isset($_GET['toolgroup']) && $_GET['toolgroup']==strval(intval($_GET['toolgr
 /* ==============================================================================
   			TRACKING
 ==============================================================================  */
-require_once '../inc/lib/events.lib.inc.php';
 event_access_tool(TOOL_CALENDAR_EVENT);
 
 /* ==============================================================================
diff --git a/main/calendar/download.php b/main/calendar/download.php
index 724d46116d..90f6d02c63 100644
--- a/main/calendar/download.php
+++ b/main/calendar/download.php
@@ -58,8 +58,6 @@ $doc_url = str_replace('///', '&', $doc_url);
 $doc_url = str_replace(' ', '+', $doc_url);
 $doc_url = str_replace('/..', '', $doc_url); //echo $doc_url;
 
-require_once api_get_path(LIBRARY_PATH).'events.lib.inc.php';
-
 if (!isset($_course)) {
 	api_not_allowed(true);	
 }
diff --git a/main/chat/chat.php b/main/chat/chat.php
index b1672dd665..ebd54edd43 100644
--- a/main/chat/chat.php
+++ b/main/chat/chat.php
@@ -1,4 +1,4 @@
-<?php // $Id: chat.php 20950 2009-05-23 16:52:57Z ivantcholakov $
+<?php // $Id: chat.php 22201 2009-07-17 19:57:03Z cfasanando $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -46,7 +46,6 @@ else
 /* ============================================================================== 
   			TRACKING
 ==============================================================================  */
-require_once('../inc/lib/events.lib.inc.php');
 event_access_tool(TOOL_CHAT);
 
 
diff --git a/main/course_home/course_home.php b/main/course_home/course_home.php
index 87d338e795..d1411e0742 100644
--- a/main/course_home/course_home.php
+++ b/main/course_home/course_home.php
@@ -1,4 +1,4 @@
-<?php // $Id: course_home.php 22113 2009-07-15 16:07:21Z iflorespaz $
+<?php // $Id: course_home.php 22201 2009-07-17 19:57:03Z cfasanando $
 
 /*
 ==============================================================================
@@ -229,8 +229,7 @@ Display::display_header($course_title, "Home");
 -----------------------------------------------------------
 */
 if(!isset($coursesAlreadyVisited[$_cid]) )
-{
-	include(api_get_path(LIBRARY_PATH) . 'events.lib.inc.php');
+{	
 	event_access_course();
 	$coursesAlreadyVisited[$_cid] = 1;
 	api_session_register('coursesAlreadyVisited');
diff --git a/main/document/create_document.php b/main/document/create_document.php
index 5e2ac92c41..bf3afa1e7a 100644
--- a/main/document/create_document.php
+++ b/main/document/create_document.php
@@ -1,4 +1,4 @@
-<?php // $Id: create_document.php 22027 2009-07-13 11:03:41Z ivantcholakov $
+<?php // $Id: create_document.php 22201 2009-07-17 19:57:03Z cfasanando $
 
 /*
 ==============================================================================
@@ -189,7 +189,6 @@ function InnerDialogLoaded()
 require_once api_get_path(LIBRARY_PATH).'fileUpload.lib.php';
 require_once api_get_path(LIBRARY_PATH).'document.lib.php';
 require_once api_get_path(LIBRARY_PATH).'groupmanager.lib.php';
-require_once api_get_path(LIBRARY_PATH).'events.lib.inc.php';
 require_once api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php';
 $nameTools = get_lang('CreateDocument');
 
diff --git a/main/document/document.php b/main/document/document.php
index 10d264bd40..cd306c03e7 100644
--- a/main/document/document.php
+++ b/main/document/document.php
@@ -1,4 +1,4 @@
-<?php // $Id: document.php 21933 2009-07-09 06:08:22Z ivantcholakov $
+<?php // $Id: document.php 22201 2009-07-17 19:57:03Z cfasanando $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -199,7 +199,6 @@ else
 //libraries are included by default
 
 require_once api_get_path(LIBRARY_PATH) . 'fileDisplay.lib.php';
-require_once api_get_path(LIBRARY_PATH) . 'events.lib.inc.php';
 require_once api_get_path(LIBRARY_PATH) . 'document.lib.php';
 require_once api_get_path(LIBRARY_PATH) . 'tablesort.lib.php';
 require_once api_get_path(LIBRARY_PATH) . 'fileUpload.lib.php';
diff --git a/main/document/download.php b/main/document/download.php
index 6e547b25eb..103f922ff4 100644
--- a/main/document/download.php
+++ b/main/document/download.php
@@ -1,4 +1,4 @@
-<?php // $Id: download.php 21124 2009-05-31 00:15:21Z cfasanando $
+<?php // $Id: download.php 22201 2009-07-17 19:57:03Z cfasanando $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -81,9 +81,7 @@ if (substr($refer_script,0,15) == "/fillsurvey.php") {
 	$_course['path']=$_course['directory'];
 } else {
 	//protection
-	api_protect_course_script();
-
-	include(api_get_path(LIBRARY_PATH).'events.lib.inc.php');
+	api_protect_course_script();	
 
 	if (! isset($_course))
 	{
diff --git a/main/document/edit_document.php b/main/document/edit_document.php
index c2a1f43eda..3390493530 100644
--- a/main/document/edit_document.php
+++ b/main/document/edit_document.php
@@ -1,4 +1,4 @@
-<?php // $Id: edit_document.php 22027 2009-07-13 11:03:41Z ivantcholakov $
+<?php // $Id: edit_document.php 22201 2009-07-17 19:57:03Z cfasanando $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -112,7 +112,6 @@ $this_section=SECTION_COURSES;
 
 require_once api_get_path(LIBRARY_PATH).'fileManage.lib.php';
 require_once api_get_path(LIBRARY_PATH).'fileUpload.lib.php';
-require_once api_get_path(LIBRARY_PATH).'events.lib.inc.php';
 require_once api_get_path(LIBRARY_PATH).'document.lib.php';
 
 require_once api_get_path(LIBRARY_PATH) . 'groupmanager.lib.php';
diff --git a/main/document/upload.php b/main/document/upload.php
index 62d6232b05..748af03b08 100644
--- a/main/document/upload.php
+++ b/main/document/upload.php
@@ -1,4 +1,4 @@
-<?php // $Id: upload.php 21653 2009-06-27 20:12:55Z iflorespaz $
+<?php // $Id: upload.php 22201 2009-07-17 19:57:03Z cfasanando $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -63,7 +63,6 @@ require_once "../inc/global.inc.php";
 
 // including additional libraries
 require_once api_get_path(LIBRARY_PATH) . 'fileUpload.lib.php';
-require_once api_get_path(LIBRARY_PATH) . 'events.lib.inc.php';
 require_once api_get_path(LIBRARY_PATH) . 'document.lib.php';
 require_once api_get_path(LIBRARY_PATH) . 'specific_fields_manager.lib.php';
 require_once api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php';
diff --git a/main/dropbox/dropbox_init.inc.php b/main/dropbox/dropbox_init.inc.php
index 12476859f6..f1d1904128 100644
--- a/main/dropbox/dropbox_init.inc.php
+++ b/main/dropbox/dropbox_init.inc.php
@@ -75,9 +75,6 @@ require_once(api_get_path(LIBRARY_PATH).'/tablesort.lib.php');
 // including the library for the dropbox
 require_once( "dropbox_class.inc.php");
 
-// including the library to do the tracking
-require_once(api_get_path(LIBRARY_PATH).'/events.lib.inc.php');
-
 // including some libraries that are also used in the documents tool
 require_once('../document/document.inc.php');  // we use a function build_document_icon_tag
 require_once(api_get_path(LIBRARY_PATH).'/fileDisplay.lib.php'); // the function choose_image is used 
diff --git a/main/exercice/Hpdownload.php b/main/exercice/Hpdownload.php
index cd04cca715..d7a622401d 100644
--- a/main/exercice/Hpdownload.php
+++ b/main/exercice/Hpdownload.php
@@ -22,7 +22,7 @@
 *	This script shows the list of exercises for administrators and students.
 *	@package dokeos.exercise
 * 	@author Istvan Mandak
-* 	@version $Id: Hpdownload.php 21122 2009-05-31 00:10:22Z cfasanando $
+* 	@version $Id: Hpdownload.php 22201 2009-07-17 19:57:03Z cfasanando $
 */
 
 
@@ -31,8 +31,6 @@ session_cache_limiter('public');
 include('../inc/global.inc.php');
 $this_section=SECTION_COURSES;
 
-include(api_get_path(LIBRARY_PATH)."events.lib.inc.php");
-
 $tbl_document = Database::get_course_table(TABLE_DOCUMENT);
 
 $doc_url=str_replace(array('../','\\..','\\0','..\\'),array('','','',''),urldecode($_GET['doc_url']));
diff --git a/main/exercice/exercice.php b/main/exercice/exercice.php
index 5a331d2f58..749c72e83e 100644
--- a/main/exercice/exercice.php
+++ b/main/exercice/exercice.php
@@ -1,5 +1,5 @@
 <?php
-// $Id: exercice.php 21933 2009-07-09 06:08:22Z ivantcholakov $
+// $Id: exercice.php 22201 2009-07-17 19:57:03Z cfasanando $
 
 /*
 ==============================================================================
@@ -58,7 +58,6 @@ require_once 'hotpotatoes.lib.php';
 require_once api_get_path(LIBRARY_PATH) . 'document.lib.php';
 require_once api_get_path(LIBRARY_PATH) . 'mail.lib.inc.php';
 require_once api_get_path(LIBRARY_PATH) . 'usermanager.lib.php';
-require_once api_get_path(LIBRARY_PATH) . 'events.lib.inc.php';
 
 /*
 -----------------------------------------------------------
@@ -525,9 +524,6 @@ if ($origin != 'learnpath') {
 	echo '<link rel="stylesheet" type="text/css" href="' . api_get_path(WEB_CODE_PATH) . 'css/default.css"/>';
 }
 
-// used for stats
-include_once (api_get_path(LIBRARY_PATH) . 'events.lib.inc.php');
-
 event_access_tool(TOOL_QUIZ);
 
 // Tool introduction
diff --git a/main/exercice/exercice_history.php b/main/exercice/exercice_history.php
index ca82e81b8c..859e608066 100755
--- a/main/exercice/exercice_history.php
+++ b/main/exercice/exercice_history.php
@@ -88,8 +88,6 @@ Display::display_header($nameTools,"Exercise");
 		}
 	}
 
-//include_once(api_get_path(LIBRARY_PATH).'events.lib.inc.php');
-
 //event_access_tool(TOOL_QUIZ);
 
 ?>
diff --git a/main/exercice/exercice_submit.php b/main/exercice/exercice_submit.php
index 320303ea67..de7ffdf795 100644
--- a/main/exercice/exercice_submit.php
+++ b/main/exercice/exercice_submit.php
@@ -1,5 +1,5 @@
 <?php
-// $Id: exercice_submit.php 21656 2009-06-28 01:01:54Z iflorespaz $
+// $Id: exercice_submit.php 22201 2009-07-17 19:57:03Z cfasanando $
 
 /*
 ==============================================================================
@@ -43,7 +43,7 @@
 *	@package dokeos.exercise
 * 	@author Olivier Brouckaert
 * 	@author Julio Montoya multiple fill in blank option added
-* 	@version $Id: exercice_submit.php 21656 2009-06-28 01:01:54Z iflorespaz $
+* 	@version $Id: exercice_submit.php 22201 2009-07-17 19:57:03Z cfasanando $
 */
 
 require_once 'exercise.class.php';
@@ -276,8 +276,7 @@ if ($formSent) {
 					//
 					define('ENABLED_LIVE_EXERCISE_TRACKING', 1);
 					require_once 'question.class.php';
-					require_once 'answer.class.php';
-					require_once api_get_path(LIBRARY_PATH) . 'events.lib.inc.php';
+					require_once 'answer.class.php';					
 					$counter = 0;
 					$main_course_user_table = Database :: get_main_table(TABLE_MAIN_COURSE_USER);
 					$table_ans = Database :: get_course_table(TABLE_QUIZ_ANSWER);
diff --git a/main/exercice/exercise_result.php b/main/exercice/exercise_result.php
index 1646bb7289..d9b8297cfa 100644
--- a/main/exercice/exercise_result.php
+++ b/main/exercice/exercise_result.php
@@ -29,7 +29,7 @@
 *	@author Olivier Brouckaert, main author
 *	@author Roan Embrechts, some refactoring
 * 	@author Julio Montoya Armas switchable fill in blank option added
-* 	@version $Id: exercise_result.php 21160 2009-06-01 15:44:49Z aportugal $
+* 	@version $Id: exercise_result.php 22201 2009-07-17 19:57:03Z cfasanando $
 *
 *	@todo	split more code up in functions, move functions to library?
 */
@@ -60,7 +60,6 @@ $this_section=SECTION_COURSES;
 // notice for unauthorized people.
 api_protect_course_script(true);
 
-require_once(api_get_path(LIBRARY_PATH).'events.lib.inc.php');
 require_once(api_get_path(LIBRARY_PATH).'mail.lib.inc.php');
 require_once(api_get_path(LIBRARY_PATH).'course.lib.php');
 
diff --git a/main/forum/download.php b/main/forum/download.php
index cdf5d74a49..6548df3852 100644
--- a/main/forum/download.php
+++ b/main/forum/download.php
@@ -59,8 +59,6 @@ $doc_url = str_replace('///', '&', $doc_url);
 $doc_url = str_replace(' ', '+', $doc_url);
 $doc_url = str_replace('/..', '', $doc_url); //echo $doc_url;
 
-include(api_get_path(LIBRARY_PATH).'events.lib.inc.php');
-
 if (! isset($_course))
 {
 	api_not_allowed(true);	
diff --git a/main/forum/forumsearch.php b/main/forum/forumsearch.php
index b995d18ddc..0ca2718e80 100644
--- a/main/forum/forumsearch.php
+++ b/main/forum/forumsearch.php
@@ -63,7 +63,6 @@ api_protect_course_script(true);
 // including additional library scripts
 require_once (api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php');
 include_once (api_get_path(LIBRARY_PATH).'groupmanager.lib.php');
-include(api_get_path(LIBRARY_PATH).'events.lib.inc.php');
 include('forumfunction.inc.php');
 include('forumconfig.inc.php');
 
diff --git a/main/forum/index.php b/main/forum/index.php
index 1e3838c82e..cf6101ba80 100644
--- a/main/forum/index.php
+++ b/main/forum/index.php
@@ -161,11 +161,8 @@ if (isset($_GET['action']) && $_GET['action'] == 'notify' AND isset($_GET['conte
 	-----------------------------------------------------------
 	  			TRACKING
 	-----------------------------------------------------------
-	*/
-	
-	include(api_get_path(LIBRARY_PATH).'events.lib.inc.php');
-	event_access_tool(TOOL_FORUM);
-	
+	*/		
+	event_access_tool(TOOL_FORUM);	
 	
 	/*
 	------------------------------------------------------------------------------------------------------
diff --git a/main/glossary/index.php b/main/glossary/index.php
index 7f29feedc2..9a09d47b68 100755
--- a/main/glossary/index.php
+++ b/main/glossary/index.php
@@ -11,7 +11,6 @@ $language_file = array('glossary');
 
 // including the global dokeos file
 require_once('../inc/global.inc.php');
-require_once('../inc/lib/events.lib.inc.php');
 
 // the section (tabs)
 $this_section=SECTION_COURSES;
diff --git a/main/group/group.php b/main/group/group.php
index 5c7f4bb87e..781bce03ce 100644
--- a/main/group/group.php
+++ b/main/group/group.php
@@ -1,4 +1,4 @@
-<?php // $Id: group.php 21933 2009-07-09 06:08:22Z ivantcholakov $
+<?php // $Id: group.php 22201 2009-07-17 19:57:03Z cfasanando $
  
 /*
 ==============================================================================
@@ -70,7 +70,6 @@ $nameTools = get_lang('GroupManagement');
 */
 require_once (api_get_path(LIBRARY_PATH).'course.lib.php');
 require_once (api_get_path(LIBRARY_PATH).'groupmanager.lib.php');
-require_once (api_get_path(LIBRARY_PATH).'events.lib.inc.php');
 
 //Create default category if it doesn't exist when group categories aren't allowed
 if( api_get_setting('allow_group_categories') == 'false')
diff --git a/main/group/group_overview.php b/main/group/group_overview.php
index 1a057e881e..c36b47f551 100644
--- a/main/group/group_overview.php
+++ b/main/group/group_overview.php
@@ -1,4 +1,4 @@
-<?php // $Id: group_overview.php 20095 2009-04-24 22:24:33Z juliomontoya $
+<?php // $Id: group_overview.php 22201 2009-07-17 19:57:03Z cfasanando $
  
 /*
 ==============================================================================
@@ -58,7 +58,6 @@ $nameTools = get_lang("GroupOverview");
 include_once (api_get_path(LIBRARY_PATH).'course.lib.php'); //necessary
 include_once (api_get_path(LIBRARY_PATH).'groupmanager.lib.php');
 include_once (api_get_path(LIBRARY_PATH).'export.lib.inc.php');
-include_once (api_get_path(LIBRARY_PATH).'events.lib.inc.php'); //necessary for statistics
 
 if( isset($_GET['action']))
 {
diff --git a/main/inc/course_document.inc.php b/main/inc/course_document.inc.php
index ac73d1df4a..ee5da9b850 100644
--- a/main/inc/course_document.inc.php
+++ b/main/inc/course_document.inc.php
@@ -142,7 +142,6 @@ $req_gid = '';
 //libraries are included by default
 
 include_once(api_get_path(LIBRARY_PATH) . 'fileDisplay.lib.php');
-include_once(api_get_path(LIBRARY_PATH) . 'events.lib.inc.php');
 include_once(api_get_path(LIBRARY_PATH) . 'document.lib.php');
 include_once(api_get_path(LIBRARY_PATH) . 'tablesort.lib.php');
 
diff --git a/main/inc/global.inc.php b/main/inc/global.inc.php
index a30c996134..b22e11578e 100644
--- a/main/inc/global.inc.php
+++ b/main/inc/global.inc.php
@@ -218,6 +218,7 @@ require_once($lib_path.'database.lib.php');
 require_once($lib_path.'display.lib.php');
 require_once($lib_path.'text.lib.php');
 require_once($lib_path.'security.lib.php');
+require_once($lib_path.'events.lib.inc.php');
 
 // @todo: this shouldn't be done here. It should be stored correctly during installation
 if(empty($_configuration['statistics_database']) && $already_installed)
diff --git a/main/inc/local.inc.php b/main/inc/local.inc.php
index bf2a6441ee..4dd82c2315 100644
--- a/main/inc/local.inc.php
+++ b/main/inc/local.inc.php
@@ -247,10 +247,9 @@ if (!empty($_SESSION['_user']['user_id']) && ! ($login || $logout)) {
                 					if (in_array($current_access_url_id, $my_url_list)) {                						
                 						$_user['user_id'] = $uData['user_id'];
 										api_session_register('_user');
-										if (!function_exists('event_login')){
-											include(api_get_path(LIBRARY_PATH)."events.lib.inc.php");
-											event_login();
-										}                						
+										
+										event_login();
+										                						
                 					} else {
 	                					$loginFailed = true;
 										api_session_unregister('_uid');
@@ -266,10 +265,9 @@ if (!empty($_SESSION['_user']['user_id']) && ! ($login || $logout)) {
                 			} else {           				
                 				$_user['user_id'] = $uData['user_id'];
 								api_session_register('_user');
-								if (!function_exists('event_login')){
-									include(api_get_path(LIBRARY_PATH)."events.lib.inc.php");
+								
 									event_login();
-								}							
+								
                 			}
                 		} else {
 							$loginFailed = true;
@@ -435,10 +433,9 @@ if (!empty($_SESSION['_user']['user_id']) && ! ($login || $logout)) {
                                                   // the user has permission to enter at this site
                                                   $_user['user_id'] = $uData['user_id'];
                                                   api_session_register('_user');
-                                                  if (!function_exists('event_login')){
-                                                      include(api_get_path(LIBRARY_PATH)."events.lib.inc.php");
+                                                    
                                                       event_login();
-                                                  }
+
                                                   // Redirect to homepage
                                                   $sso_target = isset($sso['target']) ? $sso['target'] : api_get_path(WEB_PATH) .'.index.php';
                                                   header('Location: '. $sso_target);
@@ -460,10 +457,9 @@ if (!empty($_SESSION['_user']['user_id']) && ! ($login || $logout)) {
                                             //single URL access
                                             $_user['user_id'] = $uData['user_id'];
                                             api_session_register('_user');
-                                            if (!function_exists('event_login')){
-                                                include(api_get_path(LIBRARY_PATH)."events.lib.inc.php");
+                                           
                                                 event_login();
-                                            }
+                                           
                                             // Redirect to homepage
                                             $sso_target = isset($sso['target']) ? $sso['target'] : api_get_path(WEB_PATH) .'.index.php';
                                             header('Location: '. $sso_target);           
@@ -547,10 +543,9 @@ if (!empty($_SESSION['_user']['user_id']) && ! ($login || $logout)) {
 		                		if ($uData['expiration_date']>date('Y-m-d H:i:s') OR $uData['expiration_date']=='0000-00-00 00:00:00') {
 									$_user['user_id'] = $uData['user_id'];
 									api_session_register('_user');
-									if (!function_exists('event_login')){
-										include(api_get_path(LIBRARY_PATH)."events.lib.inc.php");
+								
 										event_login();
-									}
+								
 		                		} else {
 									$loginFailed = true;
 									api_session_unregister('_uid');
diff --git a/main/link/link.php b/main/link/link.php
index 3ad405d569..5c5e8bbb22 100644
--- a/main/link/link.php
+++ b/main/link/link.php
@@ -1,4 +1,4 @@
-<?php // $Id: link.php 21933 2009-07-09 06:08:22Z ivantcholakov $
+<?php // $Id: link.php 22201 2009-07-17 19:57:03Z cfasanando $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -49,7 +49,6 @@ $language_file = array('link','admin');
 
 // including libraries
 require_once "../inc/global.inc.php";
-require_once api_get_path(LIBRARY_PATH).'events.lib.inc.php';
 require_once "linkfunctions.php";
 
 
diff --git a/main/link/link_goto.php b/main/link/link_goto.php
index 3b1d9e3596..74003dfd50 100644
--- a/main/link/link_goto.php
+++ b/main/link/link_goto.php
@@ -1,4 +1,4 @@
-<?php // $Id: link_goto.php 19491 2009-04-02 00:15:47Z iflorespaz $ 
+<?php // $Id: link_goto.php 22201 2009-07-17 19:57:03Z cfasanando $ 
 /*
 ============================================================================== 
 	Dokeos - elearning and course management software
@@ -46,8 +46,6 @@
 include('../inc/global.inc.php');
 $this_section=SECTION_COURSES;
 
-include(api_get_path(LIBRARY_PATH)."events.lib.inc.php");
-
 $link_url = Security::remove_XSS($_GET['link_url']);
 $link_id = Security::remove_XSS($_GET['link_id']);
 
diff --git a/main/newscorm/back_compat.inc.php b/main/newscorm/back_compat.inc.php
index 5e3f411b03..8425d373e2 100644
--- a/main/newscorm/back_compat.inc.php
+++ b/main/newscorm/back_compat.inc.php
@@ -7,7 +7,6 @@
  * @package dokeos.learnpath
  */
 require_once('../inc/global.inc.php');
-require_once(api_get_path(LIBRARY_PATH) . 'events.lib.inc.php');
 require_once(api_get_path(LIBRARY_PATH) . 'database.lib.php');
 require_once(api_get_path(LIBRARY_PATH) . 'document.lib.php');
 require_once(api_get_path(LIBRARY_PATH) . 'fileDisplay.lib.php');
diff --git a/main/newscorm/learnpath_functions.inc.php b/main/newscorm/learnpath_functions.inc.php
index 873ffb4533..72095326cb 100644
--- a/main/newscorm/learnpath_functions.inc.php
+++ b/main/newscorm/learnpath_functions.inc.php
@@ -1629,8 +1629,7 @@ function exportitem($id, $item_id, $item_type, $add_scorm_communications = false
 	include_once ("../lang/".$language_interface."/exercice.inc.php");
 
 	include_once (api_get_path(LIBRARY_PATH).'text.lib.php');
-	include_once ("../resourcelinker/resourcelinker.inc.php");
-	include_once (api_get_path(LIBRARY_PATH)."events.lib.inc.php");
+	include_once ("../resourcelinker/resourcelinker.inc.php");	
 
 	$LPname = display_addedresource_link_in_learnpath($item_type, $item_id, '', $id, 'builder', 'nolink');
 
diff --git a/main/notebook/index.php b/main/notebook/index.php
index f64153b27e..28bc278912 100755
--- a/main/notebook/index.php
+++ b/main/notebook/index.php
@@ -13,7 +13,6 @@ $language_file = array('notebook');
 
 // including the global dokeos file
 require_once '../inc/global.inc.php';
-require_once '../inc/lib/events.lib.inc.php';
 
 // the section (tabs)
 $this_section=SECTION_COURSES;
diff --git a/main/online/online.php b/main/online/online.php
index 6f8b37c076..9f33ccb8ab 100644
--- a/main/online/online.php
+++ b/main/online/online.php
@@ -1,4 +1,4 @@
-<?php // $Id: online.php 20467 2009-05-11 08:38:29Z ivantcholakov $
+<?php // $Id: online.php 22201 2009-07-17 19:57:03Z cfasanando $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -35,7 +35,6 @@ api_protect_course_script();
 /* ============================================================================== 
   			TRACKING
 ==============================================================================  */
-require_once('../inc/lib/events.lib.inc.php');
 event_access_tool(TOOL_CONFERENCE);
 
 ?>
diff --git a/main/search/index.php b/main/search/index.php
index 7bafccc8ba..9ff6bbb98f 100644
--- a/main/search/index.php
+++ b/main/search/index.php
@@ -12,8 +12,7 @@ if (extension_loaded('xapian')) {
 	include_once (api_get_path(LIBRARY_PATH).'debug.lib.inc.php');
 	include_once (api_get_path(LIBRARY_PATH).'system_announcements.lib.php');
 	include_once (api_get_path(LIBRARY_PATH).'groupmanager.lib.php');
-	include_once (api_get_path(LIBRARY_PATH).'usermanager.lib.php');
-	include_once (api_get_path(LIBRARY_PATH).'events.lib.inc.php');
+	include_once (api_get_path(LIBRARY_PATH).'usermanager.lib.php');	
 	//api_block_anonymous_users(); // only users who are logged in can proceed
 	require '../newscorm/lp_list_search.php';
 } else {
diff --git a/main/upload/index.php b/main/upload/index.php
index 7488d1a505..abf7225115 100755
--- a/main/upload/index.php
+++ b/main/upload/index.php
@@ -83,7 +83,6 @@ if(!$is_allowed_to_edit){
 //many useful functions in main_api.lib.php, by default included
 
 require_once(api_get_path(LIBRARY_PATH) . 'fileUpload.lib.php');
-require_once(api_get_path(LIBRARY_PATH) . 'events.lib.inc.php');
 require_once(api_get_path(LIBRARY_PATH) . 'document.lib.php');
 
 /*
diff --git a/main/upload/upload.document.php b/main/upload/upload.document.php
index 8fd9563b1a..061b513ede 100644
--- a/main/upload/upload.document.php
+++ b/main/upload/upload.document.php
@@ -18,7 +18,6 @@
 //many useful functions in main_api.lib.php, by default included
 if(!function_exists('api_get_path')){header('location: upload.php');die;}
 require_once(api_get_path(LIBRARY_PATH) . 'fileUpload.lib.php');
-require_once(api_get_path(LIBRARY_PATH) . 'events.lib.inc.php');
 require_once(api_get_path(LIBRARY_PATH) . 'document.lib.php');
 require_once('../document/document.inc.php');
 
diff --git a/main/upload/upload_ppt.php b/main/upload/upload_ppt.php
index 33eb9104f0..9ad118e5a5 100644
--- a/main/upload/upload_ppt.php
+++ b/main/upload/upload_ppt.php
@@ -17,7 +17,6 @@ $language_file[] = "scormdocument";
 // also provides access to main api (inc/lib/main_api.lib.php)
 include("../inc/global.inc.php");
 require_once(api_get_path(LIBRARY_PATH) . 'fileUpload.lib.php');
-require_once(api_get_path(LIBRARY_PATH) . 'events.lib.inc.php');
 require_once(api_get_path(LIBRARY_PATH) . 'document.lib.php');
 require_once (api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php');
 		
diff --git a/main/upload/upload_word.php b/main/upload/upload_word.php
index 7c752b0f93..d9d80f2af7 100644
--- a/main/upload/upload_word.php
+++ b/main/upload/upload_word.php
@@ -17,7 +17,6 @@ $language_file[] = "scormdocument";
 // also provides access to main api (inc/lib/main_api.lib.php)
 include("../inc/global.inc.php");
 require_once(api_get_path(LIBRARY_PATH) . 'fileUpload.lib.php');
-require_once(api_get_path(LIBRARY_PATH) . 'events.lib.inc.php');
 require_once(api_get_path(LIBRARY_PATH) . 'document.lib.php');
 require_once (api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php');
 		
diff --git a/main/user/user.php b/main/user/user.php
index 4ee6ac7ad4..ce06f5679b 100644
--- a/main/user/user.php
+++ b/main/user/user.php
@@ -1,4 +1,4 @@
-<?php // $Id: user.php 21933 2009-07-09 06:08:22Z ivantcholakov $
+<?php // $Id: user.php 22201 2009-07-17 19:57:03Z cfasanando $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -60,7 +60,6 @@ api_protect_course_script(true);
 -----------------------------------------------------------
 */
 require_once (api_get_path(LIBRARY_PATH)."debug.lib.inc.php");
-require_once (api_get_path(LIBRARY_PATH)."events.lib.inc.php");
 require_once (api_get_path(LIBRARY_PATH)."export.lib.inc.php");
 require_once (api_get_path(LIBRARY_PATH)."course.lib.php");
 require_once (api_get_path(LIBRARY_PATH).'sortabletable.class.php');
diff --git a/main/wiki/index.php b/main/wiki/index.php
index 880702ffe3..1045166c6b 100644
--- a/main/wiki/index.php
+++ b/main/wiki/index.php
@@ -54,7 +54,6 @@ $this_section=SECTION_COURSES;
 require_once (api_get_path(LIBRARY_PATH).'course.lib.php');
 require_once (api_get_path(LIBRARY_PATH).'groupmanager.lib.php');
 require_once (api_get_path(LIBRARY_PATH).'text.lib.php');
-require_once (api_get_path(LIBRARY_PATH).'events.lib.inc.php'); 
 require_once (api_get_path(LIBRARY_PATH).'security.lib.php'); 
 require_once (api_get_path(INCLUDE_PATH).'lib/mail.lib.inc.php');
 require_once (api_get_path(INCLUDE_PATH).'conf/mail.conf.php');
diff --git a/main/work/download.php b/main/work/download.php
index 4e2f8625da..b4e6eabc73 100644
--- a/main/work/download.php
+++ b/main/work/download.php
@@ -1,4 +1,4 @@
-<?php // $Id: download.php 17989 2009-01-25 05:51:54Z yannoo $
+<?php // $Id: download.php 22201 2009-07-17 19:57:03Z cfasanando $
 /* For licensing terms, see /dokeos_license.txt */
 /**
 ==============================================================================
@@ -23,7 +23,6 @@ require '../inc/global.inc.php';
 $this_section=SECTION_COURSES;
 
 require_once(api_get_path(LIBRARY_PATH).'document.lib.php');
-require (api_get_path(LIBRARY_PATH).'events.lib.inc.php');
 //include 'agenda.inc.php';
 // IMPORTANT to avoid caching of documents
 header('Expires: Wed, 01 Jan 1990 00:00:00 GMT');
diff --git a/main/work/work.php b/main/work/work.php
index ef00bce61b..a1f5cc5c00 100644
--- a/main/work/work.php
+++ b/main/work/work.php
@@ -1,4 +1,4 @@
-<?php //$Id: work.php 21976 2009-07-10 19:06:28Z herodoto $
+<?php //$Id: work.php 22201 2009-07-17 19:57:03Z cfasanando $
 /* For licensing terms, see /dokeos_license.txt */
 /**
 *	@package dokeos.work
@@ -6,7 +6,7 @@
 * 	@author Patrick Cool <patrick.cool@UGent.be>, Ghent University - ability for course admins to specify wether uploaded documents are visible or invisible by default.
 * 	@author Roan Embrechts, code refactoring and virtual course support
 * 	@author Frederic Vauthier, directories management
-*  	@version $Id: work.php 21976 2009-07-10 19:06:28Z herodoto $
+*  	@version $Id: work.php 22201 2009-07-17 19:57:03Z cfasanando $
 *
 * 	@todo refactor more code into functions, use quickforms, coding standards, ...
 */
@@ -84,7 +84,6 @@ isset($_SESSION['id_session'])?$id_session=$_SESSION['id_session']:$id_session=n
 require_once 'work.lib.php';
 require_once (api_get_path(LIBRARY_PATH) . 'course.lib.php');
 require_once (api_get_path(LIBRARY_PATH) . 'debug.lib.inc.php');
-require_once (api_get_path(LIBRARY_PATH) . 'events.lib.inc.php');
 require_once (api_get_path(LIBRARY_PATH) . 'security.lib.php');
 require_once (api_get_path(LIBRARY_PATH) . 'formvalidator/FormValidator.class.php');
 require_once(api_get_path(LIBRARY_PATH) . 'document.lib.php');