diff --git a/mathemagics/keypad.cpp b/mathemagics/keypad.cpp
index 641b6f4..261e1df 100644
--- a/mathemagics/keypad.cpp
+++ b/mathemagics/keypad.cpp
@@ -1,7 +1,7 @@
-#include <ntqevent.h>
-#include <ntqlayout.h>
-#include <ntqwhatsthis.h>
-#include <ntqtooltip.h>
+#include <tqevent.h>
+#include <tqlayout.h>
+#include <tqwhatsthis.h>
+#include <tqtooltip.h>
 
 #include <kdialog.h>
 #include <tdelocale.h>
diff --git a/mathemagics/keypad.h b/mathemagics/keypad.h
index df5ffee..2044e52 100644
--- a/mathemagics/keypad.h
+++ b/mathemagics/keypad.h
@@ -1,9 +1,9 @@
 #ifndef KEYPAD_H
 #define KEYPAD_H
 
-#include <ntqwidget.h>
-#include <ntqpushbutton.h>
-#include <ntqstring.h>
+#include <tqwidget.h>
+#include <tqpushbutton.h>
+#include <tqstring.h>
 
 class TQCloseEvent;
 
diff --git a/mathemagics/kparanoidline.cpp b/mathemagics/kparanoidline.cpp
index 7270c76..74136f9 100644
--- a/mathemagics/kparanoidline.cpp
+++ b/mathemagics/kparanoidline.cpp
@@ -1,5 +1,5 @@
-#include <ntqkeycode.h>
-#include <ntqstring.h>
+#include <tqkeycode.h>
+#include <tqstring.h>
 
 #include <kdebug.h>
 
diff --git a/mathemagics/mathemagics.cpp b/mathemagics/mathemagics.cpp
index d65721f..24ac91b 100644
--- a/mathemagics/mathemagics.cpp
+++ b/mathemagics/mathemagics.cpp
@@ -1,22 +1,22 @@
-#include <ntqcombobox.h>
-#include <ntqevent.h>
-#include <ntqfile.h>
-#include <ntqguardedptr.h>
-#include <ntqlayout.h>
-#include <ntqlineedit.h>
-#include <ntqmap.h>
-#include <ntqpushbutton.h>
-#include <ntqradiobutton.h>
-#include <ntqscrollview.h>
-#include <ntqsizepolicy.h>
-#include <ntqstring.h>
-#include <ntqstringlist.h>
-#include <ntqtextstream.h>
-#include <ntqtimer.h>
-#include <ntqtooltip.h>
-#include <ntqvaluelist.h>
-#include <ntqwhatsthis.h>
-#include <ntqwidget.h>
+#include <tqcombobox.h>
+#include <tqevent.h>
+#include <tqfile.h>
+#include <tqguardedptr.h>
+#include <tqlayout.h>
+#include <tqlineedit.h>
+#include <tqmap.h>
+#include <tqpushbutton.h>
+#include <tqradiobutton.h>
+#include <tqscrollview.h>
+#include <tqsizepolicy.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
+#include <tqtextstream.h>
+#include <tqtimer.h>
+#include <tqtooltip.h>
+#include <tqvaluelist.h>
+#include <tqwhatsthis.h>
+#include <tqwidget.h>
 
 #include <tdeaccel.h>
 #include <tdeaction.h>
diff --git a/mathemagics/mathemagics.h b/mathemagics/mathemagics.h
index a332cf5..55995a4 100644
--- a/mathemagics/mathemagics.h
+++ b/mathemagics/mathemagics.h
@@ -2,17 +2,17 @@
 #define MATHEMAGICS_H
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 
 #include <kapp.h>
-#include <ntqwidget.h>
-#include <ntqvaluelist.h>
-#include <ntqptrlist.h>
+#include <tqwidget.h>
+#include <tqvaluelist.h>
+#include <tqptrlist.h>
 #include <tdemainwindow.h>
 #include <tdeaction.h>
-#include <ntqmap.h>
-#include <ntqguardedptr.h>
+#include <tqmap.h>
+#include <tqguardedptr.h>
 
 #include "stacklevel.h"
 #include "optiondialog.h"
diff --git a/mathemagics/optiondialog.cpp b/mathemagics/optiondialog.cpp
index 24be0db..fd20f65 100644
--- a/mathemagics/optiondialog.cpp
+++ b/mathemagics/optiondialog.cpp
@@ -2,13 +2,13 @@
 #include <tdeconfig.h>
 #include <tdelocale.h>
 
-#include <ntqlayout.h>
-#include <ntqcheckbox.h>
-#include <ntqhbox.h>
-#include <ntqvgroupbox.h>
-#include <ntqlabel.h>
-#include <ntqpushbutton.h>
-#include <ntqspinbox.h>
+#include <tqlayout.h>
+#include <tqcheckbox.h>
+#include <tqhbox.h>
+#include <tqvgroupbox.h>
+#include <tqlabel.h>
+#include <tqpushbutton.h>
+#include <tqspinbox.h>
 
 #include "optiondialog.h"
 
@@ -118,4 +118,3 @@ void ConfigureDialog::slotApply()
 }
 
 #include "optiondialog.moc"
-
diff --git a/mathemagics/stacklevel.cpp b/mathemagics/stacklevel.cpp
index ce2cb83..ea96617 100644
--- a/mathemagics/stacklevel.cpp
+++ b/mathemagics/stacklevel.cpp
@@ -1,8 +1,8 @@
-#include <ntqlineedit.h>
-#include <ntqpushbutton.h>
-#include <ntqstring.h>
-#include <ntqtooltip.h>
-#include <ntqwhatsthis.h>
+#include <tqlineedit.h>
+#include <tqpushbutton.h>
+#include <tqstring.h>
+#include <tqtooltip.h>
+#include <tqwhatsthis.h>
 
 #include <kdialog.h>
 #include <tdelocale.h>
diff --git a/mathemagics/stacklevel.h b/mathemagics/stacklevel.h
index 2606ada..226944f 100644
--- a/mathemagics/stacklevel.h
+++ b/mathemagics/stacklevel.h
@@ -5,7 +5,7 @@ class TQLineEdit;
 class TQPushButton;
 class TQWidget;
 
-#include <ntqhbox.h>
+#include <tqhbox.h>
 
 class StackLevel : public TQHBox
 {