diff --git a/dll/win32/dbghelp/coff.c b/dll/win32/dbghelp/coff.c
index 01c5826c7ff..285182f682a 100644
--- a/dll/win32/dbghelp/coff.c
+++ b/dll/win32/dbghelp/coff.c
@@ -32,16 +32,9 @@
  *	Add symbol size to internal symbol table.
  */
 
-#include "config.h"
-#include "wine/port.h"
-
 #include <assert.h>
 #include <stdlib.h>
-
 #include <string.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
 
 #include <stdarg.h>
 #include "windef.h"
diff --git a/dll/win32/dbghelp/dbghelp.c b/dll/win32/dbghelp/dbghelp.c
index 5d9bdfeef5e..83c3a0ec10f 100644
--- a/dll/win32/dbghelp/dbghelp.c
+++ b/dll/win32/dbghelp/dbghelp.c
@@ -19,7 +19,6 @@
  */
 
 #ifndef DBGHELP_STATIC_LIB
-#include "config.h"
 
 #include <unistd.h>
 #include "dbghelp_private.h"
diff --git a/dll/win32/dbghelp/image.c b/dll/win32/dbghelp/image.c
index ef94ef66386..59622180dc7 100644
--- a/dll/win32/dbghelp/image.c
+++ b/dll/win32/dbghelp/image.c
@@ -18,7 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/dll/win32/dbghelp/minidump.c b/dll/win32/dbghelp/minidump.c
index 74bb429ab43..e5989f2e756 100644
--- a/dll/win32/dbghelp/minidump.c
+++ b/dll/win32/dbghelp/minidump.c
@@ -18,7 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
 #include <time.h>
 
 #define NONAMELESSUNION
diff --git a/dll/win32/dbghelp/module.c b/dll/win32/dbghelp/module.c
index 094b4f77faa..91d23bff8fc 100644
--- a/dll/win32/dbghelp/module.c
+++ b/dll/win32/dbghelp/module.c
@@ -19,7 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/dll/win32/dbghelp/msc.c b/dll/win32/dbghelp/msc.c
index 82fc44965ac..0f0aa25e768 100644
--- a/dll/win32/dbghelp/msc.c
+++ b/dll/win32/dbghelp/msc.c
@@ -34,17 +34,10 @@
 
 #define NONAMELESSUNION
 
-#include "config.h"
-#include "wine/port.h"
-
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
-
 #include <string.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
 
 #include <stdarg.h>
 #include "windef.h"
diff --git a/dll/win32/dbghelp/path.c b/dll/win32/dbghelp/path.c
index d404e483ae1..e3c8d3afdb1 100644
--- a/dll/win32/dbghelp/path.c
+++ b/dll/win32/dbghelp/path.c
@@ -18,7 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/dll/win32/dbghelp/pe_module.c b/dll/win32/dbghelp/pe_module.c
index 230c4d01d78..549f39991f6 100644
--- a/dll/win32/dbghelp/pe_module.c
+++ b/dll/win32/dbghelp/pe_module.c
@@ -21,9 +21,6 @@
  *
  */
 
-#include "config.h"
-#include "wine/port.h"
-
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/dll/win32/dbghelp/source.c b/dll/win32/dbghelp/source.c
index e98f780b16f..d0c337cc7d6 100644
--- a/dll/win32/dbghelp/source.c
+++ b/dll/win32/dbghelp/source.c
@@ -18,7 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  *
  */
-#include "config.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/dll/win32/dbghelp/stabs.c b/dll/win32/dbghelp/stabs.c
index bb56b0d6e3d..c55ca5049c6 100644
--- a/dll/win32/dbghelp/stabs.c
+++ b/dll/win32/dbghelp/stabs.c
@@ -29,9 +29,6 @@
  *     available (hopefully) from http://sources.redhat.com/gdb/onlinedocs
  */
 
-#include "config.h"
-#include "wine/port.h"
-
 #include <sys/types.h>
 #include <fcntl.h>
 #include <limits.h>
diff --git a/dll/win32/dbghelp/stack.c b/dll/win32/dbghelp/stack.c
index b3845db23a8..d04c0163c92 100644
--- a/dll/win32/dbghelp/stack.c
+++ b/dll/win32/dbghelp/stack.c
@@ -21,7 +21,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/dll/win32/dbghelp/storage.c b/dll/win32/dbghelp/storage.c
index dd9d0583233..a4079ddb90d 100644
--- a/dll/win32/dbghelp/storage.c
+++ b/dll/win32/dbghelp/storage.c
@@ -20,7 +20,6 @@
  */
 
 
-#include "config.h"
 #include <assert.h>
 #include <stdlib.h>
 #ifndef DBGHELP_STATIC_LIB
@@ -403,7 +402,7 @@ void hash_table_add(struct hash_table* ht, struct hash_table_elt* elt)
     ht->num_elts++;
 }
 
-void hash_table_iter_init(const struct hash_table* ht, 
+void hash_table_iter_init(const struct hash_table* ht,
                           struct hash_table_iter* hti, const char* name)
 {
     hti->ht = ht;
@@ -425,7 +424,7 @@ void* hash_table_iter_up(struct hash_table_iter* hti)
     if (!hti->ht->buckets) return NULL;
 
     if (hti->element) hti->element = hti->element->next;
-    while (!hti->element && hti->index < hti->last) 
+    while (!hti->element && hti->index < hti->last)
         hti->element = hti->ht->buckets[++hti->index].first;
     return hti->element;
 }
diff --git a/dll/win32/dbghelp/symbol.c b/dll/win32/dbghelp/symbol.c
index 60859c6d0f1..947df4a1cff 100644
--- a/dll/win32/dbghelp/symbol.c
+++ b/dll/win32/dbghelp/symbol.c
@@ -21,8 +21,6 @@
 
 #define NONAMELESSUNION
 
-#include "config.h"
-
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/dll/win32/dbghelp/type.c b/dll/win32/dbghelp/type.c
index d020462f6d6..d7859e17919 100644
--- a/dll/win32/dbghelp/type.c
+++ b/dll/win32/dbghelp/type.c
@@ -24,7 +24,6 @@
 
 #define NONAMELESSUNION
 
-#include "config.h"
 #include <stdlib.h>
 #include <stdarg.h>
 #include <assert.h>
diff --git a/sdk/tools/winesync/dbghelp.cfg b/sdk/tools/winesync/dbghelp.cfg
index 95cac22a18e..a10d94821ea 100644
--- a/sdk/tools/winesync/dbghelp.cfg
+++ b/sdk/tools/winesync/dbghelp.cfg
@@ -4,4 +4,4 @@ files:
   include/dbghelp.h: sdk/include/psdk/dbghelp.h
   include/wine/mscvpdb.h: sdk/include/reactos/wine/mscvpdb.h
 tags:
-  wine: d483eb21cff1f2b44f048195106d87a414dd66b8
+  wine: ceae3f0207fb8f174d0a762ef7fe4f405316541f