diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/dbgtool/hxassert.h b/amarok/src/engine/helix/helix-sp/helix-include/common/dbgtool/hxassert.h
index dd841fe2..0dadcf19 100644
--- a/amarok/src/engine/helix/helix-sp/helix-include/common/dbgtool/hxassert.h
+++ b/amarok/src/engine/helix/helix-sp/helix-include/common/dbgtool/hxassert.h
@@ -616,9 +616,9 @@ class LogInfo
 	REQUIRE_VOID_RETURN(stmt)
 
 #define REQUIRE_SUCCESS_RETURN_QUIET(expr) \
-	do { register HX_RESULT const res = expr; if (FAILED (res)) return res; } while (0)
+	do { HX_RESULT const res = expr; if (FAILED (res)) return res; } while (0)
 #define REQUIRE_SUCCESS_RETURN(expr) \
-	do { register HX_RESULT const res = expr; if (FAILED (res)) {  REQUIRE_REPORT("False condition, Aborting...",__FILE__,__LINE__); return res; } } while (0)
+	do { HX_RESULT const res = expr; if (FAILED (res)) {  REQUIRE_REPORT("False condition, Aborting...",__FILE__,__LINE__); return res; } } while (0)
 
 //
 // REQUIRE_SUCCESS reports the error if an expected result failed
diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/atomicbase.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/atomicbase.h
index ba2748f7..08a30791 100644
--- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/atomicbase.h
+++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/atomicbase.h
@@ -995,8 +995,8 @@ extern "C" {
 inline UINT32
 HXAtomicIncRetUINT32(register UINT32* pNum)
 {
-    register UINT32 zeroOffset = 0;
-    register UINT32 temp;
+    UINT32 zeroOffset = 0;
+    UINT32 temp;
 
     asm
     {
@@ -1013,8 +1013,8 @@ HXAtomicIncRetUINT32(register UINT32* pNum)
 inline UINT32
 HXAtomicDecRetUINT32(register UINT32* pNum)
 {
-    register UINT32 zeroOffset = 0;
-    register UINT32 temp;
+    UINT32 zeroOffset = 0;
+    UINT32 temp;
 
     asm
     {
diff --git a/amarok/src/playlistitem.cpp b/amarok/src/playlistitem.cpp
index 284c4917..e6522b27 100644
--- a/amarok/src/playlistitem.cpp
+++ b/amarok/src/playlistitem.cpp
@@ -974,7 +974,7 @@ void PlaylistItem::imageTransparency( TQImage& image, float factor ) //static
     uint *data = reinterpret_cast<unsigned int *>( image.bits() );
     const int pixels = image.width() * image.height();
     uint table[256];
-    register int c;
+    int c;
 
     // Precalculate lookup table
     for( int i = 0; i < 256; ++i ) {
diff --git a/amarok/src/sqlite/sqlite3.c b/amarok/src/sqlite/sqlite3.c
index d3a2b1fb..4d44660b 100644
--- a/amarok/src/sqlite/sqlite3.c
+++ b/amarok/src/sqlite/sqlite3.c
@@ -8697,8 +8697,8 @@ static int vxprintf(
         }
         bufpt = &buf[etBUFSIZE-1];
         {
-          register const char *cset;      /* Use registers for speed */
-          register int base;
+          const char *cset;      /* Use registers for speed */
+          int base;
           cset = &aDigits[infop->charset];
           base = infop->base;
           do{                                           /* Convert to ascii */
@@ -8964,7 +8964,7 @@ static int vxprintf(
     ** the output.
     */
     if( !flag_leftjustify ){
-      register int nspace;
+      int nspace;
       nspace = width-length;
       if( nspace>0 ){
         count += nspace;
@@ -8980,7 +8980,7 @@ static int vxprintf(
       count += length;
     }
     if( flag_leftjustify ){
-      register int nspace;
+      int nspace;
       nspace = width-length;
       if( nspace>0 ){
         count += nspace;
@@ -10435,14 +10435,14 @@ const unsigned char sqlite3UpperToLower[] = {
 ** there is no consistency, we will define our own.
 */
 SQLITE_PRIVATE int sqlite3StrICmp(const char *zLeft, const char *zRight){
-  register unsigned char *a, *b;
+  unsigned char *a, *b;
   a = (unsigned char *)zLeft;
   b = (unsigned char *)zRight;
   while( *a!=0 && UpperToLower[*a]==UpperToLower[*b]){ a++; b++; }
   return UpperToLower[*a] - UpperToLower[*b];
 }
 SQLITE_PRIVATE int sqlite3StrNICmp(const char *zLeft, const char *zRight, int N){
-  register unsigned char *a, *b;
+  unsigned char *a, *b;
   a = (unsigned char *)zLeft;
   b = (unsigned char *)zRight;
   while( N-- > 0 && *a!=0 && UpperToLower[*a]==UpperToLower[*b]){ a++; b++; }
@@ -48320,7 +48320,7 @@ static int patternCompare(
   const struct compareInfo *pInfo, /* Information about how to do the compare */
   const int esc                    /* The escape character */
 ){
-  register int c;
+  int c;
   int invert;
   int seen;
   int c2;