diff --git a/core/item.h b/core/item.h
index 03965c4..f23650e 100755
--- a/core/item.h
+++ b/core/item.h
@@ -110,8 +110,8 @@ private:
 	long content_id;	// content id in 'content' table
 	int  ref;			// content references
 
-friend class Db;
-friend class DbItemColumns;
+friend class  Db;
+friend struct DbItemColumns;
 };
 
 
diff --git a/notify/notify.h b/notify/notify.h
index 20c69f8..e709e5f 100755
--- a/notify/notify.h
+++ b/notify/notify.h
@@ -17,11 +17,11 @@
 #include "notifythread.h"
 
 
-class Request;
+struct Request;
 class Config;
 class Users;
 class Dirs;
-class Synchro;
+struct Synchro;
 class ThreadManager;
 
 
diff --git a/templates/misc.h b/templates/misc.h
index b3f4209..4253f6a 100755
--- a/templates/misc.h
+++ b/templates/misc.h
@@ -17,7 +17,7 @@
 #include "ezc.h"
 #include "htmltextstream.h"
 
-class User;
+struct User;
 
 
 namespace TemplatesFunctions