diff --git a/Makefile b/Makefile
index 8a30441..b33dfac 100644
--- a/Makefile
+++ b/Makefile
@@ -2,10 +2,10 @@
 # Cross Platform Makefile
 # Compatible with Ubuntu 14.04.1 and Mac OS X
 
-OBJS = cimgui.o
-OBJS += ../imgui/imgui.o
-OBJS += ../imgui/imgui_draw.o
-OBJS += ../imgui/imgui_demo.o
+OBJS = cimgui_auto.o
+OBJS += ./imgui/imgui.o
+OBJS += ./imgui/imgui_draw.o
+OBJS += ./imgui/imgui_demo.o
 
 UNAME_S := $(shell uname -s)
 
@@ -13,7 +13,7 @@ ifeq ($(UNAME_S), Linux) #LINUX
 	ECHO_MESSAGE = "Linux"
 
 	OUTPUTNAME = cimgui.so
-	CXXFLAGS = -I../../
+	CXXFLAGS = -I./imgui/
 	CXXFLAGS += -Wall
 	CXXFLAGS += -shared -fPIC
 	CFLAGS = $(CXXFLAGS)
@@ -33,7 +33,7 @@ ifeq ($(OS), Windows_NT)
 	ECHO_MESSAGE = "Windows"
 
 	OUTPUTNAME = cimgui.dll
-	CXXFLAGS = -I../../
+	CXXFLAGS = -I./imgui/
 	CXXFLAGS += -Wall
 	CXXFLAGS += -shared
 	LINKFLAGS = -limm32