diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 10c91db145..8c9f68b4a7 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,12 @@
+2000-04-17 19:45 GMT-4 David G. Holm <dholm@jsd-llc.com>
+  * include/hbapirdd.h
+  * source/rdd/dbfcdx/dbfcdx1.c
+    ! Renamed _PAGEINFO to HB_PAGEINFO_STRU and renamed PAGEINFO to
+      HB_PAGEINFO, because both _PAGEINFO and PAGEINFO are used by
+      IBM's VisualAge C++ for completely different structures (this
+      type of namespace collision is a prime example of why some of
+      us keep insisting that the HB_ prefix should always be used).
+
 20000417-23:01 GMT+2 Maurilio Longo <maurilio.longo@libero.it>
 
    * source/common/hbtrace.c
diff --git a/harbour/include/hbapirdd.h b/harbour/include/hbapirdd.h
index 0f051d11fd..8055192b1e 100644
--- a/harbour/include/hbapirdd.h
+++ b/harbour/include/hbapirdd.h
@@ -190,7 +190,7 @@ typedef struct _KEYINFO
 typedef KEYINFO * LPKEYINFO;
 
 
-typedef struct _PAGEINFO
+typedef struct HB_PAGEINFO_STRU
 {
    LONG      Page;
    LONG      Left;
@@ -213,12 +213,12 @@ typedef struct _PAGEINFO
    LPKEYINFO pKeys;
    USHORT    uiKeys;
    SHORT     CurKey;
-   struct   _PAGEINFO * Owner;
-   struct   _PAGEINFO * Child;
+   struct   HB_PAGEINFO_STRU * Owner;
+   struct   HB_PAGEINFO_STRU * Child;
    struct   _TAGINFO * TagParent;
-} PAGEINFO;
+} HB_PAGEINFO;
 
-typedef PAGEINFO * LPPAGEINFO;
+typedef HB_PAGEINFO * LPPAGEINFO;
 
 
 typedef struct _TAGINFO
diff --git a/harbour/source/rdd/dbfcdx/dbfcdx1.c b/harbour/source/rdd/dbfcdx/dbfcdx1.c
index 5ad529c1a7..4110e94c9f 100644
--- a/harbour/source/rdd/dbfcdx/dbfcdx1.c
+++ b/harbour/source/rdd/dbfcdx/dbfcdx1.c
@@ -1454,8 +1454,8 @@ static LPPAGEINFO hb_cdxPageNew( LPTAGINFO PIT, LPPAGEINFO PIK, LONG FilePosn )
 {
    LPPAGEINFO pPage;
 
-   pPage = ( LPPAGEINFO ) hb_xgrab( sizeof( PAGEINFO ) );
-   memset( pPage, 0, sizeof( PAGEINFO ) );
+   pPage = ( LPPAGEINFO ) hb_xgrab( sizeof( HB_PAGEINFO ) );
+   memset( pPage, 0, sizeof( HB_PAGEINFO ) );
    pPage->Page = FilePosn;
    pPage->Left = pPage->Right = -1;
    pPage->Owner = PIK;