diff --git a/Android.mk b/Android.mk
index 01eb351a..5d8ceb38 100644
--- a/Android.mk
+++ b/Android.mk
@@ -2,50 +2,50 @@ LOCAL_PATH:= $(call my-dir)
 
 include $(CLEAR_VARS)
 LOCAL_SRC_FILES := \
-	src/dec/alpha.c \
-	src/dec/buffer.c \
-	src/dec/frame.c \
-	src/dec/idec.c \
-	src/dec/io.c \
-	src/dec/layer.c \
-	src/dec/quant.c \
-	src/dec/tree.c \
-	src/dec/vp8.c \
-	src/dec/vp8l.c \
-	src/dec/webp.c \
-	src/dsp/cpu.c \
-	src/dsp/dec.c \
-	src/dsp/dec_neon.c \
-	src/dsp/enc.c \
-	src/dsp/lossless.c \
-	src/dsp/upsampling.c \
-	src/dsp/yuv.c \
-	src/enc/alpha.c \
-	src/enc/analysis.c \
-	src/enc/config.c \
-	src/enc/cost.c \
-	src/enc/filter.c \
-	src/enc/frame.c \
-	src/enc/iterator.c \
-	src/enc/layer.c \
-	src/enc/picture.c \
-	src/enc/quant.c \
-	src/enc/syntax.c \
-	src/enc/tree.c \
-	src/enc/webpenc.c \
-	src/mux/muxedit.c \
-	src/mux/muxinternal.c \
-	src/mux/muxread.c \
-	src/utils/alpha.c \
-	src/utils/bit_reader.c \
-	src/utils/bit_writer.c \
-	src/utils/color_cache.c \
-	src/utils/filters.c \
-	src/utils/huffman.c \
-	src/utils/quant_levels.c \
-	src/utils/rescaler.c \
-	src/utils/tcoder.c \
-	src/utils/thread.c \
+    src/dec/alpha.c \
+    src/dec/buffer.c \
+    src/dec/frame.c \
+    src/dec/idec.c \
+    src/dec/io.c \
+    src/dec/layer.c \
+    src/dec/quant.c \
+    src/dec/tree.c \
+    src/dec/vp8.c \
+    src/dec/vp8l.c \
+    src/dec/webp.c \
+    src/dsp/cpu.c \
+    src/dsp/dec.c \
+    src/dsp/dec_neon.c \
+    src/dsp/enc.c \
+    src/dsp/lossless.c \
+    src/dsp/upsampling.c \
+    src/dsp/yuv.c \
+    src/enc/alpha.c \
+    src/enc/analysis.c \
+    src/enc/config.c \
+    src/enc/cost.c \
+    src/enc/filter.c \
+    src/enc/frame.c \
+    src/enc/iterator.c \
+    src/enc/layer.c \
+    src/enc/picture.c \
+    src/enc/quant.c \
+    src/enc/syntax.c \
+    src/enc/tree.c \
+    src/enc/webpenc.c \
+    src/mux/muxedit.c \
+    src/mux/muxinternal.c \
+    src/mux/muxread.c \
+    src/utils/alpha.c \
+    src/utils/bit_reader.c \
+    src/utils/bit_writer.c \
+    src/utils/color_cache.c \
+    src/utils/filters.c \
+    src/utils/huffman.c \
+    src/utils/quant_levels.c \
+    src/utils/rescaler.c \
+    src/utils/tcoder.c \
+    src/utils/thread.c \
 
 LOCAL_CFLAGS := -Wall -DANDROID -DHAVE_MALLOC_H -DHAVE_PTHREAD \
                 -DNOT_HAVE_LOG2 -DWEBP_USE_THREAD \
diff --git a/makefile.unix b/makefile.unix
index 258003c9..161f4510 100644
--- a/makefile.unix
+++ b/makefile.unix
@@ -59,33 +59,84 @@ GROFF = /usr/bin/groff
 COL = /usr/bin/col
 LDFLAGS = $(EXTRA_LIBS) -lm
 
