diff --git a/Makefile b/Makefile
index ca9bcca47..b3fa19fe3 100644
--- a/Makefile
+++ b/Makefile
@@ -503,6 +503,7 @@ lisp/org-publish.elc:
 lisp/org-protocol.elc:	lisp/org.el
 lisp/org-remember.elc:	lisp/org.el
 lisp/org-rmail.elc:	lisp/org.el
+lisp/org-special-blocks.elc:	lisp/org-compat.el
 lisp/org-src.elc:	lisp/org-macs.el lisp/org-compat.el
 lisp/org-table.elc:	lisp/org.el
 lisp/org-taskjuggler.elc: lisp/org.el lisp/org-exp.el
diff --git a/lisp/ob-ref.el b/lisp/ob-ref.el
index 31944fd30..aa718b305 100644
--- a/lisp/ob-ref.el
+++ b/lisp/ob-ref.el
@@ -57,6 +57,7 @@
 (declare-function org-at-table-p "org" (&optional table-type))
 (declare-function org-count "org" (CL-ITEM CL-SEQ))
 (declare-function org-in-item-p "org-list" ())
+(declare-function org-at-item-p "org-list" ())
 
 (defvar org-babel-ref-split-regexp
   "[ \f\t\n\r\v]*\\(.+?\\)[ \f\t\n\r\v]*=[ \f\t\n\r\v]*\\(.+\\)[ \f\t\n\r\v]*")
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index dee23e002..91dff40bc 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -4307,7 +4307,7 @@ of what a project is and how to check if it stuck, customize the variable
 
 (defvar org-disable-agenda-to-diary nil)          ;Dynamically-scoped param.
 (defvar list-diary-entries-hook)
-
+(defvar diary-time-regexp)
 (defun org-get-entries-from-diary (date)
   "Get the (Emacs Calendar) diary entries for DATE."
   (require 'diary-lib)
@@ -5473,12 +5473,6 @@ The modified list may contain inherited tags, and tags matched by
 	  (append new list)
 	(append list new)))))
 
-(defun org-eval (form)
-  "Eval FORM and return result."
-  (condition-case error
-      (eval form)
-    (error (format "%%![Error: %s]" error))))
-
 (defun org-compile-prefix-format (key)
   "Compile the prefix format into a Lisp form that can be evaluated.
 The resulting form is returned and stored in the variable
diff --git a/lisp/org-archive.el b/lisp/org-archive.el
index a98471479..c70616661 100644
--- a/lisp/org-archive.el
+++ b/lisp/org-archive.el
@@ -211,7 +211,7 @@ this heading."
 		 (current-time)))
 	  category todo priority ltags itags atags
           ;; end of variables that will be used for saving context
-	  location afile heading buffer level newfile-p visiting)
+	  location afile heading buffer level newfile-p infile-p visiting)
 
       ;; Find the local archive location
       (setq location (org-get-local-archive-location)
diff --git a/lisp/org-capture.el b/lisp/org-capture.el
index e9a851e7b..1390f2143 100644
--- a/lisp/org-capture.el
+++ b/lisp/org-capture.el
@@ -1054,7 +1054,7 @@ Point will remain at the first line after the inserted text."
     (setq beg (point))
     (cond
      ((and (eq type 'entry) (org-mode-p))
-      (org-capture-verify-tree txt)
+      (org-capture-verify-tree (org-capture-get :template))
       (org-paste-subtree nil template t))
      ((and (memq type '(item checkitem))
 	   (org-mode-p)
diff --git a/lisp/org-latex.el b/lisp/org-latex.el
index 303eb6e38..d9e0e3fdf 100644
--- a/lisp/org-latex.el
+++ b/lisp/org-latex.el
@@ -1817,7 +1817,7 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER."
              (org-table-last-column-widths (copy-sequence
                                             org-table-last-column-widths))
              fnum fields line lines olines gr colgropen line-fmt align
-             caption shortn label attr floatp placement
+             caption width shortn label attr floatp placement
 	     longtblp tblenv tabular-env)
         (if org-export-latex-tables-verbatim
             (let* ((tbl (concat "\\begin{verbatim}\n" raw-table
diff --git a/lisp/org-special-blocks.el b/lisp/org-special-blocks.el
index 54fb6cb39..fa59657e6 100644
--- a/lisp/org-special-blocks.el
+++ b/lisp/org-special-blocks.el
@@ -40,6 +40,8 @@
 ;; user to add this class to his or her stylesheet if this div is to
 ;; mean anything.
 
+(require 'org-compat)
+
 (defvar org-special-blocks-ignore-regexp "^\\(LaTeX\\|HTML\\)$"
   "A regexp indicating the names of blocks that should be ignored
 by org-special-blocks.  These blocks will presumably be
diff --git a/lisp/org-table.el b/lisp/org-table.el
index 5d7c66734..56d927eef 100644
--- a/lisp/org-table.el
+++ b/lisp/org-table.el
@@ -3715,7 +3715,7 @@ to execute outside of tables."
 If it is a table to be sent away to a receiver, do it.
 With prefix arg, also recompute table."
   (interactive "P")
-  (let ((pos (point)) action consts-str consts cst)
+  (let ((pos (point)) action consts-str consts cst const-str)
     (save-excursion
       (beginning-of-line 1)
       (setq action (cond
diff --git a/lisp/org.el b/lisp/org.el
index 03f0b72fc..a26a3caad 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -18201,6 +18201,12 @@ With prefix arg UNCOMPILED, load the uncompiled versions."
       (display-buffer buf)
       (sit-for 0))))
 
+(defun org-eval (form)
+  "Eval FORM and return result."
+  (condition-case error
+      (eval form)
+    (error (format "%%![Error: %s]" error))))
+
 (defun org-in-commented-line ()
   "Is point in a line starting with `#'?"
   (equal (char-after (point-at-bol)) ?#))