diff --git a/el/sclang-interp.el b/el/sclang-interp.el
index 04a9a41..b836347 100644
--- a/el/sclang-interp.el
+++ b/el/sclang-interp.el
@@ -302,6 +302,7 @@ If EOB-P is non-nil, positions cursor at end of buffer."
        (list "-s"))
      (list "-iscel"))))
 
+;;;###autoload  (autoload 'sclang-start "sclang" "Start SuperCollider process." t)
 (defun sclang-start ()
   "Start SuperCollider process."
   (interactive)
diff --git a/el/sclang-mode.el b/el/sclang-mode.el
index 0f42491..4263a54 100644
--- a/el/sclang-mode.el
+++ b/el/sclang-mode.el
@@ -669,7 +669,7 @@ Returns the column to indent to."
   :group 'sclang-mode
   :type 'hook)
 
-;;;###autoload
+;;;###autoload  (autoload 'sclang-mode "sclang" "Major mode for editing SuperCollider language" t)
 (define-derived-mode sclang-mode prog-mode "SCLang"
   "Major mode for editing SuperCollider language code.
 \\{sclang-mode-map}"
diff --git a/el/sclang-util.el b/el/sclang-util.el
index ea104cb..8a0ea6f 100644
--- a/el/sclang-util.el
+++ b/el/sclang-util.el
@@ -1,3 +1,5 @@
+;;; package: sclang-util --- Utility helpers for sclang
+;;
 ;; copyright 2003-2005 stefan kersten <steve@k-hornz.de>
 ;;
 ;; This program is free software; you can redistribute it and/or
@@ -83,4 +85,4 @@
 
 (provide 'sclang-util)
 
-;; EOF
\ No newline at end of file
+;;; sclang-util.el ends here
diff --git a/el/sclang.el b/el/sclang.el
index 9bbedcc..9b6b95b 100644
--- a/el/sclang.el
+++ b/el/sclang.el
@@ -55,22 +55,16 @@
   (interactive)
   (customize-group 'sclang))
 
-(eval-and-compile
-  (let ((load-path
-	 (if (and (boundp 'byte-compile-dest-file)
-		  (stringp byte-compile-dest-file))
-	     (cons (file-name-directory byte-compile-dest-file) load-path)
-	   load-path)))
-    (require 'sclang-util)
-    (require 'sclang-browser)
-    (require 'sclang-interp)
-    (require 'sclang-language)
-    (require 'sclang-document)
-    (require 'sclang-mode)
-    (require 'sclang-minor-mode)
-    (require 'sclang-help)
-    (require 'sclang-server)
-    (require 'sclang-widgets)))
+(require 'sclang-util)
+(require 'sclang-browser)
+(require 'sclang-interp)
+(require 'sclang-language)
+(require 'sclang-document)
+(require 'sclang-mode)
+(require 'sclang-minor-mode)
+(require 'sclang-help)
+(require 'sclang-server)
+(require 'sclang-widgets)
 
 (provide 'sclang)