2 files changed, 12 insertions, 11 deletions
diff --git a/module/datetime/timespec.scm b/module/datetime/timespec.scm
index 9b236e2d..712ff327 100644
--- a/module/datetime/timespec.scm
+++ b/module/datetime/timespec.scm
@@ -4,8 +4,10 @@
 ;;; Code:
 
 (define-module (datetime timespec)
-  :use-module (hnh util)
-  :use-module (hnh util exceptions)
+  :export (make-timespec
+           timespec? timespec-time timespec-sign timespec-type)
+  :use-module ((hnh util) :select (set define*-public unless let*))
+  :use-module ((hnh util exceptions) :select (warning))
   :use-module (datetime)
   :use-module (srfi srfi-1)
   :use-module (srfi srfi-9 gnu)
@@ -26,8 +28,6 @@
   ;; u, g, z - Universal time
   (type timespec-type))                 ; char
 
-(export make-timespec timespec? timespec-time timespec-sign timespec-type)
-
 (define-public (timespec-zero)
   (make-timespec (time) '+ #\w))
 
diff --git a/module/datetime/zic.scm b/module/datetime/zic.scm
index 6343dce3..b07c2bfa 100644
--- a/module/datetime/zic.scm
+++ b/module/datetime/zic.scm
@@ -11,14 +11,18 @@
 ;; See zic(8) for data format
 ;;; Code:
 (define-module (datetime zic)
-  :use-module (hnh util)
-  :use-module (hnh util exceptions)
+  :use-module ((hnh util)
+               :select (awhen group set when sort* iterate group-by let*))
+  :use-module ((hnh util exceptions) :select (warning))
   :use-module (datetime)
   :use-module (datetime timespec)
-  :use-module (ice-9 rdelim)
+  :use-module ((ice-9 rdelim) :select (read-line))
   :use-module (srfi srfi-1)
   :use-module (srfi srfi-9)
-  :use-module (srfi srfi-9 gnu))
+  :use-module (srfi srfi-9 gnu)
+  :use-module ((vcomponent recurrence internal)
+               :select (byday make-recur-rule bymonthday))
+  )
 
 
 (define-public (read-zoneinfo ports-or-filenames)
@@ -342,9 +346,6 @@ expries rules aren't yet implemented." type)]
      (datetime time: (timespec-time timespec)))
     ))
 
-
-(use-modules (vcomponent recurrence internal))
-
 (define-public (rule->rrule rule)
   (if (eq? 'only (rule-to rule))
       #f