diff --git a/lisp/babel/ob-exp.el b/lisp/babel/ob-exp.el
index 9c948313a..f23c5aaec 100644
--- a/lisp/babel/ob-exp.el
+++ b/lisp/babel/ob-exp.el
@@ -31,11 +31,15 @@
 ;;; Code:
 (require 'ob)
 (require 'org-exp-blocks)
-(org-export-blocks-add-block '(src org-babel-exp-src-blocks nil))
+(eval-when-compile
+  (require 'cl))
+
 (add-to-list 'org-export-interblocks '(src org-babel-exp-inline-src-blocks))
 (add-to-list 'org-export-interblocks '(lob org-babel-exp-lob-one-liners))
 (add-hook 'org-export-blocks-postblock-hook 'org-exp-res/src-name-cleanup)
 
+(org-export-blocks-add-block '(src org-babel-exp-src-blocks nil))
+
 (defvar org-babel-function-def-export-keyword "function"
   "When exporting a source block function, this keyword will
 appear in the exported version in the place of source name
@@ -201,7 +205,7 @@ evaluated."
         (name (nth 4 info))
         (args (mapcar
 	       #'cdr
-	       (remove-if-not (lambda (el) (eq :var (car el))) (nth 2 info)))))
+	       (org-remove-if-not (lambda (el) (eq :var (car el))) (nth 2 info)))))
     (case type
       ('inline (format "=%s=" body))
       ('block
diff --git a/lisp/babel/ob-ref.el b/lisp/babel/ob-ref.el
index ef1dd1f0e..17a7e3451 100644
--- a/lisp/babel/ob-ref.el
+++ b/lisp/babel/ob-ref.el
@@ -53,6 +53,8 @@
 
 ;;; Code:
 (require 'ob)
+(eval-when-compile
+  (require 'cl))
 
 (defun org-babel-ref-variables (params)
   "Takes a parameter alist, and return an alist of variable
diff --git a/lisp/babel/ob-tangle.el b/lisp/babel/ob-tangle.el
index 34cff5d20..ddf942981 100644
--- a/lisp/babel/ob-tangle.el
+++ b/lisp/babel/ob-tangle.el
@@ -30,6 +30,8 @@
 
 ;;; Code:
 (require 'ob)
+(eval-when-compile
+  (require 'cl))
 
 (declare-function org-babel-get-src-block-info "ob" (&optional header-vars-only))