diff --git a/core/cfg/cfg.cpp b/core/cfg/cfg.cpp
index 39312c9ae..4c7ee30d1 100644
--- a/core/cfg/cfg.cpp
+++ b/core/cfg/cfg.cpp
@@ -31,48 +31,32 @@ struct vitem
 vector<vitem> vlist;
 wchar* trim_ws(wchar* str);
 
-struct ConfigEntry
-{
-	ConfigEntry(ConfigEntry* pp)
+ConfigEntry::ConfigEntry(ConfigEntry* pp)
 	{
 		next=pp;
 		flags=0;
 	}
-
-
-	u32 flags;
-	string name;
-	string value;
-	string valueVirtual;
-	ConfigEntry* next;
-	void SaveFile(FILE* file)
+void ConfigEntry::SaveFile(FILE* file)
 	{
 		if (flags & CEM_SAVE)
 			fprintf(file,"%s=%s\n",name.c_str(),value.c_str());
 	} 
 
-	string GetValue()
+string ConfigEntry::GetValue()
 	{
 		if (flags&CEM_VIRTUAL)
 			return valueVirtual;
 		else
 			return value;
 	}
-};
-struct ConfigSection
-{
-	u32 flags;
-	string name;
-	ConfigEntry* entrys;
-	ConfigSection* next;
-	
-	ConfigSection(ConfigSection* pp)
+
+ConfigSection::ConfigSection(ConfigSection* pp)
 	{
 		next=pp;
 		flags=0;
 		entrys=0;
 	}
-	ConfigEntry* FindEntry(string name)
+ConfigEntry* ConfigSection::FindEntry(string name)
 	{
 		ConfigEntry* c=	entrys;
 		while(c)
@@ -83,7 +67,7 @@ struct ConfigSection
 		}
 		return 0;
 	}
-	void SetEntry(string name,string value,u32 eflags)
+void ConfigSection::SetEntry(string name,string value,u32 eflags)
 	{
 		ConfigEntry* c=FindEntry(name);
 		if (c)
@@ -131,7 +115,7 @@ struct ConfigSection
 		}
 		
 	}
-	~ConfigSection()
+ConfigSection::~ConfigSection()
 	{
 		ConfigEntry* n=entrys;
 		
@@ -142,7 +126,7 @@ struct ConfigSection
 			delete p;
 		}
 	}
-	void SaveFile(FILE* file)
+void ConfigSection::SaveFile(FILE* file)
 	{
 		if (flags&CEM_SAVE)
 		{
@@ -167,11 +151,7 @@ struct ConfigSection
 		}
 	}
 
-};
-struct ConfigFile
-{
-	ConfigSection* entrys;
-	ConfigSection* FindSection(string name)
+ConfigSection* ConfigFile::FindSection(string name)
 	{
 		ConfigSection* c=	entrys;
 		while(c)
@@ -182,7 +162,7 @@ struct ConfigFile
 		}
 		return 0;
 	}
-	ConfigSection* GetEntry(string name)
+ConfigSection* ConfigFile::GetEntry(string name)
 	{
 		ConfigSection* c=FindSection(name);
 		if (!c)
@@ -193,7 +173,7 @@ struct ConfigFile
 
 		return c;
 	}
-	~ConfigFile()
+ConfigFile::~ConfigFile()
 	{
 		ConfigSection* n=entrys;
 		
@@ -205,7 +185,7 @@ struct ConfigFile
 		}
 	}
 
-	void ParseFile(FILE* file)
+void ConfigFile::ParseFile(FILE* file)
 	{
     wchar line[512];
     wchar cur_sect[512]={0};
@@ -258,7 +238,7 @@ struct ConfigFile
       }
     }
 	}
-	void SaveFile(FILE* file)
+void ConfigFile::SaveFile(FILE* file)
 	{
 		vector<ConfigSection*> stuff;
 
@@ -276,7 +256,7 @@ struct ConfigFile
 				stuff[i]->SaveFile(file);
 		}
 	}
-  s32  Exists(const wchar * Section, const wchar * Key)
+s32 ConfigFile::Exists(const wchar * Section, const wchar * Key)
   {
     if (Section==0)
       return -1;
@@ -294,7 +274,7 @@ struct ConfigFile
     else
       return 0;
   }
-  void  LoadStr(const wchar * Section, const wchar * Key, wchar * Return,const wchar* Default)
+void ConfigFile::LoadStr(const wchar * Section, const wchar * Key, wchar * Return,const wchar* Default)
   {
     verify(Section!=0 && strlen(Section)!=0);
     verify(Key!=0 && strlen(Key)!=0);
@@ -314,7 +294,7 @@ struct ConfigFile
     }
   }
 
-  string  LoadStr(const wchar * Section, const wchar * Key, const wchar* Default)
+string ConfigFile::LoadStr(const wchar * Section, const wchar * Key, const wchar* Default)
   {
     verify(Section != 0 && strlen(Section) != 0);
     verify(Key != 0 && strlen(Key) != 0);
@@ -334,15 +314,14 @@ struct ConfigFile
     }
   }
 
-  s32  LoadInt(const wchar * Section, const wchar * Key,s32 Default)
+s32 ConfigFile::LoadInt(const wchar * Section, const wchar * Key,s32 Default)
   {
     wchar temp_d[30];
     wchar temp_o[30];
     sprintf(temp_d,"%d",Default);
-    cfgLoadStr(Section,Key,temp_o,temp_d);
+    this->LoadStr(Section,Key,temp_o,temp_d);
     return atoi(temp_o);
   }
-};
 
 ConfigFile cfgdb;
 
diff --git a/core/cfg/cfg.h b/core/cfg/cfg.h
index 3278ed777..fe8fa6368 100644
--- a/core/cfg/cfg.h
+++ b/core/cfg/cfg.h
@@ -19,3 +19,42 @@ s32  cfgExists(const wchar * Section, const wchar * Key);
 void cfgSetVirtual(const wchar * lpSection, const wchar * lpKey, const wchar * lpString);
 
 bool ParseCommandLine(int argc,wchar* argv[]);
+
+struct ConfigEntry
+{
+  u32 flags;
+  string name;
+  string value;
+  string valueVirtual;
+  ConfigEntry* next;
+  ConfigEntry(ConfigEntry*);
+  string GetValue();
+  void SaveFile(FILE*);
+};
+
+struct ConfigSection
+{
+  u32 flags;
+  string name;
+  ConfigEntry* entrys;
+  ConfigSection* next;
+  ~ConfigSection();
+  ConfigSection(ConfigSection*);
+  ConfigEntry* FindEntry(string);
+  void SetEntry(string, string, u32);
+  void SaveFile(FILE*);
+};
+
+struct ConfigFile
+{
+  ConfigSection* entrys;
+  ~ConfigFile();
+  void ParseFile(FILE*);
+  void SaveFile(FILE*);
+  ConfigSection* FindSection(string);
+  ConfigSection* GetEntry(string);
+  s32 Exists(const wchar *, const wchar *);
+  void  LoadStr(const wchar *, const wchar *, wchar *,const wchar*);
+  string  LoadStr(const wchar *, const wchar *, const wchar*);
+  s32  LoadInt(const wchar *, const wchar *,s32);
+};
\ No newline at end of file