12 files changed, 13 insertions, 13 deletions
diff --git a/tdehtml/css/css_base.h b/tdehtml/css/css_base.h
index db0700a35..d39d5e94d 100644
--- a/tdehtml/css/css_base.h
+++ b/tdehtml/css/css_base.h
@@ -29,7 +29,7 @@
 #include "dom/dom_misc.h"
 #include "xml/dom_nodeimpl.h"
 #include "misc/shared.h"
-#include <kdemacros.h>
+#include <tdemacros.h>
 #include <tqdatetime.h>
 #include <tqptrlist.h>
 
diff --git a/tdehtml/dom/css_value.h b/tdehtml/dom/css_value.h
index 6e3d89717..563d09cd1 100644
--- a/tdehtml/dom/css_value.h
+++ b/tdehtml/dom/css_value.h
@@ -31,7 +31,7 @@
 
 #include <tqcolor.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace DOM {
 
diff --git a/tdehtml/dom/html_form.h b/tdehtml/dom/html_form.h
index 63c626356..7533a29de 100644
--- a/tdehtml/dom/html_form.h
+++ b/tdehtml/dom/html_form.h
@@ -33,7 +33,7 @@
 #include <dom/html_element.h>
 #include <dom/html_misc.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace DOM {
 
diff --git a/tdehtml/dom/html_image.h b/tdehtml/dom/html_image.h
index f6f25b0d6..ec2ab819e 100644
--- a/tdehtml/dom/html_image.h
+++ b/tdehtml/dom/html_image.h
@@ -31,7 +31,7 @@
 
 #include <dom/html_element.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace DOM {
 
diff --git a/tdehtml/dom/html_object.h b/tdehtml/dom/html_object.h
index 6161f8ef2..22d5b002b 100644
--- a/tdehtml/dom/html_object.h
+++ b/tdehtml/dom/html_object.h
@@ -34,7 +34,7 @@
 
 #include <dom/html_element.h>
 #include <dom/html_form.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace DOM {
 
diff --git a/tdehtml/misc/htmlattrs.h b/tdehtml/misc/htmlattrs.h
index 7f28a5081..eabe89cd2 100644
--- a/tdehtml/misc/htmlattrs.h
+++ b/tdehtml/misc/htmlattrs.h
@@ -6,7 +6,7 @@ htmlattrs.in by makeattrs, do not edit */
 #define HTML_ATTRS_H
 
 #include "dom/dom_string.h"
-#include <kdemacros.h>
+#include <tdemacros.h>
 using namespace DOM;
 
 #define ATTR_ACCEPT_CHARSET 1
diff --git a/tdehtml/misc/makeattrs b/tdehtml/misc/makeattrs
index 1ed890c2c..b981b285f 100644
--- a/tdehtml/misc/makeattrs
+++ b/tdehtml/misc/makeattrs
@@ -36,7 +36,7 @@ print out "%{\n/* This file is automatically generated from
 print out "struct attrs {\n    int name;\n    int id;\n};\n%%\n";
 
 print header "/* This file is automatically generated from
-htmlattrs.in by makeattrs, do not edit */\n/* Copyright 1999 Lars Knoll */\n\n#ifndef HTML_ATTRS_H\n#define HTML_ATTRS_H\n\n#include \"dom/dom_string.h\"\n#include <kdemacros.h>\nusing namespace DOM;\n\n";
+htmlattrs.in by makeattrs, do not edit */\n/* Copyright 1999 Lars Knoll */\n\n#ifndef HTML_ATTRS_H\n#define HTML_ATTRS_H\n\n#include \"dom/dom_string.h\"\n#include <tdemacros.h>\nusing namespace DOM;\n\n";
 
 my %amap = ();
 my $last_ci_attr = 0;
diff --git a/tdehtml/rendering/render_replaced.cpp b/tdehtml/rendering/render_replaced.cpp
index 103cad9e8..0e5666b9d 100644
--- a/tdehtml/rendering/render_replaced.cpp
+++ b/tdehtml/rendering/render_replaced.cpp
@@ -439,7 +439,7 @@ void RenderWidget::paint(PaintInfo& paintInfo, int _tx, int _ty)
         paintWidget(paintInfo, m_widget, xPos, yPos);
 }
 
-#include <tqinternal_p.h>
+#include <private/tqinternal_p.h>
 
 // The PaintBuffer class provides a shared buffer for widget painting.
 //
diff --git a/tdehtml/tdehtml_ext.cpp b/tdehtml/tdehtml_ext.cpp
index 16f60d277..63b4bc91b 100644
--- a/tdehtml/tdehtml_ext.cpp
+++ b/tdehtml/tdehtml_ext.cpp
@@ -39,7 +39,7 @@
 #include <tqpopupmenu.h>
 #include <tqurl.h>
 #include <tqmetaobject.h>
-#include <tqucomextra_p.h>
+#include <private/tqucomextra_p.h>
 #include <tqdragobject.h>
 
 #include <kdebug.h>
diff --git a/tdehtml/tdehtml_part.cpp b/tdehtml/tdehtml_part.cpp
index 712bbe764..1b74c5388 100644
--- a/tdehtml/tdehtml_part.cpp
+++ b/tdehtml/tdehtml_part.cpp
@@ -110,7 +110,7 @@ using namespace DOM;
 #include <tqfile.h>
 #include <tqtooltip.h>
 #include <tqmetaobject.h>
-#include <tqucomextra_p.h>
+#include <private/tqucomextra_p.h>
 
 #include "tdehtmlpart_p.h"
 #include "kpassivepopup.h"
diff --git a/tdehtml/tdehtml_part.h b/tdehtml/tdehtml_part.h
index 7d3f01312..a67cb28ab 100644
--- a/tdehtml/tdehtml_part.h
+++ b/tdehtml/tdehtml_part.h
@@ -30,7 +30,7 @@
 
 #include <tdeparts/part.h>
 #include <tdeparts/browserextension.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 #include <kfinddialog.h>
 
 #include <tqregexp.h>
diff --git a/tdehtml/testtdehtml.cpp b/tdehtml/testtdehtml.cpp
index 6c3d1506e..272c04fb5 100644
--- a/tdehtml/testtdehtml.cpp
+++ b/tdehtml/testtdehtml.cpp
@@ -48,7 +48,7 @@ int main(int argc, char *argv[])
 	::exit( 1 );
     }
 
-#ifndef __KDE_HAVE_GCC_VISIBILITY
+#ifndef __TDE_HAVE_GCC_VISIBILITY
     TDEHTMLFactory *fac = new TDEHTMLFactory(true);
 #endif
 
@@ -130,7 +130,7 @@ int main(int argc, char *argv[])
 
 
     int ret = a.exec();
-#ifndef __KDE_HAVE_GCC_VISIBILITY
+#ifndef __TDE_HAVE_GCC_VISIBILITY
     fac->deref();
 #endif
     return ret;