diff --git a/tipbot/modules/blackjack.py b/tipbot/modules/blackjack.py
index fdf463f..34cbbac 100644
--- a/tipbot/modules/blackjack.py
+++ b/tipbot/modules/blackjack.py
@@ -19,6 +19,8 @@ import random
 import tipbot.config as config
 from tipbot.log import log_error, log_warn, log_info, log_log
 import tipbot.coinspecs as coinspecs
+from tipbot.user import User
+from tipbot.link import Link
 from tipbot.utils import *
 from tipbot.command_manager import *
 from tipbot.redisdb import *
diff --git a/tipbot/modules/bookie.py b/tipbot/modules/bookie.py
index f055cc8..dc0b564 100644
--- a/tipbot/modules/bookie.py
+++ b/tipbot/modules/bookie.py
@@ -17,6 +17,8 @@ import random
 import tipbot.config as config
 from tipbot.log import log_error, log_warn, log_info, log_log
 import tipbot.coinspecs as coinspecs
+from tipbot.user import User
+from tipbot.link import Link
 from tipbot.utils import *
 from tipbot.command_manager import *
 from tipbot.redisdb import *
diff --git a/tipbot/modules/dice.py b/tipbot/modules/dice.py
index eeae8a3..8b11f51 100644
--- a/tipbot/modules/dice.py
+++ b/tipbot/modules/dice.py
@@ -19,6 +19,8 @@ import random
 import tipbot.config as config
 from tipbot.log import log_error, log_warn, log_info, log_log
 import tipbot.coinspecs as coinspecs
+from tipbot.user import User
+from tipbot.link import Link
 from tipbot.utils import *
 from tipbot.command_manager import *
 from tipbot.redisdb import *
diff --git a/tipbot/modules/freenode.py b/tipbot/modules/freenode.py
index ae0c241..c6cfede 100644
--- a/tipbot/modules/freenode.py
+++ b/tipbot/modules/freenode.py
@@ -13,6 +13,8 @@ import sys
 import string
 import tipbot.config as config
 from tipbot.log import log_error, log_warn, log_info, log_log
+from tipbot.user import User
+from tipbot.link import Link
 from tipbot.utils import *
 from tipbot.command_manager import *
 from irc import *
diff --git a/tipbot/modules/irc.py b/tipbot/modules/irc.py
index 00f90f5..67369d1 100644
--- a/tipbot/modules/irc.py
+++ b/tipbot/modules/irc.py
@@ -19,6 +19,8 @@ import base64
 import re
 import tipbot.config as config
 from tipbot.log import log, log_error, log_warn, log_info, log_log
+from tipbot.user import User
+from tipbot.link import Link
 from tipbot.utils import *
 from tipbot.network import *
 from tipbot.command_manager import *
diff --git a/tipbot/modules/payment.py b/tipbot/modules/payment.py
index 2aa6672..9f47255 100644
--- a/tipbot/modules/payment.py
+++ b/tipbot/modules/payment.py
@@ -14,6 +14,8 @@ import redis
 import time
 import tipbot.config as config
 from tipbot.log import log_error, log_warn, log_info, log_log
+from tipbot.user import User
+from tipbot.link import Link
 from tipbot.utils import *
 from tipbot.redisdb import *
 from tipbot.command_manager import *
diff --git a/tipbot/modules/pinata.py b/tipbot/modules/pinata.py
index 9da0e3c..f080a07 100644
--- a/tipbot/modules/pinata.py
+++ b/tipbot/modules/pinata.py
@@ -20,6 +20,8 @@ import math
 import tipbot.config as config
 from tipbot.log import log_error, log_warn, log_info, log_log
 import tipbot.coinspecs as coinspecs
+from tipbot.user import User
+from tipbot.link import Link
 from tipbot.utils import *
 from tipbot.command_manager import *
 from tipbot.redisdb import *
diff --git a/tipbot/modules/reddit.py b/tipbot/modules/reddit.py
index 87af504..04e1b38 100644
--- a/tipbot/modules/reddit.py
+++ b/tipbot/modules/reddit.py
@@ -17,6 +17,8 @@ import re
 import praw
 import tipbot.config as config
 from tipbot.log import log_error, log_warn, log_info, log_log
+from tipbot.user import User
+from tipbot.link import Link
 from tipbot.utils import *
 from tipbot.command_manager import *
 from tipbot.network import *
diff --git a/tipbot/modules/twitter.py b/tipbot/modules/twitter.py
index 97a9cce..2e66fe7 100644
--- a/tipbot/modules/twitter.py
+++ b/tipbot/modules/twitter.py
@@ -17,6 +17,8 @@ import re
 import tweepy
 import tipbot.config as config
 from tipbot.log import log_error, log_warn, log_info, log_log
+from tipbot.user import User
+from tipbot.link import Link
 from tipbot.utils import *
 from tipbot.command_manager import *
 from tipbot.network import *
diff --git a/tipbot/modules/withdraw.py b/tipbot/modules/withdraw.py
index ecdcffe..d916664 100644
--- a/tipbot/modules/withdraw.py
+++ b/tipbot/modules/withdraw.py
@@ -25,6 +25,8 @@ import dns.rdtypes.ANY.NS
 from tipbot.log import log_error, log_warn, log_info, log_log
 import tipbot.coinspecs as coinspecs
 import tipbot.config as config
+from tipbot.user import User
+from tipbot.link import Link
 from tipbot.utils import *
 from tipbot.redisdb import *
 from tipbot.command_manager import *