diff --git a/configure.ac b/configure.ac
index 00c4a07c..c350d0ee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -58,7 +58,8 @@ AC_CHECK_HEADER(png.h,
   AC_CHECK_LIB(png, png_get_libpng_ver,
                [PNG_LIBS="$PNG_LIBS -lpng"
                 PNG_INCLUDES="$PNG_INCLUDES -DWEBP_HAVE_PNG"
-                AC_DEFINE(WEBP_HAVE_PNG, [1], [Set to 1 if PNG library is installed])
+                AC_DEFINE(WEBP_HAVE_PNG, [1],
+                          [Set to 1 if PNG library is installed])
                ],
                AC_MSG_WARN(Optional png library not found),
                [$MATH_LIBS]),
@@ -85,7 +86,8 @@ AC_CHECK_HEADER(jpeglib.h,
   AC_CHECK_LIB(jpeg, jpeg_set_defaults,
                [JPEG_LIBS="$JPEG_LIBS -ljpeg"
                 JPEG_INCLUDES="$JPEG_INCLUDES -DWEBP_HAVE_JPEG"
-                AC_DEFINE(WEBP_HAVE_JPEG, [1], [Set to 1 if JPEG library is installed])
+                AC_DEFINE(WEBP_HAVE_JPEG, [1],
+                          [Set to 1 if JPEG library is installed])
                ],
                AC_MSG_WARN(Optional jpeg library not found),
                [$MATH_LIBS]),
@@ -112,7 +114,8 @@ AC_CHECK_HEADER(tiffio.h,
   AC_CHECK_LIB(tiff, TIFFGetVersion,
                [TIFF_LIBS="$TIFF_LIBS -ltiff"
                 TIFF_INCLUDES="$TIFF_INCLUDES -DWEBP_HAVE_TIFF"
-                AC_DEFINE(WEBP_HAVE_TIFF, [1], [Set to 1 if TIFF library is installed])
+                AC_DEFINE(WEBP_HAVE_TIFF, [1],
+                          [Set to 1 if TIFF library is installed])
                ],
                AC_MSG_WARN(Optional tiff library not found),
                [$MATH_LIBS]),
@@ -167,7 +170,7 @@ if test "$target_os" = "mingw32"; then
   fi
 fi
 
-dnl === If --enable-experimental is defined, add the flag WEBP_EXPERIMENTAL_FEATURES
+dnl === If --enable-experimental is defined, add -DWEBP_EXPERIMENTAL_FEATURES
 
 USE_EXPERIMENTAL_CODE=""
 AC_MSG_CHECKING(if --enable-experimental option is specified)
diff --git a/examples/Makefile.am b/examples/Makefile.am
index e979c10a..8d3e8b21 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -8,14 +8,14 @@ libexampleutilinclude_HEADERS = example_util.h
 libexampleutilincludedir =
 
 dwebp_SOURCES = dwebp.c stopwatch.h
-dwebp_CPPFLAGS = $(AM_CPPFLAGS) $(PNG_INCLUDES) $(JPEG_INCLUDES) $(USE_EXPERIMENTAL_CODE)
+dwebp_CPPFLAGS  = $(AM_CPPFLAGS) $(USE_EXPERIMENTAL_CODE)
+dwebp_CPPFLAGS += $(JPEG_INCLUDES) $(PNG_INCLUDES)
 dwebp_LDADD = libexampleutil.la ../src/libwebp.la $(PNG_LIBS) $(JPEG_LIBS)
 
 cwebp_SOURCES = cwebp.c stopwatch.h
-cwebp_CPPFLAGS  = $(AM_CPPFLAGS)
-cwebp_CPPFLAGS += $(PNG_INCLUDES) $(JPEG_INCLUDES) $(TIFF_INCLUDES)
-cwebp_CPPFLAGS += $(USE_EXPERIMENTAL_CODE)
-cwebp_LDADD = ../src/libwebp.la $(PNG_LIBS) $(JPEG_LIBS) $(TIFF_LIBS)
+cwebp_CPPFLAGS  = $(AM_CPPFLAGS) $(USE_EXPERIMENTAL_CODE)
+cwebp_CPPFLAGS += $(JPEG_INCLUDES) $(PNG_INCLUDES) $(TIFF_INCLUDES)
+cwebp_LDADD = ../src/libwebp.la $(JPEG_LIBS) $(PNG_LIBS) $(TIFF_LIBS)
 
 webpmux_SOURCES = webpmux.c
 webpmux_CPPFLAGS = $(AM_CPPFLAGS) $(USE_EXPERIMENTAL_CODE)