diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 758d41cca1..d63fad71fb 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,10 @@
+19991110-14:11 GMT+1 Victor Szel <info@szelvesz.hu>
+  * include/hbsetup.h
+    - Removed #defines which were previously moved to hbsetup.ch.
+  * include/hbextern.ch
+    source/runner/stdalone/external.prg
+    + __PREPROCESS added as EXTERNAL  
+
 19991110-11:08 GMT+1 Bruno Cantero <bruno@issnet.net>
   * include/rddapi.h
     source/rdd/dbcmd.c
diff --git a/harbour/include/hbextern.ch b/harbour/include/hbextern.ch
index 53c182f785..ce44c3d6af 100644
--- a/harbour/include/hbextern.ch
+++ b/harbour/include/hbextern.ch
@@ -36,6 +36,8 @@
 #ifndef HB_EXTERN_CH_
 #define HB_EXTERN_CH_
 
+EXTERNAL __PREPROCESS
+
 // Files from: vm
 //
 //
diff --git a/harbour/include/hbsetup.h b/harbour/include/hbsetup.h
index 7a3844f2f5..764fd1c770 100644
--- a/harbour/include/hbsetup.h
+++ b/harbour/include/hbsetup.h
@@ -117,25 +117,13 @@
 /*#define HARBOUR_OBJ_GENERATION*/
 
 /* ***********************************************************************
- * This symbol defines if we want to use strict Clipper compatibility
+ * You can select here, what type of main entry will be used in the 
+ * application (main() or WinMain()).
  *
- * By default it is disabled (symbol is not defined)
+ * By default the standard C main() function will be used.
 */
-/*#define HARBOUR_STRICT_CLIPPER_COMPATIBILITY*/
-
-/* ***********************************************************************
- * You can select here, whether you want to include feature introduced in
- * Clipper implementations other than Cl*pper 5.2e.
- *
- * By default these are all turned on
-*/
-
-/* Include new CA-Cl*pper 5.3[a,b] functions */
-#define HB_COMPAT_C53
-/* Include new Alaska XBase++ functions */
-#define HB_COMPAT_XPP
-/* Include new CA-VO functions */
-#define HB_COMPAT_VO
+/*#define HARBOUR_MAIN_STD*/
+/*#define HARBOUR_MAIN_WIN*/
 
 /* ***********************************************************************
  * You can select here, what type of main entry will be used in the 
diff --git a/harbour/source/runner/stdalone/external.prg b/harbour/source/runner/stdalone/external.prg
index fac070129d..f49c616c30 100644
--- a/harbour/source/runner/stdalone/external.prg
+++ b/harbour/source/runner/stdalone/external.prg
@@ -33,6 +33,8 @@
  *
  */
 
+EXTERNAL __PREPROCESS
+
 // Files from: vm
 //
 //
@@ -930,3 +932,4 @@ EXTERNAL _SDF
 EXTERNAL SysInit
 EXTERNAL CLIPPER520
 EXTERNAL CLIPPER530
+