diff --git a/samples/Makefile b/samples/Makefile
index 71bdba1a..0cc5b584 100644
--- a/samples/Makefile
+++ b/samples/Makefile
@@ -78,7 +78,11 @@ BINSRC = addmoddel.cpp        \
          xmpparser-test.cpp   \
          xmpsample.cpp
 
-         
+# Samples that need special treatment during compilation or linking
+OTHERSRC = geotag.cpp         \
+           metacopy.cpp       \
+           path-test.cpp
+
 # ******************************************************************************
 # Initialisations
 SHELL = /bin/sh
@@ -96,11 +100,14 @@ LDFLAGS := `pkg-config exiv2 --libs`
 
 BINOBJ = $(BINSRC:.cpp=.o)
 BINARY = $(BINSRC:.cpp=)
-OTHER  = geotag metacopy path-test
-EXECUTABLE = $(BINSRC:.cpp=$(EXEEXT)) $(OTHER)
+
+OTHEROBJ = $(OTHERSRC:.cpp=.o)
+OTHERBIN = $(OTHERSRC:.cpp=)
+
+EXECUTABLE = $(BINSRC:%.cpp=../bin/%$(EXEEXT)) $(OTHERSRC:%.cpp=../bin/%$(EXEEXT))
 
 ifdef DEP_TRACKING
-DEP = $(BINSRC:%.cpp=$(DEPDIR)/%.d)
+DEP = $(BINSRC:%.cpp=$(DEPDIR)/%.d) $(OTHERSRC:%.cpp=$(DEPDIR)/%.d)
 endif
 
 PREFIX = /usr/local/lib
@@ -108,11 +115,11 @@ LINK.cc += -rpath $(PREFIX) -L$(PREFIX)
 
 # ******************************************************************************
 # Rules
-samples: $(BINARY) $(OTHER)
+samples: $(BINARY) $(OTHERBIN)
 
 $(BINOBJ): %.o: %.cpp
 	@if [ -z `which $(PKGCONFIG)`  ]; then echo $(BAR) $'\\n***' utility $(PKGCONFIG) not available $'***\n'$(BAR) ; exit 42 ; fi
-	$(COMPILE.cc) -I../src -o $@ $<
+	$(COMPILE.cc) -o $@ $<
 	@$(MAKEDEPEND)
 	@$(POSTDEPEND)
 
@@ -136,29 +143,28 @@ endif
 relink: binclean samples
 
 # link expat directly to geotag
-geotag : geotag.cpp
-	$(COMPILE.cc) -I../src -o $@.o $<
-	$(LIBTOOL)  --mode=link $(LINK.cc) -lexpat $@.o -o ../bin/$@ 
+geotag: %: %.cpp
+	$(COMPILE.cc) -o $@.o $<
+	@$(MAKEDEPEND)
+	@$(POSTDEPEND)
+	$(LIBTOOL) --mode=link $(LINK.cc) -lexpat $@.o -o ../bin/$@
 
 # link applications which require utils.cpp support
-metacopy: metacopy.cpp ../src/utils.o
+metacopy path-test: %: %.cpp ../src/utils.o
 	$(COMPILE.cc) -I../src -o $@.o $<
-	$(LIBTOOL)  --mode=link $(LINK.cc) $@.o ../src/utils.o -o ../bin/$@
-
-path-test: path-test.cpp ../src/utils.o
-	$(COMPILE.cc) -I../src -o $@.o $<
-	$(LIBTOOL)  --mode=link $(LINK.cc) $@.o ../src/utils.o -o ../bin/$@
+	@$(MAKEDEPEND)
+	@$(POSTDEPEND)
+	$(LIBTOOL) --mode=link $(LINK.cc) $@.o ../src/utils.o -o ../bin/$@
 
 # Remove binaries, e.g., to relink them
 binclean:
-	cd ../bin ; $(RM) $(EXECUTABLE)
+	cd ../bin
+	$(RM) $(EXECUTABLE)
 
 mostlyclean:
 	$(RM) core
-	$(RM) $(CCSRC:.cpp=.ii)
-	$(RM) $(CCSRC:%.cpp=.libs/%.d) $(CSRC:%.c=.libs/%.d)
-	-rmdir .libs
-	$(RM) $(BINOBJ)
+	$(RM) $(BINSRC:.cpp=.ii) $(OTHERSRC:.cpp=.ii)
+	$(RM) $(BINOBJ) $(OTHEROBJ)
 
 clean: binclean mostlyclean
 
diff --git a/samples/taglist.cpp b/samples/taglist.cpp
index b658900d..8c5bbdd3 100644
--- a/samples/taglist.cpp
+++ b/samples/taglist.cpp
@@ -8,10 +8,8 @@
   History:   07-Jan-04, ahu: created
  */
 // *****************************************************************************
-#include "tags.hpp"
-#include "datasets.hpp"
-#include "properties.hpp"
-#include "error.hpp"
+
+#include <exiv2/exiv2.hpp>
 
 #include <string>
 #include <iostream>