diff --git a/src/calibre/gui2/__init__.py b/src/calibre/gui2/__init__.py
index a270d62cdd..32643202ec 100644
--- a/src/calibre/gui2/__init__.py
+++ b/src/calibre/gui2/__init__.py
@@ -1138,12 +1138,7 @@ def build_forms(srcdir, info=None):
             buf = cStringIO.StringIO()
             compileUi(form, buf)
             dat = buf.getvalue()
-            dat = dat.replace('__appname__', 'calibre')
             dat = dat.replace('import images_rc', '')
-            dat = dat.replace('from library import', 'from calibre.gui2.library import')
-            dat = dat.replace('from widgets import', 'from calibre.gui2.widgets import')
-            dat = dat.replace('from convert.xpath_wizard import',
-                'from calibre.gui2.convert.xpath_wizard import')
             dat = re.sub(r'^ {4}def _translate\(context, text, disambig\):\s+return.*$', '    pass', dat,
                          flags=re.M)
             dat = re.compile(r'(?:QtGui.QApplication.translate|(?<!def )_translate)\(.+?,\s+"(.+?)(?<!\\)",.+?\)', re.DOTALL).sub(r'_("\1")', dat)
diff --git a/src/calibre/gui2/convert/look_and_feel.ui b/src/calibre/gui2/convert/look_and_feel.ui
index d22fc658b4..e928e55d07 100644
--- a/src/calibre/gui2/convert/look_and_feel.ui
+++ b/src/calibre/gui2/convert/look_and_feel.ui
@@ -435,7 +435,7 @@
   <customwidget>
    <class>EncodingComboBox</class>
    <extends>QComboBox</extends>
-   <header>widgets.h</header>
+   <header>calibre/gui2/widgets.h</header>
   </customwidget>
   <customwidget>
    <class>FontFamilyChooser</class>
diff --git a/src/calibre/gui2/convert/metadata.ui b/src/calibre/gui2/convert/metadata.ui
index df9273c431..91a920b88b 100644
--- a/src/calibre/gui2/convert/metadata.ui
+++ b/src/calibre/gui2/convert/metadata.ui
@@ -274,7 +274,7 @@
   <customwidget>
    <class>EnLineEdit</class>
    <extends>QLineEdit</extends>
-   <header>widgets.h</header>
+   <header>calibre/gui2/widgets.h</header>
   </customwidget>
   <customwidget>
    <class>EditWithComplete</class>
diff --git a/src/calibre/gui2/convert/pdb_output.ui b/src/calibre/gui2/convert/pdb_output.ui
index fcca83cc2e..66f74b41e8 100644
--- a/src/calibre/gui2/convert/pdb_output.ui
+++ b/src/calibre/gui2/convert/pdb_output.ui
@@ -67,7 +67,7 @@
   <customwidget>
    <class>EncodingComboBox</class>
    <extends>QComboBox</extends>
-   <header>widgets.h</header>
+   <header>calibre/gui2/widgets.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/src/calibre/gui2/convert/pmlz_output.ui b/src/calibre/gui2/convert/pmlz_output.ui
index 162cfbb831..03f862b0ad 100644
--- a/src/calibre/gui2/convert/pmlz_output.ui
+++ b/src/calibre/gui2/convert/pmlz_output.ui
@@ -65,7 +65,7 @@
   <customwidget>
    <class>EncodingComboBox</class>
    <extends>QComboBox</extends>
-   <header>widgets.h</header>
+   <header>calibre/gui2/widgets.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/src/calibre/gui2/convert/structure_detection.ui b/src/calibre/gui2/convert/structure_detection.ui
index 21d285fb33..ad3cb79106 100644
--- a/src/calibre/gui2/convert/structure_detection.ui
+++ b/src/calibre/gui2/convert/structure_detection.ui
@@ -103,7 +103,7 @@
   <customwidget>
    <class>XPathEdit</class>
    <extends>QWidget</extends>
-   <header>convert/xpath_wizard.h</header>
+   <header>calibre/gui2/convert/xpath_wizard.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/calibre/gui2/convert/toc.ui b/src/calibre/gui2/convert/toc.ui
index 0e7b6530ea..e22acdfbd7 100644
--- a/src/calibre/gui2/convert/toc.ui
+++ b/src/calibre/gui2/convert/toc.ui
@@ -135,7 +135,7 @@
   <customwidget>
    <class>XPathEdit</class>
    <extends>QWidget</extends>
