diff --git a/khtml/css/parser.cpp b/khtml/css/parser.cpp
index 8f339055a..57275190c 100644
--- a/khtml/css/parser.cpp
+++ b/khtml/css/parser.cpp
@@ -1,22 +1,23 @@
 /* A Bison parser, made by GNU Bison 1.875d.  */
 
-/* Skeleton parser for Yacc-like parsing with Bison,
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+/*  Skeleton parser for Yacc-like parsing with Bison,
+    Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2, or (at your option)
+    any later version.
 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301, USA.
+*/
 
 /* As a special exception, when this file is copied by Bison into a
    Bison output file, you may use that output file without restriction.
@@ -1104,7 +1105,7 @@ int yydebug;
 # define YYMAXDEPTH 10000
 #endif
 
-
+
 
 #if YYERROR_VERBOSE
 
@@ -1159,7 +1160,7 @@ yystpcpy (yydest, yysrc)
 
 #endif /* !YYERROR_VERBOSE */
 
-
+
 
 #if YYDEBUG
 /*--------------------------------.
@@ -1283,7 +1284,7 @@ yydestruct (yytype, yyvaluep)
         break;
     }
 }
-
+
 
 /* Prevent warnings from -Wmissing-prototypes.  */
 
@@ -2644,7 +2645,7 @@ yyreduce:
 
 /* Line 1010 of yacc.c.  */
 
-
+
   yyvsp -= yylen;
   yyssp -= yylen;
 
diff --git a/khtml/css/parser.h b/khtml/css/parser.h
index 239de28fc..497e3017f 100644
--- a/khtml/css/parser.h
+++ b/khtml/css/parser.h
@@ -1,22 +1,23 @@
 /* A Bison parser, made by GNU Bison 1.875d.  */
 
-/* Skeleton parser for Yacc-like parsing with Bison,
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+/*  Skeleton parser for Yacc-like parsing with Bison,
+    Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2, or (at your option)
+    any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301, USA.
+*/
 
 /* As a special exception, when this file is copied by Bison into a
    Bison output file, you may use that output file without restriction.
diff --git a/khtml/misc/shared.h b/khtml/misc/shared.h
index f0a1eff96..7dfd95ed0 100644
--- a/khtml/misc/shared.h
+++ b/khtml/misc/shared.h
@@ -1,23 +1,22 @@
 /*
- * This file is part of the DOM implementation for KDE.
- * Copyright (C) 2005, 2006 Apple Computer, Inc.
- * Copyright (C) 2002 Lars Knoll
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB.  If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
+    This file is part of the DOM implementation for KDE.
+    Copyright (C) 2005, 2006 Apple Computer, Inc.
+    Copyright (C) 2002 Lars Knoll
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301, USA.
  */
 
 
@@ -53,7 +52,7 @@ public:
     TreeShared() { _ref = 0; m_parent = 0; /*counter++;*/ }
     TreeShared( type *parent ) { _ref=0; m_parent = parent; /*counter++;*/ }
     ~TreeShared() { /*counter--;*/ }
-    
+
     virtual void removedLastRef() { delete static_cast<type*>(this); }
 
     void ref() { _ref++;  }
