diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 79c0ecacd7..392148fcd4 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,39 @@
    2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2008-10-15 10:09 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
+  * make_b32.mak
+  * make_vc.mak
+  * make_gcc.mak
+    * Removed disabling -b for non-debug builds.
+    ; We aim to remove RTL .prg dependencies from hbdebug.lib, 
+      either by local implementation, .c rewrite, or force 
+      disabling debug mode in more core files.
+      Until this happens, one will have to be careful with 
+      using -b switch to compile Harbour. These are the core .prg 
+      modules currently used by hbdebug.lib:
+      - HBGETLIST(), GET(), __GET(), __GETLISTACTIVE(), __GETLISTSETACTIVE(), READINSERT(), READMODAL()
+      - HBCLASS()
+      - HBOBJECT()
+      - HBEDITOR()
+      - TBCOLUMNNEW()
+      - ACHOICE()
+      - ALERT()
+
+  * source/debug/dbgtobj.prg
+  * source/debug/dbgbrwsr.prg
+  * source/debug/dbgtwin.prg
+  * source/debug/dbgmenu.prg
+  * source/debug/dbgthsh.prg
+  * source/debug/tbrwtext.prg
+  * source/debug/dbgwa.prg
+  * source/debug/debugger.prg
+  * source/debug/dbghelp.prg
+  * source/debug/dbgtarr.prg
+  * source/debug/dbgtmenu.prg
+  * source/debug/dbgtmitm.prg
+    + Readded '#pragma DEBUGINFO=OFF'.
+
 2008-10-15 02:33 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
   * source/rtl/langapi.c
   * utils/hbtest/rt_class.prg
diff --git a/harbour/make_b32.mak b/harbour/make_b32.mak
index ce5d2c2ca5..e3877c0b36 100644
--- a/harbour/make_b32.mak
+++ b/harbour/make_b32.mak
@@ -110,7 +110,7 @@ CEXEFLAGSDLL   = $(HB_BCCDLL_DYNRT) $(CLIBFLAGS)
 #**********************************************************
 
 # Harbour Compiler Flags
-HBFLAGSCMN     = -i$(INCLUDE_DIR) -q0 -w3 -es2 -km -l $(PRG_USR) -b-
+HBFLAGSCMN     = -i$(INCLUDE_DIR) -q0 -w3 -es2 -km -l $(PRG_USR)
 !if "$(HB_BUILD_DEBUG)" == "yes"
 HBFLAGSCMN     = $(HBFLAGSCMN) -l-
 !endif
diff --git a/harbour/make_gcc.mak b/harbour/make_gcc.mak
index dadbdc1a3c..e47448432d 100644
--- a/harbour/make_gcc.mak
+++ b/harbour/make_gcc.mak
@@ -176,7 +176,7 @@ endif
 # Harbour Compiler Flags
 #**********************************************************
 
-HBFLAGSCMN     := -i$(INCLUDE_DIR) -q0 -w3 -es2 -km -l $(PRG_USR) -b-
+HBFLAGSCMN     := -i$(INCLUDE_DIR) -q0 -w3 -es2 -km -l $(PRG_USR)
 ifeq ($(HB_BUILD_DEBUG),yes)
 HBFLAGSCMN     := $(HBFLAGSCMN) -l-
 endif
diff --git a/harbour/make_vc.mak b/harbour/make_vc.mak
index 6df04a8269..d03e715378 100644
--- a/harbour/make_vc.mak
+++ b/harbour/make_vc.mak
@@ -163,7 +163,7 @@ CEXEFLAGSDLL   = -MT$(DBGMARKER) $(CLIBFLAGS)
 #**********************************************************
 
 # Harbour Compiler Flags
-HBFLAGSCMN     = -i$(INCLUDE_DIR) -q0 -w3 -es2 -km -l $(PRG_USR) -b-
+HBFLAGSCMN     = -i$(INCLUDE_DIR) -q0 -w3 -es2 -km -l $(PRG_USR)
 !if "$(HB_BUILD_DEBUG)" == "yes"
 HBFLAGSCMN     = $(HBFLAGSCMN) -l-
 !endif
diff --git a/harbour/source/debug/dbgbrwsr.prg b/harbour/source/debug/dbgbrwsr.prg
index 2c4d213e26..7dfb64600d 100644
--- a/harbour/source/debug/dbgbrwsr.prg
+++ b/harbour/source/debug/dbgbrwsr.prg
@@ -52,6 +52,8 @@
  *
  */
 
+#pragma DEBUGINFO=OFF
+
 #include "hbclass.ch"
 
 /* HBDbBrowser
diff --git a/harbour/source/debug/dbghelp.prg b/harbour/source/debug/dbghelp.prg
index caf7067f3f..b6d4c2ad81 100644
--- a/harbour/source/debug/dbghelp.prg
+++ b/harbour/source/debug/dbghelp.prg
@@ -55,6 +55,8 @@
  *
  */
 
+#pragma DEBUGINFO=OFF
+
 /* NOTE: Don't use SAY/DevOut()/DevPos() for screen output, otherwise
          the debugger output may interfere with the applications output
          redirection, and is also slower. [vszakats] */
