diff --git a/lisp/ob-eshell.el b/lisp/ob-eshell.el
index 1090bef62..bfb24f8a6 100644
--- a/lisp/ob-eshell.el
+++ b/lisp/ob-eshell.el
@@ -29,6 +29,13 @@
 (require 'ob)
 (require 'eshell)
 
+(declare-function eshell-send-input "esh-mode"
+                  (&optional use-region queue-p no-newline))
+
+(defvar eshell-last-output-start)
+(defvar eshell-last-output-end)
+(defvar eshell-last-input-end)
+
 (defvar org-babel-default-header-args:eshell '())
 
 (defun org-babel-execute:eshell (body params)
diff --git a/lisp/ob-plantuml.el b/lisp/ob-plantuml.el
index 09c9a3334..28c7b8547 100644
--- a/lisp/ob-plantuml.el
+++ b/lisp/ob-plantuml.el
@@ -69,10 +69,11 @@ function to convert variables to PlantUML assignments.
 
 If BODY does not contain @startXXX ... @endXXX clauses, @startuml
 ... @enduml will be added."
-  (let ((assignments (org-babel-variable-assignments:plantuml params)))
-    (if (string-prefix-p "@start" body t) assignments
-      (format "@startuml\n%s\n@enduml"
-	      (org-babel-expand-body:generic body params assignments)))))
+  (let ((full-body
+	 (org-babel-expand-body:generic
+	  body params (org-babel-variable-assignments:plantuml params))))
+    (if (string-prefix-p "@start" body t) full-body
+      (format "@startuml\n%s\n@enduml" full-body))))
 
 (defun org-babel-execute:plantuml (body params)
   "Execute a block of plantuml code with org-babel.
diff --git a/lisp/org-keys.el b/lisp/org-keys.el
index daad26dbf..3b8fa5f53 100644
--- a/lisp/org-keys.el
+++ b/lisp/org-keys.el
@@ -27,6 +27,8 @@
 
 ;;; Code:
 
+(require 'cl-lib)
+
 (defvar org-outline-regexp)
 
 (declare-function org-add-note "org" ())
@@ -218,6 +220,8 @@
 (defvar org-mode-map (make-sparse-keymap)
   "Keymap fo Org mode.")
 
+(defvaralias 'org-CUA-compatible 'org-replace-disputed-keys)
+
 (defcustom org-replace-disputed-keys nil
   "Non-nil means use alternative key bindings for some keys.
 
@@ -244,8 +248,6 @@ loading Org."
   :type 'boolean
   :safe #'booleanp)
 
-(defvaralias 'org-CUA-compatible 'org-replace-disputed-keys)
-
 (defcustom org-disputed-keys
   '(([(shift up)]		. [(meta p)])
     ([(shift down)]		. [(meta n)])