diff --git a/main/admin/course_request_accepted.php b/main/admin/course_request_accepted.php
index 04ec0c49a8..729ce89d8b 100644
--- a/main/admin/course_request_accepted.php
+++ b/main/admin/course_request_accepted.php
@@ -26,9 +26,7 @@ api_protect_admin_script();
 
 require_once api_get_path(LIBRARY_PATH).'add_course.lib.inc.php';
 require_once api_get_path(CONFIGURATION_PATH).'course_info.conf.php';
-require_once api_get_path(LIBRARY_PATH).'course.lib.php';
 require_once api_get_path(LIBRARY_PATH).'course_request.lib.php';
-require_once api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php';
 
 // Including a configuration file.
 require api_get_path(CONFIGURATION_PATH).'add_course.conf.php';
diff --git a/main/admin/course_request_edit.php b/main/admin/course_request_edit.php
index 1ce1920b9e..357cb71dc2 100644
--- a/main/admin/course_request_edit.php
+++ b/main/admin/course_request_edit.php
@@ -21,10 +21,8 @@ api_protect_admin_script();
 
 require_once api_get_path(LIBRARY_PATH).'add_course.lib.inc.php';
 require_once api_get_path(CONFIGURATION_PATH).'course_info.conf.php';
-require_once api_get_path(LIBRARY_PATH).'course.lib.php';
 require_once api_get_path(LIBRARY_PATH).'course_request.lib.php';
 require_once api_get_path(LIBRARY_PATH).'mail.lib.inc.php';
-require_once api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php';
 
 // Including a configuration file.
 require_once api_get_path(CONFIGURATION_PATH).'add_course.conf.php';
diff --git a/main/admin/course_request_rejected.php b/main/admin/course_request_rejected.php
index c01e96de3f..667c347cd6 100644
--- a/main/admin/course_request_rejected.php
+++ b/main/admin/course_request_rejected.php
@@ -26,10 +26,8 @@ api_protect_admin_script();
 
 require_once api_get_path(LIBRARY_PATH).'add_course.lib.inc.php';
 require_once api_get_path(CONFIGURATION_PATH).'course_info.conf.php';
-require_once api_get_path(LIBRARY_PATH).'course.lib.php';
 require_once api_get_path(LIBRARY_PATH).'course_request.lib.php';
 require_once api_get_path(LIBRARY_PATH).'mail.lib.inc.php';
-require_once api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php';
 
 // Including a configuration file.
 require api_get_path(CONFIGURATION_PATH).'add_course.conf.php';
diff --git a/main/admin/course_request_review.php b/main/admin/course_request_review.php
index d0d6aadff0..5c2835e18b 100644
--- a/main/admin/course_request_review.php
+++ b/main/admin/course_request_review.php
@@ -23,10 +23,8 @@ api_protect_admin_script();
 
 require_once api_get_path(LIBRARY_PATH).'add_course.lib.inc.php';
 require_once api_get_path(CONFIGURATION_PATH).'course_info.conf.php';
-require_once api_get_path(LIBRARY_PATH).'course.lib.php';
 require_once api_get_path(LIBRARY_PATH).'course_request.lib.php';
 require_once api_get_path(LIBRARY_PATH).'mail.lib.inc.php';
-require_once api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php';
 
 // Including a configuration file.
 require_once api_get_path(CONFIGURATION_PATH).'add_course.conf.php';
