diff --git a/Makefile b/Makefile
index 495db1b75..bd712f2b4 100644
--- a/Makefile
+++ b/Makefile
@@ -2,21 +2,29 @@ BINDIR?=/tmp/bin
 ETCDIR?=/tmp/etc
 INITDIR?=/tmp/etc/init.d
 
-dist/build/squeezed/squeezed:
+all: squeezed
+
+dist/setup: squeezed.obuild
 	obuild configure
+
+.PHONY: dist/build/squeezed/squeezed
+dist/build/squeezed/squeezed: dist/setup
 	obuild build
 
-dist/build/test/test:
-	obuild configure
+.PHONY: dist/build/test/test
+dist/build/test/test: dist/setup
 	obuild build
 
 test: dist/build/test/test
 	./dist/build/test/test
 
+squeezed: dist/build/squeezed/squeezed
+
 install: dist/build/squeezed/squeezed
 	install -D -m 0755 dist/build/squeezed/squeezed ${BINDIR}/squeezed
 	install -D -m 0644 scripts/squeezed.conf ${ETCDIR}/squeezed.conf
 	install -D -m 0755 scripts/init.d-squeezed ${INITDIR}/squeezed
+
 .PHONY: uninstall
 uninstall:
 	rm -f ${BINDIR}/squeezed
@@ -25,4 +33,4 @@ uninstall:
 
 .PHONY: clean
 clean:
-	rm -rf dist
+	obuild clean
diff --git a/src/squeezed.ml b/src/squeezed.ml
index 311132806..bd06a2bd1 100644
--- a/src/squeezed.ml
+++ b/src/squeezed.ml
@@ -12,9 +12,6 @@
  * GNU Lesser General Public License for more details.
  *)
 open Xcp_service
-open Pervasiveext 
-open Squeezed_state
-open Memory_interface
 
 module D = Debug.Make(struct let name = Memory_interface.service_name end)
 open D