require cl-lib and cc-langs only compile time

Author: zonuexe

lisp/php-mode.el

@@ -56,9 +56,9 @@
 (require 'php)
 (require 'php-face)
 (require 'cc-mode)
-(require 'cc-langs)
 
 (eval-when-compile
+  (require 'cc-langs)
   (require 'cc-fonts))
 
 ;; Boilerplate from other `cc-mode' derived modes. See
@@ -73,12 +73,12 @@
 (require 'imenu)
 (require 'package)
 (require 'nadvice)
-
-(require 'cl-lib)
 (require 'mode-local)
 (require 'php-project)
 
 (eval-when-compile
+  (require 'rx)
+  (require 'cl-lib)
   (require 'regexp-opt)
   (defvar add-log-current-defun-header-regexp)
   (defvar add-log-current-defun-function)

lisp/php-project.el

@@ -66,7 +66,8 @@
 ;;
 
 ;;; Code:
-(require 'cl-lib)
+(eval-when-compile
+  (require 'cl-lib))
 (require 'projectile nil t)
 
 ;; Constants

lisp/php.el

@@ -27,7 +27,8 @@
 ;; This file provides common variable and functions for PHP packages.
 
 ;;; Code:
-(require 'cl-lib)
+(eval-when-compile
+  (require 'cl-lib))
 (require 'flymake)
 (require 'php-project)
 (require 'rx)