diff --git a/ChangeLog b/ChangeLog
index f361a5ff52..4725d6662d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Tue Jul 14 19:22:46 PDT 1998 Manish Singh <yosh@gimp.org>
+
+	* acconfig.h
+	* configure.in
+	* app/about_dialog.c
+	* app/app_procs.c
+	* app/main.c
+	* libgimp/gimp.[ch]
+	* libgimp/gimpfeatures.h.in: added features header
+
 Mon Jul 13 22:49:15 PDT 1998 Manish Singh <yosh@gimp.org>
 
 	* configure.in: check for inline by ourselves if it's not
diff --git a/acconfig.h b/acconfig.h
index 3eb73f8516..4253e6b3d4 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -14,11 +14,6 @@
    Leave the following blank line there!!  Autoheader needs it.  */
 
 
-#undef GIMP_MAJOR_VERSION
-#undef GIMP_MINOR_VERSION
-#undef GIMP_MICRO_VERSION
-#undef GIMP_VERSION
-
 #undef HAVE_DIRENT_H
 #undef HAVE_DOPRNT
 #undef HAVE_IPC_H
diff --git a/app/about_dialog.c b/app/about_dialog.c
index 6d124181df..90d02bc4b3 100644
--- a/app/about_dialog.c
+++ b/app/about_dialog.c
@@ -18,7 +18,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
+
 #include <gtk/gtk.h>
+
+#include "libgimp/gimpfeatures.h"
+
 #include "about_dialog.h"
 #include "interface.h"
 
diff --git a/app/app_procs.c b/app/app_procs.c
index 901d50af6a..373fe02e65 100644
--- a/app/app_procs.c
+++ b/app/app_procs.c
@@ -24,6 +24,8 @@
 
 #include <gtk/gtk.h>
 
+#include "libgimp/gimpfeatures.h"
+
 #include "appenv.h"
 #include "app_procs.h"
 #include "batch.h"
diff --git a/app/dialogs/about-dialog.c b/app/dialogs/about-dialog.c
index 6d124181df..90d02bc4b3 100644
--- a/app/dialogs/about-dialog.c
+++ b/app/dialogs/about-dialog.c
@@ -18,7 +18,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
+
 #include <gtk/gtk.h>
+
+#include "libgimp/gimpfeatures.h"
+
 #include "about_dialog.h"
 #include "interface.h"
 
diff --git a/app/gui/about-dialog.c b/app/gui/about-dialog.c
index 6d124181df..90d02bc4b3 100644
--- a/app/gui/about-dialog.c
+++ b/app/gui/about-dialog.c
@@ -18,7 +18,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
+
 #include <gtk/gtk.h>
+
+#include "libgimp/gimpfeatures.h"
+
 #include "about_dialog.h"
 #include "interface.h"
 
diff --git a/app/main.c b/app/main.c
index 1f61236bcc..3a28ff7d15 100644
--- a/app/main.c
+++ b/app/main.c
@@ -29,6 +29,8 @@
 #define  WAIT_ANY -1
 #endif   /*  WAIT_ANY  */
 
+#include "libgimp/gimpfeatures.h"
+
 #include "appenv.h"
 #include "app_procs.h"
 #include "errors.h"
diff --git a/config.h.in b/config.h.in
index 789b7b7edb..a8336f5cab 100644
--- a/config.h.in
+++ b/config.h.in
@@ -49,11 +49,6 @@
 /* Define if you can safely include both <sys/time.h> and <time.h>.  */
 #undef TIME_WITH_SYS_TIME
 
-#undef GIMP_MAJOR_VERSION
-#undef GIMP_MINOR_VERSION
-#undef GIMP_MICRO_VERSION
-#undef GIMP_VERSION
-
 #undef HAVE_DIRENT_H
 #undef HAVE_DOPRNT
 #undef HAVE_IPC_H
diff --git a/configure.in b/configure.in
index 3fb0a1bcee..070b60060b 100644
--- a/configure.in
+++ b/configure.in
@@ -407,11 +407,6 @@ if test $ac_cv_path_LPC_COMMAND != ":"; then
   LPC_DEF="-DLPC_COMMAND=\\\"$ac_cv_path_LPC_COMMAND\\\""
 fi
 
-AC_DEFINE_UNQUOTED(GIMP_MAJOR_VERSION, $GIMP_MAJOR_VERSION)
-AC_DEFINE_UNQUOTED(GIMP_MINOR_VERSION, $GIMP_MINOR_VERSION)
-AC_DEFINE_UNQUOTED(GIMP_MICRO_VERSION, $GIMP_MICRO_VERSION)
-AC_DEFINE_UNQUOTED(GIMP_VERSION, "$GIMP_VERSION")
-
 AC_SUBST(GIMP_MAJOR_VERSION)
 AC_SUBST(GIMP_MINOR_VERSION)
 AC_SUBST(GIMP_MICRO_VERSION)
@@ -460,6 +455,7 @@ Makefile
 gimprc
 gimprc_user
 gimptool
+libgimp/gimpfeatures.h
 libgimp/Makefile
 plug-ins/Makefile
 plug-ins/libgck/Makefile
diff --git a/libgimp/gimp.c b/libgimp/gimp.c
index a70a77baa4..f6809a142d 100644
--- a/libgimp/gimp.c
+++ b/libgimp/gimp.c
@@ -60,6 +60,10 @@ int _writefd = 0;
 int _shm_ID = -1;
 guchar *_shm_addr = NULL;
 
+const guint gimp_major_version = GIMP_MAJOR_VERSION;
+const guint gimp_minor_version = GIMP_MINOR_VERSION;
+const guint gimp_micro_version = GIMP_MICRO_VERSION;
+
 static gdouble _gamma_val;
 static gint _install_cmap;
 static gint _use_xshm;
diff --git a/libgimp/gimp.h b/libgimp/gimp.h
index 8d26913d23..8c5af23dfa 100644
--- a/libgimp/gimp.h
+++ b/libgimp/gimp.h
@@ -22,6 +22,7 @@
 
 #include <glib.h>
 #include <libgimp/gimpenums.h>
+#include <libgimp/gimpfeatures.h>
 
 
 #ifdef __cplusplus
@@ -29,6 +30,11 @@ extern "C" {
 #endif /* __cplusplus */
 
 
+extern const guint gimp_major_version;
+extern const guint gimp_minor_version;
+extern const guint gimp_micro_version;
+
+
 typedef struct _GPlugInInfo  GPlugInInfo;
 typedef struct _GTile        GTile;
 typedef struct _GDrawable    GDrawable;