diff --git a/taglib/ogg/xiphcomment.cpp b/taglib/ogg/xiphcomment.cpp
index 6b87e3ea..cb607ce4 100644
--- a/taglib/ogg/xiphcomment.cpp
+++ b/taglib/ogg/xiphcomment.cpp
@@ -361,7 +361,7 @@ ByteVector Ogg::XiphComment::render(bool addFramingBit) const
 
   for(PictureList::ConstIterator it = d->pictureList.begin(); it != d->pictureList.end(); ++it) {
     ByteVector picture = (*it)->render().toBase64();
-    data.append(ByteVector::fromUInt(picture.size()+23,false));
+    data.append(ByteVector::fromUInt(picture.size() + 23, false));
     data.append("METADATA_BLOCK_PICTURE=");
     data.append(picture);
   }
@@ -445,7 +445,7 @@ void Ogg::XiphComment::parse(const ByteVector &data)
 
       // Parse key and value
       String key = String(entry.mid(0, sep), String::UTF8);
-      String value = String(entry.mid(sep+1), String::UTF8);
+      String value = String(entry.mid(sep + 1), String::UTF8);
       addField(key, value, false);
     }
   }
diff --git a/tests/test_bytevector.cpp b/tests/test_bytevector.cpp
index 450402e3..8d23b82b 100644
--- a/tests/test_bytevector.cpp
+++ b/tests/test_bytevector.cpp
@@ -25,7 +25,6 @@
 #include <cstring>
 #include <tbytevector.h>
 #include <tbytevectorlist.h>
-#include <tstring.h>
 #include <cppunit/extensions/HelperMacros.h>
 
 using namespace std;