diff --git a/jabber-avatar.el b/jabber-avatar.el
index d03b0dd..eff414d 100644
--- a/jabber-avatar.el
+++ b/jabber-avatar.el
@@ -1,6 +1,6 @@
 ;;; jabber-avatar.el --- generic functions for avatars
 
-;; Copyright (C) 2006, 2007  Magnus Henoch
+;; Copyright (C) 2006, 2007, 2008  Magnus Henoch
 
 ;; Author: Magnus Henoch <mange@freemail.hu>
 
@@ -32,6 +32,7 @@
 
 ;;; Code:
 
+(require 'mailcap)
 (eval-when-compile (require 'cl))
 
 ;;;; Variables
diff --git a/jabber-bookmarks.el b/jabber-bookmarks.el
index 97c5298..60562b1 100644
--- a/jabber-bookmarks.el
+++ b/jabber-bookmarks.el
@@ -20,6 +20,7 @@
 
 (require 'jabber-private)
 (require 'jabber-widget)
+(require 'jabber-autoloads)
 
 (require 'cl)
 
@@ -60,6 +61,7 @@ immediately, and return nil if it is not in the cache."
 	(plist-get entry key)
       entry)))
 
+;;;###autoload
 (defun jabber-parse-conference-bookmark (node)
   "Convert a <conference/> tag into a plist.
 The plist may contain the keys :jid, :name, :autojoin,
diff --git a/jabber-chat.el b/jabber-chat.el
index ffb5bad..e577bfd 100644
--- a/jabber-chat.el
+++ b/jabber-chat.el
@@ -21,6 +21,7 @@
 (require 'jabber-core)
 (require 'jabber-chatbuffer)
 (require 'jabber-history)
+(require 'jabber-autoloads)
 
 (require 'ewoc)
 (eval-when-compile (require 'cl))
@@ -167,6 +168,7 @@ These fields are available:
   "Face used for error messages"
   :group 'jabber-chat)
 
+;;;###autoload
 (defvar jabber-chatting-with nil
   "JID of the person you are chatting with")
 
diff --git a/jabber-chatstates.el b/jabber-chatstates.el
index acb6afa..a32b656 100644
--- a/jabber-chatstates.el
+++ b/jabber-chatstates.el
@@ -22,6 +22,7 @@
 ;; - Currently only active/composing notifications are /sent/ though all 5
 ;;   notifications are handled on receipt.
 
+(require 'jabber-autoloads)
 (require 'cl)
 
 (defgroup jabber-chatstates nil
@@ -31,9 +32,18 @@
 (defconst jabber-chatstates-xmlns "http://jabber.org/protocol/chatstates"
   "XML namespace for the chatstates feature.")
 
-;;; INCOMING
-;;; Code for requesting chat state notifications from others and handling
-;;; them.
+(defcustom jabber-chatstates-confirm t
+  "Send notifications about chat states?"
+  :group 'jabber-chatstates
+  :type 'boolean)
+
+(defvar jabber-chatstates-requested 'first-time
+  "Whether or not chat states notification was requested.
+This is one of the following:
+first-time - send state in first stanza, then switch to nil
+t - send states
+nil - don't send states")
+(make-variable-buffer-local 'jabber-chatstates-requested)
 
 (defvar jabber-chatstates-last-state nil
   "The last seen chat state.")
@@ -43,6 +53,10 @@
   "Human-readable presentation of chat state information")
 (make-variable-buffer-local 'jabber-chatstates-message)
 
+;;; INCOMING
+;;; Code for requesting chat state notifications from others and handling
+;;; them.
+
 (defun jabber-chatstates-update-message ()
   (setq jabber-chatstates-message
         (if (and jabber-chatstates-last-state
@@ -65,19 +79,6 @@
 ;;; Code for handling requests for chat state notifications and providing
 ;;; them, modulo user preferences.
 
-(defcustom jabber-chatstates-confirm t
-  "Send notifications about chat states?"
-  :group 'jabber-chatstates
-  :type 'boolean)
-
-(defvar jabber-chatstates-requested 'first-time
-  "Whether or not chat states notification was requested.
-This is one of the following:
-first-time - send state in first stanza, then switch to nil
-t - send states
-nil - don't send states")
-(make-variable-buffer-local 'jabber-chatstates-requested)
-
 (defvar jabber-chatstates-composing-sent nil
   "Has composing notification been sent?
 It can be sent and cancelled several times.")
diff --git a/jabber-events.el b/jabber-events.el
index f78030a..84df937 100644
--- a/jabber-events.el
+++ b/jabber-events.el
@@ -19,6 +19,7 @@
 ;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
+(require 'jabber-autoloads)
 (require 'cl)
 
 (defgroup jabber-events nil 
diff --git a/jabber-history.el b/jabber-history.el
index b84d183..5ce3b7b 100644
--- a/jabber-history.el
+++ b/jabber-history.el
@@ -33,6 +33,7 @@
 
 (require 'jabber-core)
 (require 'jabber-util)
+(require 'jabber-autoloads)
 
 (defgroup jabber-history nil "Customization options for Emacs
 Jabber history files."
diff --git a/jabber-muc.el b/jabber-muc.el
index f80e3e7..b559e7f 100644
--- a/jabber-muc.el
+++ b/jabber-muc.el
@@ -22,6 +22,7 @@
 (require 'jabber-chat)
 (require 'jabber-widget)
 (require 'jabber-newdisco)
+(require 'jabber-autoloads)
 
 (require 'cl)
 
@@ -48,6 +49,7 @@ Values are lists of nickname strings.")
 (defvar jabber-muc-topic ""
   "The topic of the current MUC room.")
 
+;;;###autoload
 (defcustom jabber-muc-default-nicknames nil
   "Default nickname for specific MUC rooms."
   :group 'jabber-chat
@@ -56,6 +58,7 @@ Values are lists of nickname strings.")
 		(string :tag "JID of room")
 		(string :tag "Nickname"))))
 
+;;;###autoload
 (defcustom jabber-muc-autojoin nil
   "List of MUC rooms to automatically join on connection.
 This list is saved in your Emacs customizations.  You can also store
@@ -136,6 +139,7 @@ The format is that of `mode-line-format' and `header-line-format'."
   :type 'sexp
   :group 'jabber-chat)
 
+;;;###autoload
 (defvar jabber-muc-printers '()
   "List of functions that may be able to print part of a MUC message.
 This gets prepended to `jabber-chat-printers', which see.")
@@ -710,6 +714,7 @@ group, else it is a JID."
 				  (or (plist-get bookmark :nick)
 				      (plist-get (fsm-get-state-data jc) :username)))))))))
 
+;;;###autoload
 (defun jabber-muc-message-p (message)
   "Return non-nil if MESSAGE is a groupchat message.
 That does not include private messages in a groupchat, but does
diff --git a/jabber-presence.el b/jabber-presence.el
index ae40968..42d1204 100644
--- a/jabber-presence.el
+++ b/jabber-presence.el
@@ -405,6 +405,7 @@ With prefix argument, ask for status message."
 		  (jabber-read-with-input-method "status message: " *jabber-current-status* '*jabber-status-history*))))
   (jabber-send-presence "xa" status *jabber-current-priority*))
 
+;;;###autoload
 (defun jabber-send-default-presence (&optional jc)
   "Send default presence.
 Default presence is specified by `jabber-default-priority', `jabber-default-show',
diff --git a/jabber.el b/jabber.el
index 8f48b09..ae67552 100644
--- a/jabber.el
+++ b/jabber.el
@@ -194,17 +194,20 @@ configure a Google Talk account like this:
 (defgroup jabber-debug nil "debugging options"
   :group 'jabber)
 
+;;;###autoload
 (defcustom jabber-debug-log-xml nil
   "log all XML i/o in *-jabber-xml-log-*"
   :type 'boolean
   :group 'jabber-debug)
 
+;;;###autoload
 (defcustom jabber-debug-keep-process-buffers nil
   "If nil, kill process buffers when the process dies.
 Contents of process buffers might be useful for debugging."
   :type 'boolean
   :group 'jabber-debug)
 
+;;;###autoload
 (defconst jabber-presence-faces
  '(("" . jabber-roster-user-online)
    ("away" . jabber-roster-user-away)
@@ -215,6 +218,7 @@ Contents of process buffers might be useful for debugging."
    (nil . jabber-roster-user-offline))
  "Mapping from presence types to faces")
 
+;;;###autoload
 (defconst jabber-presence-strings
   '(("" . "Online")
     ("away" . "Away")