diff --git a/Makefile b/Makefile
index 97efbbaf..ec95c53a 100644
--- a/Makefile
+++ b/Makefile
@@ -196,7 +196,7 @@ LIBTCC_INC = $(filter %.h,$(CORE_FILES)) $(filter-out $(CORE_FILES),$(NATIVE_FIL
 else
 LIBTCC_OBJ = libtcc.o
 LIBTCC_INC = $(NATIVE_FILES)
-$(LIBTCC_OBJ) tcc.o : NATIVE_DEFINES += -DONE_SOURCE
+libtcc.o : NATIVE_DEFINES += -DONE_SOURCE
 endif
 
 $(LIBTCC_OBJ) tcc.o : %.o : %.c $(LIBTCC_INC)
diff --git a/tcc.h b/tcc.h
index 00fc4bb2..3cd68443 100644
--- a/tcc.h
+++ b/tcc.h
@@ -882,8 +882,8 @@ enum tcc_token {
 #ifndef __GNUC__
   #define strtold (long double)strtod
   #define strtof (float)strtod
-  #define strtoll (long long)strtol
-  #define strtoull (unsigned long long)strtoui64
+  #define strtoll _strtoi64
+  #define strtoull _strtoui64
 #endif
 #else
 /* XXX: need to define this to use them in non ISOC99 context */
diff --git a/tests/Makefile b/tests/Makefile
index 4ce9dfaa..e07cdc35 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -3,10 +3,10 @@
 #
 
 # what tests to run
-TESTS = libtest test1 test3
+TESTS = libtest test3
 
 # these should work too
-TESTS += test2 speedtest btest weaktest
+# TESTS += test1 test2 speedtest btest weaktest
 
 # these don't work as they should
 # TESTS += test4 asmtest