diff --git a/Makefile b/Makefile
index ea2a2da..9931a3e 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ test: lib src
 	$(MAKE) -C test
 
 scripts/%: scripts/%.in
-	sed -e's#@LIBEXEC_PREFIX@#$(LIBEXEC_PREFIX)#' -e's#@PREFIX@#$(PREFIX)#' "$<" >"$@"
+	sed -e's#@LIBEXEC_PREFIX@#$(LIBEXEC_PREFIX)#' -e's#@PREFIX@#$(PREFIX)#' $< >$@
 
 scripts: scripts/beesd scripts/beesd@.service
 
diff --git a/lib/Makefile b/lib/Makefile
index ae8392f..21460f7 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -20,7 +20,7 @@ CRUCIBLE_OBJS = \
 	uuid.o \
 	.version.o \
 
-libcrucible.so: $(CRUCIBLE_OBJS)
+libcrucible.so: $(CRUCIBLE_OBJS) -luuid
 
 include ../makeflags
 
@@ -42,4 +42,4 @@ include depends.mk
 	$(CXX) $(CXXFLAGS) -fPIC -o $@ -c $<
 
 %.so:
-	$(CXX) $(LDFLAGS) -fPIC -o $@ $^ -shared -Wl,-soname,$@ -luuid
+	$(CXX) $(LDFLAGS) -fPIC -shared -Wl,-soname,$@ -o $@ $^
diff --git a/src/Makefile b/src/Makefile
index d6ccb25..058e921 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -34,15 +34,14 @@ depends.mk: $(BEES_OBJS:%.o=.depends/%.dep)
 include depends.mk
 
 %.o: %.cc %.h
-	$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+	$(CXX) $(CXXFLAGS) -o $@ -c $<
 
 ../bin/%: %.o
 	@echo Implicit bin rule "$<" '->' "$@"
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) $(LIBS) -o $@ $<
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $< $(LIBS)
 
 ../bin/bees: $(BEES_OBJS) bees-version.o
-	$(CXX) $(CXXFLAGS) -o "$@" $^ $(LDFLAGS) $(LIBS)
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
 
 clean:
-	-rm -fv bees-version.h
-	-rm -fv *.o bees-version.c
+	rm -fv *.o bees-version.c
diff --git a/test/Makefile b/test/Makefile
index 13e6f21..533c6c8 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -28,12 +28,12 @@ depends.mk: $(PROGRAMS:%=.depends/%.dep)
 include depends.mk
 
 %.o: %.cc %.h ../makeflags
-	-echo "Implicit rule %.o: %.cc" >&2
-	$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+	@echo "Implicit rule %.o: %.cc"
+	$(CXX) $(CXXFLAGS) -o $@ -c $<
 
 %: %.o ../makeflags
-	-echo "Implicit rule %: %.o" >&2
-	$(CXX) $(CXXFLAGS) -o "$@" "$<" $(LDFLAGS) $(LIBS)
+	@echo "Implicit rule %: %.o"
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) $(LIBS) -o $@ $<
 
 clean:
-	-rm -fv *.o
+	rm -fv *.o