Index: src/chext/DropMenuExt.cpp
===================================================================
diff -u -N -rd5c3edd0d167db9b5d47d04248820fda49499a5e -rcd5a36f1507a4131ce652879565c0770b36dd953
--- src/chext/DropMenuExt.cpp	(.../DropMenuExt.cpp)	(revision d5c3edd0d167db9b5d47d04248820fda49499a5e)
+++ src/chext/DropMenuExt.cpp	(.../DropMenuExt.cpp)	(revision cd5a36f1507a4131ce652879565c0770b36dd953)
@@ -21,6 +21,7 @@
 #include "DropMenuExt.h"
 #include "clipboard.h"
 #include "chext-utils.h"
+#include "..\Common\ipcstructs.h"
 
 /////////////////////////////////////////////////////////////////////////////
 // CDropMenuExt
Index: src/chext/DropMenuExt.h
===================================================================
diff -u -N -r8f31c461b6a91ce6818c646814bd19e740b109ef -rcd5a36f1507a4131ce652879565c0770b36dd953
--- src/chext/DropMenuExt.h	(.../DropMenuExt.h)	(revision 8f31c461b6a91ce6818c646814bd19e740b109ef)
+++ src/chext/DropMenuExt.h	(.../DropMenuExt.h)	(revision cd5a36f1507a4131ce652879565c0770b36dd953)
@@ -20,10 +20,6 @@
 #define __DROPMENUEXT_H_
 
 #include "resource.h"       // main symbols
-#include "IShellExtInitImpl.h"
-#include "IContextMenuImpl.h"
-#include "comdef.h"
-#include "..\Common\ipcstructs.h"
 
 /////////////////////////////////////////////////////////////////////////////
 // CDropMenuExt
Index: src/chext/MenuExt.h
===================================================================
diff -u -N -r8f31c461b6a91ce6818c646814bd19e740b109ef -rcd5a36f1507a4131ce652879565c0770b36dd953
--- src/chext/MenuExt.h	(.../MenuExt.h)	(revision 8f31c461b6a91ce6818c646814bd19e740b109ef)
+++ src/chext/MenuExt.h	(.../MenuExt.h)	(revision cd5a36f1507a4131ce652879565c0770b36dd953)
@@ -20,13 +20,7 @@
 #define __MENUEXT_H_
 
 #include "resource.h"       // main symbols
-#include "comdef.h"
-#include <AtlCom.h>
-#include <ShlObj.h>
 
-#include "IShellExtInitImpl.h"
-#include "IContextMenuImpl.h"
-
 ///////
 // globals
 void CutAmpersands(LPTSTR lpszString);
Index: src/chext/StdAfx.h
===================================================================
diff -u -N -r8f31c461b6a91ce6818c646814bd19e740b109ef -rcd5a36f1507a4131ce652879565c0770b36dd953
--- src/chext/StdAfx.h	(.../StdAfx.h)	(revision 8f31c461b6a91ce6818c646814bd19e740b109ef)
+++ src/chext/StdAfx.h	(.../StdAfx.h)	(revision cd5a36f1507a4131ce652879565c0770b36dd953)
@@ -23,10 +23,6 @@
 
 #include "../common/targetver.h"
 
-#ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x0400
-#endif
-
 #define _ATL_APARTMENT_THREADED
 
 
@@ -37,6 +33,7 @@
 #include <atlcom.h>
 #include <atlctl.h>
 #include <ShlObj.h>
+#include <comdef.h>
 
 #include "../libicpf/gen_types.h"
 
Index: src/chext/dllmain.cpp
===================================================================
diff -u -N -rd5c3edd0d167db9b5d47d04248820fda49499a5e -rcd5a36f1507a4131ce652879565c0770b36dd953
--- src/chext/dllmain.cpp	(.../dllmain.cpp)	(revision d5c3edd0d167db9b5d47d04248820fda49499a5e)
+++ src/chext/dllmain.cpp	(.../dllmain.cpp)	(revision cd5a36f1507a4131ce652879565c0770b36dd953)
@@ -7,6 +7,7 @@
 #include "MenuExt.h"
 #include "DropMenuExt.h"
 #include "ShellExtControl.h"
+#include "..\Common\ipcstructs.h"
 
 CCHExtModule _AtlModule;