diff --git a/Makefile b/Makefile
index 155773a..cf158b5 100644
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,7 @@ include $(DEVKITARM)/3ds_rules
 #---------------------------------------------------------------------------------
 TARGET		:=	$(notdir $(CURDIR))
 BUILD		:=	build
-SOURCES		:=	source
+SOURCES		:=	source include
 DATA		:=	data
 INCLUDES	:=	include
 GRAPHICS	:=	gfx
@@ -94,15 +94,15 @@ BINFILES	:=	$(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.*)))
 #---------------------------------------------------------------------------------
 # use CXX for linking C++ projects, CC for standard C
 #---------------------------------------------------------------------------------
-# ifeq ($(strip $(CPPFILES)),)
+ifeq ($(strip $(CPPFILES)),)
 #---------------------------------------------------------------------------------
 	# export LD	:=	$(CC)
 #---------------------------------------------------------------------------------
-# else
+else
 #---------------------------------------------------------------------------------
-export LD	:=	$(CXX)
+	export LD	:=	$(CXX)
 #---------------------------------------------------------------------------------
-# endif
+endif
 #---------------------------------------------------------------------------------
 
 #---------------------------------------------------------------------------------
diff --git a/source/Level.cpp b/include/Level.cpp
similarity index 100%
rename from source/Level.cpp
rename to include/Level.cpp
diff --git a/source/Level.hpp b/include/Level.hpp
similarity index 100%
rename from source/Level.hpp
rename to include/Level.hpp
diff --git a/source/Sprite.cpp b/include/Sprite.cpp
similarity index 100%
rename from source/Sprite.cpp
rename to include/Sprite.cpp
diff --git a/source/Sprite.hpp b/include/Sprite.hpp
similarity index 100%
rename from source/Sprite.hpp
rename to include/Sprite.hpp