diff --git a/main/inc/lib/autoload.class.php b/main/inc/lib/autoload.class.php
index 60f5ec53d6..f426855fa0 100755
--- a/main/inc/lib/autoload.class.php
+++ b/main/inc/lib/autoload.class.php
@@ -929,6 +929,8 @@ class Autoload
         $result['Utf8'] = '/main/inc/lib/system/text/utf8.class.php';
         $result['Utf8Decoder'] = '/main/inc/lib/system/text/utf8_decoder.class.php';
         $result['Utf8Encoder'] = '/main/inc/lib/system/text/utf8_encoder.class.php';
+        $result['WebService'] = '/main/inc/lib/webservices/WebService.class.php';
+        $result['MessagesWebService'] = '/main/inc/lib/webservices/MessagesWebService.class.php';
         $result['Wiki'] = '/main/coursecopy/classes/wiki.class.php';
         $result['Work\Access'] = '/main/work/access.class.php';
         $result['Work\AjaxController'] = '/main/work/ajax_controller.class.php';
diff --git a/webservices/classes/MessagesWebService.class.php b/main/inc/lib/webservices/MessagesWebService.class.php
similarity index 100%
rename from webservices/classes/MessagesWebService.class.php
rename to main/inc/lib/webservices/MessagesWebService.class.php
diff --git a/webservices/classes/WebService.class.php b/main/inc/lib/webservices/WebService.class.php
similarity index 100%
rename from webservices/classes/WebService.class.php
rename to main/inc/lib/webservices/WebService.class.php
diff --git a/webservices/rest.php b/webservices/rest.php
index cd74f61e01..f10b51f38c 100644
--- a/webservices/rest.php
+++ b/webservices/rest.php
@@ -7,8 +7,6 @@
  */
 /* Require libs and classes */
 require_once '../main/inc/global.inc.php';
-require_once './classes/WebService.class.php';
-require_once './classes/MessagesWebService.class.php';
 
 /* Manage actions */
 $json = array();