--- a/core/src/command_factory.h	Tue Oct 26 15:36:30 2010 +0100
+++ b/core/src/command_factory.h	Thu Oct 28 16:54:54 2010 +0100
@@ -15,7 +15,9 @@
 #define __COMMAND_FACTORY_H__
 
 #include <e32base.h>
-#include "command_constructors.h"
+#include "command_wrappers.h"
+class CCommandConstructorBase;
+class CThreadPool;
 #include "error.h"
 
 class RFs;
@@ -51,6 +53,7 @@
 	virtual void RunL();
 	virtual void DoCancel();
 	virtual TInt RunError(TInt aError);
+
 private:
 	RFs& iFs;
 	mutable RMutex iLock;
@@ -60,6 +63,7 @@
 	TBool iFailedToScanFileSystem;
 	TThreadId iFactoryThreadId; // The one the CCommandFactory active object lives in
 	RAllocator* iFactoryAllocator;
+	CThreadPool* iThreadPool;
 	};