diff --git a/_tools/code_generators/CMakeLists.txt b/_tools/code_generators/CMakeLists.txt
index cb2ac65e17c24994898a8bbd7d9ef27989b0059b..5a2baa3a04a25d049a095d59cbf153310f784206 100644
--- a/_tools/code_generators/CMakeLists.txt
+++ b/_tools/code_generators/CMakeLists.txt
@@ -40,8 +40,8 @@ target_link_libraries(resourcefs ${Boost_LIBRARIES})
 #include_directories(${FREETYPE_INCLUDE_DIRS})
 #target_link_libraries(fontrendering ${FREETYPE_LIBRARIES})
 ## Uncomment this if you want to build and use freetype 2.4.3
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/build/freetype-2.4.3/include)
-find_library(FREETYPE NAMES freetype HINTS ${CMAKE_CURRENT_SOURCE_DIR}/build/freetype-2.4.3/objs/.libs)
+include_directories(${CMAKE_CURRENT_BINARY_DIR}/freetype-2.4.3/include)
+find_library(FREETYPE NAMES freetype HINTS ${CMAKE_CURRENT_BINARY_DIR}/freetype-2.4.3/objs/.libs)
 target_link_libraries(fontrendering ${FREETYPE})
 
 find_package(ZLIB REQUIRED)
diff --git a/_tools/code_generators/resourcefs.cpp b/_tools/code_generators/resourcefs.cpp
index 7bd4257ce715ef4557cc2a9c67a21990c6788359..7f382b39d6d2cc2207180fd23f51ba5e1cb792df 100644
--- a/_tools/code_generators/resourcefs.cpp
+++ b/_tools/code_generators/resourcefs.cpp
@@ -37,7 +37,7 @@
 
 using namespace std;
 using namespace boost::program_options;
-using namespace boost::filesystem;
+namespace fs = boost::filesystem;
 
 /**
  * \param an unsigned int
@@ -83,10 +83,10 @@ int main(int argc, char *argv[])
 	}
 
 	//Traverse the input directory storing path of files 
-	path inDir(vm["in"].as<string>());
-	directory_iterator end;
-	vector<path> files;
-	for(directory_iterator it(inDir);it!=end;++it)
+	fs::path inDir(vm["in"].as<string>());
+	fs::directory_iterator end;
+	vector<fs::path> files;
+	for(fs::directory_iterator it(inDir);it!=end;++it)
 	{
 		if(is_directory(it->status()))
 		{