diff --git a/scripts/scalability-testing/agents/NullHistorian/null_historian/agent.py b/scripts/scalability-testing/agents/NullHistorian/null_historian/agent.py
index 9ce7908b23..7f0103da8b 100644
--- a/scripts/scalability-testing/agents/NullHistorian/null_historian/agent.py
+++ b/scripts/scalability-testing/agents/NullHistorian/null_historian/agent.py
@@ -39,10 +39,10 @@
 import logging
 import sys
 
-from volttron.platform.vip.agent import *
 from volttron.platform.agent.base_historian import BaseHistorian, add_timing_data_to_header
 from volttron.platform.agent import utils
 from volttron.platform.agent import math_utils
+from volttron.platform.vip.agent.core import Core
 
 utils.setup_logging()
 _log = logging.getLogger(__name__)
diff --git a/volttron/platform/agent/base_weather.py b/volttron/platform/agent/base_weather.py
index ac459e16e5..6cb0aa0d13 100644
--- a/volttron/platform/agent/base_weather.py
+++ b/volttron/platform/agent/base_weather.py
@@ -47,7 +47,7 @@
 from volttron.platform.agent.utils import fix_sqlite3_datetime, \
     get_aware_utc_now, format_timestamp, process_timestamp, \
     parse_timestamp_string
-from volttron.platform.vip.agent import *
+from volttron.platform.vip.agent import Agent
 from volttron.platform.async_ import AsyncCall
 from volttron.platform.messaging import headers
 from volttron.platform.messaging.health import (STATUS_BAD,
diff --git a/volttron/platform/lib/inotify/green.py b/volttron/platform/lib/inotify/green.py
index 01047f6d57..e2d6b76ef7 100644
--- a/volttron/platform/lib/inotify/green.py
+++ b/volttron/platform/lib/inotify/green.py
@@ -44,8 +44,7 @@
 import gevent
 from gevent.select import select
 
-from . import _inotify, __all__, _main
-from . import *
+from . import IN_NONBLOCK, _inotify, _main
 import logging
 
 _log = logging.getLogger(__name__)
diff --git a/volttron/platform/main.py b/volttron/platform/main.py
index fbba5e51bc..0d930865cf 100644
--- a/volttron/platform/main.py
+++ b/volttron/platform/main.py
@@ -92,7 +92,7 @@
 from . import config
 from . import vip
 from .vip.agent import Agent, Core
-from .vip.router import *
+from .vip.router import BaseRouter, ERROR, INCOMING, UNROUTABLE
 from .vip.socket import decode_key, encode_key, Address
 from .vip.tracking import Tracker
 from .auth import AuthService, AuthFile, AuthEntry
diff --git a/volttron/platform/vip/agent/example.py b/volttron/platform/vip/agent/example.py
index 297d14a8be..337c881807 100644
--- a/volttron/platform/vip/agent/example.py
+++ b/volttron/platform/vip/agent/example.py
@@ -1,9 +1,9 @@
-
-
-
 import gevent
 
-from volttron.platform.vip.agent import *
+from volttron.platform.vip.agent import Agent
+from volttron.platform.vip.agent.core import Core
+from volttron.platform.vip.agent.errors import Unreachable
+from volttron.platform.vip.agent.subsystems import RPC
 from volttron.platform.scheduling import periodic
 
 
diff --git a/volttron/platform/vip/green.py b/volttron/platform/vip/green.py
index cb7b4f6e15..3d103ed115 100644
--- a/volttron/platform/vip/green.py
+++ b/volttron/platform/vip/green.py
@@ -58,7 +58,6 @@
 from zmq.green import NOBLOCK, POLLOUT
 from zmq import green as _green
 
-from . import *
 from .router import BaseRouter as _BaseRouter
 from .socket import _Socket
 
diff --git a/volttrontesting/platform/security/test_aip_security.py b/volttrontesting/platform/security/test_aip_security.py
index e2c3be8786..a602e0691b 100644
--- a/volttrontesting/platform/security/test_aip_security.py
+++ b/volttrontesting/platform/security/test_aip_security.py
@@ -7,7 +7,6 @@
 from volttron.platform import is_rabbitmq_available
 from volttron.platform import get_services_core
 from volttron.platform.agent.utils import execute_command
-from volttron.platform.vip.agent import *
 from volttrontesting.fixtures.volttron_platform_fixtures import build_wrapper, cleanup_wrapper, rmq_skipif
 from volttrontesting.utils.utils import get_rand_vip
 
diff --git a/volttrontesting/services/historian/test_base_historian.py b/volttrontesting/services/historian/test_base_historian.py
index 4771e257a5..f3aab05432 100644
--- a/volttrontesting/services/historian/test_base_historian.py
+++ b/volttrontesting/services/historian/test_base_historian.py
@@ -54,7 +54,7 @@
                                                     STATUS_KEY_TIME_ERROR)
 from volttron.platform.agent import utils
 from volttron.platform.messaging import headers as headers_mod
-from volttron.platform.messaging.health import *
+from volttron.platform.messaging.health import STATUS_BAD, STATUS_GOOD, Status
 from volttron.platform.messaging import topics
 from volttron.platform.agent.known_identities import CONFIGURATION_STORE
 
diff --git a/volttrontesting/services/weather/test_base_weather.py b/volttrontesting/services/weather/test_base_weather.py
index 2a11f1ca39..d394d9576d 100644
--- a/volttrontesting/services/weather/test_base_weather.py
+++ b/volttrontesting/services/weather/test_base_weather.py
@@ -48,7 +48,7 @@
 from volttron.platform.agent import utils
 from volttron.platform.agent.base_weather import BaseWeatherAgent
 from volttron.platform.agent.utils import get_fq_identity
-from volttron.platform.messaging.health import *
+from volttron.platform.messaging.health import STATUS_BAD, STATUS_GOOD
 
 utils.setup_logging()
 _log = logging.getLogger(__name__)
diff --git a/volttrontesting/subsystems/test_health_subsystem.py b/volttrontesting/subsystems/test_health_subsystem.py
index 9bb415458b..d0c2a4290b 100644
--- a/volttrontesting/subsystems/test_health_subsystem.py
+++ b/volttrontesting/subsystems/test_health_subsystem.py
@@ -5,7 +5,7 @@
 
 from volttron.platform.messaging import topics
 from volttron.platform.messaging.headers import DATE
-from volttron.platform.messaging.health import *
+from volttron.platform.messaging.health import STATUS_BAD, STATUS_GOOD, Status
 from volttron.platform.agent.utils import parse_timestamp_string
 from volttrontesting.utils.utils import (poll_gevent_sleep,
                                          messages_contains_prefix)