7 files changed, 9 insertions, 7 deletions
diff --git a/docview/src/frm_main.pas b/docview/src/frm_main.pas
index ee7cd670..436b4b7c 100644
--- a/docview/src/frm_main.pas
+++ b/docview/src/frm_main.pas
@@ -194,7 +194,7 @@ uses
 const
   cLongName   = 'fpGUI Documentation Viewer';
   cCreatedBy  = 'Created by Graeme Geldenhuys';
-  cVersion    = 'Version 0.7 (alpha)';
+  cVersion    = 'Version ' + FPGUI_VERSION;
 
 {$I arrows.inc}
 
diff --git a/examples/apps/docedit/frm_main.pas b/examples/apps/docedit/frm_main.pas
index 04ea3f59..8f3b7369 100644
--- a/examples/apps/docedit/frm_main.pas
+++ b/examples/apps/docedit/frm_main.pas
@@ -150,7 +150,7 @@ begin
   ShowMessage(cAppName
       + #10
       + #10 + 'Written by Graeme Geldenhuys - 2007'
-      + #10 + 'Using the ' + fpGUIName + ' v' + fpGUIVersion
+      + #10 + 'Using the ' + fpGUIName + ' v' + fpGUI_Version
       ,'About');
 end;
 
diff --git a/src/corelib/fpg_main.pas b/src/corelib/fpg_main.pas
index ba7a5e3b..eb9106dd 100644
--- a/src/corelib/fpg_main.pas
+++ b/src/corelib/fpg_main.pas
@@ -59,7 +59,7 @@ const
   cMessageQueueSize = 1024;
 
   // version and name constants
-  fpGUIVersion = '0.7';
+  {$I VERSION-FILE}  // this includes the auto generated:  fpGUI_Version = xxx
   fpGUIName    = 'fpGUI Toolkit';
 
 const
diff --git a/src/corelib/gdi/fpgui_toolkit.lpk b/src/corelib/gdi/fpgui_toolkit.lpk
index 58748828..2e7a5fda 100644
--- a/src/corelib/gdi/fpgui_toolkit.lpk
+++ b/src/corelib/gdi/fpgui_toolkit.lpk
@@ -8,6 +8,7 @@
       <Version Value="8"/>
       <PathDelim Value="\"/>
       <SearchPaths>
+        <IncludeFiles Value="..\..\..\"/>
         <OtherUnitFiles Value="..\;..\..\gui\;..\..\gui\db\"/>
         <UnitOutputDirectory Value="..\..\..\lib\$(TargetCPU)-$(TargetOS)"/>
       </SearchPaths>
diff --git a/src/corelib/x11/fpgui_toolkit.lpk b/src/corelib/x11/fpgui_toolkit.lpk
index d47e94e8..d6cc9ecf 100644
--- a/src/corelib/x11/fpgui_toolkit.lpk
+++ b/src/corelib/x11/fpgui_toolkit.lpk
@@ -7,6 +7,7 @@
     <CompilerOptions>
       <Version Value="8"/>
       <SearchPaths>
+        <IncludeFiles Value="../../../"/>
         <OtherUnitFiles Value="../;../../gui/;../../gui/db/"/>
         <UnitOutputDirectory Value="../../../lib/$(TargetCPU)-$(TargetOS)"/>
       </SearchPaths>
diff --git a/src/gui/messagedialog.inc b/src/gui/messagedialog.inc
index 7a04371a..d40b5fca 100644
--- a/src/gui/messagedialog.inc
+++ b/src/gui/messagedialog.inc
@@ -371,7 +371,7 @@ begin
     dlg.DefaultButton := mbOK;
     dlg.Text := dlg.WindowTitle;
     dlg.InformativeText := LineEnding + LineEnding
-                           + 'This program uses ' + fpGUIName + ' version ' + fpGUIVersion + '.'
+                           + 'This program uses ' + fpGUIName + ' version ' + fpGUI_Version + '.'
                            + LineEnding + LineEnding
                            + fpGUIName + ' is intended for Open Source and Commercial applications. fpGUI'
                            + ' uses the LGPL 2 license with a static linking exception - the same as the Free'
diff --git a/uidesigner/vfdmain.pas b/uidesigner/vfdmain.pas
index 06112ad6..7468a99f 100644
--- a/uidesigner/vfdmain.pas
+++ b/uidesigner/vfdmain.pas
@@ -24,6 +24,7 @@ interface
 uses
   Classes,
   SysUtils,
+  fpg_main,
   fpg_widget,
   fpg_dialogs,
   vfdprops,
@@ -33,7 +34,7 @@ uses
   newformdesigner;
 
 const
-  program_version = '0.7 beta';
+  program_version = FPGUI_VERSION;
 
 type
 
@@ -84,8 +85,7 @@ implementation
 uses
   vfdformparser,
   fpg_iniutils,
-  fpg_utils,
-  fpg_main;
+  fpg_utils;
 
 var
   DefaultPasExt : String = '.pas';