diff --git a/lisp/ob-ref.el b/lisp/ob-ref.el
index f350d618d..a8a18ed65 100644
--- a/lisp/ob-ref.el
+++ b/lisp/ob-ref.el
@@ -51,6 +51,7 @@
 ;;; Code:
 (require 'ob)
 (eval-when-compile
+  (require 'org-list)
   (require 'cl))
 
 (declare-function org-remove-if-not "org" (predicate seq))
diff --git a/lisp/ob.el b/lisp/ob.el
index 5603cf561..584d6275f 100644
--- a/lisp/ob.el
+++ b/lisp/ob.el
@@ -30,6 +30,7 @@
 
 ;;; Code:
 (eval-when-compile
+  (require 'org-list)
   (require 'cl))
 (require 'org-macs)
 
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index a248068c3..fb0957a04 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -927,6 +927,12 @@ For example, 9:30am would become 09:30 rather than  9:30."
   :group 'org-agenda
   :type 'boolean)
 
+(defcustom org-agenda-time-leading-zero nil
+  "Non-nil means use leading zero for military times in agenda.
+For example, 9:30am would become 09:30 rather than  9:30."
+  :group 'org-agenda-daily/weekly
+  :type 'boolean)
+
 (defun org-agenda-time-of-day-to-ampm (time)
   "Convert TIME of a string like '13:45' to an AM/PM style time string."
   (let* ((hour-number (string-to-number (substring time 0 -3)))
diff --git a/lisp/org-macs.el b/lisp/org-macs.el
index 5a5612387..c63b1b069 100644
--- a/lisp/org-macs.el
+++ b/lisp/org-macs.el
@@ -46,9 +46,15 @@
      (if (or (> emacs-major-version 23)
 	     (and (>= emacs-major-version 23)
 		  (>= emacs-minor-version 2)))
-	 (called-interactively-p ,kind)
+	 (with-no-warnings (called-interactively-p ,kind)) ;; defined with no argument in <=23.1
        (interactive-p))))
 
+(if (or (<= emacs-major-version 23)
+	(and (<= emacs-major-version 23)
+	     (< emacs-minor-version 2)))
+    (defmacro with-silent-modifications
+      (org-unmodified)))
+
 (defmacro org-bound-and-true-p (var)
   "Return the value of symbol VAR if it is bound, else nil."
   `(and (boundp (quote ,var)) ,var))
diff --git a/lisp/org.el b/lisp/org.el
index 0c46eeca8..71e942863 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -72,7 +72,8 @@
 
 (eval-when-compile
   (require 'cl)
-  (require 'gnus-sum))
+  (require 'gnus-sum)
+)
 
 (require 'calendar)
 (require 'pcomplete)
@@ -3571,6 +3572,7 @@ Normal means, no org-mode-specific context."
 (declare-function parse-time-string "parse-time" (string))
 (declare-function org-attach-reveal "org-attach" (&optional if-exists))
 (declare-function org-export-latex-fix-inputenc "org-latex" ())
+(declare-function orgtbl-send-table "org-table" (&optional maybe))
 (defvar remember-data-file)
 (defvar texmathp-why)
 (declare-function speedbar-line-directory "speedbar" (&optional depth))