diff --git a/image/src/ScriptedNotificationObserver.cpp b/image/src/ScriptedNotificationObserver.cpp
index 5c2a8f0ed53..3c7f0529657 100644
--- a/image/src/ScriptedNotificationObserver.cpp
+++ b/image/src/ScriptedNotificationObserver.cpp
@@ -24,30 +24,37 @@ NS_IMPL_CYCLE_COLLECTING_RELEASE(ScriptedNotificationObserver)
 ScriptedNotificationObserver::ScriptedNotificationObserver(
     imgIScriptedNotificationObserver* aInner)
 : mInner(aInner)
-{
-}
+{ }
 
 NS_IMETHODIMP
 ScriptedNotificationObserver::Notify(imgIRequest* aRequest,
                                      int32_t aType,
                                      const nsIntRect* /*aUnused*/)
 {
-  if (aType == imgINotificationObserver::SIZE_AVAILABLE)
+  if (aType == imgINotificationObserver::SIZE_AVAILABLE) {
     return mInner->SizeAvailable(aRequest);
-  if (aType == imgINotificationObserver::FRAME_UPDATE)
+  }
+  if (aType == imgINotificationObserver::FRAME_UPDATE) {
     return mInner->FrameUpdate(aRequest);
-  if (aType == imgINotificationObserver::FRAME_COMPLETE)
+  }
+  if (aType == imgINotificationObserver::FRAME_COMPLETE) {
     return mInner->FrameComplete(aRequest);
-  if (aType == imgINotificationObserver::DECODE_COMPLETE)
+  }
+  if (aType == imgINotificationObserver::DECODE_COMPLETE) {
     return mInner->DecodeComplete(aRequest);
-  if (aType == imgINotificationObserver::LOAD_COMPLETE)
+  }
+  if (aType == imgINotificationObserver::LOAD_COMPLETE) {
     return mInner->LoadComplete(aRequest);
-  if (aType == imgINotificationObserver::DISCARD)
+  }
+  if (aType == imgINotificationObserver::DISCARD) {
     return mInner->Discard(aRequest);
-  if (aType == imgINotificationObserver::IS_ANIMATED)
+  }
+  if (aType == imgINotificationObserver::IS_ANIMATED) {
     return mInner->IsAnimated(aRequest);
-  if (aType == imgINotificationObserver::HAS_TRANSPARENCY)
+  }
+  if (aType == imgINotificationObserver::HAS_TRANSPARENCY) {
     return mInner->HasTransparency(aRequest);
+  }
   return NS_OK;
 }
 
diff --git a/image/src/ScriptedNotificationObserver.h b/image/src/ScriptedNotificationObserver.h
index fccb3010b04..b3529e74366 100644
--- a/image/src/ScriptedNotificationObserver.h
+++ b/image/src/ScriptedNotificationObserver.h
@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef ScriptedNotificationObserver_h
-#define ScriptedNotificationObserver_h
+#ifndef mozilla_image_src_ScriptedNotificationObserver_h
+#define mozilla_image_src_ScriptedNotificationObserver_h
 
 #include "imgINotificationObserver.h"
 #include "nsCOMPtr.h"
@@ -19,17 +19,19 @@ namespace image {
 class ScriptedNotificationObserver : public imgINotificationObserver
 {
 public:
-  explicit ScriptedNotificationObserver(imgIScriptedNotificationObserver* aInner);
+  explicit
+    ScriptedNotificationObserver(imgIScriptedNotificationObserver* aInner);
 
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_IMGINOTIFICATIONOBSERVER
   NS_DECL_CYCLE_COLLECTION_CLASS(ScriptedNotificationObserver)
 
 private:
-  virtual ~ScriptedNotificationObserver() {}
+  virtual ~ScriptedNotificationObserver() { }
   nsCOMPtr<imgIScriptedNotificationObserver> mInner;
 };
 
-}}
+} // namespace image
+} // namespace mozilla
 
-#endif
+#endif // mozilla_image_src_ScriptedNotificationObserver_h