diff --git a/.travis.sh b/.travis.sh
index b41084e5..b18a2532 100755
--- a/.travis.sh
+++ b/.travis.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 if [ "$ANALYZE" = "true" ] ; then
-	cppcheck --error-exitcode=1 -j2 -DRANGECHECK -iSource/win_opendir.c -ISource Source toolsrc 2> stderr.txt
+	cppcheck --error-exitcode=1 -j2 -DRANGECHECK -ISource Source toolsrc 2> stderr.txt
 	RET=$?
 	if [ -s stderr.txt ]
 	then
@@ -10,6 +10,7 @@ if [ "$ANALYZE" = "true" ] ; then
 else
 	set -e
 	export VERBOSE=1
+	rm -rf CMakeCache.txt CMakeFiles/
 	mkdir build && cd build
 	cmake -G "Unix Makefiles" "$CROSSRULE" .. -DENABLE_WERROR=ON
 	make