-DEC_OBJS = src/dec/frame.o src/dec/webp.o src/dec/quant.o src/dec/tree.o \
-           src/dec/vp8.o src/dec/vp8l.o src/dec/idec.o src/dec/alpha.o  \
-           src/dec/layer.o src/dec/io.o src/dec/buffer.o
-ENC_OBJS = src/enc/webpenc.o src/enc/syntax.o \
-           src/enc/alpha.o src/enc/layer.o \
-           src/enc/tree.o src/enc/config.o src/enc/frame.o \
-           src/enc/quant.o src/enc/iterator.o src/enc/analysis.o \
-           src/enc/cost.o src/enc/picture.o src/enc/filter.o
-DSP_OBJS = src/dsp/cpu.o src/dsp/enc.o \
-           src/dsp/enc_sse2.o src/dsp/dec.o src/dsp/dec_sse2.o \
-           src/dsp/dec_neon.o src/dsp/lossless.o src/dsp/upsampling.o \
-           src/dsp/upsampling_sse2.o src/dsp/yuv.o
-UTILS_OBJS = src/utils/alpha.o src/utils/bit_reader.o src/utils/bit_writer.o \
-             src/utils/color_cache.o src/utils/filters.o src/utils/huffman.o \
-             src/utils/quant_levels.o src/utils/rescaler.o src/utils/thread.o \
-             src/utils/tcoder.o
+DEC_OBJS = \
+    src/dec/alpha.o \
+    src/dec/buffer.o \
+    src/dec/frame.o \
+    src/dec/idec.o \
+    src/dec/io.o \
+    src/dec/layer.o \
+    src/dec/quant.o \
+    src/dec/tree.o \
+    src/dec/vp8.o \
+    src/dec/vp8l.o \
+    src/dec/webp.o \
 
-OBJS = $(DEC_OBJS) $(ENC_OBJS) $(DSP_OBJS) $(UTILS_OBJS)
+DSP_OBJS = \
+    src/dsp/cpu.o \
+    src/dsp/dec.o \
+    src/dsp/dec_neon.o \
+    src/dsp/dec_sse2.o \
+    src/dsp/enc.o \
+    src/dsp/enc_sse2.o \
+    src/dsp/lossless.o \
+    src/dsp/upsampling.o \
+    src/dsp/upsampling_sse2.o \
+    src/dsp/yuv.o \
 
-MUX_OBJS = src/mux/muxedit.o src/mux/muxinternal.o src/mux/muxread.o
+ENC_OBJS = \
+    src/enc/alpha.o \
+    src/enc/analysis.o \
+    src/enc/config.o \
+    src/enc/cost.o \
+    src/enc/filter.o \
+    src/enc/frame.o \
+    src/enc/iterator.o \
+    src/enc/layer.o \
+    src/enc/picture.o \
+    src/enc/quant.o \
+    src/enc/syntax.o \
+    src/enc/tree.o \
+    src/enc/webpenc.o \
 
-HDRS = src/webp/encode.h src/enc/vp8enci.h src/enc/cost.h src/webp/mux.h \
-       src/dec/vp8i.h src/dec/vp8li.h src/dsp/yuv.h src/dsp/dsp.h \
-       src/dsp/lossless.h src/utils/alpha.h src/utils/bit_writer.h \
-       src/utils/bit_reader.h src/utils/color_cache.h src/utils/filters.h \
-       src/utils/huffman.h src/utils/thread.h \
-       src/utils/tcoder.h
+MUX_OBJS = \
+    src/mux/muxedit.o \
+    src/mux/muxinternal.o \
+    src/mux/muxread.o \
+
+UTILS_OBJS = \
+    src/utils/alpha.o \
+    src/utils/bit_reader.o \
+    src/utils/bit_writer.o \
+    src/utils/color_cache.o \
+    src/utils/filters.o \
+    src/utils/huffman.o \
+    src/utils/quant_levels.o \
+    src/utils/rescaler.o \
+    src/utils/tcoder.o \
+    src/utils/thread.o \
+
+LIBWEBP_OBJS = $(DEC_OBJS) $(DSP_OBJS) $(ENC_OBJS) $(UTILS_OBJS)
+LIBWEBPMUX_OBJS = $(MUX_OBJS)
+
+HDRS = \
+    src/dec/vp8i.h \
+    src/dec/vp8li.h \
+    src/dsp/dsp.h \
+    src/dsp/lossless.h \
+    src/dsp/yuv.h \
+    src/enc/cost.h \
+    src/enc/vp8enci.h \
+    src/utils/alpha.h \
+    src/utils/bit_reader.h \
+    src/utils/bit_writer.h \
+    src/utils/color_cache.h \
+    src/utils/filters.h \
+    src/utils/huffman.h \
+    src/utils/tcoder.h \
+    src/utils/thread.h \
+    src/webp/encode.h \
+    src/webp/mux.h \
 
 OUT_LIBS = src/libwebp.a src/mux/libwebpmux.a
 OUT_EXAMPLES = examples/cwebp examples/dwebp examples/webpmux
@@ -97,10 +148,10 @@ all: ex
 %.o: %.c $(HDRS)
 	$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
 
-src/libwebp.a: $(OBJS)
+src/libwebp.a: $(LIBWEBP_OBJS)
 	$(AR) $(ARFLAGS) $@ $^
 
-src/mux/libwebpmux.a: $(MUX_OBJS)
+src/mux/libwebpmux.a: $(LIBWEBPMUX_OBJS)
 	$(AR) $(ARFLAGS) $@ $^
 
 ex: $(OUT_EXAMPLES)