Move obsolete declarations into "org-compat.el"

lisp/org-capture.el

@@ -474,7 +474,6 @@ When LOCAL is set, use the local variable `org-capture-current-plist',
 this is necessary after initialization of the capture process,
 to avoid conflicts with other active capture processes."
   (plist-get (if local org-capture-current-plist org-capture-plist) prop))
-(define-obsolete-function-alias 'org-capture-member 'org-capture-get "Org 9.2")
 
 ;;; The minor mode
 

lisp/org-compat.el

@@ -66,6 +66,13 @@
 (defvar org-table-tab-recognizes-table.el)
 (defvar org-table1-hline-regexp)
 
+
+;;; Emacs < 27.1 compatibility
+
+(unless (fboundp 'pcomplete-uniquify-list)
+  ;; The misspelled variant was made obsolete in Emacs 27.1
+  (defalias 'pcomplete-uniquify-list 'pcomplete-uniqify-list))
+
 
 ;;; Emacs < 26.1 compatibility
 
@@ -216,6 +223,9 @@ Counting starts at 1."
 (define-obsolete-function-alias 'org-activate-angle-links 'ignore "Org 9.0")
 (define-obsolete-function-alias 'org-get-indentation
   'current-indentation "Org 9.2")
+(define-obsolete-function-alias 'org-capture-member 'org-capture-get "Org 9.2")
+(define-obsolete-function-alias 'org-remove-from-invisibility-spec
+  'remove-from-invisibility-spec "Org 9.2")
 
 (defun org-in-fixed-width-region-p ()
   "Non-nil if point in a fixed-width region."
@@ -496,9 +506,6 @@ Unlike to `use-region-p', this function also checks
 
 ;;; Invisibility compatibility
 
-(define-obsolete-function-alias 'org-remove-from-invisibility-spec 'remove-from-invisibility-spec
-  "Org 9.2")
-
 (defun org-in-invisibility-spec-p (arg)
   "Is ARG a member of `buffer-invisibility-spec'?"
   (when (consp buffer-invisibility-spec)

lisp/org-pcomplete.el

@@ -38,10 +38,6 @@
 (declare-function org-entry-properties "org" (&optional pom which))
 (declare-function org-tag-alist-to-string "org" (alist &optional skip-key))
 
-(unless (fboundp 'pcomplete-uniquify-list)
-  ;; The misspelled variant was made obsolete in Emacs 27.1
-  (defalias 'pcomplete-uniquify-list 'pcomplete-uniqify-list))
-
 ;;;; Customization variables
 
 (defvar org-drawer-regexp)