diff --git a/src/asfvideo.cpp b/src/asfvideo.cpp
index f9cf1dab..f5e8c7d0 100644
--- a/src/asfvideo.cpp
+++ b/src/asfvideo.cpp
@@ -276,16 +276,14 @@ void AsfVideo::decodeBlock() {
       extendedStreamProperties();
     else if (tag->second == "Degradable_JPEG_Media")
       DegradableJPEGMedia();
-    else  // tag found but not processed
-    {
+    else {  // tag found but not processed
       // Make sure that the remaining size is non-zero, so that we won't
       // keep revisiting the same location in the file.
       const uint64_t remaining_size = objectHeader.getRemainingSize();
       Internal::enforce(remaining_size > 0, Exiv2::ErrorCode::kerCorruptedMetadata);
       io_->seekOrThrow(io_->tell() + remaining_size, BasicIo::beg, ErrorCode::kerFailedToReadImageData);
     }
-  } else  // tag not found
-  {
+  } else {  // tag not found
     // Make sure that the remaining size is non-zero, so that we won't keep
     // revisiting the same location in the file.
     const uint64_t remaining_size = objectHeader.getRemainingSize();
diff --git a/src/bmffimage.cpp b/src/bmffimage.cpp
index 78b0f20c..a020ff8b 100644
--- a/src/bmffimage.cpp
+++ b/src/bmffimage.cpp
@@ -66,7 +66,13 @@ enum {
 
 // *****************************************************************************
 // class member definitions
-#ifdef EXV_ENABLE_BMFF
+#ifndef EXV_ENABLE_BMFF
+namespace Exiv2 {
+bool enableBMFF(bool) {
+  return false;
+}
+}  // namespace Exiv2
+#else
 namespace Exiv2 {
 static bool enabled = false;
 bool enableBMFF(bool enable) {
@@ -801,10 +807,4 @@ bool isBmffType(BasicIo& iIo, bool advance) {
   return matched;
 }
 }  // namespace Exiv2
-#else  // ifdef EXV_ENABLE_BMFF
-namespace Exiv2 {
-bool enableBMFF(bool) {
-  return false;
-}
-}  // namespace Exiv2
 #endif