From 1862b858a405ec7e3888e2a338f809753cc59d75 Mon Sep 17 00:00:00 2001
From: Mats Lidell <mats.lidell@lidells.se>
Date: Tue, 12 May 2026 23:52:09 +0200
Subject: [PATCH 1/2] Do not load and generate autoloads from hload-path in
 batch

* hload-path.el: Only generate and load autoloads when interactive
---
 ChangeLog     | 4 ++++
 hload-path.el | 5 +++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 65e790a6..dd5994bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2026-05-13  Mats Lidell  <matsl@gnu.org>
+
+* hload-path.el: Only generate and load autoloads when interactive.
+
 2026-05-12  Mats Lidell  <matsl@gnu.org>
 
 * Makefile (HYPB_NATIVE_COMP): Use MAKE variable in recursive make.
diff --git a/hload-path.el b/hload-path.el
index 1ca8dccc..4e2fc48f 100644
--- a/hload-path.el
+++ b/hload-path.el
@@ -143,8 +143,9 @@ This is used only when running from git source and not a package release."
 
 ;; Ensure *-autoloads.el files are already generated or generate them.
 ;; Then ensure they are loaded.
-(hyperb:maybe-generate-autoloads)
-(hyperb:maybe-load-autoloads)
+(unless noninteractive
+  (hyperb:maybe-generate-autoloads)
+  (hyperb:maybe-load-autoloads))
 
 (provide 'hload-path)
 

From 79dd86262333fd333496643a96a081d2af53661c Mon Sep 17 00:00:00 2001
From: Mats Lidell <mats.lidell@lidells.se>
Date: Wed, 13 May 2026 22:20:03 +0200
Subject: [PATCH 2/2] Remove compile dependency on loading autoloads

Add declare-function and defvar declarations so each el-file can be
byte compiled without requiring the autoloads to be loaded.
---
 hactypes.el     |  7 ++--
 hargs.el        |  5 +++
 hbut.el         | 13 ++++----
 hgnus.el        |  2 +-
 hmh.el          |  3 +-
 hmouse-drv.el   |  2 ++
 hmouse-sh.el    | 12 +++----
 hmouse-tag.el   |  3 +-
 hpath.el        |  1 +
 hrmail.el       |  4 ++-
 hsmail.el       |  6 ++++
 hsys-consult.el | 12 ++++---
 hsys-org.el     |  3 ++
 hsys-www.el     |  3 +-
 hui-mini.el     | 10 ++++--
 hui-mouse.el    |  5 +++
 hui-select.el   |  6 ++--
 hui-window.el   |  4 +++
 hui.el          |  6 +++-
 hversion.el     |  1 +
 hycontrol.el    | 86 ++++++++++++++++++++++++-------------------------
 hypb.el         |  4 +++
 hywconfig.el    |  5 +++
 hywiki.el       |  6 ++++
 kotl/kfile.el   |  8 +++++
 kotl/kview.el   |  8 +++--
 kotl/kvspec.el  |  5 ++-
 27 files changed, 153 insertions(+), 77 deletions(-)

diff --git a/hactypes.el b/hactypes.el
index a0827190..4106168d 100644
--- a/hactypes.el
+++ b/hactypes.el
@@ -24,14 +24,15 @@
 ;;; Public declarations
 ;;; ************************************************************************
 
-(declare-function kotl-mode:goto-cell "kotl-mode")
+(declare-function kcell-view:indent "kcell-view")
 (declare-function kotl-mode:beginning-of-buffer "kotl-mode")
+(declare-function kotl-mode:goto-cell "kotl-mode")
 (declare-function kotl-mode:goto-cell-ref "kotl-mode")
-(declare-function kcell-view:indent "kcell-view")
-
 (declare-function org-fold-show-context "org-fold")
 (declare-function org-roam-id-find "‎ext:org-roam-id")
 (declare-function rmail:msg-to-p "hrmail")
+(declare-function smart-eobp "hui-mouse")
+(declare-function smart-tags-file-path "hmouse-tag")
 
 ;;; ************************************************************************
 ;;; Standard Hyperbole action types
diff --git a/hargs.el b/hargs.el
index 5f14c7c2..7438a4ce 100644
--- a/hargs.el
+++ b/hargs.el
@@ -66,6 +66,11 @@
 
 (declare-function smart-dired-pathname-up-to-point "hui-mouse")
 
+(declare-function Info-menu-item-at-p "hmouse-info")
+(declare-function Info-note-at-p "hmouse-info")
+(declare-function Info-current-filename-sans-extension "hmouse-info")
+(declare-function Info-read-index-item-name "hmouse-info")
+
 ;;; ************************************************************************
 ;;; Public variables
 ;;; ************************************************************************
diff --git a/hbut.el b/hbut.el
index 166220e0..e09e70a7 100644
--- a/hbut.el
+++ b/hbut.el
@@ -49,12 +49,14 @@ Use the function, (hbut:max-len), to read the proper value.")
 
 (declare-function hargs:delimited "hargs")
 (declare-function hargs:read-match "hargs")
-(declare-function hpath:find-noselect "hpath")
+(declare-function hpath:display-buffer "hpath")
+(declare-function hpath:file-position-to-line-and-column "hpath")
 (declare-function hpath:find "hpath")
+(declare-function hpath:find-noselect "hpath")
+(declare-function hpath:shorten "hpath")
 (declare-function hpath:substitute-var "hpath")
 (declare-function hpath:symlink-referent "hpath")
 (declare-function hpath:www-p "hpath")
-(declare-function hpath:shorten "hpath")
 (declare-function hsys-org-block-start-at-p "hsys-org")
 (declare-function hsys-org-src-block-start-at-p "hsys-org")
 (declare-function hui:buf-writable-err "hui")
@@ -62,15 +64,14 @@ Use the function, (hbut:max-len), to read the proper value.")
 (declare-function hui:ibut-rename "hui")
 (declare-function hui:key-dir "hui")
 (declare-function hui:key-src "hui")
+(declare-function hyrolo-hdr-move-after-p "hyrolo")
+(declare-function hywiki-find-referent "hywiki")
 (declare-function hywiki-get-referent "hywiki")
 (declare-function kbd-key:act "hib-kbd")
 (declare-function kbd-key:is-p "hib-kbd")
 (declare-function org-context "org")
-
-(declare-function hpath:file-position-to-line-and-column "hpath")
-
-(declare-function hyrolo-hdr-move-after-p "hyrolo")
 (declare-function smart-eolp "hui-mouse")
+(declare-function hsys-org-at-read-only-p "hsys-org")
 
 ;;; ************************************************************************
 ;;; Private variables
diff --git a/hgnus.el b/hgnus.el
index 2e59edc1..79b58f4b 100644
--- a/hgnus.el
+++ b/hgnus.el
@@ -35,7 +35,7 @@
 ;;; Other required Elisp libraries
 ;;; ************************************************************************
 
-(eval-and-compile (mapc #'require '(hload-path hmail hsmail hypb gnus-msg)))
+(eval-and-compile (mapc #'require '(hload-path hmail hsmail hypb gnus-msg hvar)))
 
 ;;; ************************************************************************
 ;;; Public variables
diff --git a/hmh.el b/hmh.el
index 0b8f9be1..41b95854 100644
--- a/hmh.el
+++ b/hmh.el
@@ -13,7 +13,7 @@
 ;; This file is part of GNU Hyperbole.
 
 ;;; Commentary:
-;; 
+;;
 ;;   Automatically configured for use in "hsettings.el".
 ;;   If hsettings loading fails prior to initializing Hyperbole Mh support,
 ;;
@@ -41,6 +41,7 @@
 ;;; ************************************************************************
 
 (declare-function hypb:window-list "hypb")
+(declare-function var:append "hvar")
 
 ;;; ************************************************************************
 ;;; Public functions
diff --git a/hmouse-drv.el b/hmouse-drv.el
index b1235e35..86534bea 100644
--- a/hmouse-drv.el
+++ b/hmouse-drv.el
@@ -55,6 +55,7 @@
 (defvar hmouse-set-point-command)       ; "hui-mouse.el"
 
 (defvar hyperbole-mode-map)             ; "hyperbole.el"
+(defvar hyperbole-mode)                 ; "hyperbole.el"
 
 (defvar action-key-default-function)    ; defcustom hui-mouse
 (defvar assist-key-default-function)    ; defcustom hui-mouse
@@ -73,6 +74,7 @@
 (declare-function hui:ebut-link-directly "hui")
 (declare-function hui:ibut-link-directly "hui")
 (declare-function org-todo "org")
+(declare-function hpath:display-buffer "hpath")
 
 ;;; ************************************************************************
 ;;; Public variables
diff --git a/hmouse-sh.el b/hmouse-sh.el
index aece498d..3d869fc0 100644
--- a/hmouse-sh.el
+++ b/hmouse-sh.el
@@ -39,7 +39,7 @@
 (defvar hmouse-set-point-command)       ; "hui-mouse.el"
 (defvar hmouse-bindings)                ; "hmouse-key.el"
 (defvar hmouse-bindings-flag)           ; "hmouse-key.el"
-
+(defvar hyperbole-mode)                 ; "hyperbole.el"
 (defvar Info-mode-map)
 
 (declare-function action-key-depress-emacs "hmouse-drv")
@@ -98,7 +98,7 @@ Use nil as cmd value to unbind a key."
 	   [right-fringe down-mouse-3]
 	   [vertical-line down-mouse-3]
 	   [mode-line down-mouse-3])
-	  
+
 	  ([down-mouse-4]
 	   [double-down-mouse-4] [triple-down-mouse-4]
 	   [header-line down-mouse-4]
@@ -114,7 +114,7 @@ Use nil as cmd value to unbind a key."
 	   [right-fringe down-mouse-5]
 	   [vertical-line down-mouse-5]
 	   [mode-line down-mouse-5]))))
-	   
+
   (hmouse-set-key-list
    release-cmd
    (nth (1- mouse-key-number)
@@ -209,7 +209,7 @@ This includes depresses and drags.  Shifted Mouse Key 1 is
 	   [right-fringe S-down-mouse-3]
 	   [vertical-line S-down-mouse-3]
 	   [mode-line S-down-mouse-3])
-	  
+
 	  ([S-down-mouse-4] [header-line S-down-mouse-4]
 	   [left-fringe S-down-mouse-4]
 	   [right-fringe S-down-mouse-4]
@@ -221,7 +221,7 @@ This includes depresses and drags.  Shifted Mouse Key 1 is
 	   [right-fringe S-down-mouse-5]
 	   [vertical-line S-down-mouse-5]
 	   [mode-line S-down-mouse-5]))))
