diff --git a/Makefile b/Makefile
index 118c3a5..89baf30 100644
--- a/Makefile
+++ b/Makefile
@@ -181,18 +181,18 @@ endif
 all: $(PROGS) $(TCCLIBS) $(TCCDOCS)
 
 # Host Tiny C Compiler
-tcc$(EXESUF): tcc.o $(LIBTCC)
-	$(CC) -o $@ $^ $(LIBS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(LINK_LIBTCC)
+tcc$(EXESUF): tcc.o $(LIBTCC) lib/libtcc1.c
+	$(CC) -o $@ $^ $(LIBS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(LINK_LIBTCC) lib/libtcc1.c
 
 # Cross Tiny C Compilers
-%-tcc$(EXESUF): tcc.c
-	$(CC) -o $@ $< -DONE_SOURCE $(if $($@_TCC),$(NATIVE_DEFINES),$(DEFINES)) $(CPPFLAGS) $(CFLAGS) $(LIBS) $(LDFLAGS)
+%-tcc$(EXESUF): tcc.c lib/libtcc1.c
+	$(CC) -o $@ $< -DONE_SOURCE $(if $($@_TCC),$(NATIVE_DEFINES),$(DEFINES)) $(CPPFLAGS) $(CFLAGS) $(LIBS) $(LDFLAGS) lib/libtcc1.c
 	$(if $($@_LINK),ln -sf $@ $($@_LINK))
 	$(if $($@_TCC),ln -sf $@ tcc$(EXESUF))
 
 # profiling version
-tcc_p$(EXESUF): $(NATIVE_FILES)
-	$(CC) -o $@ $< -DONE_SOURCE $(NATIVE_DEFINES) $(CPPFLAGS_P) $(CFLAGS_P) $(LIBS_P) $(LDFLAGS_P)
+tcc_p$(EXESUF): $(NATIVE_FILES) lib/libtcc1.c
+	$(CC) -o $@ $< -DONE_SOURCE $(NATIVE_DEFINES) $(CPPFLAGS_P) $(CFLAGS_P) $(LIBS_P) $(LDFLAGS_P) lib/libtcc1.c
 
 $(I386_CROSS) $($(I386_CROSS)_LINK): DEFINES = -DTCC_TARGET_I386
 $(X64_CROSS) $($(X64_CROSS)_LINK): DEFINES = -DTCC_TARGET_X86_64
diff --git a/i386-gen.c b/i386-gen.c
index fc0748f..77536f8 100644
--- a/i386-gen.c
+++ b/i386-gen.c
@@ -1061,7 +1061,7 @@ ST_FUNC void gen_bounded_ptr_add(void)
 ST_FUNC void gen_bounded_ptr_deref(void)
 {
     addr_t func;
-    addr_t size, align;
+    int  size, align;
     Elf32_Rel *rel;
     Sym *sym;