-import ctypes
-from ctypes import c_int, c_char_p
-from database import Database,Tags,Query,Messages,Message,Tags
-from cnotmuch.globals import nmlib,STATUS,NotmuchError
+from database import Database, Query
+from message import Messages, Message
+from thread import Threads, Thread
+from tag import Tags
+from cnotmuch.globals import nmlib, STATUS, NotmuchError