diff --git a/debug-viewer/GstDebugViewer/Common/__init__.py b/debug-viewer/GstDebugViewer/Common/__init__.py
index 2dc1d5c89a..c1549eb1a8 100644
--- a/debug-viewer/GstDebugViewer/Common/__init__.py
+++ b/debug-viewer/GstDebugViewer/Common/__init__.py
@@ -17,3 +17,4 @@
 
 """GStreamer development utilities common module"""
 
+import Data, GUI, Main, utils
diff --git a/debug-viewer/GstDebugViewer/GUI.py b/debug-viewer/GstDebugViewer/GUI.py
index 86a2009281..7a7de88671 100755
--- a/debug-viewer/GstDebugViewer/GUI.py
+++ b/debug-viewer/GstDebugViewer/GUI.py
@@ -43,13 +43,7 @@ import gtk.glade
 
 ## import gnome # FIXME
 
-import GstDebugViewer.Common.Data
-import GstDebugViewer.Common.GUI
-import GstDebugViewer.Common.Main
-Common = GstDebugViewer.Common
-from GstDebugViewer.Common import utils
-
-from GstDebugViewer import Data, Main
+from GstDebugViewer import Common, Data, Main
 
 class ColorTheme (object):
 
@@ -1123,7 +1117,9 @@ class App (object):
 
     def attach (self):
 
-        state_filename = os.path.join (utils.XDG.CONFIG_HOME, "gst-debug-viewer", "state")
+        config_home = Common.utils.XDG.CONFIG_HOME
+
+        state_filename = os.path.join (config_home, "gst-debug-viewer", "state")
 
         self.state = AppState (state_filename)