diff --git a/src/gen/db/__init__.py b/src/gen/db/__init__.py
index 6b2f5e048..d9564e54b 100644
--- a/src/gen/db/__init__.py
+++ b/src/gen/db/__init__.py
@@ -23,5 +23,7 @@ from dbconst import *
 from read import *
 from cursor import *
 from bsddbtxn import *
-from write import *
+from txn import *
+from undoredo import *
 from exceptions import *
+from write import *
diff --git a/src/gen/db/write.py b/src/gen/db/write.py
index 16aebfcab..24f886345 100644
--- a/src/gen/db/write.py
+++ b/src/gen/db/write.py
@@ -51,14 +51,12 @@ from sys import maxint
 #-------------------------------------------------------------------------
 from gen.lib import (GenderStats, Person, Family, Event, Place, Source, 
                      MediaObject, Repository, Note)
-from gen.db import (GrampsDbRead, BSDDBTxn)
-from txn import GrampsDbTxn
-from undoredo import GrampsDbUndoBSDDB as GrampsDbUndo
+from gen.db import (GrampsDbRead, BSDDBTxn, GrampsDbTxn, GrampsCursor,
+                    FileVersionError, FileVersionDeclineToUpgrade,
+                    GrampsDbUndoBSDDB as GrampsDbUndo)
 from gen.db.dbconst import *
 from gen.utils.callback import Callback
 from BasicUtils import UpdateCallback
-from gen.db.cursor import GrampsCursor
-from gen.db.exceptions import FileVersionError, FileVersionDeclineToUpgrade
 import Errors
 from QuestionDialog import QuestionDialog2