diff --git a/volttron/platform/messaging/__init__.py b/volttron/platform/messaging/__init__.py
index 8153685948..ad8a9bc1dd 100644
--- a/volttron/platform/messaging/__init__.py
+++ b/volttron/platform/messaging/__init__.py
@@ -22,4 +22,5 @@
 # ===----------------------------------------------------------------------===
 # }}}
 
-from .socket import *
+from .headers import Headers
+from .socket import Socket
diff --git a/volttron/platform/messaging/headers.py b/volttron/platform/messaging/headers.py
index b17c81909d..ec068ebccc 100644
--- a/volttron/platform/messaging/headers.py
+++ b/volttron/platform/messaging/headers.py
@@ -24,6 +24,7 @@
 
 '''VOLTTRON platform™ messaging header name constants.'''
 
+__all__ = ['Headers']
 
 __author__ = 'Brandon Carpenter <brandon.carpenter@pnnl.gov>'
 __copyright__ = 'Copyright (c) 2016, Battelle Memorial Institute'
diff --git a/volttron/platform/messaging/health.py b/volttron/platform/messaging/health.py
index a0e2824250..ade7bca8f6 100644
--- a/volttron/platform/messaging/health.py
+++ b/volttron/platform/messaging/health.py
@@ -25,9 +25,8 @@
 import logging
 
 from volttron.platform import jsonapi
-from volttron.platform.agent.utils import (get_aware_utc_now,
-                                           format_timestamp,
-                                           parse_timestamp_string)
+from volttron.platform.agent.utils import get_aware_utc_now, format_timestamp
+
 
 CURRENT_STATUS = "current_status"
 LAST_UPDATED = "utc_last_updated"
diff --git a/volttron/platform/messaging/socket.py b/volttron/platform/messaging/socket.py
index 1afc93e0b0..a585c8e786 100644
--- a/volttron/platform/messaging/socket.py
+++ b/volttron/platform/messaging/socket.py
@@ -31,7 +31,7 @@
 from .headers import Headers
 
 
-__all__ = ['Headers', 'Socket']
+__all__ = ['Socket']
 
 __author__ = 'Brandon Carpenter <brandon.carpenter@pnnl.gov>'
 __copyright__ = 'Copyright (c) 2016, Battelle Memorial Institute'