diff --git a/Makefile b/Makefile
index eb2db88..ef66d40 100644
--- a/Makefile
+++ b/Makefile
@@ -139,7 +139,7 @@ arm-tcc-vfp-eabi$(EXESUF): $(ARM_FILES)
 
 # libtcc generation and test
 libtcc.o: $(NATIVE_FILES)
-	$(CC) -o $@ -c $< $(NATIVE_TARGET) -DLIBTCC $(CFLAGS)
+	$(CC) -o $@ -c libtcc.c $(NATIVE_TARGET) $(CFLAGS)
 
 libtcc.a: libtcc.o
 	$(AR) rcs $@ $^
diff --git a/libtcc.c b/libtcc.c
index c9505d6..31961fa 100644
--- a/libtcc.c
+++ b/libtcc.c
@@ -125,7 +125,6 @@ static struct TCCState *tcc_state;
 static const char *tcc_lib_path = CONFIG_TCCDIR;
 
 
-
 #ifdef TCC_TARGET_I386
 #include "i386-gen.c"
 #endif
@@ -706,14 +705,12 @@ void error1(TCCState *s1, int is_warning, const char *fmt, va_list ap)
         s1->nb_errors++;
 }
 
-#ifdef LIBTCC
 void tcc_set_error_func(TCCState *s, void *error_opaque,
                         void (*error_func)(void *opaque, const char *msg))
 {
     s->error_opaque = error_opaque;
     s->error_func = error_func;
 }
-#endif
 
 /* error without aborting current compilation */
 void error_noabort(const char *fmt, ...)
@@ -1130,7 +1127,6 @@ static int tcc_compile(TCCState *s1)
     return s1->nb_errors != 0 ? -1 : 0;
 }
 
-#ifdef LIBTCC
 int tcc_compile_string(TCCState *s, const char *str)
 {
     BufferedFile bf1, *bf = &bf1;
@@ -1158,7 +1154,6 @@ int tcc_compile_string(TCCState *s, const char *str)
     /* currently, no need to close */
     return ret;
 }
-#endif
 
 /* define a preprocessor symbol. A value can also be provided with the '=' operator */
 void tcc_define_symbol(TCCState *s1, const char *sym, const char *value)
diff --git a/tcc.c b/tcc.c
index 556ca38..32dc66c 100644
--- a/tcc.c
+++ b/tcc.c
@@ -20,8 +20,6 @@
 
 #include "libtcc.c"
 
-#if !defined(LIBTCC)
-
 void help(void)
 {
     printf("tcc version " TCC_VERSION " - Tiny C Compiler - Copyright (C) 2001-2006 Fabrice Bellard\n"
@@ -565,4 +563,3 @@ int main(int argc, char **argv)
     return ret;
 }
 
-#endif
diff --git a/win32/build-tcc.bat b/win32/build-tcc.bat
index 8821345..020ae4b 100644
--- a/win32/build-tcc.bat
+++ b/win32/build-tcc.bat
@@ -8,7 +8,7 @@
 @echo>>..\config.h #define CONFIG_SYSROOT ""
 :
 gcc -Os -fno-strict-aliasing ../tcc.c -o tcc.exe -s
-gcc -Os -fno-strict-aliasing ../tcc.c -D LIBTCC -c -o libtcc.o
+gcc -Os -fno-strict-aliasing ../libtcc.c -c -o libtcc.o
 gcc -Os tools/tiny_impdef.c -o tiny_impdef.exe -s
 gcc -Os tools/tiny_libmaker.c -o tiny_libmaker.exe -s
 mkdir libtcc