diff --git a/taglib/mod/modfile.h b/taglib/mod/modfile.h
index 6fd41b00..f66a0ef3 100644
--- a/taglib/mod/modfile.h
+++ b/taglib/mod/modfile.h
@@ -33,57 +33,60 @@ namespace TagLib {
 
   namespace Mod {
 
-    class TAGLIB_EXPORT File : public TagLib::Mod::FileBase {
-      public:
-        /*!
-         * Contructs a Protracker file from \a file. If \a readProperties
-         * is true the file's audio properties will also be read using
-         * \a propertiesStyle. If false, \a propertiesStyle is ignored.
-         */
-        File(FileName file, bool readProperties = true,
-             AudioProperties::ReadStyle propertiesStyle =
-             AudioProperties::Average);
+    class TAGLIB_EXPORT File : public TagLib::Mod::FileBase
+    {
+    public:
+      /*!
+       * Contructs a Protracker file from \a file. If \a readProperties
+       * is true the file's audio properties will also be read using
+       * \a propertiesStyle. If false, \a propertiesStyle is ignored.
+       */
+      File(FileName file, bool readProperties = true,
+           AudioProperties::ReadStyle propertiesStyle =
+           AudioProperties::Average);
 
-        /*!
-         * Contructs a Protracker file from \a stream. If \a readProperties
-         * is true the file's audio properties will also be read using
-         * \a propertiesStyle. If false, \a propertiesStyle is ignored.
-         */
-        File(IOStream *stream, bool readProperties = true,
-             AudioProperties::ReadStyle propertiesStyle =
-             AudioProperties::Average);
+      /*!
+       * Contructs a Protracker file from \a stream. If \a readProperties
+       * is true the file's audio properties will also be read using
+       * \a propertiesStyle. If false, \a propertiesStyle is ignored.
+       */
+      File(IOStream *stream, bool readProperties = true,
+           AudioProperties::ReadStyle propertiesStyle =
+           AudioProperties::Average);
 
-        /*!
-         * Destroys this instance of the File.
-         */
-        virtual ~File();
+      /*!
+       * Destroys this instance of the File.
+       */
+      virtual ~File();
 
-        Mod::Tag *tag() const;
+      Mod::Tag *tag() const;
 
-        /*!
-         * Returns the Mod::Properties for this file. If no audio properties
-         * were read then this will return a null pointer.
-         */
-        Mod::Properties *audioProperties() const;
+      /*!
+       * Returns the Mod::Properties for this file. If no audio properties
+       * were read then this will return a null pointer.
+       */
+      Mod::Properties *audioProperties() const;
 
-        /*!
-         * Save the file.
-         * This is the same as calling save(AllTags);
-         *
-         * \note Saving Protracker tags is not supported.
-         */
-        bool save();
+      /*!
+       * Save the file.
+       * This is the same as calling save(AllTags);
+       *
+       * \note Saving Protracker tags is not supported.
+       */
+      bool save();
 
-      private:
-        File(const File &);
-        File &operator=(const File &);
+    private:
+      File(const File &);
+      File &operator=(const File &);
 
-        void read(bool readProperties);
+      void read(bool readProperties);
 
-        class FilePrivate;
-        FilePrivate *d;
+      class FilePrivate;
+      FilePrivate *d;
     };
+
   }
+
 }
 
 #endif
diff --git a/taglib/mod/modfilebase.h b/taglib/mod/modfilebase.h
index d03af493..383bde11 100644
--- a/taglib/mod/modfilebase.h
+++ b/taglib/mod/modfilebase.h
@@ -31,7 +31,9 @@
 #include <algorithm>
 
 namespace TagLib {
+
   namespace Mod {
+
     class TAGLIB_EXPORT FileBase : public TagLib::File
     {
     protected:
@@ -52,7 +54,9 @@ namespace TagLib {
       bool readU16B(ushort &number);
       bool readU32B(ulong &number);
     };
+
   }
+
 }
 
 #endif
diff --git a/taglib/mod/modproperties.h b/taglib/mod/modproperties.h
index 02a1c606..1e04baaf 100644
--- a/taglib/mod/modproperties.h
+++ b/taglib/mod/modproperties.h
@@ -26,19 +26,21 @@
 #include "audioproperties.h"
 
 namespace TagLib {
+
   namespace Mod {
-    class TAGLIB_EXPORT Properties : public AudioProperties {
-      friend class File;
+
+    class TAGLIB_EXPORT Properties : public AudioProperties
+    {
     public:
       Properties(AudioProperties::ReadStyle propertiesStyle);
       virtual ~Properties();
       
-      int length()     const;
-      int bitrate()    const;
+      int length() const;
+      int bitrate() const;
       int sampleRate() const;
-      int channels()   const;
+      int channels() const;
 
-      uint  instrumentCount()  const;
+      uint instrumentCount() const;
       uchar lengthInPatterns() const;
 
       void setChannels(int channels);
@@ -47,13 +49,17 @@ namespace TagLib {
       void setLengthInPatterns(uchar lengthInPatterns);
 
     private:
+      friend class File;
+
       Properties(const Properties&);
       Properties &operator=(const Properties&);
 
       class PropertiesPrivate;
       PropertiesPrivate *d;
     };
+
   }
+
 }
 
 #endif
diff --git a/taglib/mod/modtag.h b/taglib/mod/modtag.h
index 93467450..253a4666 100644
--- a/taglib/mod/modtag.h
+++ b/taglib/mod/modtag.h
@@ -25,7 +25,9 @@
 #include "tag.h"
 
 namespace TagLib {
+
   namespace Mod {
+
     /*!
      * Tags for module files (Mod, S3M, IT, XM).
      *
@@ -164,7 +166,9 @@ namespace TagLib {
       class TagPrivate;
       TagPrivate *d;
     };
+
   }
+
 }
 
 #endif