--- a/core/src/commands.h	Wed Oct 13 15:07:15 2010 +0100
+++ b/core/src/commands.h	Sun Oct 17 18:43:12 2010 +0100
@@ -561,6 +561,8 @@
 	};
 
 
+#ifdef FSHELL_CORE_SUPPORT_FSCK
+
 class CCmdFsck : public CCommandBase
 	{
 public:
@@ -576,6 +578,7 @@
 	HBufC* iDriveLetter;
 	};
 
+#endif
 
 class CCmdDriver : public CCommandBase
 	{
@@ -607,6 +610,8 @@
 	};
 
 
+#ifdef FSHELL_CORE_SUPPORT_CHUNKINFO
+
 class CCmdChunkInfo : public CMemoryAccessCommandBase
 	{
 public:
@@ -636,6 +641,9 @@
 	CTextBuffer* iBuf;
 	};
 
+#endif
+
+#ifdef FSHELL_CORE_SUPPORT_SVRINFO
 
 class CCmdSvrInfo : public CMemoryAccessCommandBase
 	{
@@ -654,16 +662,15 @@
 	TUint iAddress;
 	TName iName;
 	TFullName iFullName;
-#ifdef FSHELL_MEMORY_ACCESS_SUPPORT
 	TServerKernelInfo iServerInfo;
 	TThreadKernelInfo iThreadInfo;
 	TProcessKernelInfo iProcessInfo;
 	TSessionKernelInfo iSessionInfo;
-#endif
 	CTextFormatter* iFormatter;
 	CTextBuffer* iBuf;
 	};
 
+#endif // FSHELL_CORE_SUPPORT_SVRINFO
 
 class CCmdTickle : public CCommandBase
 	{
@@ -884,6 +891,8 @@
 	};
 
 
+#ifdef FSHELL_CORE_SUPPORT_READMEM
+
 class CCmdReadMem : public CMemoryAccessCommandBase
 	{
 public:
@@ -904,6 +913,7 @@
 	RFile iFile;
 	};
 
+#endif // FSHELL_CORE_SUPPORT_READMEM
 
 class CCmdE32Header : public CCommandBase
 	{
@@ -924,6 +934,7 @@
 	CTextFormatter* iFormatter;
 	};
 
+#ifdef FSHELL_CORE_SUPPORT_OBJINFO
 
 class CCmdObjInfo : public CMemoryAccessCommandBase
 	{
@@ -948,6 +959,8 @@
 	TBool iAll;
 	};
 
+#endif
+
 class CCmdTouch : public CCommandBase
 	{
 public: