diff --git a/core/core-packages.el b/core/core-packages.el
index 3fd22c245..1fe3a0bb7 100644
--- a/core/core-packages.el
+++ b/core/core-packages.el
@@ -649,10 +649,9 @@ If RECOMPILE-P is non-nil, only recompile out-of-date files."
                       (let ((elc-file (byte-compile-dest-file target)))
                         (and (file-exists-p elc-file)
                              (file-newer-than-file-p file elc-file))))
-              (let ((result (if (and (string-match-p "/autoload/.*\\.el$" target)
-                                     (not (doom-packages--read-if-cookies target)))
-                                'no-byte-compile
-                              (byte-compile-file target)))
+              (let ((result (if (doom-packages--read-if-cookies target)
+                                (byte-compile-file target)
+                              'no-byte-compile))
                     (short-name (file-relative-name target doom-emacs-dir)))
                 (cl-incf
                  (cond ((eq result 'no-byte-compile)
diff --git a/modules/lang/haskell/+dante.el b/modules/lang/haskell/+dante.el
index bf2d61fa1..837d6b9e0 100644
--- a/modules/lang/haskell/+dante.el
+++ b/modules/lang/haskell/+dante.el
@@ -1,4 +1,5 @@
 ;;; lang/haskell/+dante.el -*- lexical-binding: t; -*-
+;;;###if (featurep! +dante)
 
 (def-package! dante
   :after haskell-mode
diff --git a/modules/lang/haskell/+intero.el b/modules/lang/haskell/+intero.el
index 2586df6a8..666ef0355 100644
--- a/modules/lang/haskell/+intero.el
+++ b/modules/lang/haskell/+intero.el
@@ -1,4 +1,5 @@
 ;;; lang/haskell/+intero.el -*- lexical-binding: t; -*-
+;;;###if (featurep! +intero)
 
 (def-package! intero
   :hook (haskell-mode . intero-mode)
diff --git a/modules/lang/java/+eclim.el b/modules/lang/java/+eclim.el
index 1113e387a..8bacaa9d6 100644
--- a/modules/lang/java/+eclim.el
+++ b/modules/lang/java/+eclim.el
@@ -1,4 +1,5 @@
 ;;; lang/java/+eclim.el -*- lexical-binding: t; -*-
+;;;###if (featurep! +eclim)
 
 ;; NOTE This submodule is incomplete
 
diff --git a/modules/lang/java/+meghanada.el b/modules/lang/java/+meghanada.el
index 63f994c91..19b5b47c0 100644
--- a/modules/lang/java/+meghanada.el
+++ b/modules/lang/java/+meghanada.el
@@ -1,4 +1,5 @@
 ;;; lang/java/+meghanada.el -*- lexical-binding: t; -*-
+;;;###if (featurep! +meghanada)
 
 (def-package! meghanada
   :hook (java-mode . meghanada-mode)