diff --git a/main/admin/course_virtual.php b/main/admin/course_virtual.php
old mode 100755
new mode 100644
index 23f02e7513..f3c8bc240e
--- a/main/admin/course_virtual.php
+++ b/main/admin/course_virtual.php
@@ -23,17 +23,7 @@ if (isset($extra_lang_file)) include(api_get_path(INCLUDE_PATH)."../lang/english
 if (isset($extra_lang_file)) include(api_get_path(INCLUDE_PATH)."../lang/".$language_interface."/".$extra_lang_file.".inc.php");
 
 /*
------------------------------------------------------------
-	Libraries
------------------------------------------------------------
-*/
-
-require_once api_get_path(LIBRARY_PATH) . 'course.lib.php';
-
-/*
------------------------------------------------------------
 	Constants
------------------------------------------------------------
 */
 
 define ("CREATE_VIRTUAL_COURSE_OPTION", "create_virtual_course");
diff --git a/main/admin/dashboard_add_courses_to_user.php b/main/admin/dashboard_add_courses_to_user.php
index b4ceea5fda..9a49125627 100644
--- a/main/admin/dashboard_add_courses_to_user.php
+++ b/main/admin/dashboard_add_courses_to_user.php
@@ -14,8 +14,6 @@ $cidReset=true;
 // including some necessary dokeos files
 require_once '../inc/global.inc.php';
 require_once '../inc/lib/xajax/xajax.inc.php';
-require_once api_get_path(LIBRARY_PATH).'course.lib.php';
-require_once api_get_path(LIBRARY_PATH).'usermanager.lib.php';
 
 global $_configuration;
 
diff --git a/main/admin/dashboard_add_sessions_to_user.php b/main/admin/dashboard_add_sessions_to_user.php
index 96e38829be..0fecb3cd59 100644
--- a/main/admin/dashboard_add_sessions_to_user.php
+++ b/main/admin/dashboard_add_sessions_to_user.php
@@ -14,9 +14,6 @@ $cidReset=true;
 // including some necessary dokeos files
 require_once '../inc/global.inc.php';
 require_once api_get_path(LIBRARY_PATH).'xajax/xajax.inc.php';
-require_once api_get_path(LIBRARY_PATH).'sessionmanager.lib.php';
-require_once api_get_path(LIBRARY_PATH).'usermanager.lib.php';
-
 global $_configuration;
 
 // create an ajax object
diff --git a/main/admin/dashboard_add_users_to_user.php b/main/admin/dashboard_add_users_to_user.php
index d58b54c4f6..97f9295eba 100644
--- a/main/admin/dashboard_add_users_to_user.php
+++ b/main/admin/dashboard_add_users_to_user.php
@@ -14,11 +14,9 @@ $cidReset=true;
 // including some necessary dokeos files
 require_once '../inc/global.inc.php';
 require_once '../inc/lib/xajax/xajax.inc.php';
-require_once api_get_path(LIBRARY_PATH).'usermanager.lib.php';
 
 global $_configuration;
 
-
 // create an ajax object
 $xajax = new xajax();
 $xajax -> registerFunction ('search_users');
diff --git a/main/admin/subscribe_class2course.php b/main/admin/subscribe_class2course.php
old mode 100755
new mode 100644
index f8a3679bab..a346ba4902
--- a/main/admin/subscribe_class2course.php
+++ b/main/admin/subscribe_class2course.php
@@ -11,12 +11,11 @@ $language_file = 'admin';
 
 $cidReset = true;
 
-require ('../inc/global.inc.php');
+require_once '../inc/global.inc.php';
 $this_section=SECTION_PLATFORM_ADMIN;
 
-require_once (api_get_path(LIBRARY_PATH).'course.lib.php');
-require_once (api_get_path(LIBRARY_PATH).'classmanager.lib.php');
 api_protect_admin_script();
+
 $classes = $_GET['classes'];
 $form_sent = 0;
 $error_message = '';
diff --git a/main/survey/survey.download.inc.php b/main/survey/survey.download.inc.php
old mode 100755
new mode 100644
index 7cf6553851..fdbaa7284c
--- a/main/survey/survey.download.inc.php
+++ b/main/survey/survey.download.inc.php
@@ -13,8 +13,7 @@
 
 function check_download_survey($course, $invitation, $doc_url) {
 
-	require_once 'survey.lib.php';
-	require_once api_get_path(LIBRARY_PATH).'course.lib.php';
+	require_once 'survey.lib.php';	
 
 	// Getting all the course information
 	$_course = CourseManager::get_course_information($course);
diff --git a/main/user/subscribe_class.php b/main/user/subscribe_class.php
old mode 100755
new mode 100644
index b5f6957945..3d8e948c14
--- a/main/user/subscribe_class.php
+++ b/main/user/subscribe_class.php
@@ -16,10 +16,6 @@ if(api_get_setting('use_session_mode')=='true') {
 	api_not_allowed(true);
 }
 
-require_once (api_get_path(LIBRARY_PATH).'course.lib.php');
-require_once (api_get_path(LIBRARY_PATH).'classmanager.lib.php');
-require_once (api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php');
-
 /*
 	MAIN CODE
 */