-   <header>convert/xpath_wizard.h</header>
+   <header>calibre/gui2/convert/xpath_wizard.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/calibre/gui2/convert/txt_output.ui b/src/calibre/gui2/convert/txt_output.ui
index 3a62643551..676db97ea7 100644
--- a/src/calibre/gui2/convert/txt_output.ui
+++ b/src/calibre/gui2/convert/txt_output.ui
@@ -138,7 +138,7 @@
   <customwidget>
    <class>EncodingComboBox</class>
    <extends>QComboBox</extends>
-   <header>widgets.h</header>
+   <header>calibre/gui2/widgets.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/src/calibre/gui2/dialogs/comicconf.ui b/src/calibre/gui2/dialogs/comicconf.ui
index b5eab32547..24fa321626 100644
--- a/src/calibre/gui2/dialogs/comicconf.ui
+++ b/src/calibre/gui2/dialogs/comicconf.ui
@@ -159,7 +159,7 @@
   <customwidget>
    <class>EnLineEdit</class>
    <extends>QLineEdit</extends>
-   <header>widgets.h</header>
+   <header>calibre/gui2/widgets.h</header>
   </customwidget>
  </customwidgets>
  <resources>
diff --git a/src/calibre/gui2/dialogs/metadata_bulk.ui b/src/calibre/gui2/dialogs/metadata_bulk.ui
index 33cdf438d6..7adefe140f 100644
--- a/src/calibre/gui2/dialogs/metadata_bulk.ui
+++ b/src/calibre/gui2/dialogs/metadata_bulk.ui
@@ -1247,7 +1247,7 @@ is completed. This can be slow on large libraries.</string>
   <customwidget>
    <class>EnLineEdit</class>
    <extends>QLineEdit</extends>
-   <header>widgets.h</header>
+   <header>calibre/gui2/widgets.h</header>
   </customwidget>
   <customwidget>
    <class>EditWithComplete</class>
@@ -1257,7 +1257,7 @@ is completed. This can be slow on large libraries.</string>
   <customwidget>
    <class>HistoryLineEdit</class>
    <extends>QLineEdit</extends>
-   <header>widgets.h</header>
+   <header>calibre/gui2/widgets.h</header>
   </customwidget>
   <customwidget>
    <class>LanguagesEdit</class>
diff --git a/src/calibre/gui2/dialogs/search.ui b/src/calibre/gui2/dialogs/search.ui
index 60aa0431fa..f9966fd12c 100644
--- a/src/calibre/gui2/dialogs/search.ui
+++ b/src/calibre/gui2/dialogs/search.ui
@@ -326,7 +326,7 @@
   <customwidget>
    <class>EnLineEdit</class>
    <extends>QLineEdit</extends>
-   <header>widgets.h</header>
+   <header>calibre/gui2/widgets.h</header>
   </customwidget>
   <customwidget>
    <class>EditWithComplete</class>
diff --git a/src/calibre/gui2/dialogs/tag_editor.ui b/src/calibre/gui2/dialogs/tag_editor.ui
index e8885a158f..ee5471ebd6 100644
--- a/src/calibre/gui2/dialogs/tag_editor.ui
+++ b/src/calibre/gui2/dialogs/tag_editor.ui
@@ -262,7 +262,7 @@
   <customwidget>
    <class>EnLineEdit</class>
    <extends>QLineEdit</extends>
-   <header>widgets.h</header>
+   <header>calibre/gui2/widgets.h</header>
   </customwidget>
  </customwidgets>
  <resources>
diff --git a/src/calibre/gui2/dialogs/tag_list_editor.ui b/src/calibre/gui2/dialogs/tag_list_editor.ui
index cd36d57044..be0da561fb 100644
--- a/src/calibre/gui2/dialogs/tag_list_editor.ui
+++ b/src/calibre/gui2/dialogs/tag_list_editor.ui
@@ -118,7 +118,7 @@
   <customwidget>
    <class>HistoryLineEdit</class>
    <extends>QLineEdit</extends>
