diff --git a/lisp/org-gnus.el b/lisp/org-gnus.el
index f0f5ca2fa..26bb8899d 100644
--- a/lisp/org-gnus.el
+++ b/lisp/org-gnus.el
@@ -31,15 +31,31 @@
 
 ;;; Code:
 
-(require 'org)
+(require 'gnus-sum)
 (require 'gnus-util)
+(require 'nnheader)
+(require 'nnir)
+(require 'org)
 
 
 ;;; Declare external functions and variables
 
+(declare-function gnus-activate-group "gnus-start" (group &optional scan dont-check method dont-sub-check))
+(declare-function gnus-find-method-for-group "gnus" (group &optional info))
+(declare-function gnus-group-group-name "gnus-group")
+(declare-function gnus-group-jump-to-group "gnus-group" (group &optional prompt))
+(declare-function gnus-group-read-group "gnus-group" (&optional all no-article group select-articles))
 (declare-function message-fetch-field "message" (header &optional not-all))
+(declare-function message-generate-headers "message" (headers))
+(declare-function message-narrow-to-headers "message")
+(declare-function message-tokenize-header "message" (header &optional separator))
+(declare-function message-unquote-tokens "message" (elems))
 (declare-function nnvirtual-map-article "nnvirtual" (article))
 
+(defvar gnus-newsgroup-name)
+(defvar gnus-summary-buffer)
+(defvar gnus-other-frame-object)
+
 
 ;;; Customization variables