diff --git a/Make.inc b/Make.inc
index 90a9875..f05828f 100644
--- a/Make.inc
+++ b/Make.inc
@@ -7,7 +7,7 @@ USECLANG = 0
 ifeq ($(USECLANG),1)
 USEGCC = 0
 CC = clang
-CFLAGS= -std=c99 -Wall -O3 -I$(OPENLIBM_HOME) -I$(OPENLIBM_HOME)/include -I$(OPENLIBM_HOME)/ld80 -I$(OPENLIBM_HOME)/$(ARCH) -I$(OPENLIBM_HOME)/src -DASSEMBLER -D__BSD_VISIBLE -Wno-implicit-function-declaration
+CFLAGS= -std=c99 -Wall -O3 -I$(OPENLIBM_HOME) -I$(OPENLIBM_HOME)/include -I$(OPENLIBM_HOME)/ld80 -I$(OPENLIBM_HOME)/$(ARCH) -I$(OPENLIBM_HOME)/src -DASSEMBLER -D__BSD_VISIBLE -Wno-implicit-function-declaration -fno-builtin
 endif
 
 ifeq ($(USEGCC),1)
@@ -24,7 +24,7 @@ default: all
 	$(QUIET_ASM)$(CC) $(filter -f% -m% -B% -I% -D%,$(CFLAGS)) -c $< -o $@
 
 clean:
-	rm -f *.o *.c.o *.S.o *~
+	rm -fr *.o *.c.o *.S.o *~ test-double test-float test-double-system test-float-system *.dSYM
 
 # OS-specific stuff
 ifeq ($(ARCH),i386)
diff --git a/Makefile b/Makefile
index b7cd5f9..0f284ec 100644
--- a/Makefile
+++ b/Makefile
@@ -27,6 +27,6 @@ libopenlibm.a: $(OBJS)
 libopenlibm.$(SHLIB_EXT): $(OBJS)
 	$(QUIET_LINK)$(CC) -shared $(OBJS) -o libopenlibm.$(SHLIB_EXT)
 
-cleanall:
+distclean:
 	rm -f $(OBJS) *.a *.$(SHLIB_EXT)
 	$(MAKE) -C test clean
diff --git a/test/Makefile b/test/Makefile
index 93b13f6..7782924 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -14,6 +14,3 @@ test-double-system: test-double.c libm-test.c
 
 test-float-system: test-float.c libm-test.c
 	$(CC) -g $< -DSYS_MATH_H -lm -o $@
-
-clean:
-	rm -fr *~ *# test-double test-float test-double-system test-float-system *.dSYM