@@ -135,7 +134,7 @@ template <class T, class U> inline SharedPtr<T> static_pointer_cast(const Shared
 template <class T, class U> inline SharedPtr<T> const_pointer_cast(const SharedPtr<U> &p) { return SharedPtr<T>(const_cast<T *>(p.get())); }
 
 //A special pointer for nodes keeping track of the document,
-//which helps distinguish back links from them to it, in order to break 
+//which helps distinguish back links from them to it, in order to break
 //cycles
 template <class T> class DocPtr {
 public:
@@ -143,35 +142,35 @@ public:
     DocPtr(T *ptr) : m_ptr(ptr) { if (ptr) ptr->selfOnlyRef(); }
     DocPtr(const DocPtr &o) : m_ptr(o.m_ptr) { if (T *ptr = m_ptr) ptr->selfOnlyRef(); }
     ~DocPtr() { if (T *ptr = m_ptr) ptr->selfOnlyDeref(); }
-    
+
     template <class U> DocPtr(const DocPtr<U> &o) : m_ptr(o.get()) { if (T *ptr = m_ptr) ptr->selfOnlyRef(); }
-    
+
     void resetSkippingRef(T *o) { m_ptr = o; }
-    
+
     T *get() const { return m_ptr; }
-    
+
     T &operator*() const { return *m_ptr; }
     T *operator->() const { return m_ptr; }
-    
+
     bool operator!() const { return !m_ptr; }
 
     // this type conversion operator allows implicit conversion to
     // bool but not to other integer types
-    
+
     typedef T * (DocPtr::*UnspecifiedBoolType)() const;
     operator UnspecifiedBoolType() const
     {
         return m_ptr ? &DocPtr::get : 0;
     }
-    
+
     DocPtr &operator=(const DocPtr &);
     DocPtr &operator=(T *);
-    
+
  private:
     T *m_ptr;
 };
 
-template <class T> DocPtr<T> &DocPtr<T>::operator=(const DocPtr<T> &o) 
+template <class T> DocPtr<T> &DocPtr<T>::operator=(const DocPtr<T> &o)
 {
     T *optr = o.m_ptr;
     if (optr)
@@ -192,34 +191,34 @@ template <class T> inline DocPtr<T> &DocPtr<T>::operator=(T *optr)
     return *this;
 }
 
-template <class T> inline bool operator==(const DocPtr<T> &a, const DocPtr<T> &b) 
-{ 
-    return a.get() == b.get(); 
+template <class T> inline bool operator==(const DocPtr<T> &a, const DocPtr<T> &b)
+{
+    return a.get() == b.get();
 }
 
-template <class T> inline bool operator==(const DocPtr<T> &a, const T *b) 
-{ 
-    return a.get() == b; 
+template <class T> inline bool operator==(const DocPtr<T> &a, const T *b)
+{
+    return a.get() == b;
 }
 
-template <class T> inline bool operator==(const T *a, const DocPtr<T> &b) 
+template <class T> inline bool operator==(const T *a, const DocPtr<T> &b)
 {
-    return a == b.get(); 
+    return a == b.get();
 }
 
-template <class T> inline bool operator!=(const DocPtr<T> &a, const DocPtr<T> &b) 
-{ 
-    return a.get() != b.get(); 
+template <class T> inline bool operator!=(const DocPtr<T> &a, const DocPtr<T> &b)
+{
+    return a.get() != b.get();
 }
 
 template <class T> inline bool operator!=(const DocPtr<T> &a, const T *b)
 {
-    return a.get() != b; 
+    return a.get() != b;
 }
 
-template <class T> inline bool operator!=(const T *a, const DocPtr<T> &b) 
-{ 
-    return a != b.get(); 
+template <class T> inline bool operator!=(const T *a, const DocPtr<T> &b)
+{
+    return a != b.get();
 }
 
 
diff --git a/kio/kio/yacc.c b/kio/kio/yacc.c
index fcb65e88c..a6fa63428 100644
--- a/kio/kio/yacc.c
+++ b/kio/kio/yacc.c
@@ -13,10 +13,11 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301, USA.
+*/
 
 /* As a special exception, when this file is copied by Bison into a
    Bison output file, you may use that output file without restriction.
@@ -676,7 +677,7 @@ int yydebug;
 # define YYMAXDEPTH 10000
 #endif
 
-
+
 
 #if YYERROR_VERBOSE
 
@@ -731,7 +732,7 @@ yystpcpy (yydest, yysrc)
 
 #endif /* !YYERROR_VERBOSE */
 
-
+
 
 #if YYDEBUG
 /*--------------------------------.
@@ -800,7 +801,7 @@ yydestruct (yymsg, yytype, yyvaluep)
         break;
     }
 }
-
+
 
 /* Prevent warnings from -Wmissing-prototypes.  */
 
@@ -853,7 +854,7 @@ yyparse ()
 #endif
 #endif
 {
-  
+
   register int yystate;
   register int yyn;
   int yyresult;
@@ -1278,7 +1279,7 @@ yyreduce:
 
 /* Line 1037 of yacc.c.  */
 #line 1281 "yacc.tab.c"
-
+
   yyvsp -= yylen;
   yyssp -= yylen;