diff --git a/Makefile.mak b/Makefile.mak
index 330e2c0c..703796f4 100644
--- a/Makefile.mak
+++ b/Makefile.mak
@@ -128,75 +128,81 @@ DLL_CFLAGS = /D"VL_BUILD_DLL"
 EXE_LFLAGS = $(LFLAGS) /LIBPATH:"$(bindir)" vl.lib
 MEX_FLAGS  = -I. -Itoolbox -L"$(bindir)" -lvl
 
-libsrc =                \
- vl\aib.c               \
- vl\dsift.c             \
- vl\generic.c           \
- vl\getopt_long.c       \
- vl\hikmeans.c          \
- vl\host.c              \
- vl\ikmeans.c           \
- vl\imop.c              \
- vl\imopv.c             \
- vl\imopv_sse2.c        \
- vl\kdtree.c            \
- vl\mathop.c            \
- vl\mathop_sse2.c       \
- vl\mser.c              \
- vl\pgm.c               \
- vl\random.c            \
- vl\rodrigues.c         \
- vl\sift.c              \
- vl\quickshift.c        \
- vl\stringop.c
-
-cmdsrc =                \
- src\aib.c              \
- src\mser.c             \
- src\sift.c             \
- src\test_getopt_long.c \
- src\test_host.c        \
- src\test_imopv.c       \
- src\test_mathop.c      \
- src\test_nan.c         \
- src\test_rand.c        \
- src\test_stringop.c
-
-mexsrc =                          \
- toolbox\aib\vl_aib.c             \
- toolbox\aib\vl_aibhist.c         \
- toolbox\geometry\vl_irodr.c      \
- toolbox\geometry\vl_rodr.c       \
- toolbox\imop\vl_imintegral.c     \
- toolbox\imop\vl_imsmooth.c       \
- toolbox\imop\vl_imwbackwardmx.c  \
- toolbox\imop\vl_tpsumx.c         \
- toolbox\kmeans\vl_hikmeans.c     \
- toolbox\kmeans\vl_hikmeanspush.c \
- toolbox\kmeans\vl_ikmeans.c      \
- toolbox\kmeans\vl_ikmeanspush.c  \
- toolbox\misc\vl_alldist.c        \
- toolbox\misc\vl_alldist2.c       \
- toolbox\misc\vl_binsearch.c      \
- toolbox\misc\vl_binsum.c         \
- toolbox\misc\vl_getpid.c         \
- toolbox\misc\vl_ihashfind.c      \
- toolbox\misc\vl_ihashsum.c       \
- toolbox\misc\vl_inthist.c        \
- toolbox\misc\vl_kdtreebuild.c    \
- toolbox\misc\vl_kdtreequery.c    \
- toolbox\misc\vl_localmax.c       \
- toolbox\misc\vl_samplinthist.c   \
- toolbox\misc\vl_simdctrl.c       \
- toolbox\misc\vl_twister.c        \
- toolbox\misc\vl_whistc.c         \
- toolbox\mser\vl_erfill.c         \
- toolbox\mser\vl_mser.c           \
- toolbox\quickshift\vl_quickshift.c \
- toolbox\sift\vl_dsift.c          \
- toolbox\sift\vl_sift.c           \
- toolbox\sift\vl_siftdescriptor.c \
- toolbox\sift\vl_ubcmatch.c
+libsrc =                                                             \
+  vl\aib.c                                                           \
+  vl\dsift.c                                                         \
+  vl\generic.c                                                       \
+  vl\getopt_long.c                                                   \
+  vl\heap.c                                                          \
+  vl\hikmeans.c                                                      \
+  vl\host.c                                                          \
+  vl\ikmeans.c                                                       \
+  vl\imop.c                                                          \
+  vl\imopv.c                                                         \
+  vl\imopv_sse2.c                                                    \
+  vl\kdtree.c                                                        \
+  vl\mathop.c                                                        \
+  vl\mathop_sse2.c                                                   \
+  vl\mser.c                                                          \
+  vl\pgm.c                                                           \
+  vl\quickshift.c                                                    \
+  vl\random.c                                                        \
+  vl\rodrigues.c                                                     \
+  vl\sift.c                                                          \
+  vl\stringop.c
+
+cmdsrc =                                                             \
+  src\aib.c                                                          \
+  src\mser.c                                                         \
+  src\sift.c                                                         \
+  src\test_getopt_long.c                                             \
+  src\test_heap-t.c                                                  \
+  src\test_heap.c                                                    \
+  src\test_host.c                                                    \
+  src\test_imopv.c                                                   \
+  src\test_mathop.c                                                  \
+  src\test_mathop_abs.c                                              \
+  src\test_nan.c                                                     \
+  src\test_rand.c                                                    \
+  src\test_stringop.c                                                \
+  src\test_vec_comp.c
+
+mexsrc =                                                             \
+  toolbox\aib\vl_aib.c                                               \
+  toolbox\aib\vl_aibhist.c                                           \
+  toolbox\geometry\vl_irodr.c                                        \
+  toolbox\geometry\vl_rodr.c                                         \
+  toolbox\imop\vl_imintegral.c                                       \
+  toolbox\imop\vl_imsmooth.c                                         \
+  toolbox\imop\vl_imwbackwardmx.c                                    \
+  toolbox\imop\vl_tpsumx.c                                           \
+  toolbox\kmeans\vl_hikmeans.c                                       \
+  toolbox\kmeans\vl_hikmeanspush.c                                   \
+  toolbox\kmeans\vl_ikmeans.c                                        \
+  toolbox\kmeans\vl_ikmeanspush.c                                    \
+  toolbox\misc\vl_alldist.c                                          \
+  toolbox\misc\vl_alldist2.c                                         \
+  toolbox\misc\vl_binsearch.c                                        \
+  toolbox\misc\vl_binsum.c                                           \
+  toolbox\misc\vl_getpid.c                                           \
+  toolbox\misc\vl_ihashfind.c                                        \
+  toolbox\misc\vl_ihashsum.c                                         \
+  toolbox\misc\vl_inthist.c                                          \
+  toolbox\misc\vl_kdtreebuild.c                                      \
+  toolbox\misc\vl_kdtreequery.c                                      \
+  toolbox\misc\vl_localmax.c                                         \
+  toolbox\misc\vl_samplinthist.c                                     \
+  toolbox\misc\vl_simdctrl.c                                         \
+  toolbox\misc\vl_twister.c                                          \
+  toolbox\misc\vl_version.c                                          \
+  toolbox\misc\vl_whistc.c                                           \
+  toolbox\mser\vl_erfill.c                                           \
+  toolbox\mser\vl_mser.c                                             \
+  toolbox\quickshift\vl_quickshift.c                                 \
+  toolbox\sift\vl_dsift.c                                            \
+  toolbox\sift\vl_sift.c                                             \
+  toolbox\sift\vl_siftdescriptor.c                                   \
+  toolbox\sift\vl_ubcmatch.c
 
 # horrible Make program, horrible code:
 libobj = $(libsrc:vl\=bin\w32\objs\)