Change: (helm-org-ql.el) Headers, requirements

Preparing for it to be a separate package.

helm-org-ql.el

@@ -2,6 +2,8 @@
 
 ;; Author: Adam Porter <adam@alphapapa.net>
 ;; URL: https://github.com/alphapapa/org-ql
+;; Version: 0.6-pre
+;; Package-Requires: ((emacs "26.1") (dash "2.17.0") (s "1.12.0") (helm-org "1.0") (org-ql "0.6-pre"))
 
 ;;; Commentary:
 
@@ -28,32 +30,20 @@
 
 ;;; Code:
 
-(eval-and-compile
+;;;; Requirements
 
+(require 'cl-lib)
 (require 'org)
+
+(require 'dash)
+(require 's)
+
+(require 'helm)
+(require 'helm-org)
+
 (require 'org-ql)
 (require 'org-ql-search)
 
-;;;; Compatibility
-
-  ;; Declare Helm functions since Helm may not be installed.
-  (declare-function helm "ext:helm")
-  (declare-function helm-run-after-exit "ext:helm")
-  (declare-function helm-window "ext:helm-lib")
-  (declare-function helm-buffer-get "ext:helm-lib")
-  (declare-function helm-make-source "ext:helm-source")
-  (declare-function helm-org-goto-marker "ext:helm-org")
-
-  ;; Silence byte-compiler about variables.
-  (defvar helm-map)
-  (defvar helm-pattern)
-  (defvar helm-input-idle-delay)
-
-  (when (require 'helm nil 'noerror)
-
-    ;; Requirements.
-    (require 'helm-org)
-
 ;;;; Variables
 
 (defvar helm-org-ql-map
@@ -224,7 +214,7 @@ WINDOW-WIDTH should be the width of the Helm window."
          (path (if helm-org-ql-reverse-paths
                    (concat heading "\\" (s-join "\\" (nreverse path)))
                  (concat (s-join "/" path) "/" heading))))
-        (cons (concat prefix path) (point-marker))))))
+    (cons (concat prefix path) (point-marker)))))
 
 ;;;; Footer