Index: src/ch/DirTreeCtrl.h
===================================================================
diff -u -r90e8a7720fc23cf282e486c7b2bc1dc590b5d74c -r8068e0c351055554340ac9755d1bc846893bf2b8
--- src/ch/DirTreeCtrl.h	(.../DirTreeCtrl.h)	(revision 90e8a7720fc23cf282e486c7b2bc1dc590b5d74c)
+++ src/ch/DirTreeCtrl.h	(.../DirTreeCtrl.h)	(revision 8068e0c351055554340ac9755d1bc846893bf2b8)
@@ -64,8 +64,6 @@
 #ifndef __DIRTREECTRL_H__
 #define __DIRTREECTRL_H__
 
-#include "shlobj.h"
-
 // Functions that deal with PIDLs
 LPITEMIDLIST	ConcatPidls(LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2);
 LPITEMIDLIST	CopyITEMID(LPMALLOC lpMalloc, LPITEMIDLIST lpi);
@@ -88,8 +86,8 @@
 	LPSHELLFOLDER lpsf;				// this shell folder (always exists)
 	LPITEMIDLIST lpiidl;			// this item id list relative to desktop (always exists)
 			
-	LPSHELLFOLDER lpsfParent;		// parent shell folder (may be NULL)
-	LPITEMIDLIST lpiidlRelative;	// this item id list relative to the parent's lpsf (may be NULL)
+	LPSHELLFOLDER lpsfParent;		// parent shell folder (may be nullptr)
+	LPITEMIDLIST lpiidlRelative;	// this item id list relative to the parent's lpsf (may be nullptr)
 };
 
 class CDirTreeCtrl : public CTreeCtrl