diff --git a/dlls/shell32/clipboard.c b/dlls/shell32/clipboard.c
index f039a17861b..6e82ed17ea5 100644
--- a/dlls/shell32/clipboard.c
+++ b/dlls/shell32/clipboard.c
@@ -145,7 +145,7 @@ HGLOBAL RenderSHELLIDLIST (LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cid
 {
 	int i,offset = 0, sizePidl, size;
 	HGLOBAL hGlobal;
-	LPCIDA	pcida;
+	LPIDA	pcida;
 
 	TRACE("(%p,%p,%u)\n", pidlRoot, apidl, cidl);
 
diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c
index ad4a4abde2f..8ec14e07775 100644
--- a/dlls/shell32/pidl.c
+++ b/dlls/shell32/pidl.c
@@ -1776,7 +1776,7 @@ LPITEMIDLIST *  _ILCopyaPidl(LPITEMIDLIST * apidlsrc, UINT cidl)
 *
 * creates aPidl from CIDA
 */
-LPITEMIDLIST * _ILCopyCidaToaPidl(LPITEMIDLIST* pidl, LPCIDA cida)
+LPITEMIDLIST * _ILCopyCidaToaPidl(LPITEMIDLIST* pidl, LPIDA cida)
 {
 	int i;
 	LPITEMIDLIST * dst = (LPITEMIDLIST*)SHAlloc(cida->cidl * sizeof(LPITEMIDLIST));
diff --git a/dlls/shell32/pidl.h b/dlls/shell32/pidl.h
index 37c7280854f..e1b92202be9 100644
--- a/dlls/shell32/pidl.h
+++ b/dlls/shell32/pidl.h
@@ -194,6 +194,6 @@ BOOL	pcheck	(LPCITEMIDLIST pidl);
  */
 void _ILFreeaPidl(LPITEMIDLIST * apidl, UINT cidl);
 LPITEMIDLIST * _ILCopyaPidl(LPITEMIDLIST * apidlsrc, UINT cidl);
-LPITEMIDLIST * _ILCopyCidaToaPidl(LPITEMIDLIST* pidl, LPCIDA cida);
+LPITEMIDLIST * _ILCopyCidaToaPidl(LPITEMIDLIST* pidl, LPIDA cida);
 
 #endif
diff --git a/dlls/shell32/shv_bg_cmenu.c b/dlls/shell32/shv_bg_cmenu.c
index b1fa3d2b415..7ad84a2a1b9 100644
--- a/dlls/shell32/shv_bg_cmenu.c
+++ b/dlls/shell32/shv_bg_cmenu.c
@@ -240,7 +240,7 @@ static BOOL DoPaste(
 	    LPITEMIDLIST pidl;
 	    IShellFolder *psfFrom = NULL, *psfDesktop;
 
-	    LPCIDA lpcida = GlobalLock(medium.u.hGlobal);
+	    LPIDA lpcida = GlobalLock(medium.u.hGlobal);
 	    TRACE("cida=%p\n", lpcida);
 
 	    apidl = _ILCopyCidaToaPidl(&pidl, lpcida);
diff --git a/include/shellapi.h b/include/shellapi.h
index 223c1383208..708c81f54d7 100644
--- a/include/shellapi.h
+++ b/include/shellapi.h
@@ -39,7 +39,7 @@ typedef struct _DRAGINFOA
 	BOOL fNC;
 	LPSTR   lpFileList;
 	DWORD grfKeyState;
-} DRAGINFOA, * LPDRAGINFOA;
+} DRAGINFOA, *LPDRAGINFOA;
 
 typedef struct _DRAGINFOW
 {	UINT uSize;
@@ -47,7 +47,7 @@ typedef struct _DRAGINFOW
 	BOOL fNC;
 	LPWSTR  lpFileList;
 	DWORD grfKeyState;
-} DRAGINFOW, LPDRAGINFOW;
+} DRAGINFOW, *LPDRAGINFOW;
 
 DECL_WINELIB_TYPE_AW(DRAGINFO)
 DECL_WINELIB_TYPE_AW(LPDRAGINFO)
diff --git a/include/shlobj.h b/include/shlobj.h
index 74b9d5079ce..62f4054862b 100644
--- a/include/shlobj.h
+++ b/include/shlobj.h
@@ -29,6 +29,8 @@
 extern "C" {
 #endif /* defined(__cplusplus) */
 
+#include "pshpack1.h"
+
 /****************************************************************************
 * SHITEMID, ITEMIDLIST, PIDL API
 */
@@ -84,7 +86,7 @@ extern UINT cfShellIDList;
 typedef struct
 {	UINT cidl;
 	UINT aoffset[1];
-} CIDA, *LPCIDA,*LPIDA;
+} CIDA, *LPIDA;
 
 #define CFSTR_SHELLIDLISTOFFSET "Shell Object Offsets"    /* CF_OBJECTPOSITIONS */
 #define CFSTR_NETRESOURCES      "Net Resource"            /* CF_NETRESOURCE */
@@ -543,6 +545,8 @@ typedef struct _DROPFILES
   BOOL  fWide;
 } DROPFILES;
 
+#include "poppack.h" 
+
 #ifdef __cplusplus
 } /* extern "C" */
 #endif /* defined(__cplusplus) */
diff --git a/include/shlwapi.h b/include/shlwapi.h
index f7856dd053a..29d5edf8ead 100644
--- a/include/shlwapi.h
+++ b/include/shlwapi.h
@@ -27,6 +27,8 @@
 extern "C" {
 #endif /* defined(__cplusplus) */
 
+#include "pshpack1.h"
+
 #ifndef NO_SHLWAPI_REG
 
 /* Registry functions */
@@ -924,6 +926,8 @@ typedef struct _DLLVERSIONINFO2 {
 
 HRESULT WINAPI DllInstall(BOOL,LPCWSTR);
 
+#include "poppack.h" 
+
 #ifdef __cplusplus
 } /* extern "C" */
 #endif /* defined(__cplusplus) */