-   <header>widgets.h</header>
+   <header>calibre/gui2/widgets.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/src/calibre/gui2/dialogs/user_profiles.ui b/src/calibre/gui2/dialogs/user_profiles.ui
index c615569eb4..a84fb83c75 100644
--- a/src/calibre/gui2/dialogs/user_profiles.ui
+++ b/src/calibre/gui2/dialogs/user_profiles.ui
@@ -402,7 +402,7 @@ p, li { white-space: pre-wrap; }
                  <item>
                   <widget class="QLabel" name="label_8">
                    <property name="text">
-                    <string>For help with writing advanced news recipes, please visit &lt;a href=&quot;http://manual.__appname__-ebook.com/news.html&quot;&gt;User Recipes&lt;/a&gt;</string>
+                    <string>For help with writing advanced news recipes, please visit &lt;a href=&quot;http://manual.calibre-ebook.com/news.html&quot;&gt;User Recipes&lt;/a&gt;</string>
                    </property>
                    <property name="wordWrap">
                     <bool>true</bool>
@@ -467,12 +467,12 @@ p, li { white-space: pre-wrap; }
   <customwidget>
    <class>BasicList</class>
    <extends>QListWidget</extends>
-   <header>widgets.h</header>
+   <header>calibre/gui2/widgets.h</header>
   </customwidget>
   <customwidget>
    <class>EnLineEdit</class>
    <extends>QLineEdit</extends>
-   <header>widgets.h</header>
+   <header>calibre/gui2/widgets.h</header>
   </customwidget>
  </customwidgets>
  <resources>
diff --git a/src/calibre/gui2/store/config/chooser/adv_search_builder.ui b/src/calibre/gui2/store/config/chooser/adv_search_builder.ui
index 63cf596bea..6833a2072e 100644
--- a/src/calibre/gui2/store/config/chooser/adv_search_builder.ui
+++ b/src/calibre/gui2/store/config/chooser/adv_search_builder.ui
@@ -384,7 +384,7 @@
   <customwidget>
    <class>EnLineEdit</class>
    <extends>QLineEdit</extends>
-   <header>widgets.h</header>
+   <header>calibre/gui2/widgets.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/src/calibre/gui2/store/config/chooser/chooser_widget.ui b/src/calibre/gui2/store/config/chooser/chooser_widget.ui
index 7513cdd752..416fccd8d4 100644
--- a/src/calibre/gui2/store/config/chooser/chooser_widget.ui
+++ b/src/calibre/gui2/store/config/chooser/chooser_widget.ui
@@ -136,7 +136,7 @@
   <customwidget>
    <class>HistoryLineEdit</class>
    <extends>QLineEdit</extends>
-   <header>widgets.h</header>
+   <header>calibre/gui2/widgets.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/src/calibre/gui2/store/search/adv_search_builder.ui b/src/calibre/gui2/store/search/adv_search_builder.ui
index b5836807f6..d0a589b2a0 100644
--- a/src/calibre/gui2/store/search/adv_search_builder.ui
+++ b/src/calibre/gui2/store/search/adv_search_builder.ui
@@ -384,7 +384,7 @@
   <customwidget>
    <class>EnLineEdit</class>
    <extends>QLineEdit</extends>
-   <header>widgets.h</header>
+   <header>calibre/gui2/widgets.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/src/calibre/gui2/store/stores/mobileread/adv_search_builder.ui b/src/calibre/gui2/store/stores/mobileread/adv_search_builder.ui
index 7742ccbd97..5e8f01d1f2 100644
--- a/src/calibre/gui2/store/stores/mobileread/adv_search_builder.ui
+++ b/src/calibre/gui2/store/stores/mobileread/adv_search_builder.ui
@@ -293,7 +293,7 @@
   <customwidget>
    <class>EnLineEdit</class>
    <extends>QLineEdit</extends>
-   <header>widgets.h</header>
+   <header>calibre/gui2/widgets.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/src/calibre/gui2/store/stores/mobileread/store_dialog.ui b/src/calibre/gui2/store/stores/mobileread/store_dialog.ui
index b698352dfd..3026260a58 100644
--- a/src/calibre/gui2/store/stores/mobileread/store_dialog.ui
+++ b/src/calibre/gui2/store/stores/mobileread/store_dialog.ui
@@ -118,7 +118,7 @@
   <customwidget>
    <class>HistoryLineEdit</class>
    <extends>QLineEdit</extends>
-   <header>widgets.h</header>
+   <header>calibre/gui2/widgets.h</header>
   </customwidget>
  </customwidgets>
  <resources/>