diff --git a/tools/generator.cc b/tools/generator.cc
index c8763f1ef..def040495 100644
--- a/tools/generator.cc
+++ b/tools/generator.cc
@@ -25,6 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #ifdef WIN32
 #include <direct.h>
+#include <filesystem>
 
 #define strncasecmp _strnicmp
 #endif
@@ -62,7 +63,7 @@ void CplusplusGenerator::writeEnumMember(ConstField *cf, bool isLast){
 
 void CplusplusGenerator::writeClass(Class *klass){
 	ostringstream filename;
-	
+
 	filename<<mCurProj->getName()<<"/"<<klass->getName()<<".hh";
 	mOutfile.open(filename.str().c_str());
 	if (!mOutfile.is_open()){
@@ -90,7 +91,7 @@ void CplusplusGenerator::writeClass(Class *klass){
 		mOutfile<<"public:"<<endl;
 		for_each(methods.begin(),methods.end(),bind1st(mem_fun(&CplusplusGenerator::writeMethod),this));
 	}
-	
+
 	mOutfile<<"};"<<endl<<endl;
 	if (!mCurProj->getName().empty())
 		mOutfile<<"} //end of namespace "<<mCurProj->getName()<<endl;
@@ -100,7 +101,7 @@ void CplusplusGenerator::writeClass(Class *klass){
 
 void CplusplusGenerator::writeArgument(Argument *arg, bool isReturn){
 	Type *type=arg->getType();
-	
+
 	if (type->getBasicType()==Type::Class){
 		if (arg->isConst()){
 			mOutfile<<"const ";
@@ -115,7 +116,7 @@ void CplusplusGenerator::writeArgument(Argument *arg, bool isReturn){
 	}else if (type->getBasicType()==Type::String){
 		if (!isReturn)
 			mOutfile<<"const std::string &";
-		else 
+		else
 			mOutfile<<"std::string";
 	}else if (type->getBasicType()==Type::Void){
 		mOutfile<<"void";
@@ -138,7 +139,7 @@ void CplusplusGenerator::writeHelpComment(const std::string &comment, int ntabs)
 	writeTabs(ntabs);
 	mOutfile<<" * ";
 	for(i=0;i<comment.size();i++,curindex++){
-		
+
 		if (comment[i]=='\n' || (curindex>100 && comment[i]==' ')){
 			mOutfile<<endl;
 			writeTabs(ntabs);
@@ -150,22 +151,22 @@ void CplusplusGenerator::writeHelpComment(const std::string &comment, int ntabs)
 
 void CplusplusGenerator::writeMethod(Method *method){
 	if (method->isCallback()) return;
-	
+
 	Argument *retarg=method->getReturnArg();
 	const list<Argument*> &args=method->getArgs();
 	list<Argument*>::const_iterator it;
-	
+
 	writeTabs(1);
 	mOutfile<<"/**"<<endl;
 	writeHelpComment(method->getHelp(),1);
 	mOutfile<<endl;
 	writeTabs(1);
 	mOutfile<<"**/"<<endl;
-	
+
 	writeTabs(1);
 	writeArgument(retarg,true);
 	mOutfile<<" "<<method->getName()<<"(";
-	
+
 	for(it=args.begin();it!=args.end();++it){
 		if (it!=args.begin()) mOutfile<<", ";
 		writeArgument(*it);
@@ -190,7 +191,7 @@ void JavascriptGenerator::generate(Project *proj){
 	_mkdir(to_lower(proj->getName()).c_str());
 #endif
 	ostringstream filename;
-	
+
 	/*write a file for the namespace*/
 	filename<<to_lower(mCurProj->getName())<<"/"<<to_lower(mCurProj->getName())<<".js";
 	mOutfile.open(filename.str().c_str());
@@ -219,12 +220,12 @@ string JavascriptGenerator::getEnumName(Class *klass){
 
 void JavascriptGenerator::writeEnum(Class *klass){
 	if (klass->getType()!=Type::Enum) return;
-	
+
 	ostringstream filename;
 	list<ConstField*> members=klass->getConstFields();
 	list<ConstField*>::iterator it;
 	string enum_name=getEnumName(klass);
-	
+
 	filename<<to_lower(mCurProj->getName())<<"/"<<to_lower(enum_name)<<".js";
 	mOutfile.open(filename.str().c_str());
 	if (!mOutfile.is_open()){
@@ -232,7 +233,7 @@ void JavascriptGenerator::writeEnum(Class *klass){
 		return;
 	}
 	mOutfile<<"/* Wrapper generated by lp-gen-wrappers, do not edit*/"<<endl<<endl;
-	
+
 	mOutfile<<"var "<<mCurProj->getName()<<" = "<<mCurProj->getName()<<" || {};"<<endl;
 	mOutfile<<"/**"<<endl;
 	writeHelpComment(klass->getHelp(),0);
@@ -243,7 +244,7 @@ void JavascriptGenerator::writeEnum(Class *klass){
 	mOutfile<<mCurProj->getName()<<"."<<enum_name<<" = {"<<endl;
 	string prefix=ConstField::getCommonPrefix(members);
 	size_t prefix_size=prefix.size();
-	
+
 	for(it=members.begin();it!=members.end();){
 		ConstField *cf=(*it);
 		if (!cf->getHelp().empty()){
@@ -283,13 +284,13 @@ void JavascriptGenerator::writeEnum(Class *klass){
 
 void JavascriptGenerator::writeClass(Class *klass){
 	ostringstream filename;
-	
+
 	if (klass->getType()==Type::Enum) {
 		return;
 	}
 	const list<Method*> &methods=klass->getMethods();
 	if (methods.empty()) return;//skip empty classes
-	
+
 	filename<<to_lower(mCurProj->getName())<<"/"<<to_lower(klass->getName())<<".js";
 	mOutfile.open(filename.str().c_str());
 	if (!mOutfile.is_open()){
@@ -299,14 +300,14 @@ void JavascriptGenerator::writeClass(Class *klass){
 	mCurClass=klass;
 	mOutfile<<"/* Wrapper generated by lp-gen-wrappers, do not edit*/"<<endl;
 	mOutfile<<endl;
-	
+
 	//if (!mCurProj->getName().empty())
 	//	mOutfile<<"namespace "<<mCurProj->getName()<<"{"<<endl<<endl;
 	mOutfile<<"/**"<<endl;
 	mOutfile<<" * "<<klass->getHelp()<<endl;
 	mOutfile<<" * @external "<<klass->getName()<<endl;
 	mOutfile<<"**/"<<endl;
-	
+
 	list<Property*> properties=klass->getProperties();
 	for_each(properties.begin(),properties.end(),bind1st(mem_fun(&JavascriptGenerator::writeProperty),this));
 	mOutfile<<endl;
@@ -405,16 +406,16 @@ void JavascriptGenerator::writeMethod(Method *method){
 	Argument *retarg=method->getReturnArg();
 	const list<Argument*> &args=method->getArgs();
 	list<Argument*>::const_iterator it;
-	
+
 	if (method->isCallback()) return;
 	if (method->getPropertyBehaviour()!=Method::None) return;
 	if (method->getName()=="ref" || method->getName()=="unref") return;
-	
+
 	mOutfile<<"/**"<<endl;
 	writeHelpComment(method->getHelp(),0);
 	mOutfile<<endl;
 	mOutfile<<" * @function external:"<<mCurClass->getName()<<"#"<<method->getName()<<endl;
-	
+
 	for(it=args.begin();it!=args.end();++it){
 		writeArgument(*it);
 	}
@@ -437,14 +438,14 @@ string JavascriptGenerator::getEventHelp(const string &help){
 void JavascriptGenerator::writeEvent(Method* event){
 	const list<Argument*> &args=event->getArgs();
 	list<Argument*>::const_iterator it;
-	
+
 	if (!event->isCallback()) return;
 	mOutfile<<"/**"<<endl;
 	writeHelpComment(getEventHelp(event->getHelp()),0);
 	mOutfile<<endl;
 	mOutfile<<" * @event external:"<<mCurClass->getName()<<"#"<<event->getName()<<endl;
 	mOutfile<<" * @type {object}"<<endl;
-	
+
 	for(it=args.begin();it!=args.end();++it){
 		writeArgument(*it,PropertyArg);
 	}