diff --git a/taglib/tagunion.cpp b/taglib/tagunion.cpp
index ae181eb8..28fbb09d 100644
--- a/taglib/tagunion.cpp
+++ b/taglib/tagunion.cpp
@@ -27,31 +27,31 @@
 
 using namespace TagLib;
 
-#define stringUnion(method)                                      \
-  if(tag(0) && !tag(0)->method().isEmpty())			 \
-    return tag(0)->method();					 \
-  if(tag(1) && !tag(1)->method().isEmpty())			 \
-    return tag(1)->method();					 \
-  if(tag(2) && !tag(2)->method().isEmpty())			 \
-    return tag(2)->method();					 \
-  return String::null                                            \
+#define stringUnion(method)                                          \
+  if(tag(0) && !tag(0)->method().isEmpty())                          \
+    return tag(0)->method();                                         \
+  if(tag(1) && !tag(1)->method().isEmpty())                          \
+    return tag(1)->method();                                         \
+  if(tag(2) && !tag(2)->method().isEmpty())                          \
+    return tag(2)->method();                                         \
+  return String::null                                                \
 
-#define numberUnion(method)                                      \
-  if(tag(0) && tag(0)->method() > 0)				 \
-    return tag(0)->method();					 \
-  if(tag(1) && tag(1)->method() > 0)				 \
-    return tag(1)->method();					 \
-  if(tag(2) && tag(2)->method() > 0)				 \
-    return tag(2)->method();					 \
+#define numberUnion(method)                                          \
+  if(tag(0) && tag(0)->method() > 0)                                 \
+    return tag(0)->method();                                         \
+  if(tag(1) && tag(1)->method() > 0)                                 \
+    return tag(1)->method();                                         \
+  if(tag(2) && tag(2)->method() > 0)                                 \
+    return tag(2)->method();                                         \
   return 0
 
-#define setUnion(method, value)                                  \
-  if(tag(0))							 \
-    tag(0)->set##method(value);					 \
-  if(tag(1))							 \
-    tag(1)->set##method(value);					 \
-  if(tag(2))							 \
-    tag(2)->set##method(value);					 \
+#define setUnion(method, value)                                      \
+  if(tag(0))                                                         \
+    tag(0)->set##method(value);                                      \
+  if(tag(1))                                                         \
+    tag(1)->set##method(value);                                      \
+  if(tag(2))                                                         \
+    tag(2)->set##method(value);                                      \
 
 class TagUnion::TagUnionPrivate
 {
diff --git a/taglib/tagunion.h b/taglib/tagunion.h
index ad29c6ac..a57d6222 100644
--- a/taglib/tagunion.h
+++ b/taglib/tagunion.h
@@ -76,12 +76,12 @@ namespace TagLib {
     template <class T> T *access(int index, bool create)
     {
       if(!create || tag(index))
-	return static_cast<T *>(tag(index));
+        return static_cast<T *>(tag(index));
 
       set(index, new T);
       return static_cast<T *>(tag(index));
     }
-    
+
   private:
     TagUnion(const Tag &);
     TagUnion &operator=(const Tag &);
diff --git a/taglib/trueaudio/trueaudiofile.cpp b/taglib/trueaudio/trueaudiofile.cpp
index c5979ecf..2a0ccaa7 100644
--- a/taglib/trueaudio/trueaudiofile.cpp
+++ b/taglib/trueaudio/trueaudiofile.cpp
@@ -145,7 +145,7 @@ bool TrueAudio::File::save()
     removeBlock(d->ID3v2Location, d->ID3v2OriginalSize);
     d->ID3v1Location -= d->ID3v2OriginalSize;
     d->ID3v2Location = -1;
-    d->ID3v2OriginalSize = 0; 
+    d->ID3v2OriginalSize = 0;
     d->hasID3v2 = false;
   }
 
diff --git a/taglib/wavpack/wavpackfile.cpp b/taglib/wavpack/wavpackfile.cpp
index e0360253..9a64b8c1 100644
--- a/taglib/wavpack/wavpackfile.cpp
+++ b/taglib/wavpack/wavpackfile.cpp
@@ -166,7 +166,7 @@ bool WavPack::File::save()
       if(d->hasID3v1) {
         if(d->ID3v1Location > d->APELocation) {
           d->ID3v1Location -= d->APESize;
-	}
+        }
       }
     }
   }