diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 42e81111208..6028276f6df 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2008-01-11  Glenn Morris  <rgm@gnu.org>
+
+	* language/china-util.el (big5-to-flat-code, flat-code-to-big5)
+	(euc-to-flat-code, flat-code-to-euc):
+	* textmodes/org.el (elmo-msgdb-overview-get-entity)
+	(wl-summary-buffer-msgdb): Declare as funtions.
+
 2008-01-10  Martin Rudalics  <rudalics@gmx.at>
 
 	* progmodes/ada-mode.el (ada-set-syntax-table-properties):
diff --git a/lisp/language/china-util.el b/lisp/language/china-util.el
index 6eaa3b5e76e..6d628c62c11 100644
--- a/lisp/language/china-util.el
+++ b/lisp/language/china-util.el
@@ -175,6 +175,13 @@ Return the length of resulting text."
 ;; Many kudos to Himi!  The used code has been adapted from his
 ;; mule-ucs package.
 
+;; Silence the compiler, which otherwise warns that these functions
+;; might not be defined at runtime. They are only used when compiling.
+(declare-function big5-to-flat-code "china-util" (num))
+(declare-function flat-code-to-big5 "china-util" (num))
+(declare-function euc-to-flat-code  "china-util" (num))
+(declare-function flat-code-to-euc  "china-util" (num))
+
 (eval-when-compile
 (defun big5-to-flat-code (num)
   "Convert NUM in Big 5 encoding to a `flat code'.