diff --git a/el/sclang-help.el b/el/sclang-help.el
index e30f8e9..97d998f 100644
--- a/el/sclang-help.el
+++ b/el/sclang-help.el
@@ -349,7 +349,7 @@
   (sclang-help-mode-limit-point-to-code (sclang-end-of-defun arg)))
 
 (defun sclang-help-mode-fontify-region (start end loudly)
-  (flet ((fontify-code
+  (cl-flet ((fontify-code
 	  (start end loudly)
 	  (funcall 'font-lock-default-fontify-region start end loudly))
 	 (fontify-non-code
@@ -435,7 +435,7 @@
 
 ;; (defun sclang-extension-help-directories ()
 ;;   "Build a list of help directories for extensions."
-;;   (flet ((flatten (seq)
+;;   (cl-flet ((flatten (seq)
 ;; 		  (if (null seq)
 ;; 		      seq
 ;; 		    (if (listp seq)
diff --git a/el/sclang-interp.el b/el/sclang-interp.el
index b254038..24aebbc 100644
--- a/el/sclang-interp.el
+++ b/el/sclang-interp.el
@@ -287,7 +287,7 @@ If EOB-P is non-nil, positions cursor at end of buffer."
 (defun sclang-make-options ()
   (let ((default-directory "")
 	(res ()))
-    (flet ((append-option
+    (cl-flet ((append-option
 	    (option &optional value)
 	    (setq res (append res (list option) (and value (list value))))))
       (if (file-directory-p sclang-runtime-directory)
diff --git a/el/sclang-language.el b/el/sclang-language.el
index e86bf7f..4303a83 100644
--- a/el/sclang-language.el
+++ b/el/sclang-language.el
@@ -252,7 +252,7 @@ low-resource systems."
 
 (defun sclang-read-symbol (prompt &optional default predicate require-match inherit-input-method)
   (if sclang-use-symbol-table
-      (flet ((make-minibuffer-local-map
+      (cl-flet ((make-minibuffer-local-map
 	      (parent-keymap)
 	      (let ((map (make-sparse-keymap)))
 		(set-keymap-parent map parent-keymap)
@@ -753,7 +753,7 @@ current-directory, iff `sclang-source-directoy' is nil."
 Looks for all repetitive patterns in ITEMS recursively.  Therefore, it is
 computationally expensive, especially when ITEMS is a long list.  If you don't
 want smart pattern guessing, use `sclang-format' directly to format your Pseq."
-  (flet ((find-reps (items)
+  (cl-flet ((find-reps (items)
 	   (let (r)
 	     (while items
 	       (let ((ret (car items))
diff --git a/el/sclang-server.el b/el/sclang-server.el
index 71f388e..90c9917 100644
--- a/el/sclang-server.el
+++ b/el/sclang-server.el
@@ -120,7 +120,7 @@
   (define-key map [?o] 'sclang-server-dump-osc)
   (define-key map [?p] 'sclang-show-server-panel)
   (define-key map [?q] 'sclang-server-quit)
-  (flet ((fill-record-map (map)
+  (cl-flet ((fill-record-map (map)
 			  (define-key map [?n] 'sclang-server-prepare-for-record)
 			  (define-key map [?p] 'sclang-server-pause-recording)
 			  (define-key map [?r] 'sclang-server-record)