diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..7393e46
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+
+*.o
diff --git a/Makefile b/Makefile
index 0914571..631110b 100644
--- a/Makefile
+++ b/Makefile
@@ -8,14 +8,17 @@ CONTRIB_DIR = $(abspath $(HOME_DIR)/kolibrios/contrib)
 SDK_DIR = $(CONTRIB_DIR)/sdk
 C_LAYER = $(CONTRIB_DIR)/C_Layer
 
-CFLAGS = -fno-ident -fomit-frame-pointer -U__WIN32__ -U_Win32 -U_WIN32 -U__MINGW32__ -UWIN32  -I $(SDK_DIR)/sources/newlib/libc/include
-LDFLAGS = -static -S -nostdlib -T app.lds --subsystem native -DNDEBUG -L $(TOOLCHAIN_DIR)/lib -L $(TOOLCHAIN_DIR)/mingw32/lib -L $(SDK_DIR)/lib
+MICROTAR = lib/microtar/src
+CCSV = lib/ccsv
 
-INCLUDES = -I $(SDK_DIR)/sources/newlib/libc/include -I..
+CFLAGS = -fno-ident -fomit-frame-pointer -U__WIN32__ -U_Win32 -U_WIN32 -U__MINGW32__ -UWIN32 -DNDEBUG -c
+LDFLAGS = -static -S -nostdlib -T app.lds --subsystem native -L $(TOOLCHAIN_DIR)/lib -L $(TOOLCHAIN_DIR)/mingw32/lib -L $(SDK_DIR)/lib
+
+INCLUDES = -I $(SDK_DIR)/sources/newlib/libc/include -I include -I $(SDK_DIR)/sources/newlib/libc/include -I $(MICROTAR) -I $(CCSV)/include
 LIBPATH = -L $(SDK_DIR)/lib -L $(TOOLCHAIN_DIR)/mingw32/lib
 
-MICROTAR_SOURCES = lib/microtar/src/microtar.c
-CCSV_SOURCE = lib/ccsv/src/ccsv.c
+MICROTAR_SOURCES = $(MICROTAR)/microtar.c
+CCSV_SOURCE = $(CCSV)/src/ccsv.c
 
 SOURCES := $(MICROTAR_SOURCES) $(CCSV_SOURCE) \
 		src/kospm_tar.c src/kospm_list.c src/kospm_common.c \
@@ -32,4 +35,4 @@ libkospm.a: $(OBJECTS) Makefile
 	$(CC) $(CFLAGS) $(INCLUDES) -o $@ $<
 
 clean:
-	rn -f $(OBJECTS) libkospm.a
+	rm -f $(OBJECTS) libkospm.a