diff --git a/src/libFLAC/Makefile.am b/src/libFLAC/Makefile.am
index d06edd17..cef4c8e4 100644
--- a/src/libFLAC/Makefile.am
+++ b/src/libFLAC/Makefile.am
@@ -36,11 +36,11 @@ if FLaC__CPU_PPC
 # The -force_cpusubtype_ALL is needed to insert a ppc64 instruction
 # into cpu.c with an asm().
 if FLaC__SYS_DARWIN
-#@@@@@@ PPC optimizations temporarily disabled
+#@@@ PPC optimizations temporarily disabled
 CPUCFLAGS = -faltivec -force_cpusubtype_ALL -DFLAC__NO_ASM
 else
 # Linux-gcc for PPC does not have -force_cpusubtype_ALL, it is Darwin-specific
-#@@@@@@ PPC optimizations temporarily disabled
+#@@@ PPC optimizations temporarily disabled
 CPUCFLAGS = -maltivec -mabi=altivec -DFLAC__NO_ASM
 endif
 endif
diff --git a/src/libFLAC/ppc/as/Makefile.am b/src/libFLAC/ppc/as/Makefile.am
index 2d8a085c..7952c407 100644
--- a/src/libFLAC/ppc/as/Makefile.am
+++ b/src/libFLAC/ppc/as/Makefile.am
@@ -28,7 +28,7 @@
 #  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 #  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#@@@@@@
+#@@@
 if FLaC__HAS_AS__TEMPORARILY_DISABLED
 
 SUFFIXES = .s .lo
diff --git a/src/libFLAC/ppc/gas/Makefile.am b/src/libFLAC/ppc/gas/Makefile.am
index a124aaf7..27b4fe95 100644
--- a/src/libFLAC/ppc/gas/Makefile.am
+++ b/src/libFLAC/ppc/gas/Makefile.am
@@ -28,7 +28,7 @@
 #  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 #  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#@@@@@@
+#@@@
 if FLaC__HAS_GAS__TEMPORARILY_DISABLED
 
 SUFFIXES = .s .lo
diff --git a/src/metaflac/operations_shorthand_picture.c b/src/metaflac/operations_shorthand_picture.c
index a472b939..9e4a7427 100644
--- a/src/metaflac/operations_shorthand_picture.c
+++ b/src/metaflac/operations_shorthand_picture.c
@@ -21,7 +21,7 @@
 #endif
 
 #include <errno.h>
-#include <stdio.h> /* for snprintf() */
+#include <stdio.h>
 #include <string.h>
 #include "options.h"
 #include "utils.h"
diff --git a/src/test_libFLAC++/metadata_manip.cpp b/src/test_libFLAC++/metadata_manip.cpp
index 89feae10..d31b28fb 100644
--- a/src/test_libFLAC++/metadata_manip.cpp
+++ b/src/test_libFLAC++/metadata_manip.cpp
@@ -330,11 +330,11 @@ static bool write_chain_(FLAC::Metadata::Chain &chain, bool use_padding, bool pr
 					return false;
 			}
 			if(0 == (file = fopen(filename, "rb")))
-				return false; /*@@@ chain status still says OK though */
+				return false; /*@@@@ chain status still says OK though */
 			if(!open_tempfile_(filename, &tempfile, &tempfilename)) {
 				fclose(file);
 				cleanup_tempfile_(&tempfile, &tempfilename);
-				return false; /*@@@ chain status still says OK though */
+				return false; /*@@@@ chain status still says OK though */
 			}
 			if(!chain.write(use_padding, (::FLAC__IOHandle)file, callbacks, (::FLAC__IOHandle)tempfile, callbacks)) {
 				fclose(file);
@@ -352,7 +352,7 @@ static bool write_chain_(FLAC::Metadata::Chain &chain, bool use_padding, bool pr
 		else {
 			FILE *file = fopen(filename, "r+b");
 			if(0 == file)
-				return false; /*@@@ chain status still says OK though */
+				return false; /*@@@@ chain status still says OK though */
 			if(!chain.write(use_padding, (::FLAC__IOHandle)file, callbacks))
 				return false;
 			fclose(file);
@@ -378,7 +378,7 @@ static bool read_chain_(FLAC::Metadata::Chain &chain, const char *filename, bool
 			bool ret;
 			FILE *file = fopen(filename, "rb");
 			if(0 == file)
-				return false; /*@@@ chain status still says OK though */
+				return false; /*@@@@ chain status still says OK though */
 			ret = chain.read((::FLAC__IOHandle)file, callbacks);
 			fclose(file);
 			return ret;
diff --git a/src/test_libFLAC/metadata_manip.c b/src/test_libFLAC/metadata_manip.c
index 4896c128..58df54ce 100644
--- a/src/test_libFLAC/metadata_manip.c
+++ b/src/test_libFLAC/metadata_manip.c
@@ -317,11 +317,11 @@ static FLAC__bool write_chain_(FLAC__Metadata_Chain *chain, FLAC__bool use_paddi
 					return false;
 			}
 			if(0 == (file = fopen(filename, "rb")))
-				return false; /*@@@ chain status still says OK though */
+				return false; /*@@@@ chain status still says OK though */
 			if(!open_tempfile_(filename, &tempfile, &tempfilename)) {
 				fclose(file);
 				cleanup_tempfile_(&tempfile, &tempfilename);
-				return false; /*@@@ chain status still says OK though */
+				return false; /*@@@@ chain status still says OK though */
 			}
 			if(!FLAC__metadata_chain_write_with_callbacks_and_tempfile(chain, use_padding, (FLAC__IOHandle)file, callbacks, (FLAC__IOHandle)tempfile, callbacks)) {
 				fclose(file);
@@ -339,7 +339,7 @@ static FLAC__bool write_chain_(FLAC__Metadata_Chain *chain, FLAC__bool use_paddi
 		else {
 			FILE *file = fopen(filename, "r+b");
 			if(0 == file)
-				return false; /*@@@ chain status still says OK though */
+				return false; /*@@@@ chain status still says OK though */
 			if(!FLAC__metadata_chain_write_with_callbacks(chain, use_padding, (FLAC__IOHandle)file, callbacks))
 				return false;
 			fclose(file);
@@ -365,7 +365,7 @@ static FLAC__bool read_chain_(FLAC__Metadata_Chain *chain, const char *filename,
 			FLAC__bool ret;
 			FILE *file = fopen(filename, "rb");
 			if(0 == file)
-				return false; /*@@@ chain status still says OK though */
+				return false; /*@@@@ chain status still says OK though */
 			ret = FLAC__metadata_chain_read_with_callbacks(chain, (FLAC__IOHandle)file, callbacks);
 			fclose(file);
 			return ret;