diff --git a/gramps/cli/arghandler.py b/gramps/cli/arghandler.py
index 4860d62fb..c4b6309c4 100644
--- a/gramps/cli/arghandler.py
+++ b/gramps/cli/arghandler.py
@@ -53,8 +53,8 @@ from clidbman import CLIDbManager, NAME_FILE, find_locker_name
 
 from gramps.gen.plug import BasePluginManager
 from gramps.gen.plug.report import CATEGORY_BOOK, CATEGORY_CODE
-from gramps.cli.plug import cl_report
-from gramps.cli.user import User
+from plug import cl_report
+from user import User
 
 #-------------------------------------------------------------------------
 #
diff --git a/gramps/cli/plug/__init__.py b/gramps/cli/plug/__init__.py
index e21b7befb..ec43416f2 100644
--- a/gramps/cli/plug/__init__.py
+++ b/gramps/cli/plug/__init__.py
@@ -60,8 +60,8 @@ from gramps.gen.plug.report import (CATEGORY_TEXT, CATEGORY_DRAW, CATEGORY_BOOK,
 from gramps.gen.plug.report._paper import paper_sizes
 from gramps.gen.const import USER_HOME
 from gramps.gen.dbstate import DbState
-from gramps.cli.grampscli import CLIManager
-from gramps.cli.user import User
+from ..grampscli import CLIManager
+from ..user import User
 
 #------------------------------------------------------------------------
 #