diff --git a/exwm-floating.el b/exwm-floating.el
index f8891be..36a658a 100644
--- a/exwm-floating.el
+++ b/exwm-floating.el
@@ -30,7 +30,6 @@
 (require 'exwm-core)
 (eval-when-compile (require 'exwm-workspace))
 
-;;;###autoload
 (defvar exwm-floating-border-width 1 "Border width of the floating window.")
 (defvar exwm-floating-border-color "blue"
   "Border color of the floating window.")
diff --git a/exwm-layout.el b/exwm-layout.el
index 13bd085..4ccaef7 100644
--- a/exwm-layout.el
+++ b/exwm-layout.el
@@ -28,6 +28,8 @@
 (require 'exwm-core)
 (eval-when-compile (require 'exwm-workspace))
 
+(defvar exwm-floating-border-width)
+
 ;;;###autoload
 (defun exwm-layout--show (id &optional window)
   "Show window ID exactly fit in the Emacs window WINDOW."
diff --git a/exwm-workspace.el b/exwm-workspace.el
index a6f21b2..6f76d20 100644
--- a/exwm-workspace.el
+++ b/exwm-workspace.el
@@ -63,7 +63,6 @@
 
 (defvar exwm-workspace--switch-history nil
   "History for `read-from-minibuffer' to interactively switch workspace.")
-;;;###autoload
 (defvar exwm-workspace--switch-history-outdated nil
   "Non-nil to indicate `exwm-workspace--switch-history' is outdated.")