diff --git a/harbour/source/debug/dbgmenu.prg b/harbour/source/debug/dbgmenu.prg
index 56068ab21e..3c3652f6da 100644
--- a/harbour/source/debug/dbgmenu.prg
+++ b/harbour/source/debug/dbgmenu.prg
@@ -50,6 +50,8 @@
  *
  */
 
+#pragma DEBUGINFO=OFF
+
 #include "hbclass.ch"
 
 #xcommand MENU [<oMenu>] => [ <oMenu> := ] HBDbMenu():New()
diff --git a/harbour/source/debug/dbgtarr.prg b/harbour/source/debug/dbgtarr.prg
index f4c6aaa353..ea3c99d49f 100644
--- a/harbour/source/debug/dbgtarr.prg
+++ b/harbour/source/debug/dbgtarr.prg
@@ -50,6 +50,8 @@
  *
  */
 
+#pragma DEBUGINFO=OFF
+
 #include "hbclass.ch"
 
 #include "common.ch"
diff --git a/harbour/source/debug/dbgthsh.prg b/harbour/source/debug/dbgthsh.prg
index 787963bad9..274144a709 100644
--- a/harbour/source/debug/dbgthsh.prg
+++ b/harbour/source/debug/dbgthsh.prg
@@ -51,6 +51,8 @@
  *
  */
 
+#pragma DEBUGINFO=OFF
+
 #include "hbclass.ch"
 
 #include "common.ch"
diff --git a/harbour/source/debug/dbgtmenu.prg b/harbour/source/debug/dbgtmenu.prg
index 174f5f9ead..f6dfe60abd 100644
--- a/harbour/source/debug/dbgtmenu.prg
+++ b/harbour/source/debug/dbgtmenu.prg
@@ -54,6 +54,8 @@
          the debugger output may interfere with the applications output
          redirection, and is also slower. [vszakats] */
 
+#pragma DEBUGINFO=OFF
+
 #include "hbclass.ch"
 #include "hbmemvar.ch"
 
diff --git a/harbour/source/debug/dbgtmitm.prg b/harbour/source/debug/dbgtmitm.prg
index e4d7a4242b..438c111454 100644
--- a/harbour/source/debug/dbgtmitm.prg
+++ b/harbour/source/debug/dbgtmitm.prg
@@ -54,6 +54,8 @@
          the debugger output may interfere with the applications output
          redirection, and is also slower. [vszakats] */
 
+#pragma DEBUGINFO=OFF
+
 #include "hbclass.ch"
 
 #include "common.ch"
diff --git a/harbour/source/debug/dbgtobj.prg b/harbour/source/debug/dbgtobj.prg
index b988436413..f0b35e3524 100644
--- a/harbour/source/debug/dbgtobj.prg
+++ b/harbour/source/debug/dbgtobj.prg
@@ -50,6 +50,8 @@
  *
  */
 
+#pragma DEBUGINFO=OFF
+
 #include "hbclass.ch"
 
 #include "common.ch"
diff --git a/harbour/source/debug/dbgtwin.prg b/harbour/source/debug/dbgtwin.prg
index 9d3886c094..39b2659106 100644
--- a/harbour/source/debug/dbgtwin.prg
+++ b/harbour/source/debug/dbgtwin.prg
@@ -65,6 +65,8 @@
          the debugger output may interfere with the applications output
          redirection, and is also slower. [vszakats] */
 
+#pragma DEBUGINFO=OFF
+
 #include "hbclass.ch"
 #include "hbmemvar.ch"
 
diff --git a/harbour/source/debug/dbgwa.prg b/harbour/source/debug/dbgwa.prg
index 76d1bc55d4..9b3910de62 100644
--- a/harbour/source/debug/dbgwa.prg
+++ b/harbour/source/debug/dbgwa.prg
@@ -50,6 +50,8 @@
  *
  */
 
+#pragma DEBUGINFO=OFF
+
 #include "common.ch"
 #include "setcurs.ch"
 #include "inkey.ch"
diff --git a/harbour/source/debug/debugger.prg b/harbour/source/debug/debugger.prg
index 9e95779e44..6c1955fc9b 100644
--- a/harbour/source/debug/debugger.prg
+++ b/harbour/source/debug/debugger.prg
@@ -62,6 +62,8 @@
          the debugger output may interfere with the applications output
          redirection, and is also slower. [vszakats] */
 
+#pragma DEBUGINFO=OFF
+
 #include "hbclass.ch"
 #include "hbdebug.ch"   // for "nMode" of __dbgEntry
 #include "hbgtinfo.ch"
diff --git a/harbour/source/debug/tbrwtext.prg b/harbour/source/debug/tbrwtext.prg
index 00e1b0bc66..2cbf20e3ef 100644
--- a/harbour/source/debug/tbrwtext.prg
+++ b/harbour/source/debug/tbrwtext.prg
@@ -50,6 +50,8 @@
  *
  */
 
+#pragma DEBUGINFO=OFF
+
 #include "hbclass.ch"
 
 #include "common.ch"