diff --git a/qtinterface/Makefile.am b/qtinterface/Makefile.am
index 841f062..56f4ea1 100644
--- a/qtinterface/Makefile.am
+++ b/qtinterface/Makefile.am
@@ -34,7 +34,7 @@ tqbuttongroup.cpp tqbutton.cpp \
 tqcanvas.cpp tqcdestyle.cpp tqcheckbox.cpp tqclipboard.cpp tqcolordialog.cpp tqcombobox.cpp tqcommonstyle.cpp \
 tqdatabrowser.cpp tqdatatable.cpp tqdataview.cpp tqdatetimeedit.cpp tqdesktopwidget.cpp tqdial.cpp tqdialog.cpp tqdns.cpp tqdockarea.cpp tqdockwindow.cpp tqdragobject.cpp \
 tqerrormessage.cpp tqeventloop.cpp \
-tqframe.cpp tqftp.cpp tqfiledialog.cpp \
+tqframe.cpp tqftp.cpp tqfiledialog.cpp tqfontdialog.cpp \
 tqgl.cpp tqgplugin.cpp tqgrid.cpp tqgridview.cpp tqgroupbox.cpp tqguardedptr.cpp \
 tqhbox.cpp tqhbuttongroup.cpp tqheader.cpp tqhgroupbox.cpp tqhttp.cpp \
 tqiconview.cpp tqimageformatplugin.cpp tqinputcontext.cpp tqinputdialog.cpp \
@@ -82,7 +82,7 @@ tqbuttongroup.h tqbutton.h \
 tqcanvas.h tqcdestyle.h tqcheckbox.h tqclipboard.h tqcolordialog.h tqcombobox.h tqcommonstyle.h \
 tqdatabrowser.h tqdatatable.h tqdataview.h tqdatetimeedit.h tqdesktopwidget.h tqdial.h tqdialog.h tqdns.h tqdockarea.h tqdockwindow.h tqdragobject.h \
 tqerrormessage.h tqeventloop.h \
-tqfiledialog.h tqframe.h tqftp.h \
+tqfiledialog.h tqfontdialog.h tqframe.h tqftp.h \
 tqgl.h tqgplugin.h tqgrid.h tqgridview.h tqgroupbox.h tqguardedptr.h \
 tqhbox.h tqhbuttongroup.h tqheader.h tqhgroupbox.h tqhttp.h \
 tqiconview.h tqimageformatplugin.h tqinputcontext.h tqinputdialog.h \
@@ -135,6 +135,7 @@ include ../admin/Doxyfile.am
 install-exec-local:
 	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	cp -Rp "$(srcdir)/tqt-replace" "$(DESTDIR)$(bindir)/"
+	cp -Rp "$(srcdir)/tqt-replace-stream" "$(DESTDIR)$(bindir)/"
 	cp -Rp "$(srcdir)/moc-tqt" "$(DESTDIR)$(bindir)/"
 	cp -Rp "$(srcdir)/mcopidl-tqt" "$(DESTDIR)$(bindir)/"
 	cp -Rp "$(srcdir)/dcopidl-tqt" "$(DESTDIR)$(bindir)/"
@@ -142,4 +143,4 @@ install-exec-local:
 	cp -Rp "$(srcdir)/dcopidl2cpp-tqt" "$(DESTDIR)$(bindir)/"
 	cp -Rp "$(srcdir)/convert_qt_tqt1" "$(DESTDIR)$(bindir)/"
 	cp -Rp "$(srcdir)/convert_qt_tqt2" "$(DESTDIR)$(bindir)/"
-	cp -Rp "$(srcdir)/convert_qt_tqt3" "$(DESTDIR)$(bindir)/"
\ No newline at end of file
+	cp -Rp "$(srcdir)/convert_qt_tqt3" "$(DESTDIR)$(bindir)/"
diff --git a/qtinterface/tqt.h b/qtinterface/tqt.h
index 3d18199..d2c00ea 100644
--- a/qtinterface/tqt.h
+++ b/qtinterface/tqt.h
@@ -29,6 +29,16 @@ Boston, MA 02110-1301, USA.
 #define QT3_SUPPORT
 #endif
 
+#ifdef TQT_METHOD
+#undef TQT_METHOD
+#endif
+#ifdef TQT_SLOT
+#undef TQT_SLOT
+#endif
+#ifdef TQT_SIGNAL
+#undef TQT_SIGNAL
+#endif
+
 #ifdef __cplusplus
 #define TQT_METHOD(a)	METHOD(a)
 #define TQT_SLOT(a)	SLOT(a)