diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 213c25c0ec..3efbc09d65 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,7 @@
+199908.01-20:30 WIB Andi Jahja
+  * msgxxx.c
+    correct directives, it now works
+
 199908.01-16:30 GMT+3 Alexander Kresin
   * hbpplib.b32
     * it works now
diff --git a/harbour/source/rtl/msgxxx.c b/harbour/source/rtl/msgxxx.c
index bd7c239bd9..2bd04363f0 100644
--- a/harbour/source/rtl/msgxxx.c
+++ b/harbour/source/rtl/msgxxx.c
@@ -6,51 +6,51 @@
 #include "hbsetup.h"
 
 #if   defined(HARBOUR_LANGUAGE_EU)
-#include "natmsg/msgeu.c"
+#include "source/rtl/natmsg/msgeu.c"
 #elif defined(HARBOUR_LANGUAGE_NL)
-#include "natmsg/msgnl.c"
+#include "source/rtl/natmsg/msgnl.c"
 #elif defined(HARBOUR_LANGUAGE_EO)
-#include "natmsg/msgeo.c"
+#include "source/rtl/natmsg/msgeo.c"
 #elif defined(HARBOUR_LANGUAGE_GL)
-#include "natmsg/msggl.c"
+#include "source/rtl/natmsg/msggl.c"
 #elif defined(HARBOUR_LANGUAGE_DE)
-#include "natmsg/msgde.c"
+#include "source/rtl/natmsg/msgde.c"
 #elif defined(HARBOUR_LANGUAGE_ID)
-#include "natmsg/msgid.c"
+#include "source/rtl/natmsg/msgid.c"
 #elif defined(HARBOUR_LANGUAGE_HU852)
-#include "natmsg/msghu852.c"
+#include "source/rtl/natmsg/msghu852.c"
 #elif defined(HARBOUR_LANGUAGE_HUCWI)
-#include "natmsg/msghucwi.c"
+#include "source/rtl/natmsg/msghucwi.c"
 #elif defined(HARBOUR_LANGUAGE_HUWIN)
-#include "natmsg/msghuwin.c"
+#include "source/rtl/natmsg/msghuwin.c"
 #elif defined(HARBOUR_LANGUAGE_KO)
-#include "natmsg/msgko.c"
+#include "source/rtl/natmsg/msgko.c"
 #elif defined(HARBOUR_LANGUAGE_PT)
-#include "natmsg/msgpt.c"
+#include "source/rtl/natmsg/msgpt.c"
 #elif defined(HARBOUR_LANGUAGE_RUWIN)
-#include "natmsg/msgruwin.c"
+#include "source/rtl/natmsg/msgruwin.c"
 #elif defined(HARBOUR_LANGUAGE_RU886)
-#include "natmsg/msgru886.c"
+#include "source/rtl/natmsg/msgru886.c"
 #elif defined(HARBOUR_LANGUAGE_ES)
-#include "natmsg/msges.c"
+#include "source/rtl/natmsg/msges.c"
 #elif defined(HARBOUR_LANGUAGE_CA)
-#include "natmsg/msgca.c"
+#include "source/rtl/natmsg/msgca.c"
 #elif defined(HARBOUR_LANGUAGE_IT)
-#include "natmsg/msgit.c"
+#include "source/rtl/natmsg/msgit.c"
 #elif defined(HARBOUR_LANGUAGE_FR)
-#include "natmsg/msgfr.c"
+#include "source/rtl/natmsg/msgfr.c"
 #elif defined(HARBOUR_LANGUAGE_CS852)
-#include "natmsg/msgcs852.c"
+#include "source/rtl/natmsg/msgcs852.c"
 #elif defined(HARBOUR_LANGUAGE_CSKAM)
-#include "natmsg/msgcskam.c"
+#include "source/rtl/natmsg/msgcskam.c"
 #elif defined(HARBOUR_LANGUAGE_SR852)
-#include "natmsg/msgsr852.c"
+#include "source/rtl/natmsg/msgsr852.c"
 #elif defined(HARBOUR_LANGUAGE_PL852)
-#include "natmsg/msgpl852.c"
+#include "source/rtl/natmsg/msgpl852.c"
 #elif defined(HARBOUR_LANGUAGE_PLMAZ)
-#include "natmsg/msgplmaz.c"
+#include "source/rtl/natmsg/msgplmaz.c"
 #else
-#include "natmsg/msgen.c"
+#include "source/rtl/natmsg/msgen.c"
 #endif
 
 char *hb_errorNatDescription( ULONG ulGenError )