diff --git a/client/components/cards/attachments.js b/client/components/cards/attachments.js
index b17d032dd..35dd4a9b8 100644
--- a/client/components/cards/attachments.js
+++ b/client/components/cards/attachments.js
@@ -1,3 +1,5 @@
+import Attachments from '../../../models/attachments';
+
 Template.attachmentsGalery.events({
   'click .js-add-attachment': Popup.open('cardAttachments'),
   'click .js-confirm-delete': Popup.afterConfirm(
diff --git a/client/components/main/editor.js b/client/components/main/editor.js
index 61daa2bfc..e71829c05 100755
--- a/client/components/main/editor.js
+++ b/client/components/main/editor.js
@@ -1,3 +1,5 @@
+import Attachments from '../../../models/attachments';
+
 Template.editor.onRendered(() => {
   const textareaSelector = 'textarea';
   const mentions = [
diff --git a/client/components/users/userAvatar.js b/client/components/users/userAvatar.js
index 87b918107..73a6cad27 100644
--- a/client/components/users/userAvatar.js
+++ b/client/components/users/userAvatar.js
@@ -1,3 +1,4 @@
+import Avatars from '../../../models/avatars';
 Template.userAvatar.helpers({
   userData() {
     // We need to handle a special case for the search results provided by the
diff --git a/models/activities.js b/models/activities.js
index 2663dd299..2a7f1574b 100644
--- a/models/activities.js
+++ b/models/activities.js
@@ -1,3 +1,5 @@
+import Attachments from './attachments';
+
 // Activities don't need a schema because they are always set from the a trusted
 // environment - the server - and there is no risk that a user change the logic
 // we use with this collection. Moreover using a schema for this collection
diff --git a/models/boards.js b/models/boards.js
index 306bae134..7f514182e 100644
--- a/models/boards.js
+++ b/models/boards.js
@@ -1,3 +1,5 @@
+import Attachments from './attachments';
+
 Boards = new Mongo.Collection('boards');
 
 /**
diff --git a/models/cards.js b/models/cards.js
index 04d187b3c..427e3fd4a 100644
--- a/models/cards.js
+++ b/models/cards.js
@@ -1,3 +1,5 @@
+import Attachments from './attachments';
+
 Cards = new Mongo.Collection('cards');
 
 // XXX To improve pub/sub performances a card document should include a
diff --git a/models/exporter.js b/models/exporter.js
index 31b020e1b..1c07f3ce2 100644
--- a/models/exporter.js
+++ b/models/exporter.js
@@ -1,3 +1,5 @@
+import Attachments from './attachments';
+
 //const stringify = require('csv-stringify');
 
 // exporter maybe is broken since Gridfs introduced, add fs and path
diff --git a/server/publications/boards.js b/server/publications/boards.js
index b80a6b23a..2fc3dc915 100644
--- a/server/publications/boards.js
+++ b/server/publications/boards.js
@@ -1,3 +1,5 @@
+import Attachments from '../../models/attachments';
+
 // This is the publication used to display the board list. We publish all the
 // non-archived boards:
 // 1. that the user is a member of