diff --git a/src/main.rs b/src/main.rs
index 961690e..63f5fc0 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -51,7 +51,6 @@ use diesel::prelude::*;
 use dotenv::dotenv;
 use env::{dburl, photos_dir};
 use photosdir::PhotosDir;
-pub use server::Link;
 use std::fs::File;
 use std::io::{self, BufReader};
 use std::path::Path;
diff --git a/src/server/views_by_date.rs b/src/server/views_by_date.rs
index c526773..7f57153 100644
--- a/src/server/views_by_date.rs
+++ b/src/server/views_by_date.rs
@@ -1,6 +1,5 @@
-use super::PhotoLink;
+use super::{Link, PhotoLink};
 use super::splitlist::links_by_time;
-use Link;
 use chrono::Duration as ChDuration;
 use chrono::naive::{NaiveDate, NaiveDateTime};
 use diesel::expression::sql_literal::SqlLiteral;
diff --git a/templates/details.rs.html b/templates/details.rs.html
index e92a7a4..377e6e8 100644
--- a/templates/details.rs.html
+++ b/templates/details.rs.html
@@ -1,7 +1,7 @@
-@use ::Link;
 @use nickel::Request;
 @use nickel_jwt_session::SessionRequestExtensions;
 @use models::{Photo, Person, Place, Tag, Camera, Coord};
+@use server::Link;
 @use templates::page_base;
 
 @(req: &Request, lpath: &[Link], people: &[Person], places: &[Place], tags: &[Tag], position: &Option<Coord>, attribution: &Option<String>, camera: &Option<Camera>, photo: &Photo)
diff --git a/templates/head.rs.html b/templates/head.rs.html
index f3d8f3c..6ab1dff 100644
--- a/templates/head.rs.html
+++ b/templates/head.rs.html
@@ -1,6 +1,6 @@
-@use ::Link;
 @use nickel::Request;
 @use nickel_jwt_session::SessionRequestExtensions;
+@use server::Link;
 
 @(req: &Request, lpath: &[Link])
 
diff --git a/templates/index.rs.html b/templates/index.rs.html
index 2dafdf4..42c57cf 100644
--- a/templates/index.rs.html
+++ b/templates/index.rs.html
@@ -1,7 +1,6 @@
-@use ::Link;
 @use models::Coord;
 @use nickel::Request;
-@use server::PhotoLink;
+@use server::{Link, PhotoLink};
 @use templates::{data_positions, page_base, photo_link};
 
 @(req: &Request, title: &str, lpath: &[Link], photos: &[PhotoLink], coords: &[Coord])
diff --git a/templates/page_base.rs.html b/templates/page_base.rs.html
index 0f51d36..ffb8409 100644
--- a/templates/page_base.rs.html
+++ b/templates/page_base.rs.html
@@ -1,6 +1,6 @@
-@use ::Link;
 @use nickel::Request;
 @use nickel_jwt_session::SessionRequestExtensions;
+@use server::Link;
 @use templates::head;
 @use templates::statics::{photos_css, admin_js, ux_js};