diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 92f62348c1..d47bbb4378 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,17 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-07-17 15:20 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * include/hbdefs.h
+  * src/rtl/hbsocket.c
+  * include/hbthread.h
+    * Moved header collision avoidance hack to the root of
+      the problem, right after '#include <stdint.h>'.
+      This way it's done centrally.
+
+  * config/vxworks/diab.mk
+    - Deleted fixed TOFIX.
+
 2010-07-17 14:59 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * ChangeLog
     * Updated VxWorks notes in 2010-07-16 18:22 UTC+0200 Viktor Szakats
@@ -492,7 +503,7 @@
     % Deleted unnecessary compile time macros.
 
   ; TOFIX: vxworks HB_BUILD_SHARED=yes is broken. harbour .so
-           is not found. Couldn't find out why.
+           is not found. Couldn't find out why. [DONE]
   ; TOFIX: vxworks/gcc/arm hbatomic.h needs support added.
            arm harbour and hbpp builds fine.
 
diff --git a/harbour/config/vxworks/diab.mk b/harbour/config/vxworks/diab.mk
index cf624b159d..4fdd4f3135 100644
--- a/harbour/config/vxworks/diab.mk
+++ b/harbour/config/vxworks/diab.mk
@@ -77,9 +77,6 @@ DLIBPATHS := $(foreach dir,$(LIB_DIR) $(SYSLIBPATHS_DYN),-L$(dir))
 LDLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS_BIN),-l$(lib))
 
 ifeq ($(HB_BUILD_SHARED),yes)
-   # TOFIX: .so is referred by it's full link time search path,
-   #        there is even a backslash present in the dir formed by
-   #        the linker
    LDFLAGS += -Wl, -Xdynamic
 endif
 LDFLAGS += $(LDLIBPATHS)
diff --git a/harbour/include/hbdefs.h b/harbour/include/hbdefs.h
index f14badaf2b..77a181b564 100644
--- a/harbour/include/hbdefs.h
+++ b/harbour/include/hbdefs.h
@@ -76,6 +76,10 @@
         defined( HB_OS_BEOS ) || defined( HB_OS_QNX ) || \
         defined( HB_OS_VXWORKS ) ) )
    #include <stdint.h>
+   /* NOTE: Hack to avoid collision between stdint.h and unistd.h. [vszakats] */
+#  if defined( HB_OS_VXWORKS ) && defined( _INTPTR ) && !defined( _INTPTR_T )
+#     define _INTPTR_T
+#  endif
    /* workaround for BCC 5.8 bug */
    #if ( defined( __BORLANDC__ ) && __BORLANDC__ >= 1410 )
       #undef INT32_MIN
diff --git a/harbour/include/hbthread.h b/harbour/include/hbthread.h
index f7be0eac2b..740f5bf09d 100644
--- a/harbour/include/hbthread.h
+++ b/harbour/include/hbthread.h
@@ -65,10 +65,6 @@
       defined( HB_OS_SUNOS ) || defined( HB_OS_HPUX ) || \
       defined( HB_OS_BSD ) || defined( HB_OS_BEOS ) || \
       defined( HB_OS_QNX ) || defined( HB_OS_VXWORKS )
-   /* NOTE: Hack to avoid collision between stdint.h and unistd.h. [vszakats] */
-#  if defined( HB_OS_VXWORKS ) && defined( _INTPTR ) && !defined( _INTPTR_T )
-#     define _INTPTR_T
-#  endif
 #  include <pthread.h>
 #  define HB_PTHREAD_API
 #  if defined( HB_OS_VXWORKS )
diff --git a/harbour/src/rtl/hbsocket.c b/harbour/src/rtl/hbsocket.c
index e9de9486d4..06ee8b3731 100644
--- a/harbour/src/rtl/hbsocket.c
+++ b/harbour/src/rtl/hbsocket.c
@@ -214,10 +214,6 @@
 #  include <sys/ioctl.h>
 #  if defined( HB_OS_BEOS )
 #     include <sys/sockio.h>
-#  endif
-   /* NOTE: Hack to avoid collision between stdint.h and unistd.h. [vszakats] */
-#  if defined( HB_OS_VXWORKS ) && defined( _INTPTR ) && !defined( _INTPTR_T )
-#     define _INTPTR_T
 #  endif
 #  if defined( HB_OS_VXWORKS )
 #     include <sockLib.h>