diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 2edbe37a18..251abed870 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -7,6 +7,14 @@
    For example:
    2002-12-01 23:12 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
+      now respects scopes.
+  * contrib/libnf/dosver.prg
+  * contrib/libnf/floptst.prg
+  * contrib/libnf/isshare.prg
+  * contrib/libnf/menuto.prg
+  * contrib/libnf/mouse2.prg
+  * contrib/libnf/nwlstat.prg
+  * contrib/libnf/nwuid.prg
   * contrib/libnf/page.prg
   * contrib/libnf/popadder.prg
   * contrib/libnf/pvid.prg
diff --git a/harbour/contrib/libnf/descend.c b/harbour/contrib/libnf/descend.c
index 89a4e18298..43533aa249 100644
--- a/harbour/contrib/libnf/descend.c
+++ b/harbour/contrib/libnf/descend.c
@@ -45,9 +45,9 @@
  *  $END$
  */
 
-#include <hbapi.H>
+#include <hbapi.h>
 #include <hbapiitm.h>
-//#include <FM.API>
+//#include <fm.api>
 
 HB_FUNC( FT_DESCEND)
 {
diff --git a/harbour/contrib/libnf/getenvrn.c b/harbour/contrib/libnf/getenvrn.c
index e3c5797a20..d298850c21 100644
--- a/harbour/contrib/libnf/getenvrn.c
+++ b/harbour/contrib/libnf/getenvrn.c
@@ -95,8 +95,8 @@
  *  $END$
  */
 
-#include <EXTEND.API>
-#include <FM.API>
+#include <extend.api>
+#include <fm.api>
 
 #define NORETURN   0
 #define CHARTYPE   1
diff --git a/harbour/contrib/libnf/ontick.c b/harbour/contrib/libnf/ontick.c
index 44966c9b82..57d053d711 100644
--- a/harbour/contrib/libnf/ontick.c
+++ b/harbour/contrib/libnf/ontick.c
@@ -60,9 +60,9 @@
  *  $END$
  */
 
-#include <EXTEND.API>
-#include <ITEM.API>
-#include <CPMI.H>
+#include <extend.api>
+#include <item.api>
+#include <cpmi.h>
 
 typedef union
 {
diff --git a/harbour/contrib/libnf/peek.c b/harbour/contrib/libnf/peek.c
index 591452ca0d..770edee382 100644
--- a/harbour/contrib/libnf/peek.c
+++ b/harbour/contrib/libnf/peek.c
@@ -55,8 +55,8 @@
  *  $END$
  */
 
-#include <EXTEND.API>
-#include <CPMI.H>
+#include <extend.api>
+#include <cpmi.h>
 
 #define FP_SEG( fp ) ( *( ( unsigned int * ) &( fp ) + 1 ) )
 #define FP_OFF( fp ) ( *( ( unsigned int * ) &( fp ) ) )
diff --git a/harbour/contrib/libnf/poke.c b/harbour/contrib/libnf/poke.c
index fd3eb4af4e..38fd4bf3ba 100644
--- a/harbour/contrib/libnf/poke.c
+++ b/harbour/contrib/libnf/poke.c
@@ -58,8 +58,8 @@
  *  $END$
  */
 
-#include <EXTEND.API>
-#include <cpmi.H>
+#include <extend.api>
+#include <cpmi.h>
 
 #define FP_SEG( fp ) ( *( ( unsigned int * ) &( fp ) + 1 ) )
 #define FP_OFF( fp ) ( *( ( unsigned int * ) &( fp ) ) )