-	  
+
   (hmouse-set-key-list
    release-cmd
    (nth (1- shifted-mouse-key-number)
@@ -290,7 +290,7 @@ This includes depresses and drags.  Shifted Mouse Key 1 is
 	   [vertical-line S-mouse-5]
 	   [mode-line S-drag-mouse-5]
 	   [mode-line S-mouse-5])))))
-	   
+
 (defun hmouse-get-bindings (middle-flag)
   "Return the list of active bindings of mouse keys used by Hyperbole.
 If MIDDLE-FLAG is non-nil, include the middle mouse key
diff --git a/hmouse-tag.el b/hmouse-tag.el
index 541a601a..d6cad676 100644
--- a/hmouse-tag.el
+++ b/hmouse-tag.el
@@ -59,6 +59,7 @@
 (defvar hkey-value)                     ; "hui-mouse.el"
 
 (declare-function hsys-org-get-value "hsys-org")
+(declare-function hsys-org-mode-p "hsys-org")
 (declare-function org-in-src-block-p "org")
 (declare-function ibtype:def-symbol "hbut")
 
@@ -890,7 +891,7 @@ Otherwise:
      identifier, then the man page is displayed."
 
   (interactive)
-  
+
   (if (fboundp 'objc-to-definition)
       ;; Only fboundp if the OO-Browser has been loaded.
       (smart-objc-oo-browser)
diff --git a/hpath.el b/hpath.el
index e368a6ce..d895a15e 100644
--- a/hpath.el
+++ b/hpath.el
@@ -153,6 +153,7 @@ The format is ${variable}.  Match grouping 1 is the name of the variable.")
 (declare-function kbd-key:key-series-to-events "hib-kbd")
 (declare-function kcell-view:indent "kcell-view")
 (declare-function klink:act "klink")
+(declare-function kotl-mode:to-valid-position "kotl-mode")
 (declare-function mm-mailcap-command "mm-decode")
 (declare-function org-element-property "org-element-ast")
 
diff --git a/hrmail.el b/hrmail.el
index dc7e59c5..2c623504 100644
--- a/hrmail.el
+++ b/hrmail.el
@@ -13,7 +13,7 @@
 ;; This file is part of GNU Hyperbole.
 
 ;;; Commentary:
-;; 
+;;
 ;;   Automatically configured for use in "hyperbole.el".
 ;;   If hsettings loading fails prior to initializing Hyperbole Rmail support,
 ;;
@@ -37,6 +37,8 @@
 (defvar rmail-old-text)
 (defvar message-setup-hook)             ; "message.el"
 
+(declare-function smart-eobp "hui-mouse")
+
 ;;; ************************************************************************
 ;;; Public functions
 ;;; ************************************************************************
diff --git a/hsmail.el b/hsmail.el
index 15916f55..3dbb535c 100644
--- a/hsmail.el
+++ b/hsmail.el
@@ -52,6 +52,12 @@ for a comment.")
 ;; message-mode defines message-indentation-spaces - mail-indentation-spaces removed
 ;; message-mode defines message-reply-buffer - mail-reply-buffer removed
 
+;;; ************************************************************************
+;;; Public declarations
+;;; ************************************************************************
+
+(declare-function hmail:msg-narrow "hmail")
+
 ;;; ************************************************************************
 ;;; Overloaded functions
 ;;; ************************************************************************
diff --git a/hsys-consult.el b/hsys-consult.el
index 81306d3f..0343a20c 100644
--- a/hsys-consult.el
+++ b/hsys-consult.el
@@ -38,11 +38,6 @@
 ;;; Public declarations
 ;;; ************************************************************************
 
-(declare-function hyrolo-at-tags-p "hyrolo")
-(declare-function hywiki-at-tags-p "hywiki")
-(declare-function hsys-org-directory-at-tags-p "hsys-org")
-(declare-function hsys-org-at-tags-p "hsys-org")
-
 (declare-function consult--async-command "ext:consult")
 (declare-function consult--grep "ext:consult")
 (declare-function consult--grep-make-builder "ext:consult")
@@ -51,6 +46,13 @@
 (declare-function consult--ripgrep-make-builder "ext:consult")
 (declare-function consult-grep "ext:consult")
 (declare-function consult-ripgrep "ext:consult")
+(declare-function hsys-org-at-tags-p "hsys-org")
+(declare-function hsys-org-consult-grep "hsys-org")
+(declare-function hsys-org-directory-at-tags-p "hsys-org")
+(declare-function hyrolo-at-tags-p "hyrolo")
+(declare-function hyrolo-consult-grep "hyrolo")
+(declare-function hywiki-at-tags-p "hywiki")
+(declare-function hywiki-consult-grep "hywiki")
 (declare-function org-roam-db-autosync-mode "ext:org-roam")
 (declare-function org-roam-node-find "ext:org-roam")
 (declare-function org-roam-node-level "ext:org-roam")
diff --git a/hsys-org.el b/hsys-org.el
index 9d0e185f..18e9a8c9 100644
--- a/hsys-org.el
+++ b/hsys-org.el
@@ -69,6 +69,9 @@
 (declare-function hsys-org-roam-tags-view "hsys-org")
 
 (declare-function org-babel-get-src-block-info "org-babel")
+(declare-function org-element--property "org-element-ast")
+(declare-function org-element-lineage "org-element-ast")
+(declare-function org-element-type "org-element-ast")
 (declare-function org-fold-show-context "org-fold")
 (declare-function org-id-find "org-id")
 (declare-function org-link-open-from-string "ol")
diff --git a/hsys-www.el b/hsys-www.el
index 71fb13ac..ec95f928 100644
--- a/hsys-www.el
+++ b/hsys-www.el
@@ -45,9 +45,10 @@
 
 (declare-function eww--dwim-expand-url "eww" (url))
 
+(declare-function hpath:display-buffer "hpath")
+(declare-function hpath:remote-at-p "hpath")
 (declare-function hpath:remote-available-p "hpath")
 (declare-function hpath:remote-p "hpath")
-(declare-function hpath:remote-at-p "hpath")
 (declare-function hpath:www-at-p "hpath")
 
 ;; Forward declare conditionally defined functions
diff --git a/hui-mini.el b/hui-mini.el
index 458da0a7..63379ba8 100644
--- a/hui-mini.el
+++ b/hui-mini.el
@@ -30,6 +30,7 @@
 (defvar hargs:reading-type)             ; "hargs.el"
 (defvar hbmap:dir-user)                 ; "hbmap.el"
 (defvar hbmap:filename)                 ; "hbmap.el"
+(defvar hsys-org-enable-smart-keys)     ; "hsys-org.el"
 (defvar hui:menu-highlight-flag)        ; "hui-mini.el"
 (defvar hui:menu-hywiki nil)            ; "hui-mini.el"
 (defvar hui:menu-mode-map)              ; "hui-mini.el"
@@ -41,9 +42,14 @@
 (defvar hywiki-mode)                    ; "hywiki.el"
 (defvar org-mode-map)                   ; "org.el"
 
-(declare-function hpath:find "hpath")
-(declare-function hmouse-update-smart-keys "hmouse-key")
 (declare-function hargs:at-p "hargs")
+(declare-function hkey-help-show "hmouse-drv")
+(declare-function hmouse-update-smart-keys "hmouse-key")
+(declare-function hpath:find "hpath")
+(declare-function hyperb:init-menubar "hinit")
+(declare-function hyperbole-mode "hyperbole")
+(declare-function hyrolo-add "hyrolo")
+(declare-function hyrolo-fgrep "hyrolo")
 (declare-function kbd-key:hyperbole-mini-menu-key-p "hib-kbd")
 
 ;;; ************************************************************************
diff --git a/hui-mouse.el b/hui-mouse.el
index adf4b8bc..c8a94b2c 100644
--- a/hui-mouse.el
+++ b/hui-mouse.el
@@ -97,6 +97,11 @@
 (declare-function kotl-mode:eobp "kotl-mode")
 (declare-function kotl-mode:eolp "kotl-mode")
 
+;; Other Hyperbole functions
+(declare-function smart-python-at-tag-p "hmouse-tag")
+(declare-function smart-tags-file-list "hmouse-tag")
+(declare-function Info-handle-in-note "hmouse-info")
+
 ;; Emacs functions
 (declare-function Custom-buffer-done "cus-edit")
 (declare-function Custom-newline "cus-edit")
diff --git a/hui-select.el b/hui-select.el
index fa800f48..bd5e87aa 100644
--- a/hui-select.el
+++ b/hui-select.el
@@ -345,10 +345,12 @@ Used to include a final line when marking indented code.")
 (defvar hyperbole-mode-map)             ; "hyperbole.el"
 (defvar org-mode-map)                   ; "org.el"
 
-(declare-function kview:valid-position-p "kotl/kview")
+(declare-function hargs:delimited "hargs")
 (declare-function hkey-set-key "hyperbole")
 (declare-function hypb:cmd-key-vector "hypb")
-(declare-function hargs:delimited "hargs")
+(declare-function kotl-mode:to-valid-position "kotl/kotl-mode")
+(declare-function kview:valid-position-p "kotl/kview")
+(declare-function smart-eobp "hui-mouse")
 
 ;;; ************************************************************************
 ;;; Private variables
diff --git a/hui-window.el b/hui-window.el
index f4e3372c..79d4ffd7 100644
--- a/hui-window.el
+++ b/hui-window.el
@@ -58,10 +58,14 @@
 (declare-function hbut:act "hbut")
 (declare-function hbut:action "hbut")
 (declare-function hbut:at-p "hbut")
+(declare-function hkey-help-hide "hmouse-drv")
 (declare-function hkey-summarize "hmouse-drv")
 (declare-function hmouse-save-region "hmouse-drv")
 (declare-function hmouse-use-region-p "hmouse-drv")
 (declare-function hmouse-window-coordinates "hmouse-drv")
+(declare-function hui-menu-screen-commands "hui-jmenu")
+(declare-function hyperbole "hui-mini")
+(declare-function smart-eobp "hui-mouse")
 (declare-function smart-helm-alive-p "hui-mouse")
 (declare-function smart-helm-line-has-action "hui-mouse")
 (declare-function smart-helm-to-minibuffer "hui-mouse")
diff --git a/hui.el b/hui.el
index 48ecd8c9..7b34b23d 100644
--- a/hui.el
+++ b/hui.el
@@ -39,8 +39,10 @@
 (defvar hyperbole-mode-map)             ; "hyperbole.el"
 (defvar hywiki-mode)                    ; "hywiki.el"
 
+(declare-function Info-menu-item-at-p "hmouse-info")
 (declare-function actypes::link-to-wikiword "hywiki")
 (declare-function bookmark-bmenu-bookmark "bookmark")
+(declare-function hui-register-struct-at-point "hui-register")
 (declare-function hui:menu-choose "hui-mini")
 (declare-function hywiki-get-buffer-page-name "hywiki")
 (declare-function hywiki-in-page-p "hywiki")
@@ -50,7 +52,9 @@
 (declare-function kcell-view:absolute-reference "kotl/kview")
 (declare-function kcell-view:idstamp "kotl/kview")
 (declare-function klink:absolute "kotl/klink")
-(declare-function kotl-mode:copy-region-as-kill "kotl-mode")
+(declare-function klink:at-p "kotl/klink")
+(declare-function kotl-mode "kotl/kotl-mode")
+(declare-function kotl-mode:copy-region-as-kill "kotl/kotl-mode")
 (declare-function kotl-mode:kill-region "kotl-mode")
 (declare-function texinfo-copy-node-name "texnfo-upd")
 
diff --git a/hversion.el b/hversion.el
index b8d560cd..33c8cd41 100644
--- a/hversion.el
+++ b/hversion.el
@@ -30,6 +30,7 @@
 (declare-function hpath:substitute-value "hpath")
 (declare-function id-info-item "hversion")
 (declare-function br-in-browser "hpath")
+(declare-function hpath:display-buffer "hpath")
 
 ;;; ************************************************************************
 ;;; Public variables
diff --git a/hycontrol.el b/hycontrol.el
index 2255b485..0645b80d 100644
--- a/hycontrol.el
+++ b/hycontrol.el
@@ -91,7 +91,7 @@
 ;;   perpendicular to that edge by 50% while keeping the original edge
 ;;   fixed in place.  Try them and you will quickly see how they can
 ;;   help.
-;;   
+;;
 ;;   ----
 ;;
 ;;   When HyControl creates a new frame, it automatically sizes it to the
@@ -532,6 +532,48 @@ The cycle is in clockwise order from the upper left corner.")
   "Store value of `which-key-inhibit' flag from \"which-key\" package, if any.
 Used on entry to HyControl.")
 
+;; This just sets the keymap locally and shows the minor mode
+;; indicator in the buffer's mode-line; the separate global minor mode
+;; turns things on and off.
+;;;###autoload
+(define-minor-mode hycontrol-local-frames-mode
+  "Toggle Hyperbole Frames control minor mode in the current buffer."
+  :lighter " HyFrm"
+  :group 'hyperbole-screen)
+
+;;;###autoload
+(define-globalized-minor-mode hycontrol-frames-mode hycontrol-local-frames-mode
+  (lambda () (hycontrol-local-frames-mode 1))
+  :group 'hyperbole-screen)
+
+;; These hooks run by the generated `hycontrol-frames-mode' function
+;; do the global work of turning on and off the mode.
+(add-hook 'hycontrol-frames-mode-on-hook
+	  (lambda () (hycontrol-frames current-prefix-arg)))
+
+(add-hook 'hycontrol-frames-mode-off-hook 'hycontrol-end-mode)
+
+;; This just sets the keymap locally and shows the minor mode
+;; indicator in the buffer's mode-line; the separate global minor mode
+;; turns things on and off.
+;;;###autoload
+(define-minor-mode hycontrol-local-windows-mode
+  "Toggle Hyperbole Windows control minor mode in the current buffer."
+  :lighter " HyWin"
+  :group 'hyperbole-screen)
+
+;;;###autoload
+(define-globalized-minor-mode hycontrol-windows-mode hycontrol-local-windows-mode
+  (lambda () (hycontrol-local-windows-mode 1))
+  :group 'hyperbole-screen)
+
+;; These hooks run by the generated `hycontrol-windows-mode' function
+;; do the global work of turning on and off the mode.
+(add-hook 'hycontrol-windows-mode-on-hook
+	  (lambda () (hycontrol-windows current-prefix-arg)))
+
+(add-hook 'hycontrol-windows-mode-off-hook 'hycontrol-end-mode)
+
 ;;; ************************************************************************
 ;;; Private functions
 ;;; ************************************************************************
@@ -1101,48 +1143,6 @@ instead of quitting HyControl."
       (message "Hyperbole finished controlling frames"))
     (hycontrol-disable-modes)))
 
-;; This just sets the keymap locally and shows the minor mode
-;; indicator in the buffer's mode-line; the separate global minor mode
-;; turns things on and off.
-;;;###autoload
-(define-minor-mode hycontrol-local-frames-mode
-  "Toggle Hyperbole Frames control minor mode in the current buffer."
-  :lighter " HyFrm"
-  :group 'hyperbole-screen)
-
-;;;###autoload
-(define-globalized-minor-mode hycontrol-frames-mode hycontrol-local-frames-mode
-  (lambda () (hycontrol-local-frames-mode 1))
-  :group 'hyperbole-screen)
-
-;; These hooks run by the generated `hycontrol-frames-mode' function
-;; do the global work of turning on and off the mode.
-(add-hook 'hycontrol-frames-mode-on-hook
-	  (lambda () (hycontrol-frames current-prefix-arg)))
-
-(add-hook 'hycontrol-frames-mode-off-hook 'hycontrol-end-mode)
-
-;; This just sets the keymap locally and shows the minor mode
-;; indicator in the buffer's mode-line; the separate global minor mode
-;; turns things on and off.
-;;;###autoload
-(define-minor-mode hycontrol-local-windows-mode
-  "Toggle Hyperbole Windows control minor mode in the current buffer."
-  :lighter " HyWin"
-  :group 'hyperbole-screen)
-
-;;;###autoload
-(define-globalized-minor-mode hycontrol-windows-mode hycontrol-local-windows-mode
-  (lambda () (hycontrol-local-windows-mode 1))
-  :group 'hyperbole-screen)
-
-;; These hooks run by the generated `hycontrol-windows-mode' function
-;; do the global work of turning on and off the mode.
-(add-hook 'hycontrol-windows-mode-on-hook
-	  (lambda () (hycontrol-windows current-prefix-arg)))
-
-(add-hook 'hycontrol-windows-mode-off-hook 'hycontrol-end-mode)
-
 ;;; Frame Display Commands
 (defun hycontrol-delete-other-frames ()
   "Confirm and then delete all other frames."
diff --git a/hypb.el b/hypb.el
index a424ca3d..48ec1ff4 100644
--- a/hypb.el
+++ b/hypb.el
@@ -60,6 +60,10 @@
 (declare-function hkey-either "hmouse-drv")
 (declare-function hycontrol-frame-to-right-center "hycontrol")
 
+(defvar hsys-org-enable-smart-keys)     ; "hsys-org.el"
+(declare-function kview:char-invisible-p "kotl/kview")
+(declare-function smart-eobp "hui-mouse")
+
 ;;; ************************************************************************
 ;;; Public variables
 ;;; ************************************************************************
diff --git a/hywconfig.el b/hywconfig.el
index 9965d67f..0fac050c 100644
--- a/hywconfig.el
+++ b/hywconfig.el
@@ -64,6 +64,11 @@
           :match ,(lambda (_widget value) (and (integerp value) (> value 0))))
   :group 'hyperbole-screen)
 
+;;; ************************************************************************
+;;; Public declarations
+;;; ************************************************************************
+
+(declare-function hyperbole "hui-mini")
 
 ;;; ************************************************************************
 ;;; Public functions
diff --git a/hywiki.el b/hywiki.el
index da2a54d3..23197e5f 100644
--- a/hywiki.el
+++ b/hywiki.el
@@ -166,7 +166,10 @@
 (defvar org-agenda-buffer-tmp-name)              ;; "org-agenda.el"
 (defvar org-export-with-broken-links)            ;; "ox.el"
 (defvar org-publish-project-alist)               ;; "ox-publish.el"
+(defvar hyperbole-mode)                          ;; "hyperbole.el"
 
+(declare-function Info-current-filename-sans-extension "hui-mouse")
+(declare-function Info-read-index-item-name "hui-mouse")
 (declare-function activities-completing-read "activities" (:prompt prompt :default default))
 (declare-function activities-new "activities" (name))
 (declare-function activities-resume "activities" (activity :resetp resetp))
@@ -181,6 +184,8 @@
 (declare-function consult--lookup-member "ext:consult")
 (declare-function consult--read "ext:consult")
 (declare-function hsys-org-at-tags-p "hsys-org")
+(declare-function hyperbole-mode "hyperbole")
+(declare-function hyrolo-fgrep "hyrolo")
 (declare-function hywiki-org-format-heading "hywiki")
 (declare-function ibtypes::pathname "hpath")
 (declare-function ibtypes::pathname-line-and-column "hpath")
@@ -194,6 +199,7 @@
 (declare-function org-roam-node-read "org-roam" (&optional initial-input filter-fn sort-fn require-match prompt))
 (declare-function org-roam-node-title "org-roam-node" (node))
 (declare-function smart-treemacs-edit "hui-treemacs" (&optional dir))
+(declare-function smart-treemacs-modeline "hui-treemacs")
 
 ;;; ************************************************************************
 ;;; Private variables
diff --git a/kotl/kfile.el b/kotl/kfile.el
index f3a5a519..aab5d84f 100644
--- a/kotl/kfile.el
+++ b/kotl/kfile.el
@@ -21,6 +21,14 @@
 
 (eval-and-compile (mapc #'require '(kproperty kmenu kview kvspec kcell)))
 
+;;; ************************************************************************
+;;; Public declarations
+;;; ************************************************************************
+
+(declare-function kimport:file "kimport")
+(declare-function kimport:copy-and-set-buffer "kimport")
+(declare-function kotl-mode "kotl-mode")
+
 ;;; ************************************************************************
 ;;; Public variables
 ;;; ************************************************************************
diff --git a/kotl/kview.el b/kotl/kview.el
index 08a56b8b..fcac7ed2 100644
--- a/kotl/kview.el
+++ b/kotl/kview.el
@@ -30,12 +30,11 @@
 (defvar hyrolo-hdr-regexp)
 (defvar hbut:source-prefix)
 
-(declare-function klabel:format "klabel.el")
-(declare-function klabel:idstamp-p "klabel.el")
-(declare-function kcell:create-top "kcell")
 (declare-function kcell:create "kcell")
+(declare-function kcell:create-top "kcell")
 (declare-function kcell:get-attr "kcell")
 (declare-function kcell:plist "kcell")
+(declare-function kcell:ref-to-id "kcell")
 (declare-function kcell:remove-attr "kcell")
 (declare-function kcell:set-attr "kcell")
 (declare-function kfile:narrow-to-kcells "kfile")
@@ -44,12 +43,15 @@
 (declare-function klabel-type:increment "klabel")
 (declare-function klabel-type:parent "klabel")
 (declare-function klabel-type:set-labels "klabel")
+(declare-function klabel:format "klabel.el")
+(declare-function klabel:idstamp-p "klabel.el")
 (declare-function kotl-mode:beginning-of-line "kotl-mode")
 (declare-function kotl-mode:fill-cell "kotl-mode")
 (declare-function kotl-mode:goto-cell "kotl-mode")
 (declare-function kotl-mode:goto-heading "kotl/kotl-mode")
 (declare-function kotl-mode:hide-subtree "kotl-mode")
 (declare-function kotl-mode:to-end-of-line "kotl-mode")
+(declare-function kotl-mode:to-valid-position "kotl-mode")
 (declare-function kotl-mode:to-visible-position "kotl-mode")
 (declare-function kotl-mode:tree-end "kotl-mode")
 (declare-function kvspec:show-lines-this-cell "kvspec")
diff --git a/kotl/kvspec.el b/kotl/kvspec.el
index 993c91cf..c3c3969b 100644
--- a/kotl/kvspec.el
+++ b/kotl/kvspec.el
@@ -70,8 +70,11 @@ It is local to each koutline.  Nil value means it has not been set yet.")
 ;;; Public declarations
 ;;; ************************************************************************
 
-(declare-function kotl-mode:hide-subtree "kotl-mode")
 (declare-function kfile:narrow-to-kcells "kfile")
+(declare-function kotl-mode:hide-subtree "kotl-mode")
+(declare-function kotl-mode:is-p "kotl-mode")
+(declare-function kotl-mode:show-all "kotl-mode")
+(declare-function kotl-mode:show-tree "kotl-mode")
 
 ;;; ************************************************************************
 ;;; Private variables