diff --git a/src/core/crypto/pbkdf2_cmac.cpp b/src/core/crypto/pbkdf2_cmac.cpp
index eff761e5f..fe95f3179 100644
--- a/src/core/crypto/pbkdf2_cmac.cpp
+++ b/src/core/crypto/pbkdf2_cmac.cpp
@@ -38,7 +38,7 @@
 void otPbkdf2Cmac(
     const uint8_t *aPassword, uint16_t aPasswordLen,
     const uint8_t *aSalt, uint16_t aSaltLen,
-    uint32_t aIterationCounter , uint16_t aKeyLen,
+    uint32_t aIterationCounter, uint16_t aKeyLen,
     uint8_t *aKey)
 {
     uint32_t blockCounter = 0;
diff --git a/src/core/meshcop/dtls.cpp b/src/core/meshcop/dtls.cpp
index 2f6f1896f..63ca99f4d 100644
--- a/src/core/meshcop/dtls.cpp
+++ b/src/core/meshcop/dtls.cpp
@@ -482,7 +482,7 @@ ThreadError Dtls::MapError(int rval)
     return error;
 }
 
-void Dtls::HandleMbedtlsDebug(void *ctx, int level, const char *, int , const char *str)
+void Dtls::HandleMbedtlsDebug(void *ctx, int level, const char *, int, const char *str)
 {
     Dtls *pThis = static_cast<Dtls *>(ctx);
     (void)pThis;
diff --git a/tests/unit/test_lowpan.cpp b/tests/unit/test_lowpan.cpp
index 1c01f254d..09c3677a4 100644
--- a/tests/unit/test_lowpan.cpp
+++ b/tests/unit/test_lowpan.cpp
@@ -199,7 +199,7 @@ static void Test(TestIphcVector &aVector, bool aCompress, bool aDecompress)
         }
         else
         {
-            VerifyOrQuit(compressBytes < 0 , "6lo: Lowpan::Compress failed");
+            VerifyOrQuit(compressBytes < 0, "6lo: Lowpan::Compress failed");
         }
 
         message->Free();
@@ -226,14 +226,14 @@ static void Test(TestIphcVector &aVector, bool aCompress, bool aDecompress)
             otTestPrintHex(result, message->GetLength() + iphcLength - decompressedBytes);
             printf("\n");
 
-            VerifyOrQuit(decompressedBytes == aVector.mIphcHeader.mLength , "6lo: Lowpan::Decompress failed");
+            VerifyOrQuit(decompressedBytes == aVector.mIphcHeader.mLength, "6lo: Lowpan::Decompress failed");
             VerifyOrQuit(message->GetOffset() == aVector.mPayloadOffset, "6lo: Lowpan::Decompress failed");
             VerifyOrQuit(message->GetOffset() == message->GetLength(), "6lo: Lowpan::Decompress failed");
             VerifyOrQuit(memcmp(ip6, result, ip6Length) == 0, "6lo: Lowpan::Decompress failed");
         }
         else
         {
-            VerifyOrQuit(decompressedBytes < 0 , "6lo: Lowpan::Decompress failed");
+            VerifyOrQuit(decompressedBytes < 0, "6lo: Lowpan::Decompress failed");
         }
 
         message->Free();
diff --git a/tests/unit/test_platform.cpp b/tests/unit/test_platform.cpp
index fe3aa1b6c..89761878f 100644
--- a/tests/unit/test_platform.cpp
+++ b/tests/unit/test_platform.cpp
@@ -415,7 +415,7 @@ exit:
         return kPlatResetReason_PowerOn;
     }
 
-    void otPlatLog(otLogLevel , otLogRegion , const char *, ...)
+    void otPlatLog(otLogLevel, otLogRegion, const char *, ...)
     {
     }