diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index d929c3d6d..abfc8a379 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -10,12 +10,6 @@
 	_WAVEFORMATEX_ for compatibility.
 	Thanks to:    Andrew Jones <guln at sf dot net>
 
-2006-04-19  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
-
-	* include/winnt.h (FIELD_OFFSET): Compile.
-	Recent C++ compiler (gcc 3.4 and better) don't like the original macro.
-	* include/ddk/winddk.h: Ditto.
-
 2006-04-19  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
 
 	* include/winuser.h (CharNextEx,CharNextExW,CharPrevEx,CharPrevExW):
diff --git a/winsup/w32api/include/ddk/winddk.h b/winsup/w32api/include/ddk/winddk.h
index c9dabbb52..123a44a73 100644
--- a/winsup/w32api/include/ddk/winddk.h
+++ b/winsup/w32api/include/ddk/winddk.h
@@ -3967,14 +3967,9 @@ KefReleaseSpinLockFromDpcLevel(
  *   IN PCHAR  Field);
  */
 #ifndef FIELD_OFFSET
-#ifdef __cplusplus
-#define FIELD_OFFSET(Type, Field) (reinterpret_cast<LONG> \
-  (&reinterpret_cast<char&>(static_cast<Type *>(0)->Field)))
-#else
 #define FIELD_OFFSET(Type, Field) \
   ((LONG) (&(((Type *) 0)->Field)))
 #endif
-#endif
 
 /*
  * PVOID
diff --git a/winsup/w32api/include/winnt.h b/winsup/w32api/include/winnt.h
index 219d99055..e6f071d79 100644
--- a/winsup/w32api/include/winnt.h
+++ b/winsup/w32api/include/winnt.h
@@ -845,12 +845,7 @@ typedef DWORD FLONG;
 #define RTL_CRITSECT_TYPE 0
 #define RTL_RESOURCE_TYPE 1
 /* Also in winddk.h */
-#ifdef __cplusplus
-#define FIELD_OFFSET(t,f) (reinterpret_cast<LONG> \
-	(&reinterpret_cast<char&>(static_cast<t*>(0)->f)))
-#else
 #define FIELD_OFFSET(t,f) ((LONG)&(((t*)0)->f))
-#endif
 #ifndef CONTAINING_RECORD
 #define CONTAINING_RECORD(address, type, field) \
   ((type*)((PCHAR)(address) - (PCHAR)(&((type *)0)->field)))