[dia/neduard/meson_fixes: 21/26] #31 Remove HAVE_CONFIG_H.

[Eduard <neduard src gnome org>]

commit a838f509bb1347f2d87275adab8f6388eea3844b
Author: Eduard <eddnicodei gmail com>
Date:   Fri Feb 1 09:31:52 2019 +0000

    #31 Remove HAVE_CONFIG_H.
    
      This is not needed anymore since we always generate config.h.

 app/app_procs.c                           | 2 +-
 app/autosave.c                            | 4 +---
 app/color_area.c                          | 4 +---
 app/commands.c                            | 2 +-
 app/confirm.c                             | 2 +-
 app/connectionpoint_ops.c                 | 2 +-
 app/create_object.c                       | 2 +-
 app/cursor.c                              | 2 +-
 app/cut_n_paste.c                         | 2 +-
 app/defaults.c                            | 2 +-
 app/dia-props.c                           | 4 +---
 app/diagram.c                             | 2 +-
 app/diapagelayout.c                       | 4 +---
 app/disp_callbacks.c                      | 4 +---
 app/display.c                             | 4 +---
 app/exit_dialog.c                         | 2 +-
 app/filedlg.c                             | 2 +-
 app/find-and-replace.c                    | 2 +-
 app/grid.c                                | 4 +---
 app/handle_ops.c                          | 2 +-
 app/interface.c                           | 2 +-
 app/layer_dialog.c                        | 4 +---
 app/linewidth_area.c                      | 4 +---
 app/load_save.c                           | 2 +-
 app/magnify.c                             | 2 +-
 app/main.c                                | 2 +-
 app/menus.c                               | 4 +---
 app/modify_tool.c                         | 2 +-
 app/object_ops.c                          | 4 +---
 app/pagesetup.c                           | 4 +---
 app/plugin-manager.c                      | 4 +---
 app/preferences.c                         | 2 +-
 app/properties-dialog.c                   | 4 +---
 app/recent_files.c                        | 4 +---
 app/render_gdk.c                          | 2 +-
 app/ruler.c                               | 2 +-
 app/scroll_tool.c                         | 2 +-
 app/select.c                              | 2 +-
 app/sheets_dialog.c                       | 4 +---
 app/sheets_dialog_callbacks.c             | 4 +---
 app/splash.c                              | 2 +-
 app/textedit.c                            | 2 +-
 app/textedit_tool.c                       | 2 +-
 app/tool.c                                | 2 +-
 app/toolbox.c                             | 2 +-
 app/undo.c                                | 2 +-
 app/winmain.c                             | 2 +-
 lib/arrows.c                              | 2 +-
 lib/attributes.c                          | 2 +-
 lib/bezier-common.c                       | 2 +-
 lib/bezier_conn.c                         | 2 +-
 lib/beziershape.c                         | 2 +-
 lib/boundingbox.c                         | 2 +-
 lib/color.c                               | 2 +-
 lib/connection.c                          | 2 +-
 lib/connpoint_line.c                      | 2 +-
 lib/create.c                              | 4 +---
 lib/debug.c                               | 2 +-
 lib/debug.h                               | 2 +-
 lib/dia_dirs.c                            | 2 +-
 lib/dia_image.c                           | 2 +-
 lib/dia_xml.c                             | 2 +-
 lib/diaarrowchooser.c                     | 2 +-
 lib/diaarrowselector.c                    | 2 +-
 lib/diacellrendererenum.c                 | 2 +-
 lib/diacellrendererproperty.c             | 2 +-
 lib/diacolorselector.c                    | 2 +-
 lib/diadynamicmenu.c                      | 2 +-
 lib/diafontselector.c                     | 2 +-
 lib/diagdkrenderer.c                      | 2 +-
 lib/diagramdata.c                         | 4 +---
 lib/diaimportrenderer.c                   | 2 +-
 lib/dialib.c                              | 2 +-
 lib/dialinechooser.c                      | 4 +---
 lib/dialinestyleselector.c                | 2 +-
 lib/dialogs.c                             | 4 +---
 lib/diaoptionmenu.c                       | 2 +-
 lib/diapatternselector.c                  | 2 +-
 lib/diarenderer.c                         | 2 +-
 lib/diasvgrenderer.c                      | 2 +-
 lib/element.c                             | 2 +-
 lib/filter.c                              | 4 +---
 lib/focus.c                               | 2 +-
 lib/font-height.c                         | 4 +---
 lib/font.c                                | 4 +---
 lib/geometry.c                            | 2 +-
 lib/geometry.h                            | 4 +---
 lib/group.c                               | 2 +-
 lib/intl.c                                | 2 +-
 lib/layer.c                               | 4 +---
 lib/message.c                             | 2 +-
 lib/objchange.c                           | 2 +-
 lib/object-alias.c                        | 2 +-
 lib/object.c                              | 2 +-
 lib/object_defaults.c                     | 2 +-
 lib/orth_conn.c                           | 2 +-
 lib/paper.c                               | 2 +-
 lib/parent.c                              | 2 +-
 lib/path-math.c                           | 2 +-
 lib/pattern.c                             | 2 +-
 lib/plug-ins.c                            | 2 +-
 lib/poly_conn.c                           | 2 +-
 lib/polyshape.c                           | 2 +-
 lib/prefs.c                               | 4 +---
 lib/prefs.h                               | 4 +---
 lib/prop_attr.c                           | 4 +---
 lib/prop_basic.c                          | 4 +---
 lib/prop_dict.c                           | 4 +---
 lib/prop_geomtypes.c                      | 4 +---
 lib/prop_inttypes.c                       | 4 +---
 lib/prop_matrix.c                         | 2 +-
 lib/prop_pattern.c                        | 2 +-
 lib/prop_pixbuf.c                         | 2 +-
 lib/prop_sdarray.c                        | 4 +---
 lib/prop_sdarray_widget.c                 | 4 +---
 lib/prop_text.c                           | 4 +---
 lib/prop_widgets.c                        | 4 +---
 lib/propdesc.c                            | 4 +---
 lib/propdialogs.c                         | 4 +---
 lib/properties.c                          | 4 +---
 lib/proplist.c                            | 4 +---
 lib/propobject.c                          | 4 +---
 lib/propregistry.c                        | 4 +---
 lib/render_pixmap.c                       | 2 +-
 lib/sheet.c                               | 2 +-
 lib/standard-path.c                       | 2 +-
 lib/text.c                                | 2 +-
 lib/textline.c                            | 2 +-
 lib/units.h                               | 2 +-
 lib/utils.c                               | 2 +-
 lib/widgets.c                             | 2 +-
 meson.build                               | 4 ----
 objects/AADL/aadl.c                       | 4 +---
 objects/AADL/aadl.h                       | 4 +---
 objects/AADL/edit_port_declaration.c      | 2 +-
 objects/Database/compound.c               | 4 +---
 objects/Database/database.c               | 4 +---
 objects/Database/reference.c              | 4 +---
 objects/Database/table.c                  | 4 +---
 objects/ER/attribute.c                    | 4 +---
 objects/ER/entity.c                       | 4 +---
 objects/ER/er.c                           | 4 +---
 objects/ER/participation.c                | 4 +---
 objects/ER/relationship.c                 | 4 +---
 objects/FS/flow-ortho.c                   | 4 +---
 objects/FS/flow.c                         | 4 +---
 objects/FS/fs.c                           | 4 +---
 objects/FS/function.c                     | 4 +---
 objects/GRAFCET/action.c                  | 4 +---
 objects/GRAFCET/action_text_draw.c        | 2 +-
 objects/GRAFCET/boolequation.c            | 2 +-
 objects/GRAFCET/condition.c               | 4 +---
 objects/GRAFCET/grafcet.c                 | 4 +---
 objects/GRAFCET/step.c                    | 4 +---
 objects/GRAFCET/transition.c              | 4 +---
 objects/GRAFCET/vector.c                  | 4 +---
 objects/GRAFCET/vergent.c                 | 4 +---
 objects/Istar/actor.c                     | 4 +---
 objects/Istar/goal.c                      | 4 +---
 objects/Istar/istar.c                     | 4 +---
 objects/Istar/link.c                      | 4 +---
 objects/Istar/other.c                     | 4 +---
 objects/Jackson/domain.c                  | 4 +---
 objects/Jackson/jackson.c                 | 4 +---
 objects/Jackson/phenomenon.c              | 4 +---
 objects/Jackson/requirement.c             | 4 +---
 objects/KAOS/goal.c                       | 4 +---
 objects/KAOS/kaos.c                       | 4 +---
 objects/KAOS/metaandorrel.c               | 4 +---
 objects/KAOS/metabinrel.c                 | 4 +---
 objects/KAOS/other.c                      | 4 +---
 objects/Misc/analog_clock.c               | 4 +---
 objects/Misc/diagram_as_object.c          | 2 +-
 objects/Misc/grid_object.c                | 4 +---
 objects/Misc/libmisc.c                    | 4 +---
 objects/Misc/measure.c                    | 2 +-
 objects/Misc/n_gon.c                      | 2 +-
 objects/Misc/tree.c                       | 4 +---
 objects/SADT/annotation.c                 | 4 +---
 objects/SADT/arrow.c                      | 4 +---
 objects/SADT/box.c                        | 4 +---
 objects/SADT/sadt.c                       | 4 +---
 objects/Sozi/sozi-object.h                | 4 +---
 objects/Sozi/sozi.c                       | 4 +---
 objects/UML/activity.c                    | 4 +---
 objects/UML/actor.c                       | 4 +---
 objects/UML/association.c                 | 4 +---
 objects/UML/branch.c                      | 4 +---
 objects/UML/class.c                       | 4 +---
 objects/UML/class_attributes_dialog.c     | 2 +-
 objects/UML/class_dialog.c                | 2 +-
 objects/UML/class_operations_dialog.c     | 2 +-
 objects/UML/class_templates_dialog.c      | 2 +-
 objects/UML/classicon.c                   | 4 +---
 objects/UML/component.c                   | 4 +---
 objects/UML/component_feature.c           | 4 +---
 objects/UML/constraint.c                  | 4 +---
 objects/UML/dependency.c                  | 4 +---
 objects/UML/fork.c                        | 4 +---
 objects/UML/generalization.c              | 4 +---
 objects/UML/implements.c                  | 4 +---
 objects/UML/large_package.c               | 4 +---
 objects/UML/lifeline.c                    | 4 +---
 objects/UML/message.c                     | 4 +---
 objects/UML/node.c                        | 4 +---
 objects/UML/note.c                        | 4 +---
 objects/UML/object.c                      | 4 +---
 objects/UML/realizes.c                    | 4 +---
 objects/UML/small_package.c               | 4 +---
 objects/UML/state.c                       | 4 +---
 objects/UML/state_term.c                  | 4 +---
 objects/UML/stereotype.c                  | 2 +-
 objects/UML/transition.c                  | 4 +---
 objects/UML/uml.c                         | 4 +---
 objects/UML/umlattribute.c                | 4 +---
 objects/UML/umlformalparameter.c          | 4 +---
 objects/UML/umloperation.c                | 4 +---
 objects/UML/umlparameter.c                | 4 +---
 objects/UML/usecase.c                     | 4 +---
 objects/chronogram/chronogram.c           | 4 +---
 objects/chronogram/chronoline.c           | 4 +---
 objects/chronogram/chronoline_event.c     | 2 +-
 objects/chronogram/chronoref.c            | 4 +---
 objects/custom/custom.c                   | 2 +-
 objects/custom/custom_object.c            | 4 +---
 objects/custom/custom_util.c              | 2 +-
 objects/custom/shape_info.c               | 2 +-
 objects/custom/shape_typeinfo.c           | 2 +-
 objects/custom_lines/custom_lines.c       | 2 +-
 objects/flowchart/box.c                   | 4 +---
 objects/flowchart/diamond.c               | 4 +---
 objects/flowchart/ellipse.c               | 4 +---
 objects/flowchart/flowchart.c             | 4 +---
 objects/flowchart/parallelogram.c         | 4 +---
 objects/network/basestation.c             | 4 +---
 objects/network/bus.c                     | 4 +---
 objects/network/network.c                 | 4 +---
 objects/network/radiocell.c               | 4 +---
 objects/standard/arc.c                    | 2 +-
 objects/standard/bezier.c                 | 4 +---
 objects/standard/beziergon.c              | 4 +---
 objects/standard/box.c                    | 4 +---
 objects/standard/ellipse.c                | 4 +---
 objects/standard/image.c                  | 2 +-
 objects/standard/line.c                   | 4 +---
 objects/standard/outline.c                | 2 +-
 objects/standard/polygon.c                | 4 +---
 objects/standard/polyline.c               | 4 +---
 objects/standard/standard.c               | 4 +---
 objects/standard/textobj.c                | 4 +---
 objects/standard/zigzagline.c             | 4 +---
 plug-ins/cairo/diacairo-renderer.c        | 2 +-
 plug-ins/cairo/diacairo.c                 | 2 +-
 plug-ins/cgm/cgm.c                        | 4 +---
 plug-ins/drs/dia-render-script-import.c   | 2 +-
 plug-ins/drs/dia-render-script-renderer.c | 2 +-
 plug-ins/drs/dia-render-script.c          | 2 +-
 plug-ins/dxf/dxf-export.c                 | 4 +---
 plug-ins/dxf/dxf-import.c                 | 4 +---
 plug-ins/dxf/dxf.c                        | 2 +-
 plug-ins/hpgl/hpgl.c                      | 4 +---
 plug-ins/libart/dialibart.c               | 2 +-
 plug-ins/libart/dialibartrenderer.c       | 2 +-
 plug-ins/libart/export_png.c              | 2 +-
 plug-ins/libart/render_libart.c           | 2 +-
 plug-ins/metapost/metapost.c              | 2 +-
 plug-ins/metapost/render_metapost.c       | 2 +-
 plug-ins/pdf/pdf.c                        | 2 +-
 plug-ins/pgf/pgf.c                        | 2 +-
 plug-ins/pgf/render_pgf.c                 | 2 +-
 plug-ins/postscript/diapsft2renderer.c    | 2 +-
 plug-ins/postscript/diapsrenderer.c       | 2 +-
 plug-ins/postscript/paginate_psprint.c    | 4 +---
 plug-ins/postscript/postscript.c          | 2 +-
 plug-ins/postscript/ps-utf8.c             | 2 +-
 plug-ins/postscript/ps-utf8.h             | 2 +-
 plug-ins/postscript/render_eps.c          | 2 +-
 plug-ins/postscript/win32print.c          | 2 +-
 plug-ins/pstricks/pstricks.c              | 2 +-
 plug-ins/pstricks/render_pstricks.c       | 2 +-
 plug-ins/python/diamodule.c               | 2 +-
 plug-ins/python/pydia-color.c             | 2 +-
 plug-ins/python/pydia-cpoint.c            | 2 +-
 plug-ins/python/pydia-diagram.c           | 2 +-
 plug-ins/python/pydia-diagramdata.c       | 2 +-
 plug-ins/python/pydia-display.c           | 2 +-
 plug-ins/python/pydia-error.c             | 2 +-
 plug-ins/python/pydia-export.c            | 2 +-
 plug-ins/python/pydia-font.c              | 2 +-
 plug-ins/python/pydia-geometry.c          | 2 +-
 plug-ins/python/pydia-handle.c            | 2 +-
 plug-ins/python/pydia-image.c             | 2 +-
 plug-ins/python/pydia-layer.c             | 2 +-
 plug-ins/python/pydia-menuitem.c          | 2 +-
 plug-ins/python/pydia-object.c            | 2 +-
 plug-ins/python/pydia-paperinfo.c         | 2 +-
 plug-ins/python/pydia-properties.c        | 2 +-
 plug-ins/python/pydia-property.c          | 2 +-
 plug-ins/python/pydia-render.c            | 2 +-
 plug-ins/python/pydia-sheet.c             | 2 +-
 plug-ins/python/pydia-text.c              | 2 +-
 plug-ins/python/python.c                  | 4 +---
 plug-ins/shape/shape-export.c             | 2 +-
 plug-ins/shape/shape.c                    | 2 +-
 plug-ins/stress/stress.c                  | 2 +-
 plug-ins/svg/render_svg.c                 | 2 +-
 plug-ins/svg/svg-import.c                 | 4 +---
 plug-ins/svg/svg.c                        | 2 +-
 plug-ins/vdx/vdx-export.c                 | 4 +---
 plug-ins/vdx/vdx-import.c                 | 4 +---
 plug-ins/vdx/vdx.c                        | 2 +-
 plug-ins/wpg/wpg-import.c                 | 2 +-
 plug-ins/wpg/wpg.c                        | 2 +-
 plug-ins/xfig/xfig-common.c               | 4 +---
 plug-ins/xfig/xfig-export.c               | 4 +---
 plug-ins/xfig/xfig-import.c               | 4 +---
 plug-ins/xfig/xfig.c                      | 2 +-
 plug-ins/xslt/xslt.c                      | 2 +-
 tests/test-svg.c                          | 2 +-
 319 files changed, 318 insertions(+), 630 deletions(-)
---
diff --git a/app/app_procs.c b/app/app_procs.c
index 22bc82f9..6f7066ef 100644
--- a/app/app_procs.c
+++ b/app/app_procs.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/app/autosave.c b/app/autosave.c
index 308c9583..56afd504 100644
--- a/app/autosave.c
+++ b/app/autosave.c
@@ -26,9 +26,7 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include "autosave.h"
 #include "diagram.h"
diff --git a/app/color_area.c b/app/color_area.c
index 4d2471a3..c79c776c 100644
--- a/app/color_area.c
+++ b/app/color_area.c
@@ -16,9 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <stdio.h>
 
diff --git a/app/commands.c b/app/commands.c
index 36607524..73e20268 100644
--- a/app/commands.c
+++ b/app/commands.c
@@ -15,7 +15,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 
 #ifdef HAVE_UNISTD_H
 #  include <unistd.h>
diff --git a/app/confirm.c b/app/confirm.c
index 89b0803e..a2a9be82 100644
--- a/app/confirm.c
+++ b/app/confirm.c
@@ -20,7 +20,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include "confirm.h"
 #include "intl.h"
diff --git a/app/connectionpoint_ops.c b/app/connectionpoint_ops.c
index 26d078c3..95f83774 100644
--- a/app/connectionpoint_ops.c
+++ b/app/connectionpoint_ops.c
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-#include <config.h>
+#include "config.h"
 
 #include <assert.h>
 
diff --git a/app/create_object.c b/app/create_object.c
index 6804123b..b73a478b 100644
--- a/app/create_object.c
+++ b/app/create_object.c
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-#include <config.h>
+#include "config.h"
 
 #include "create_object.h"
 #include "connectionpoint_ops.h"
diff --git a/app/cursor.c b/app/cursor.c
index 4dd45ade..f8ad5696 100644
--- a/app/cursor.c
+++ b/app/cursor.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <gdk/gdk.h>
 
diff --git a/app/cut_n_paste.c b/app/cut_n_paste.c
index f2e634f8..c7c0ceb7 100644
--- a/app/cut_n_paste.c
+++ b/app/cut_n_paste.c
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 
diff --git a/app/defaults.c b/app/defaults.c
index 9800831e..527998bd 100644
--- a/app/defaults.c
+++ b/app/defaults.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <gtk/gtk.h>
 
diff --git a/app/dia-props.c b/app/dia-props.c
index 49aa6ff0..278fb85b 100644
--- a/app/dia-props.c
+++ b/app/dia-props.c
@@ -19,9 +19,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
+#include "config.h"
 
 #include "dia-props.h"
 
diff --git a/app/diagram.c b/app/diagram.c
index bd138761..bb79ad94 100644
--- a/app/diagram.c
+++ b/app/diagram.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <assert.h>
 #include <string.h>
diff --git a/app/diapagelayout.c b/app/diapagelayout.c
index a463dc81..480d2567 100644
--- a/app/diapagelayout.c
+++ b/app/diapagelayout.c
@@ -21,9 +21,7 @@
 
 /*#define PAGELAYOUT_TEST*/
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include "diapagelayout.h"
 #include "widgets.h"
diff --git a/app/disp_callbacks.c b/app/disp_callbacks.c
index 030dd2e6..304e2d54 100644
--- a/app/disp_callbacks.c
+++ b/app/disp_callbacks.c
@@ -16,9 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <stdio.h>
 #include <string.h>
diff --git a/app/display.c b/app/display.c
index a6210880..1265a04c 100644
--- a/app/display.c
+++ b/app/display.c
@@ -16,9 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <string.h>
 #include <stdio.h>
diff --git a/app/exit_dialog.c b/app/exit_dialog.c
index e4c5decc..cc2eace6 100644
--- a/app/exit_dialog.c
+++ b/app/exit_dialog.c
@@ -21,7 +21,7 @@
 
 /* TODO: Non-modal api */
 
-#include <config.h>
+#include "config.h"
 
 #include "exit_dialog.h"
 
diff --git a/app/filedlg.c b/app/filedlg.c
index f3faaac8..d33b65b7 100644
--- a/app/filedlg.c
+++ b/app/filedlg.c
@@ -19,7 +19,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/app/find-and-replace.c b/app/find-and-replace.c
index 3961ee5d..a6139e5f 100644
--- a/app/find-and-replace.c
+++ b/app/find-and-replace.c
@@ -21,7 +21,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <gtk/gtk.h>
 
diff --git a/app/grid.c b/app/grid.c
index 7ac60c0f..98ae70a0 100644
--- a/app/grid.c
+++ b/app/grid.c
@@ -16,9 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/app/handle_ops.c b/app/handle_ops.c
index 03fe31d9..608641f0 100644
--- a/app/handle_ops.c
+++ b/app/handle_ops.c
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-#include <config.h>
+#include "config.h"
 
 #include "handle_ops.h"
 #include "handle.h"
diff --git a/app/interface.c b/app/interface.c
index 4bf12676..79f95e91 100644
--- a/app/interface.c
+++ b/app/interface.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <gtk/gtk.h>
 
diff --git a/app/layer_dialog.c b/app/layer_dialog.c
index 70e1384a..c000c6f7 100644
--- a/app/layer_dialog.c
+++ b/app/layer_dialog.c
@@ -22,9 +22,7 @@
  * Copyright (C) 1995 Spencer Kimball and Peter Mattis
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <string.h>
diff --git a/app/linewidth_area.c b/app/linewidth_area.c
index 6baf0ea4..c4c9d992 100644
--- a/app/linewidth_area.c
+++ b/app/linewidth_area.c
@@ -16,9 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include "linewidth_area.h"
 #include "attributes.h"
diff --git a/app/load_save.c b/app/load_save.c
index e699ab7e..54f5358b 100644
--- a/app/load_save.c
+++ b/app/load_save.c
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-#include <config.h>
+#include "config.h"
 
 /* so we get fdopen declared even when compiling with -ansi */
 #define _POSIX_C_SOURCE 200809L
diff --git a/app/magnify.c b/app/magnify.c
index df4a84b7..972fd4c5 100644
--- a/app/magnify.c
+++ b/app/magnify.c
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-#include <config.h>
+#include "config.h"
 #include <stdlib.h>
 #include <math.h>
 
diff --git a/app/main.c b/app/main.c
index 967dd8d5..0c07483b 100644
--- a/app/main.c
+++ b/app/main.c
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-#include <config.h>
+#include "config.h"
 
 #include "app_procs.h"
 
diff --git a/app/menus.c b/app/menus.c
index 53f4fc33..75a06361 100644
--- a/app/menus.c
+++ b/app/menus.c
@@ -17,9 +17,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
diff --git a/app/modify_tool.c b/app/modify_tool.c
index a7f96784..14a69755 100644
--- a/app/modify_tool.c
+++ b/app/modify_tool.c
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <math.h>
diff --git a/app/object_ops.c b/app/object_ops.c
index 3d4f0497..1bd2338d 100644
--- a/app/object_ops.c
+++ b/app/object_ops.c
@@ -16,9 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <stdlib.h>
 
diff --git a/app/pagesetup.c b/app/pagesetup.c
index 0a6ed2ac..3e6fa5da 100644
--- a/app/pagesetup.c
+++ b/app/pagesetup.c
@@ -19,9 +19,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <gtk/gtk.h>
 
diff --git a/app/plugin-manager.c b/app/plugin-manager.c
index d9000f70..d833985f 100644
--- a/app/plugin-manager.c
+++ b/app/plugin-manager.c
@@ -21,9 +21,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
+#include "config.h"
 
 #include <string.h>
 
diff --git a/app/preferences.c b/app/preferences.c
index c45cd38d..9aa747a0 100644
--- a/app/preferences.c
+++ b/app/preferences.c
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-#include <config.h>
+#include "config.h"
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/app/properties-dialog.c b/app/properties-dialog.c
index 265a38ce..9fb366fd 100644
--- a/app/properties-dialog.c
+++ b/app/properties-dialog.c
@@ -16,9 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <string.h>
 
diff --git a/app/recent_files.c b/app/recent_files.c
index d8a5e0cd..bb8c628d 100644
--- a/app/recent_files.c
+++ b/app/recent_files.c
@@ -19,9 +19,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <gdk/gdkkeysyms.h>
 
diff --git a/app/render_gdk.c b/app/render_gdk.c
index 930e36bd..0a0a7edd 100644
--- a/app/render_gdk.c
+++ b/app/render_gdk.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <math.h>
 #include <stdlib.h>
diff --git a/app/ruler.c b/app/ruler.c
index c26b0551..9a81a789 100644
--- a/app/ruler.c
+++ b/app/ruler.c
@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 
 /* GtkRuler is deprecated by gtk-2-24, gone with gtk-3-0 because it is 
  * deemed to be too specialized for maintenance in Gtk. Maybe Dia is 
diff --git a/app/scroll_tool.c b/app/scroll_tool.c
index e9ce9ff6..2d498aa4 100644
--- a/app/scroll_tool.c
+++ b/app/scroll_tool.c
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-#include <config.h>
+#include "config.h"
 
 #include "scroll_tool.h"
 #include "handle_ops.h"
diff --git a/app/select.c b/app/select.c
index 738562ec..30dfa87b 100644
--- a/app/select.c
+++ b/app/select.c
@@ -17,7 +17,7 @@
  */
 
 /* select.c -- callbacks to implement the Select menu */
-#include <config.h>
+#include "config.h"
 
 #include <assert.h>
 
diff --git a/app/sheets_dialog.c b/app/sheets_dialog.c
index ce5358f5..d3f8cbf7 100644
--- a/app/sheets_dialog.c
+++ b/app/sheets_dialog.c
@@ -26,9 +26,7 @@
  *                         for accelerated buttons.
  */
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
+#include "config.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/app/sheets_dialog_callbacks.c b/app/sheets_dialog_callbacks.c
index 6a23e5af..343d7588 100644
--- a/app/sheets_dialog_callbacks.c
+++ b/app/sheets_dialog_callbacks.c
@@ -21,9 +21,7 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
+#include "config.h"
 
 #include <errno.h>
 #include <string.h>
diff --git a/app/splash.c b/app/splash.c
index fecf445f..b6c7cde5 100644
--- a/app/splash.c
+++ b/app/splash.c
@@ -1,4 +1,4 @@
-#include <config.h>
+#include "config.h"
 
 #include <gtk/gtk.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
diff --git a/app/textedit.c b/app/textedit.c
index 6bd282f5..be0b0734 100644
--- a/app/textedit.c
+++ b/app/textedit.c
@@ -32,7 +32,7 @@
  * particular text.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include "object.h"
 #include "focus.h"
diff --git a/app/textedit_tool.c b/app/textedit_tool.c
index 55ed0f27..172f46cf 100644
--- a/app/textedit_tool.c
+++ b/app/textedit_tool.c
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-#include <config.h>
+#include "config.h"
 
 #include "textedit_tool.h"
 
diff --git a/app/tool.c b/app/tool.c
index 492af30c..f4b023f6 100644
--- a/app/tool.c
+++ b/app/tool.c
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-#include <config.h>
+#include "config.h"
 
 #include "tool.h"
 #include "create_object.h"
diff --git a/app/toolbox.c b/app/toolbox.c
index 8fdb424e..941a50bf 100644
--- a/app/toolbox.c
+++ b/app/toolbox.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <gtk/gtk.h>
 #include "gtkwrapbox.h"
diff --git a/app/undo.c b/app/undo.c
index 55201f28..889e91ee 100644
--- a/app/undo.c
+++ b/app/undo.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include "undo.h"
 #include "object_ops.h"
diff --git a/app/winmain.c b/app/winmain.c
index b8a7b3bc..1091709f 100644
--- a/app/winmain.c
+++ b/app/winmain.c
@@ -1,4 +1,4 @@
-#include <config.h>
+#include "config.h"
 
 #include <stdlib.h>
 #include <glib.h>
diff --git a/lib/arrows.c b/lib/arrows.c
index 8df15805..c3d68bbf 100644
--- a/lib/arrows.c
+++ b/lib/arrows.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 
 #define _BSD_SOURCE 1 /* to get finite */
 #include <math.h>
diff --git a/lib/attributes.c b/lib/attributes.c
index 7a44ae32..8c5edc21 100644
--- a/lib/attributes.c
+++ b/lib/attributes.c
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-#include <config.h>
+#include "config.h"
 
 #include "attributes.h"
 #include "intl.h"
diff --git a/lib/bezier-common.c b/lib/bezier-common.c
index fef28adc..8d963297 100644
--- a/lib/bezier-common.c
+++ b/lib/bezier-common.c
@@ -22,7 +22,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "config.h" 
+#include "config.h"
 
 #include "bezier-common.h"
 #include "diarenderer.h"
diff --git a/lib/bezier_conn.c b/lib/bezier_conn.c
index 54b45087..a28db3dd 100644
--- a/lib/bezier_conn.c
+++ b/lib/bezier_conn.c
@@ -20,7 +20,7 @@
 
  /** \file bezier_conn.c Allows to construct object consisting of bezier lines */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/beziershape.c b/lib/beziershape.c
index 9f27f939..723d809a 100644
--- a/lib/beziershape.c
+++ b/lib/beziershape.c
@@ -19,7 +19,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/boundingbox.c b/lib/boundingbox.c
index 83c73501..32d92bd5 100644
--- a/lib/boundingbox.c
+++ b/lib/boundingbox.c
@@ -17,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 
 #define _BSD_SOURCE 1
 #include <math.h>
diff --git a/lib/color.c b/lib/color.c
index 72231d6b..4362eb54 100644
--- a/lib/color.c
+++ b/lib/color.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
  
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <gtk/gtk.h>
diff --git a/lib/connection.c b/lib/connection.c
index 6283c5fa..735a6970 100644
--- a/lib/connection.c
+++ b/lib/connection.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <string.h> /* memcpy() */
diff --git a/lib/connpoint_line.c b/lib/connpoint_line.c
index 1d98d5fe..d0862a57 100644
--- a/lib/connpoint_line.c
+++ b/lib/connpoint_line.c
@@ -17,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <string.h>
 #include "connpoint_line.h"
diff --git a/lib/create.c b/lib/create.c
index 66bcc079..13f9c24a 100644
--- a/lib/create.c
+++ b/lib/create.c
@@ -20,9 +20,7 @@
  * standard objects.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <string.h>
 #include <math.h>
diff --git a/lib/debug.c b/lib/debug.c
index 348069b3..4d686231 100644
--- a/lib/debug.c
+++ b/lib/debug.c
@@ -18,7 +18,7 @@
 
 /* This file contains various functions to aid in debugging in general. */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <glib/gprintf.h>
diff --git a/lib/debug.h b/lib/debug.h
index bacc9828..478dd4c2 100644
--- a/lib/debug.h
+++ b/lib/debug.h
@@ -21,7 +21,7 @@
 #ifndef DEBUG_H
 #define DEBUG_H
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <stdarg.h>
diff --git a/lib/dia_dirs.c b/lib/dia_dirs.c
index fdddc286..b813d63d 100644
--- a/lib/dia_dirs.c
+++ b/lib/dia_dirs.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <string.h> /* strlen() */
 
diff --git a/lib/dia_image.c b/lib/dia_image.c
index c733e697..a0d06955 100644
--- a/lib/dia_image.c
+++ b/lib/dia_image.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 #include <string.h> /* memmove */
 
 #include "intl.h"
diff --git a/lib/dia_xml.c b/lib/dia_xml.c
index 2425cb9c..c2a14104 100644
--- a/lib/dia_xml.c
+++ b/lib/dia_xml.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 /** \file dia_xml.c  Helper function to convert Dia's basic to and from XML */
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/diaarrowchooser.c b/lib/diaarrowchooser.c
index 5185a942..514268c2 100644
--- a/lib/diaarrowchooser.c
+++ b/lib/diaarrowchooser.c
@@ -22,7 +22,7 @@
 /** \file diaarrowchooser.c  A widget to choose arrowhead.  This only select arrowhead, not width  and 
height. 
  * \ingroup diawidgets
  */
-#include <config.h>
+#include "config.h"
 
 #include <gtk/gtk.h>
 #include "intl.h"
diff --git a/lib/diaarrowselector.c b/lib/diaarrowselector.c
index 9812f09f..a2320da0 100644
--- a/lib/diaarrowselector.c
+++ b/lib/diaarrowselector.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <gtk/gtk.h>
 
diff --git a/lib/diacellrendererenum.c b/lib/diacellrendererenum.c
index 7f2ae1ac..fdc99ae0 100644
--- a/lib/diacellrendererenum.c
+++ b/lib/diacellrendererenum.c
@@ -1,4 +1,4 @@
-#include <config.h>
+#include "config.h"
 
 #include "diacellrendererenum.h"
 #include "properties.h"
diff --git a/lib/diacellrendererproperty.c b/lib/diacellrendererproperty.c
index 512cb55d..47d8dd76 100644
--- a/lib/diacellrendererproperty.c
+++ b/lib/diacellrendererproperty.c
@@ -23,7 +23,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <gtk/gtk.h>
 
diff --git a/lib/diacolorselector.c b/lib/diacolorselector.c
index c1b859bb..5e2a28b5 100644
--- a/lib/diacolorselector.c
+++ b/lib/diacolorselector.c
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-#include <config.h>
+#include "config.h"
 
 #include <gtk/gtk.h>
 
diff --git a/lib/diadynamicmenu.c b/lib/diadynamicmenu.c
index 195a4a45..a26e8e9c 100644
--- a/lib/diadynamicmenu.c
+++ b/lib/diadynamicmenu.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 #include <string.h>
 #include "intl.h"
 #undef GTK_DISABLE_DEPRECATED /* GtkOptionMenu, ... */
diff --git a/lib/diafontselector.c b/lib/diafontselector.c
index d216c2f6..16ef2e93 100644
--- a/lib/diafontselector.c
+++ b/lib/diafontselector.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/lib/diagdkrenderer.c b/lib/diagdkrenderer.c
index 84886720..1ea59dbf 100644
--- a/lib/diagdkrenderer.c
+++ b/lib/diagdkrenderer.c
@@ -19,7 +19,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <math.h>
 #include <stdlib.h>
diff --git a/lib/diagramdata.c b/lib/diagramdata.c
index d031f5d2..b60d68bc 100644
--- a/lib/diagramdata.c
+++ b/lib/diagramdata.c
@@ -20,9 +20,7 @@
  * data global to a diagram.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include "intl.h"
 #include "diagramdata.h"
diff --git a/lib/diaimportrenderer.c b/lib/diaimportrenderer.c
index 95648cea..f36f33ac 100644
--- a/lib/diaimportrenderer.c
+++ b/lib/diaimportrenderer.c
@@ -19,7 +19,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-#include <config.h>
+#include "config.h"
 
 #include "diaimportrenderer.h"
 #include "object.h"
diff --git a/lib/dialib.c b/lib/dialib.c
index 2d99e66c..9247a347 100644
--- a/lib/dialib.c
+++ b/lib/dialib.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/dialinechooser.c b/lib/dialinechooser.c
index ff360db6..5d2f5a12 100644
--- a/lib/dialinechooser.c
+++ b/lib/dialinechooser.c
@@ -19,9 +19,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include "intl.h"
 #include "widgets.h"
diff --git a/lib/dialinestyleselector.c b/lib/dialinestyleselector.c
index 4c6c4794..f2eece02 100644
--- a/lib/dialinestyleselector.c
+++ b/lib/dialinestyleselector.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 
 #undef GTK_DISABLE_DEPRECATED /* GtkOptionMenu, ... */
 #include <gtk/gtk.h>
diff --git a/lib/dialogs.c b/lib/dialogs.c
index 1f2cc368..69ee48f9 100644
--- a/lib/dialogs.c
+++ b/lib/dialogs.c
@@ -19,9 +19,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include "intl.h"
 #include <gtk/gtk.h>
diff --git a/lib/diaoptionmenu.c b/lib/diaoptionmenu.c
index 1201e0c8..aca88eb6 100644
--- a/lib/diaoptionmenu.c
+++ b/lib/diaoptionmenu.c
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-#include <config.h>
+#include "config.h"
 
 #include "diaoptionmenu.h"
 
diff --git a/lib/diapatternselector.c b/lib/diapatternselector.c
index 7b92a66f..4bf7d54b 100644
--- a/lib/diapatternselector.c
+++ b/lib/diapatternselector.c
@@ -19,7 +19,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-#include <config.h> 
+#include "config.h"
 
 #include "diapatternselector.h"
 #include "intl.h"
diff --git a/lib/diarenderer.c b/lib/diarenderer.c
index 7ed882ab..0f188ed5 100644
--- a/lib/diarenderer.c
+++ b/lib/diarenderer.c
@@ -19,7 +19,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-#include <config.h>
+#include "config.h"
 
 #include "diarenderer.h"
 #include "object.h"
diff --git a/lib/diasvgrenderer.c b/lib/diasvgrenderer.c
index e5c6e076..3015fa45 100644
--- a/lib/diasvgrenderer.c
+++ b/lib/diasvgrenderer.c
@@ -24,7 +24,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/lib/element.c b/lib/element.c
index 8099e550..0c9d74a4 100644
--- a/lib/element.c
+++ b/lib/element.c
@@ -22,7 +22,7 @@
  *  handles as well as a mainpoint in the middle.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <assert.h>
diff --git a/lib/filter.c b/lib/filter.c
index fc6644e7..4ff0822c 100644
--- a/lib/filter.c
+++ b/lib/filter.c
@@ -19,9 +19,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include "filter.h"
 #include "intl.h"
diff --git a/lib/focus.c b/lib/focus.c
index 1a6bb15d..686f77be 100644
--- a/lib/focus.c
+++ b/lib/focus.c
@@ -24,7 +24,7 @@
  * in app/disp_callbacks.c
  */
 
-#include <config.h>
+#include "config.h"
 #include "text.h"
 #include "focus.h"
 #include "diagramdata.h"
diff --git a/lib/font-height.c b/lib/font-height.c
index d1593bf2..4215dfa7 100644
--- a/lib/font-height.c
+++ b/lib/font-height.c
@@ -18,9 +18,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <pango/pango.h>
 #ifdef HAVE_FREETYPE
diff --git a/lib/font.c b/lib/font.c
index fa3c75c6..be6a2ac8 100644
--- a/lib/font.c
+++ b/lib/font.c
@@ -18,9 +18,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/geometry.c b/lib/geometry.c
index 8f4810c8..e01f2d1b 100644
--- a/lib/geometry.c
+++ b/lib/geometry.c
@@ -20,7 +20,7 @@
  */
 
 /* include glib.h first, so we don't pick up its inline functions as well */
-#include <config.h>
+#include "config.h"
 
 #include <glib.h>
 /* include normal versions of the inlined functions here ... */
diff --git a/lib/geometry.h b/lib/geometry.h
index 699f22dc..889d6cbd 100644
--- a/lib/geometry.h
+++ b/lib/geometry.h
@@ -20,9 +20,7 @@
 #ifndef GEOMETRY_H
 #define GEOMETRY_H
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include "diatypes.h"
 
diff --git a/lib/group.c b/lib/group.c
index 879ce64a..51d23930 100644
--- a/lib/group.c
+++ b/lib/group.c
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-#include <config.h>
+#include "config.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/lib/intl.c b/lib/intl.c
index 14c8c550..34b678f8 100644
--- a/lib/intl.c
+++ b/lib/intl.c
@@ -1,4 +1,4 @@
-#include <config.h>
+#include "config.h"
 
 #include "intl.h"
 
diff --git a/lib/layer.c b/lib/layer.c
index e1a9636b..37857069 100644
--- a/lib/layer.c
+++ b/lib/layer.c
@@ -16,9 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include "intl.h"
 #include "diagramdata.h"
diff --git a/lib/message.c b/lib/message.c
index 5a7e8217..38fd8102 100644
--- a/lib/message.c
+++ b/lib/message.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <string.h>
diff --git a/lib/objchange.c b/lib/objchange.c
index 35306621..a57e7ce0 100644
--- a/lib/objchange.c
+++ b/lib/objchange.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include "object.h"
 
diff --git a/lib/object-alias.c b/lib/object-alias.c
index 3192cf8e..970392b0 100644
--- a/lib/object-alias.c
+++ b/lib/object-alias.c
@@ -19,7 +19,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-#include <config.h>
+#include "config.h"
 
 /* To map an old name to a new object type the alias indirection is used.
  * Starting with the old object from file the old name will persist. So there
diff --git a/lib/object.c b/lib/object.c
index fe93aea1..66999e19 100644
--- a/lib/object.c
+++ b/lib/object.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <string.h>
diff --git a/lib/object_defaults.c b/lib/object_defaults.c
index fd151a83..ca454061 100644
--- a/lib/object_defaults.c
+++ b/lib/object_defaults.c
@@ -21,7 +21,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-#include <config.h>
+#include "config.h"
 
 #include <stdlib.h> /* atoi() */
 #include <string.h>
diff --git a/lib/orth_conn.c b/lib/orth_conn.c
index e7d52476..e62689ed 100644
--- a/lib/orth_conn.c
+++ b/lib/orth_conn.c
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/paper.c b/lib/paper.c
index 15ca9574..5df9b11c 100644
--- a/lib/paper.c
+++ b/lib/paper.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <string.h>
diff --git a/lib/parent.c b/lib/parent.c
index d6802a26..daf93c2e 100644
--- a/lib/parent.c
+++ b/lib/parent.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include "geometry.h"
 #include "object.h"
diff --git a/lib/path-math.c b/lib/path-math.c
index bc1bf42e..8f6c2240 100644
--- a/lib/path-math.c
+++ b/lib/path-math.c
@@ -18,7 +18,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-#include <config.h>
+#include "config.h"
 
 #include "geometry.h"
 #include "boundingbox.h"
diff --git a/lib/pattern.c b/lib/pattern.c
index 06f1b298..2d1395a3 100644
--- a/lib/pattern.c
+++ b/lib/pattern.c
@@ -18,7 +18,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-#include <config.h> 
+#include "config.h"
 #include "diatypes.h"
 #include "pattern.h"
 #include "color.h"
diff --git a/lib/plug-ins.c b/lib/plug-ins.c
index 415e8f57..59feea73 100644
--- a/lib/plug-ins.c
+++ b/lib/plug-ins.c
@@ -19,7 +19,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/lib/poly_conn.c b/lib/poly_conn.c
index ea337c33..ba076106 100644
--- a/lib/poly_conn.c
+++ b/lib/poly_conn.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/polyshape.c b/lib/polyshape.c
index df0afb35..f5c7f8c4 100644
--- a/lib/polyshape.c
+++ b/lib/polyshape.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/prefs.c b/lib/prefs.c
index 2ee42c89..f17b4947 100644
--- a/lib/prefs.c
+++ b/lib/prefs.c
@@ -16,9 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 #include <string.h>
 
 #include "prefs.h"
diff --git a/lib/prefs.h b/lib/prefs.h
index 29d35dc8..26ffbcf2 100644
--- a/lib/prefs.h
+++ b/lib/prefs.h
@@ -21,9 +21,7 @@
 #ifndef PREFS_H
 #define PREFS_H
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include "diatypes.h"
 #include "widgets.h"
diff --git a/lib/prop_attr.c b/lib/prop_attr.c
index 3da4ec8e..a93fac6f 100644
--- a/lib/prop_attr.c
+++ b/lib/prop_attr.c
@@ -22,9 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <gtk/gtk.h>
 #include "dia_xml.h"
diff --git a/lib/prop_basic.c b/lib/prop_basic.c
index 495b6627..35ea3cbc 100644
--- a/lib/prop_basic.c
+++ b/lib/prop_basic.c
@@ -23,9 +23,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <string.h>
 
diff --git a/lib/prop_dict.c b/lib/prop_dict.c
index eada7d16..95f4607f 100644
--- a/lib/prop_dict.c
+++ b/lib/prop_dict.c
@@ -23,9 +23,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <gtk/gtk.h>
 #define WIDGET GtkWidget
diff --git a/lib/prop_geomtypes.c b/lib/prop_geomtypes.c
index 81c4fe00..58e777da 100644
--- a/lib/prop_geomtypes.c
+++ b/lib/prop_geomtypes.c
@@ -22,9 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <string.h>
 
diff --git a/lib/prop_inttypes.c b/lib/prop_inttypes.c
index 67f1ec75..ea5585c1 100644
--- a/lib/prop_inttypes.c
+++ b/lib/prop_inttypes.c
@@ -23,9 +23,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <stdlib.h> /* strtol */
 
diff --git a/lib/prop_matrix.c b/lib/prop_matrix.c
index 8c51ca01..ca64db48 100644
--- a/lib/prop_matrix.c
+++ b/lib/prop_matrix.c
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-#include <config.h>
+#include "config.h"
 
 #include <math.h>
 #include <gtk/gtk.h>
diff --git a/lib/prop_pattern.c b/lib/prop_pattern.c
index 93273f9e..d6bfbb92 100644
--- a/lib/prop_pattern.c
+++ b/lib/prop_pattern.c
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-#include <config.h>
+#include "config.h"
 
 #include <gtk/gtk.h>
 #define WIDGET GtkWidget
diff --git a/lib/prop_pixbuf.c b/lib/prop_pixbuf.c
index 47487e55..e2009290 100644
--- a/lib/prop_pixbuf.c
+++ b/lib/prop_pixbuf.c
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-#include <config.h>
+#include "config.h"
 
 #include <gtk/gtk.h>
 #define WIDGET GtkWidget
diff --git a/lib/prop_sdarray.c b/lib/prop_sdarray.c
index 5995820f..8fe7cc7c 100644
--- a/lib/prop_sdarray.c
+++ b/lib/prop_sdarray.c
@@ -24,9 +24,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <gtk/gtk.h>
 #define WIDGET GtkWidget
diff --git a/lib/prop_sdarray_widget.c b/lib/prop_sdarray_widget.c
index 683aab3c..b412f9ef 100644
--- a/lib/prop_sdarray_widget.c
+++ b/lib/prop_sdarray_widget.c
@@ -53,9 +53,7 @@
  what's been implemented below is something a lot simpler, just enough to
  support exisiting ArrayProp usage ;)
  */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include "properties.h"
 #include "propinternals.h"
diff --git a/lib/prop_text.c b/lib/prop_text.c
index 5a4ff904..14900551 100644
--- a/lib/prop_text.c
+++ b/lib/prop_text.c
@@ -23,9 +23,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
diff --git a/lib/prop_widgets.c b/lib/prop_widgets.c
index 4d2a12ff..44d51649 100644
--- a/lib/prop_widgets.c
+++ b/lib/prop_widgets.c
@@ -22,9 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <glib.h>
 #undef GTK_DISABLE_DEPRECATED /* GtkList */
diff --git a/lib/propdesc.c b/lib/propdesc.c
index b6f529b5..b2e2d6fb 100644
--- a/lib/propdesc.c
+++ b/lib/propdesc.c
@@ -24,9 +24,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <glib.h>
 
diff --git a/lib/propdialogs.c b/lib/propdialogs.c
index b6856750..2d0c1e8b 100644
--- a/lib/propdialogs.c
+++ b/lib/propdialogs.c
@@ -22,9 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <string.h>
 
diff --git a/lib/properties.c b/lib/properties.c
index 84eb788d..4900db10 100644
--- a/lib/properties.c
+++ b/lib/properties.c
@@ -24,9 +24,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include "geometry.h"
 #undef G_INLINE_FUNC
diff --git a/lib/proplist.c b/lib/proplist.c
index e47ba2f9..b3b070e6 100644
--- a/lib/proplist.c
+++ b/lib/proplist.c
@@ -23,9 +23,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include "properties.h"
 #include "propinternals.h"
diff --git a/lib/propobject.c b/lib/propobject.c
index 2e3f5f67..671402fb 100644
--- a/lib/propobject.c
+++ b/lib/propobject.c
@@ -27,9 +27,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <string.h>
 
diff --git a/lib/propregistry.c b/lib/propregistry.c
index 4bfe839e..daec0c30 100644
--- a/lib/propregistry.c
+++ b/lib/propregistry.c
@@ -22,9 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <gtk/gtk.h>
 #include "properties.h"
diff --git a/lib/render_pixmap.c b/lib/render_pixmap.c
index 6bf9bbf4..6fc59172 100644
--- a/lib/render_pixmap.c
+++ b/lib/render_pixmap.c
@@ -29,7 +29,7 @@
  * is the ported to GObject 'RendererGdk'. No more huge code duplication 
  * but only some renderer parametrization tweaking.                 --hb
  */
-#include <config.h>
+#include "config.h"
 
 #include <math.h>
 #include <stdlib.h>
diff --git a/lib/sheet.c b/lib/sheet.c
index e55cf944..85ddfbaf 100644
--- a/lib/sheet.c
+++ b/lib/sheet.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/lib/standard-path.c b/lib/standard-path.c
index f44a7528..9b53c38e 100644
--- a/lib/standard-path.c
+++ b/lib/standard-path.c
@@ -31,7 +31,7 @@
  * based object, which can render holes, even if the _DiaRenderer can not. It is 
  * using a newer file format representation through BezPointarrayProperty.
  */
-#include <config.h>
+#include "config.h"
 
 #include "object.h"
 #include "diarenderer.h"
diff --git a/lib/text.c b/lib/text.c
index 3d8684bf..40f5367f 100644
--- a/lib/text.c
+++ b/lib/text.c
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/textline.c b/lib/textline.c
index 65eb9a06..c51b87e3 100644
--- a/lib/textline.c
+++ b/lib/textline.c
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/units.h b/lib/units.h
index 49f1db6a..19b0f074 100644
--- a/lib/units.h
+++ b/lib/units.h
@@ -18,7 +18,7 @@
 #ifndef UNITS_H
 #define UNITS_H
 
-#include <config.h>
+#include "config.h"
 #include "diavar.h"
 
 typedef enum {
diff --git a/lib/utils.c b/lib/utils.c
index e358bf63..ed1d22ce 100644
--- a/lib/utils.c
+++ b/lib/utils.c
@@ -24,7 +24,7 @@
  */
 
 
-#include <config.h>
+#include "config.h"
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/lib/widgets.c b/lib/widgets.c
index d1467630..2d16003d 100644
--- a/lib/widgets.c
+++ b/lib/widgets.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 #include <string.h>
 #include "intl.h"
 #include "widgets.h"
diff --git a/meson.build b/meson.build
index 121b0f07..4390becd 100644
--- a/meson.build
+++ b/meson.build
@@ -76,10 +76,6 @@ configuration_inc = include_directories('.')
 config_h_in = configure_file(output: 'config.h.in', configuration: conf)
 config_h = vcs_tag(input: config_h_in, output: 'config.h')
 
-# TODO: Remove this once we remove autotools and
-# remove `#ifdef HAVE_CONFIG_H` checks from all source files.
-add_project_arguments('-DHAVE_CONFIG_H', language: 'c')
-
 subdir('po')
 subdir('lib')
 subdir('objects')
diff --git a/objects/AADL/aadl.c b/objects/AADL/aadl.c
index 40a5b1db..8467dc63 100644
--- a/objects/AADL/aadl.c
+++ b/objects/AADL/aadl.c
@@ -19,9 +19,7 @@
 */
 
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include "object.h"
 
diff --git a/objects/AADL/aadl.h b/objects/AADL/aadl.h
index 2247f3ef..609de9d6 100644
--- a/objects/AADL/aadl.h
+++ b/objects/AADL/aadl.h
@@ -19,9 +19,7 @@
 */
 
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/objects/AADL/edit_port_declaration.c b/objects/AADL/edit_port_declaration.c
index fcc9171e..7ea4f466 100644
--- a/objects/AADL/edit_port_declaration.c
+++ b/objects/AADL/edit_port_declaration.c
@@ -18,7 +18,7 @@
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <gtk/gtk.h>
 #include <string.h>
diff --git a/objects/Database/compound.c b/objects/Database/compound.c
index 524b1a06..59b14a35 100644
--- a/objects/Database/compound.c
+++ b/objects/Database/compound.c
@@ -22,9 +22,7 @@
  *          and many arms going from the connnection point.
  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include "config.h"
 
 #include <gtk/gtk.h> /* because of GtkWidgket */
 #include "pixmaps/compound.xpm"
diff --git a/objects/Database/database.c b/objects/Database/database.c
index 74106e3c..b792dd2c 100644
--- a/objects/Database/database.c
+++ b/objects/Database/database.c
@@ -16,9 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include "config.h"
 
 #include "intl.h"
 #include "object.h"
diff --git a/objects/Database/reference.c b/objects/Database/reference.c
index f85b6ef4..267261e3 100644
--- a/objects/Database/reference.c
+++ b/objects/Database/reference.c
@@ -21,9 +21,7 @@
  *          code.
  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include "config.h"
 
 #include "database.h"
 #include "arrows.h"
diff --git a/objects/Database/table.c b/objects/Database/table.c
index 67f85f26..2236b998 100644
--- a/objects/Database/table.c
+++ b/objects/Database/table.c
@@ -26,9 +26,7 @@
  * template. -- pn
  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <string.h>
diff --git a/objects/ER/attribute.c b/objects/ER/attribute.c
index 61651c3a..32178493 100644
--- a/objects/ER/attribute.c
+++ b/objects/ER/attribute.c
@@ -18,9 +18,7 @@
 
 /* DO NOT USE THIS OBJECT AS A BASIS FOR A NEW OBJECT. */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/objects/ER/entity.c b/objects/ER/entity.c
index 999d9d5e..42586ce3 100644
--- a/objects/ER/entity.c
+++ b/objects/ER/entity.c
@@ -18,9 +18,7 @@
 
 /* DO NOT USE THIS OBJECT AS A BASIS FOR A NEW OBJECT. */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/objects/ER/er.c b/objects/ER/er.c
index 31e56c35..875216d6 100644
--- a/objects/ER/er.c
+++ b/objects/ER/er.c
@@ -16,9 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <string.h>
 #include <stdio.h>
diff --git a/objects/ER/participation.c b/objects/ER/participation.c
index 71ccf3b3..6b0e004b 100644
--- a/objects/ER/participation.c
+++ b/objects/ER/participation.c
@@ -18,9 +18,7 @@
 
 /* DO NOT USE THIS OBJECT AS A BASIS FOR A NEW OBJECT. */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/objects/ER/relationship.c b/objects/ER/relationship.c
index 1f89c566..7effece6 100644
--- a/objects/ER/relationship.c
+++ b/objects/ER/relationship.c
@@ -18,9 +18,7 @@
 
 /* DO NOT USE THIS OBJECT AS A BASIS FOR A NEW OBJECT. */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/objects/FS/flow-ortho.c b/objects/FS/flow-ortho.c
index 06bd337c..6f641bc6 100644
--- a/objects/FS/flow-ortho.c
+++ b/objects/FS/flow-ortho.c
@@ -20,9 +20,7 @@
  * please send e-mail to David Thompson <dcthomp mail utexas edu>
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/objects/FS/flow.c b/objects/FS/flow.c
index 07086e85..0cfbd70c 100644
--- a/objects/FS/flow.c
+++ b/objects/FS/flow.c
@@ -18,9 +18,7 @@
 
 /* DO NOT USE THIS OBJECT AS A BASIS FOR A NEW OBJECT. */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/objects/FS/fs.c b/objects/FS/fs.c
index 2030fca3..e6bf6a75 100644
--- a/objects/FS/fs.c
+++ b/objects/FS/fs.c
@@ -16,9 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <string.h>
 #include <stdio.h>
diff --git a/objects/FS/function.c b/objects/FS/function.c
index 3376455c..91eccbb0 100644
--- a/objects/FS/function.c
+++ b/objects/FS/function.c
@@ -18,9 +18,7 @@
 
 /* DO NOT USE THIS OBJECT AS A BASIS FOR A NEW OBJECT. */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/objects/GRAFCET/action.c b/objects/GRAFCET/action.c
index 54d7068a..9ed88c19 100644
--- a/objects/GRAFCET/action.c
+++ b/objects/GRAFCET/action.c
@@ -19,9 +19,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/objects/GRAFCET/action_text_draw.c b/objects/GRAFCET/action_text_draw.c
index d5565c6c..24d922a9 100644
--- a/objects/GRAFCET/action_text_draw.c
+++ b/objects/GRAFCET/action_text_draw.c
@@ -19,7 +19,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/objects/GRAFCET/boolequation.c b/objects/GRAFCET/boolequation.c
index 58b9c5a7..640c455f 100644
--- a/objects/GRAFCET/boolequation.c
+++ b/objects/GRAFCET/boolequation.c
@@ -21,7 +21,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 #include "boolequation.h"
 
 #define OVERLINE_RATIO .1
diff --git a/objects/GRAFCET/condition.c b/objects/GRAFCET/condition.c
index 49876c5b..140f6abc 100644
--- a/objects/GRAFCET/condition.c
+++ b/objects/GRAFCET/condition.c
@@ -19,9 +19,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/objects/GRAFCET/grafcet.c b/objects/GRAFCET/grafcet.c
index 4add6d4e..c9cf0999 100644
--- a/objects/GRAFCET/grafcet.c
+++ b/objects/GRAFCET/grafcet.c
@@ -19,9 +19,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include "object.h"
 
diff --git a/objects/GRAFCET/step.c b/objects/GRAFCET/step.c
index 5de8f85c..faa81c4e 100644
--- a/objects/GRAFCET/step.c
+++ b/objects/GRAFCET/step.c
@@ -19,9 +19,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/objects/GRAFCET/transition.c b/objects/GRAFCET/transition.c
index 152f7c9c..35279c63 100644
--- a/objects/GRAFCET/transition.c
+++ b/objects/GRAFCET/transition.c
@@ -19,9 +19,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/objects/GRAFCET/vector.c b/objects/GRAFCET/vector.c
index a23bb782..5cdbb0a1 100644
--- a/objects/GRAFCET/vector.c
+++ b/objects/GRAFCET/vector.c
@@ -21,9 +21,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/objects/GRAFCET/vergent.c b/objects/GRAFCET/vergent.c
index 4bd2771c..1d42c0d4 100644
--- a/objects/GRAFCET/vergent.c
+++ b/objects/GRAFCET/vergent.c
@@ -19,9 +19,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/objects/Istar/actor.c b/objects/Istar/actor.c
index 75f26093..f8cf587e 100644
--- a/objects/Istar/actor.c
+++ b/objects/Istar/actor.c
@@ -22,9 +22,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/objects/Istar/goal.c b/objects/Istar/goal.c
index 04338535..9d6ea6e2 100644
--- a/objects/Istar/goal.c
+++ b/objects/Istar/goal.c
@@ -26,9 +26,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/objects/Istar/istar.c b/objects/Istar/istar.c
index 7d2f9c5f..850d5930 100644
--- a/objects/Istar/istar.c
+++ b/objects/Istar/istar.c
@@ -22,9 +22,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
                 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include "object.h"
 
diff --git a/objects/Istar/link.c b/objects/Istar/link.c
index 340f90f1..85818f0c 100644
--- a/objects/Istar/link.c
+++ b/objects/Istar/link.c
@@ -20,9 +20,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/objects/Istar/other.c b/objects/Istar/other.c
index df32736a..cee4b910 100644
--- a/objects/Istar/other.c
+++ b/objects/Istar/other.c
@@ -25,9 +25,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/objects/Jackson/domain.c b/objects/Jackson/domain.c
index b961c375..cbfd3912 100644
--- a/objects/Jackson/domain.c
+++ b/objects/Jackson/domain.c
@@ -25,9 +25,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <stdio.h>
 #include <assert.h>
diff --git a/objects/Jackson/jackson.c b/objects/Jackson/jackson.c
index 33614c2f..b2a7a928 100644
--- a/objects/Jackson/jackson.c
+++ b/objects/Jackson/jackson.c
@@ -25,9 +25,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
                 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include "object.h"
 
diff --git a/objects/Jackson/phenomenon.c b/objects/Jackson/phenomenon.c
index 9f7075c9..ee714195 100644
--- a/objects/Jackson/phenomenon.c
+++ b/objects/Jackson/phenomenon.c
@@ -25,9 +25,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/objects/Jackson/requirement.c b/objects/Jackson/requirement.c
index 9498f86c..96b0d89f 100644
--- a/objects/Jackson/requirement.c
+++ b/objects/Jackson/requirement.c
@@ -25,9 +25,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/objects/KAOS/goal.c b/objects/KAOS/goal.c
index 403b4402..9892ab77 100644
--- a/objects/KAOS/goal.c
+++ b/objects/KAOS/goal.c
@@ -26,9 +26,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/objects/KAOS/kaos.c b/objects/KAOS/kaos.c
index fc23a07a..8de9ad5e 100644
--- a/objects/KAOS/kaos.c
+++ b/objects/KAOS/kaos.c
@@ -26,9 +26,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
                 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include "object.h"
 
diff --git a/objects/KAOS/metaandorrel.c b/objects/KAOS/metaandorrel.c
index 510f53da..86a74ac7 100644
--- a/objects/KAOS/metaandorrel.c
+++ b/objects/KAOS/metaandorrel.c
@@ -26,9 +26,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/objects/KAOS/metabinrel.c b/objects/KAOS/metabinrel.c
index b8c96a18..59020877 100644
--- a/objects/KAOS/metabinrel.c
+++ b/objects/KAOS/metabinrel.c
@@ -26,9 +26,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/objects/KAOS/other.c b/objects/KAOS/other.c
index 8d4fac27..173eb5ab 100644
--- a/objects/KAOS/other.c
+++ b/objects/KAOS/other.c
@@ -26,9 +26,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/objects/Misc/analog_clock.c b/objects/Misc/analog_clock.c
index 51cd651a..62845b47 100644
--- a/objects/Misc/analog_clock.c
+++ b/objects/Misc/analog_clock.c
@@ -19,9 +19,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/objects/Misc/diagram_as_object.c b/objects/Misc/diagram_as_object.c
index 307dda67..33c13866 100644
--- a/objects/Misc/diagram_as_object.c
+++ b/objects/Misc/diagram_as_object.c
@@ -18,7 +18,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-#include <config.h>
+#include "config.h"
 
 #include <time.h>
 #include <glib.h>
diff --git a/objects/Misc/grid_object.c b/objects/Misc/grid_object.c
index c572d970..0f0ab544 100644
--- a/objects/Misc/grid_object.c
+++ b/objects/Misc/grid_object.c
@@ -19,9 +19,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/objects/Misc/libmisc.c b/objects/Misc/libmisc.c
index 09049f07..2f11e8fb 100644
--- a/objects/Misc/libmisc.c
+++ b/objects/Misc/libmisc.c
@@ -19,9 +19,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include "object.h"
 
diff --git a/objects/Misc/measure.c b/objects/Misc/measure.c
index 7b962688..e5e91bae 100644
--- a/objects/Misc/measure.c
+++ b/objects/Misc/measure.c
@@ -18,7 +18,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-#include <config.h>
+#include "config.h"
 
 #include "object.h"
 #include "diarenderer.h"
diff --git a/objects/Misc/n_gon.c b/objects/Misc/n_gon.c
index fe7b4b1a..687edd1c 100644
--- a/objects/Misc/n_gon.c
+++ b/objects/Misc/n_gon.c
@@ -18,7 +18,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-#include <config.h>
+#include "config.h"
 
 #include "object.h"
 #include "diarenderer.h"
diff --git a/objects/Misc/tree.c b/objects/Misc/tree.c
index 3fcd258e..6636e3e4 100644
--- a/objects/Misc/tree.c
+++ b/objects/Misc/tree.c
@@ -16,9 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/objects/SADT/annotation.c b/objects/SADT/annotation.c
index 1464b08a..2e350fb5 100644
--- a/objects/SADT/annotation.c
+++ b/objects/SADT/annotation.c
@@ -21,9 +21,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/objects/SADT/arrow.c b/objects/SADT/arrow.c
index f59d3de0..2fee4fe2 100644
--- a/objects/SADT/arrow.c
+++ b/objects/SADT/arrow.c
@@ -19,9 +19,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/objects/SADT/box.c b/objects/SADT/box.c
index 1981db41..8cb7f5cd 100644
--- a/objects/SADT/box.c
+++ b/objects/SADT/box.c
@@ -22,9 +22,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/objects/SADT/sadt.c b/objects/SADT/sadt.c
index b87e9113..c9ff450a 100644
--- a/objects/SADT/sadt.c
+++ b/objects/SADT/sadt.c
@@ -19,9 +19,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include "object.h"
 
diff --git a/objects/Sozi/sozi-object.h b/objects/Sozi/sozi-object.h
index 40ed1091..44ee6db2 100644
--- a/objects/Sozi/sozi-object.h
+++ b/objects/Sozi/sozi-object.h
@@ -22,9 +22,7 @@
 #ifndef SOZI_OBJECT_H
 #define SOZI_OBJECT_H
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 /* dia stuff */
 #include "object.h"
diff --git a/objects/Sozi/sozi.c b/objects/Sozi/sozi.c
index 5ec4dce0..5c94841b 100644
--- a/objects/Sozi/sozi.c
+++ b/objects/Sozi/sozi.c
@@ -19,9 +19,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include "object.h"
 
diff --git a/objects/UML/activity.c b/objects/UML/activity.c
index 79301873..b0ae7ba1 100644
--- a/objects/UML/activity.c
+++ b/objects/UML/activity.c
@@ -19,9 +19,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/objects/UML/actor.c b/objects/UML/actor.c
index a65d7c15..3a53de4c 100644
--- a/objects/UML/actor.c
+++ b/objects/UML/actor.c
@@ -15,9 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/objects/UML/association.c b/objects/UML/association.c
index 95356990..ebadd1a5 100644
--- a/objects/UML/association.c
+++ b/objects/UML/association.c
@@ -48,9 +48,7 @@
 
 /* DO NOT USE THIS OBJECT AS A BASIS FOR A NEW OBJECT. */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/objects/UML/branch.c b/objects/UML/branch.c
index cd56026d..9eb833c9 100644
--- a/objects/UML/branch.c
+++ b/objects/UML/branch.c
@@ -19,9 +19,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/objects/UML/class.c b/objects/UML/class.c
index 5cd7cdb2..b7ceaab4 100644
--- a/objects/UML/class.c
+++ b/objects/UML/class.c
@@ -22,9 +22,7 @@
 
 /** \file objects/UML/class.c  Implementation of the 'UML - Class' type */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <gtk/gtk.h>
diff --git a/objects/UML/class_attributes_dialog.c b/objects/UML/class_attributes_dialog.c
index ce05bff5..f3981bdd 100644
--- a/objects/UML/class_attributes_dialog.c
+++ b/objects/UML/class_attributes_dialog.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
  */
-#include <config.h>
+#include "config.h"
 
 #include <assert.h>
 #undef GTK_DISABLE_DEPRECATED /* GtkList, ... */
diff --git a/objects/UML/class_dialog.c b/objects/UML/class_dialog.c
index 2910924c..a1a8a119 100644
--- a/objects/UML/class_dialog.c
+++ b/objects/UML/class_dialog.c
@@ -29,7 +29,7 @@
 **                                                                          **
 **--------------------------------------------------------------------------*/
 
-#include <config.h>
+#include "config.h"
 
 #include <assert.h>
 #undef GTK_DISABLE_DEPRECATED /* GtkList, ... */
diff --git a/objects/UML/class_operations_dialog.c b/objects/UML/class_operations_dialog.c
index 607ba22f..12afab29 100644
--- a/objects/UML/class_operations_dialog.c
+++ b/objects/UML/class_operations_dialog.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
  */
-#include <config.h>
+#include "config.h"
 
 #include <assert.h>
 #undef GTK_DISABLE_DEPRECATED /* GtkList, ... */
diff --git a/objects/UML/class_templates_dialog.c b/objects/UML/class_templates_dialog.c
index 9f9fadb9..8f5c846e 100644
--- a/objects/UML/class_templates_dialog.c
+++ b/objects/UML/class_templates_dialog.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
  */
-#include <config.h>
+#include "config.h"
 
 #include <assert.h>
 #undef GTK_DISABLE_DEPRECATED /* GtkList, ... */
diff --git a/objects/UML/classicon.c b/objects/UML/classicon.c
index f6dd9b92..d7bde83e 100644
--- a/objects/UML/classicon.c
+++ b/objects/UML/classicon.c
@@ -16,9 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/objects/UML/component.c b/objects/UML/component.c
index fe5b9437..5538193f 100644
--- a/objects/UML/component.c
+++ b/objects/UML/component.c
@@ -16,9 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/objects/UML/component_feature.c b/objects/UML/component_feature.c
index 49a75ec7..59fdf740 100644
--- a/objects/UML/component_feature.c
+++ b/objects/UML/component_feature.c
@@ -22,9 +22,7 @@
  * 2003-08-13, 2003-08-15: W. Borgert <debacle debian org>
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/objects/UML/constraint.c b/objects/UML/constraint.c
index 9f853394..a71deb11 100644
--- a/objects/UML/constraint.c
+++ b/objects/UML/constraint.c
@@ -16,9 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/objects/UML/dependency.c b/objects/UML/dependency.c
index f5cdd892..d827d948 100644
--- a/objects/UML/dependency.c
+++ b/objects/UML/dependency.c
@@ -16,9 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/objects/UML/fork.c b/objects/UML/fork.c
index 8669b339..fe16b96d 100644
--- a/objects/UML/fork.c
+++ b/objects/UML/fork.c
@@ -19,9 +19,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/objects/UML/generalization.c b/objects/UML/generalization.c
index 21c762c6..d48ac8f0 100644
--- a/objects/UML/generalization.c
+++ b/objects/UML/generalization.c
@@ -16,9 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/objects/UML/implements.c b/objects/UML/implements.c
index 4475f0e1..c891b4e2 100644
--- a/objects/UML/implements.c
+++ b/objects/UML/implements.c
@@ -16,9 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/objects/UML/large_package.c b/objects/UML/large_package.c
index c7206b0d..a894b5a7 100644
--- a/objects/UML/large_package.c
+++ b/objects/UML/large_package.c
@@ -16,9 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/objects/UML/lifeline.c b/objects/UML/lifeline.c
index c110a2bb..6c6a2bd1 100644
--- a/objects/UML/lifeline.c
+++ b/objects/UML/lifeline.c
@@ -16,9 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/objects/UML/message.c b/objects/UML/message.c
index 1e2f9a75..bb88ff7d 100644
--- a/objects/UML/message.c
+++ b/objects/UML/message.c
@@ -16,9 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/objects/UML/node.c b/objects/UML/node.c
index 10a0c11a..8181d7be 100644
--- a/objects/UML/node.c
+++ b/objects/UML/node.c
@@ -19,9 +19,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/objects/UML/note.c b/objects/UML/note.c
index fa39f2c9..a8171f73 100644
--- a/objects/UML/note.c
+++ b/objects/UML/note.c
@@ -16,9 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/objects/UML/object.c b/objects/UML/object.c
index 2ea38305..c5e5e742 100644
--- a/objects/UML/object.c
+++ b/objects/UML/object.c
@@ -16,9 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/objects/UML/realizes.c b/objects/UML/realizes.c
index fcb2ede1..56aa62e3 100644
--- a/objects/UML/realizes.c
+++ b/objects/UML/realizes.c
@@ -16,9 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/objects/UML/small_package.c b/objects/UML/small_package.c
index 16d36294..bd057495 100644
--- a/objects/UML/small_package.c
+++ b/objects/UML/small_package.c
@@ -16,9 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/objects/UML/state.c b/objects/UML/state.c
index e1de050a..b382cba9 100644
--- a/objects/UML/state.c
+++ b/objects/UML/state.c
@@ -16,9 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/objects/UML/state_term.c b/objects/UML/state_term.c
index fb851d38..d1863055 100644
--- a/objects/UML/state_term.c
+++ b/objects/UML/state_term.c
@@ -19,9 +19,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/objects/UML/stereotype.c b/objects/UML/stereotype.c
index c15f1ec5..33b36c81 100644
--- a/objects/UML/stereotype.c
+++ b/objects/UML/stereotype.c
@@ -18,7 +18,7 @@
 
 /* Separate functions to handle stereotypes in guillemots. */
 
-#include <config.h>
+#include "config.h"
 
 #include <string.h>
 #include "stereotype.h"
diff --git a/objects/UML/transition.c b/objects/UML/transition.c
index 9ca169c6..a991ab4a 100644
--- a/objects/UML/transition.c
+++ b/objects/UML/transition.c
@@ -16,9 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <string.h>
diff --git a/objects/UML/uml.c b/objects/UML/uml.c
index ccf98ac8..f6872452 100644
--- a/objects/UML/uml.c
+++ b/objects/UML/uml.c
@@ -16,9 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <string.h>
 #include <stdio.h>
diff --git a/objects/UML/umlattribute.c b/objects/UML/umlattribute.c
index 67c61d96..9feffe17 100644
--- a/objects/UML/umlattribute.c
+++ b/objects/UML/umlattribute.c
@@ -21,9 +21,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <string.h>
 
diff --git a/objects/UML/umlformalparameter.c b/objects/UML/umlformalparameter.c
index 10224f96..bb53a225 100644
--- a/objects/UML/umlformalparameter.c
+++ b/objects/UML/umlformalparameter.c
@@ -21,9 +21,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <string.h>
 
diff --git a/objects/UML/umloperation.c b/objects/UML/umloperation.c
index bf7924cc..7632619c 100644
--- a/objects/UML/umloperation.c
+++ b/objects/UML/umloperation.c
@@ -44,9 +44,7 @@ for c in theClasses :
 
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <math.h>
 #include <string.h>
diff --git a/objects/UML/umlparameter.c b/objects/UML/umlparameter.c
index 0fb35221..f2e6b2e0 100644
--- a/objects/UML/umlparameter.c
+++ b/objects/UML/umlparameter.c
@@ -21,9 +21,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <string.h>
 
diff --git a/objects/UML/usecase.c b/objects/UML/usecase.c
index c52e8efd..a8d3523b 100644
--- a/objects/UML/usecase.c
+++ b/objects/UML/usecase.c
@@ -16,9 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/objects/chronogram/chronogram.c b/objects/chronogram/chronogram.c
index 994048d5..cd287b04 100644
--- a/objects/chronogram/chronogram.c
+++ b/objects/chronogram/chronogram.c
@@ -19,9 +19,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include "object.h"
 
diff --git a/objects/chronogram/chronoline.c b/objects/chronogram/chronoline.c
index b160bcc0..ea3af5e3 100644
--- a/objects/chronogram/chronoline.c
+++ b/objects/chronogram/chronoline.c
@@ -22,9 +22,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/objects/chronogram/chronoline_event.c b/objects/chronogram/chronoline_event.c
index 01afefce..f9c6ecdf 100644
--- a/objects/chronogram/chronoline_event.c
+++ b/objects/chronogram/chronoline_event.c
@@ -19,7 +19,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdlib.h>
 #include <math.h>
diff --git a/objects/chronogram/chronoref.c b/objects/chronogram/chronoref.c
index a82e532d..44d2c02c 100644
--- a/objects/chronogram/chronoref.c
+++ b/objects/chronogram/chronoref.c
@@ -22,9 +22,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/objects/custom/custom.c b/objects/custom/custom.c
index c21310a2..be782e15 100644
--- a/objects/custom/custom.c
+++ b/objects/custom/custom.c
@@ -19,7 +19,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/objects/custom/custom_object.c b/objects/custom/custom_object.c
index 2f547000..a9e67369 100644
--- a/objects/custom/custom_object.c
+++ b/objects/custom/custom_object.c
@@ -22,9 +22,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <gmodule.h>
diff --git a/objects/custom/custom_util.c b/objects/custom/custom_util.c
index e276affc..e1e6cf75 100644
--- a/objects/custom/custom_util.c
+++ b/objects/custom/custom_util.c
@@ -19,7 +19,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include "custom_util.h"
 
diff --git a/objects/custom/shape_info.c b/objects/custom/shape_info.c
index c73c6ada..86ef0c67 100644
--- a/objects/custom/shape_info.c
+++ b/objects/custom/shape_info.c
@@ -21,7 +21,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-#include <config.h>
+#include "config.h"
 
 #include <stdlib.h>
 #include <libxml/tree.h>
diff --git a/objects/custom/shape_typeinfo.c b/objects/custom/shape_typeinfo.c
index bbcd6974..f8ad7e83 100644
--- a/objects/custom/shape_typeinfo.c
+++ b/objects/custom/shape_typeinfo.c
@@ -21,7 +21,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-#include <config.h>
+#include "config.h"
 
 #include "shape_info.h"
 #include "custom_util.h"
diff --git a/objects/custom_lines/custom_lines.c b/objects/custom_lines/custom_lines.c
index 05916300..8efdce63 100644
--- a/objects/custom_lines/custom_lines.c
+++ b/objects/custom_lines/custom_lines.c
@@ -22,7 +22,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/objects/flowchart/box.c b/objects/flowchart/box.c
index f9948f1e..02692996 100644
--- a/objects/flowchart/box.c
+++ b/objects/flowchart/box.c
@@ -21,9 +21,7 @@
 
 /* DO NOT USE THIS OBJECT AS A BASIS FOR A NEW OBJECT. */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/objects/flowchart/diamond.c b/objects/flowchart/diamond.c
index 9018150d..51e9d787 100644
--- a/objects/flowchart/diamond.c
+++ b/objects/flowchart/diamond.c
@@ -21,9 +21,7 @@
 
 /* DO NOT USE THIS OBJECT AS A BASIS FOR A NEW OBJECT. */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/objects/flowchart/ellipse.c b/objects/flowchart/ellipse.c
index e3451593..be56d139 100644
--- a/objects/flowchart/ellipse.c
+++ b/objects/flowchart/ellipse.c
@@ -21,9 +21,7 @@
 
 /* DO NOT USE THIS OBJECT AS A BASIS FOR A NEW OBJECT. */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/objects/flowchart/flowchart.c b/objects/flowchart/flowchart.c
index d1c05c49..92793cfd 100644
--- a/objects/flowchart/flowchart.c
+++ b/objects/flowchart/flowchart.c
@@ -16,9 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include "intl.h"
 #include "object.h"
diff --git a/objects/flowchart/parallelogram.c b/objects/flowchart/parallelogram.c
index 1da7356c..fccf93f8 100644
--- a/objects/flowchart/parallelogram.c
+++ b/objects/flowchart/parallelogram.c
@@ -21,9 +21,7 @@
 
 /* DO NOT USE THIS OBJECT AS A BASIS FOR A NEW OBJECT. */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/objects/network/basestation.c b/objects/network/basestation.c
index 91d662c7..1e972588 100644
--- a/objects/network/basestation.c
+++ b/objects/network/basestation.c
@@ -19,9 +19,7 @@
 /* Copyright 2003, W. Borgert <debacle debian org>
    copied a lot from UML/actor.c */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/objects/network/bus.c b/objects/network/bus.c
index 1734a31a..23eb5b92 100644
--- a/objects/network/bus.c
+++ b/objects/network/bus.c
@@ -16,9 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/objects/network/network.c b/objects/network/network.c
index 2829ada3..7f4457be 100644
--- a/objects/network/network.c
+++ b/objects/network/network.c
@@ -16,9 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include "object.h"
 #include "sheet.h"
diff --git a/objects/network/radiocell.c b/objects/network/radiocell.c
index 39335038..e39d09a2 100644
--- a/objects/network/radiocell.c
+++ b/objects/network/radiocell.c
@@ -19,9 +19,7 @@
 /* Copyright 2003, W. Borgert <debacle debian org>
    copied a lot from UML/large_package.c and standard/polygon.c */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/objects/standard/arc.c b/objects/standard/arc.c
index 425a1d6e..e0c8cbb6 100644
--- a/objects/standard/arc.c
+++ b/objects/standard/arc.c
@@ -18,7 +18,7 @@
 
  /*! \file arc.c -- Implementation of "Standard - Arc" */
 
-#include <config.h>
+#include "config.h"
 
 #define _BSD_SOURCE 1 /* to get finite */
 #include <math.h>
diff --git a/objects/standard/bezier.c b/objects/standard/bezier.c
index 005d5031..ead2d12c 100644
--- a/objects/standard/bezier.c
+++ b/objects/standard/bezier.c
@@ -19,9 +19,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/objects/standard/beziergon.c b/objects/standard/beziergon.c
index 52d1b1ac..e50d34a9 100644
--- a/objects/standard/beziergon.c
+++ b/objects/standard/beziergon.c
@@ -19,9 +19,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/objects/standard/box.c b/objects/standard/box.c
index 2992b6a9..fbd99d92 100644
--- a/objects/standard/box.c
+++ b/objects/standard/box.c
@@ -16,9 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/objects/standard/ellipse.c b/objects/standard/ellipse.c
index 74964633..fc10929b 100644
--- a/objects/standard/ellipse.c
+++ b/objects/standard/ellipse.c
@@ -16,9 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/objects/standard/image.c b/objects/standard/image.c
index 111c5855..2ee756a0 100644
--- a/objects/standard/image.c
+++ b/objects/standard/image.c
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-#include <config.h>
+#include "config.h"
 
 #include <assert.h>
 #include <string.h>
diff --git a/objects/standard/line.c b/objects/standard/line.c
index 53c57624..470b7d17 100644
--- a/objects/standard/line.c
+++ b/objects/standard/line.c
@@ -18,9 +18,7 @@
  */
 
 /*! \file line.c -- Implements the "Standard - Line" object */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/objects/standard/outline.c b/objects/standard/outline.c
index 1cb5541a..615c555b 100644
--- a/objects/standard/outline.c
+++ b/objects/standard/outline.c
@@ -26,7 +26,7 @@
  * It should be possible to do all those fancy text effects like outline, rotate, ...
  * by converting text to pathes before rendering.
  */
-#include <config.h>
+#include "config.h"
 
 #include "object.h"
 #include "diarenderer.h"
diff --git a/objects/standard/polygon.c b/objects/standard/polygon.c
index 103ce79b..f8850f33 100644
--- a/objects/standard/polygon.c
+++ b/objects/standard/polygon.c
@@ -16,9 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/objects/standard/polyline.c b/objects/standard/polyline.c
index 80468ca7..3ba03ff2 100644
--- a/objects/standard/polyline.c
+++ b/objects/standard/polyline.c
@@ -16,9 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/objects/standard/standard.c b/objects/standard/standard.c
index 837cd9e7..ae203703 100644
--- a/objects/standard/standard.c
+++ b/objects/standard/standard.c
@@ -16,9 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include "object.h"
 #include "sheet.h"
diff --git a/objects/standard/textobj.c b/objects/standard/textobj.c
index 37eb0f20..1ceb2664 100644
--- a/objects/standard/textobj.c
+++ b/objects/standard/textobj.c
@@ -16,9 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/objects/standard/zigzagline.c b/objects/standard/zigzagline.c
index ccfffd76..cf457c0e 100644
--- a/objects/standard/zigzagline.c
+++ b/objects/standard/zigzagline.c
@@ -16,9 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/plug-ins/cairo/diacairo-renderer.c b/plug-ins/cairo/diacairo-renderer.c
index ea22235e..e2d3185c 100644
--- a/plug-ins/cairo/diacairo-renderer.c
+++ b/plug-ins/cairo/diacairo-renderer.c
@@ -20,7 +20,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
 #include <math.h>
diff --git a/plug-ins/cairo/diacairo.c b/plug-ins/cairo/diacairo.c
index 6e9aa442..779b7640 100644
--- a/plug-ins/cairo/diacairo.c
+++ b/plug-ins/cairo/diacairo.c
@@ -20,7 +20,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
 #include <math.h>
diff --git a/plug-ins/cgm/cgm.c b/plug-ins/cgm/cgm.c
index a18554f5..f73d5668 100644
--- a/plug-ins/cgm/cgm.c
+++ b/plug-ins/cgm/cgm.c
@@ -21,9 +21,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include "cgm.h"
 
diff --git a/plug-ins/drs/dia-render-script-import.c b/plug-ins/drs/dia-render-script-import.c
index 00bdf148..8b1dd733 100644
--- a/plug-ins/drs/dia-render-script-import.c
+++ b/plug-ins/drs/dia-render-script-import.c
@@ -21,7 +21,7 @@
 
 /*!  \file dia-render-script-import.c import of dia-render-script either to 
  * diagram with objects or maybe as one object */
-#include <config.h>
+#include "config.h"
 
 #include "geometry.h"
 #include "color.h"
diff --git a/plug-ins/drs/dia-render-script-renderer.c b/plug-ins/drs/dia-render-script-renderer.c
index a381c881..ff29cf89 100644
--- a/plug-ins/drs/dia-render-script-renderer.c
+++ b/plug-ins/drs/dia-render-script-renderer.c
@@ -21,7 +21,7 @@
 
 /*! A DiaRenderer mapping every renderer method to some metafile representation */
 
-#include <config.h>
+#include "config.h"
 
 #define G_LOG_DOMAIN "DiaRenderScript"
 #include <glib.h>
diff --git a/plug-ins/drs/dia-render-script.c b/plug-ins/drs/dia-render-script.c
index 566f4fdc..d046d6f5 100644
--- a/plug-ins/drs/dia-render-script.c
+++ b/plug-ins/drs/dia-render-script.c
@@ -46,7 +46,7 @@
  * </diagram>
  */
  
-#include <config.h>
+#include "config.h"
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/plug-ins/dxf/dxf-export.c b/plug-ins/dxf/dxf-export.c
index b80636fc..dea29f8b 100644
--- a/plug-ins/dxf/dxf-export.c
+++ b/plug-ins/dxf/dxf-export.c
@@ -20,9 +20,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <stdio.h>
 #include <string.h>
diff --git a/plug-ins/dxf/dxf-import.c b/plug-ins/dxf/dxf-import.c
index 77f82b6b..f6ad60de 100644
--- a/plug-ins/dxf/dxf-import.c
+++ b/plug-ins/dxf/dxf-import.c
@@ -21,9 +21,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
  
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/plug-ins/dxf/dxf.c b/plug-ins/dxf/dxf.c
index aa245bef..b7ace809 100644
--- a/plug-ins/dxf/dxf.c
+++ b/plug-ins/dxf/dxf.c
@@ -20,7 +20,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 #include "intl.h"
 #include "filter.h"
 #include "plug-ins.h"
diff --git a/plug-ins/hpgl/hpgl.c b/plug-ins/hpgl/hpgl.c
index 208d76de..146e964f 100644
--- a/plug-ins/hpgl/hpgl.c
+++ b/plug-ins/hpgl/hpgl.c
@@ -27,9 +27,7 @@
  *   interested renderers ?
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <stdio.h>
 #include <string.h>
diff --git a/plug-ins/libart/dialibart.c b/plug-ins/libart/dialibart.c
index 4eafa340..a351f172 100644
--- a/plug-ins/libart/dialibart.c
+++ b/plug-ins/libart/dialibart.c
@@ -19,7 +19,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 #include <stdio.h>
 
 #include "intl.h"
diff --git a/plug-ins/libart/dialibartrenderer.c b/plug-ins/libart/dialibartrenderer.c
index b4c93484..f24f90d9 100644
--- a/plug-ins/libart/dialibartrenderer.c
+++ b/plug-ins/libart/dialibartrenderer.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <math.h>
 #include <string.h> /* strlen */
diff --git a/plug-ins/libart/export_png.c b/plug-ins/libart/export_png.c
index 5d553923..4c67dfbb 100644
--- a/plug-ins/libart/export_png.c
+++ b/plug-ins/libart/export_png.c
@@ -19,7 +19,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 
 #if defined(HAVE_LIBPNG) && defined(HAVE_LIBART)
 
diff --git a/plug-ins/libart/render_libart.c b/plug-ins/libart/render_libart.c
index e2555ad6..718ff628 100644
--- a/plug-ins/libart/render_libart.c
+++ b/plug-ins/libart/render_libart.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <math.h>
 #include <string.h> /* strlen */
diff --git a/plug-ins/metapost/metapost.c b/plug-ins/metapost/metapost.c
index fc52dadc..19a998a3 100644
--- a/plug-ins/metapost/metapost.c
+++ b/plug-ins/metapost/metapost.c
@@ -19,7 +19,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-#include <config.h>
+#include "config.h"
 #include "render_metapost.h"
 #include "intl.h"
 #include "filter.h"
diff --git a/plug-ins/metapost/render_metapost.c b/plug-ins/metapost/render_metapost.c
index 63a0b787..7cd0a429 100644
--- a/plug-ins/metapost/render_metapost.c
+++ b/plug-ins/metapost/render_metapost.c
@@ -31,7 +31,7 @@
  */
 
 
-#include <config.h>
+#include "config.h"
 
 #include <string.h>
 #include <time.h>
diff --git a/plug-ins/pdf/pdf.c b/plug-ins/pdf/pdf.c
index f7d94f74..865fc713 100644
--- a/plug-ins/pdf/pdf.c
+++ b/plug-ins/pdf/pdf.c
@@ -18,7 +18,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-#include <config.h>
+#include "config.h"
 #include "intl.h"
 #include "filter.h"
 #include "plug-ins.h"
diff --git a/plug-ins/pgf/pgf.c b/plug-ins/pgf/pgf.c
index 68c471ec..f7a7544a 100644
--- a/plug-ins/pgf/pgf.c
+++ b/plug-ins/pgf/pgf.c
@@ -1,5 +1,5 @@
 /* -*- Mode: C; c-basic-offset: 4 -*- */
-#include <config.h>
+#include "config.h"
 #include "render_pgf.h"
 #include "intl.h"
 #include "filter.h"
diff --git a/plug-ins/pgf/render_pgf.c b/plug-ins/pgf/render_pgf.c
index 3b95cb05..055409cb 100644
--- a/plug-ins/pgf/render_pgf.c
+++ b/plug-ins/pgf/render_pgf.c
@@ -51,7 +51,7 @@ TODO:
 */
 
 
-#include <config.h>
+#include "config.h"
 
 #include <string.h>
 #include <time.h>
diff --git a/plug-ins/postscript/diapsft2renderer.c b/plug-ins/postscript/diapsft2renderer.c
index 9399ee9b..8397a2c8 100644
--- a/plug-ins/postscript/diapsft2renderer.c
+++ b/plug-ins/postscript/diapsft2renderer.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <string.h>
 
diff --git a/plug-ins/postscript/diapsrenderer.c b/plug-ins/postscript/diapsrenderer.c
index 427c5283..375cdbd6 100644
--- a/plug-ins/postscript/diapsrenderer.c
+++ b/plug-ins/postscript/diapsrenderer.c
@@ -22,7 +22,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <string.h>
 #include <time.h>
diff --git a/plug-ins/postscript/paginate_psprint.c b/plug-ins/postscript/paginate_psprint.c
index a8a24263..59108db9 100644
--- a/plug-ins/postscript/paginate_psprint.c
+++ b/plug-ins/postscript/paginate_psprint.c
@@ -19,9 +19,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 /* so we get popen and sigaction even when compiling with -ansi */
 #define _POSIX_C_SOURCE 2
diff --git a/plug-ins/postscript/postscript.c b/plug-ins/postscript/postscript.c
index 1859c4b1..099d7f29 100644
--- a/plug-ins/postscript/postscript.c
+++ b/plug-ins/postscript/postscript.c
@@ -19,7 +19,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include "intl.h"
 #include "message.h"
diff --git a/plug-ins/postscript/ps-utf8.c b/plug-ins/postscript/ps-utf8.c
index 3103b3d3..a169e54b 100644
--- a/plug-ins/postscript/ps-utf8.c
+++ b/plug-ins/postscript/ps-utf8.c
@@ -25,7 +25,7 @@
  */
 #include "ps-utf8.h"
 
-#include <config.h>
+#include "config.h"
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
diff --git a/plug-ins/postscript/ps-utf8.h b/plug-ins/postscript/ps-utf8.h
index e25eb944..14edc7d8 100644
--- a/plug-ins/postscript/ps-utf8.h
+++ b/plug-ins/postscript/ps-utf8.h
@@ -23,7 +23,7 @@
 #ifndef PS_UTF8_H
 #define PS_UTF8_H
 
-#include <config.h>
+#include "config.h"
 #include <glib.h>
 
 #include "diatypes.h"
diff --git a/plug-ins/postscript/render_eps.c b/plug-ins/postscript/render_eps.c
index fdedb537..5a185def 100644
--- a/plug-ins/postscript/render_eps.c
+++ b/plug-ins/postscript/render_eps.c
@@ -44,7 +44,7 @@
  * info (and conceivably more, like color defs), and one to actually render.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <string.h>
 #include <time.h>
diff --git a/plug-ins/postscript/win32print.c b/plug-ins/postscript/win32print.c
index 10f1e2df..af7b75e6 100644
--- a/plug-ins/postscript/win32print.c
+++ b/plug-ins/postscript/win32print.c
@@ -21,7 +21,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
diff --git a/plug-ins/pstricks/pstricks.c b/plug-ins/pstricks/pstricks.c
index 3b9da82b..8106f34a 100644
--- a/plug-ins/pstricks/pstricks.c
+++ b/plug-ins/pstricks/pstricks.c
@@ -1,5 +1,5 @@
 /* -*- Mode: C; c-basic-offset: 4 -*- */
-#include <config.h>
+#include "config.h"
 #include "render_pstricks.h"
 #include "intl.h"
 #include "filter.h"
diff --git a/plug-ins/pstricks/render_pstricks.c b/plug-ins/pstricks/render_pstricks.c
index 44b0ffdb..c84d52f7 100644
--- a/plug-ins/pstricks/render_pstricks.c
+++ b/plug-ins/pstricks/render_pstricks.c
@@ -40,7 +40,7 @@ NOT WORKING (exporting macros):
 */
 
 
-#include <config.h>
+#include "config.h"
 
 #include <string.h>
 #include <time.h>
diff --git a/plug-ins/python/diamodule.c b/plug-ins/python/diamodule.c
index 72ffa347..66b4ae36 100644
--- a/plug-ins/python/diamodule.c
+++ b/plug-ins/python/diamodule.c
@@ -17,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <Python.h>
 #include <locale.h>
diff --git a/plug-ins/python/pydia-color.c b/plug-ins/python/pydia-color.c
index a554b142..58ad0782 100644
--- a/plug-ins/python/pydia-color.c
+++ b/plug-ins/python/pydia-color.c
@@ -17,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <config.h>
+#include "config.h"
 
 #include "pydia-object.h"
 #include "pydia-color.h"
diff --git a/plug-ins/python/pydia-cpoint.c b/plug-ins/python/pydia-cpoint.c
index 61f20776..c78eb56b 100644
--- a/plug-ins/python/pydia-cpoint.c
+++ b/plug-ins/python/pydia-cpoint.c
@@ -17,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <config.h>
+#include "config.h"
 
 #include "pydia-geometry.h"
 #include "pydia-cpoint.h"
diff --git a/plug-ins/python/pydia-diagram.c b/plug-ins/python/pydia-diagram.c
index 2fbf9a43..698ea7e9 100644
--- a/plug-ins/python/pydia-diagram.c
+++ b/plug-ins/python/pydia-diagram.c
@@ -17,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <config.h>
+#include "config.h"
 
 
 #include "pydia-diagram.h"
diff --git a/plug-ins/python/pydia-diagramdata.c b/plug-ins/python/pydia-diagramdata.c
index 9a219b09..34c07fe9 100644
--- a/plug-ins/python/pydia-diagramdata.c
+++ b/plug-ins/python/pydia-diagramdata.c
@@ -17,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <config.h>
+#include "config.h"
 
 
 #include "pydia-object.h"
diff --git a/plug-ins/python/pydia-display.c b/plug-ins/python/pydia-display.c
index e1572231..f148c398 100644
--- a/plug-ins/python/pydia-display.c
+++ b/plug-ins/python/pydia-display.c
@@ -17,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <config.h>
+#include "config.h"
 
 #include "pydia-display.h"
 #include "pydia-diagram.h"
diff --git a/plug-ins/python/pydia-error.c b/plug-ins/python/pydia-error.c
index 3d8688ce..e3bcd9bd 100644
--- a/plug-ins/python/pydia-error.c
+++ b/plug-ins/python/pydia-error.c
@@ -17,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <config.h>
+#include "config.h"
 
 #include "pydia-object.h"
 #include "pydia-error.h"
diff --git a/plug-ins/python/pydia-export.c b/plug-ins/python/pydia-export.c
index 24b8772a..2cfeb72e 100644
--- a/plug-ins/python/pydia-export.c
+++ b/plug-ins/python/pydia-export.c
@@ -17,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <config.h>
+#include "config.h"
 
 #include "pydia-object.h"
 #include "pydia-export.h"
diff --git a/plug-ins/python/pydia-font.c b/plug-ins/python/pydia-font.c
index ce33f648..43c2e67d 100644
--- a/plug-ins/python/pydia-font.c
+++ b/plug-ins/python/pydia-font.c
@@ -17,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <config.h>
+#include "config.h"
 
 #include "pydia-object.h"
 #include "pydia-font.h"
diff --git a/plug-ins/python/pydia-geometry.c b/plug-ins/python/pydia-geometry.c
index 7c567db3..7bfd0ced 100644
--- a/plug-ins/python/pydia-geometry.c
+++ b/plug-ins/python/pydia-geometry.c
@@ -17,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <config.h>
+#include "config.h"
 
 #include "pydia-object.h"
 #include "pydia-geometry.h"
diff --git a/plug-ins/python/pydia-handle.c b/plug-ins/python/pydia-handle.c
index 3c9811da..0b7335d3 100644
--- a/plug-ins/python/pydia-handle.c
+++ b/plug-ins/python/pydia-handle.c
@@ -17,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <config.h>
+#include "config.h"
 
 #include "pydia-handle.h"
 #include "pydia-cpoint.h"
diff --git a/plug-ins/python/pydia-image.c b/plug-ins/python/pydia-image.c
index 2c2c3fb3..ea0d816b 100644
--- a/plug-ins/python/pydia-image.c
+++ b/plug-ins/python/pydia-image.c
@@ -17,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <config.h>
+#include "config.h"
 
 #include "pydia-object.h"
 #include "pydia-image.h"
diff --git a/plug-ins/python/pydia-layer.c b/plug-ins/python/pydia-layer.c
index 3ef09457..72a0e27b 100644
--- a/plug-ins/python/pydia-layer.c
+++ b/plug-ins/python/pydia-layer.c
@@ -17,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <config.h>
+#include "config.h"
 
 #include "pydia-layer.h"
 #include "pydia-object.h"
diff --git a/plug-ins/python/pydia-menuitem.c b/plug-ins/python/pydia-menuitem.c
index 7c275c12..899cc60f 100644
--- a/plug-ins/python/pydia-menuitem.c
+++ b/plug-ins/python/pydia-menuitem.c
@@ -17,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <config.h>
+#include "config.h"
 
 #include "pydia-menuitem.h"
 #include "pydia-object.h" /* for PyObject_HEAD_INIT */
diff --git a/plug-ins/python/pydia-object.c b/plug-ins/python/pydia-object.c
index da10e0dd..1b1722a7 100644
--- a/plug-ins/python/pydia-object.c
+++ b/plug-ins/python/pydia-object.c
@@ -17,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <config.h>
+#include "config.h"
 
 #include "pydia-object.h"
 #include "pydia-cpoint.h"
diff --git a/plug-ins/python/pydia-paperinfo.c b/plug-ins/python/pydia-paperinfo.c
index 0fd41b40..09dd6d1c 100644
--- a/plug-ins/python/pydia-paperinfo.c
+++ b/plug-ins/python/pydia-paperinfo.c
@@ -17,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <config.h>
+#include "config.h"
 
 #include "pydia-paperinfo.h"
 #include "pydia-object.h" /* for PyObject_HEAD_INIT */
diff --git a/plug-ins/python/pydia-properties.c b/plug-ins/python/pydia-properties.c
index 98edbbc7..fd63002c 100644
--- a/plug-ins/python/pydia-properties.c
+++ b/plug-ins/python/pydia-properties.c
@@ -17,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <config.h>
+#include "config.h"
 
 #include "pydia-object.h"
 #include "pydia-properties.h"
diff --git a/plug-ins/python/pydia-property.c b/plug-ins/python/pydia-property.c
index 5fe4fd92..fe50c752 100644
--- a/plug-ins/python/pydia-property.c
+++ b/plug-ins/python/pydia-property.c
@@ -17,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <Python.h>
 #include <glib.h>
diff --git a/plug-ins/python/pydia-render.c b/plug-ins/python/pydia-render.c
index a50e3890..b3bff6f4 100644
--- a/plug-ins/python/pydia-render.c
+++ b/plug-ins/python/pydia-render.c
@@ -27,7 +27,7 @@
  * To do that probably some code from pygtk.gobject needs to
  * be borrowed/shared
  */
-#include <config.h>
+#include "config.h"
 
 #include <Python.h>
 #include <glib.h>
diff --git a/plug-ins/python/pydia-sheet.c b/plug-ins/python/pydia-sheet.c
index 9c3529d0..361f3612 100644
--- a/plug-ins/python/pydia-sheet.c
+++ b/plug-ins/python/pydia-sheet.c
@@ -17,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <config.h>
+#include "config.h"
 
 #include "pydia-object.h"
 #include "pydia-sheet.h"
diff --git a/plug-ins/python/pydia-text.c b/plug-ins/python/pydia-text.c
index 7a1f2b63..7861fa73 100644
--- a/plug-ins/python/pydia-text.c
+++ b/plug-ins/python/pydia-text.c
@@ -17,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <config.h>
+#include "config.h"
 
 #include "pydia-object.h"
 #include "pydia-text.h"
diff --git a/plug-ins/python/python.c b/plug-ins/python/python.c
index 54b3e027..921dde1f 100644
--- a/plug-ins/python/python.c
+++ b/plug-ins/python/python.c
@@ -17,9 +17,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <Python.h>
 #include <stdio.h>
diff --git a/plug-ins/shape/shape-export.c b/plug-ins/shape/shape-export.c
index e99ae053..a3e3c79f 100644
--- a/plug-ins/shape/shape-export.c
+++ b/plug-ins/shape/shape-export.c
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-#include <config.h>
+#include "config.h"
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/plug-ins/shape/shape.c b/plug-ins/shape/shape.c
index d92d8436..1702c76e 100644
--- a/plug-ins/shape/shape.c
+++ b/plug-ins/shape/shape.c
@@ -20,7 +20,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 #include "intl.h"
 #include "filter.h"
 #include "plug-ins.h"
diff --git a/plug-ins/stress/stress.c b/plug-ins/stress/stress.c
index 1dc04c6a..0b87d97d 100644
--- a/plug-ins/stress/stress.c
+++ b/plug-ins/stress/stress.c
@@ -18,7 +18,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-#include <config.h>
+#include "config.h"
 
 #include "intl.h"
 #include "message.h"
diff --git a/plug-ins/svg/render_svg.c b/plug-ins/svg/render_svg.c
index 1af057a6..31955332 100644
--- a/plug-ins/svg/render_svg.c
+++ b/plug-ins/svg/render_svg.c
@@ -18,7 +18,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-#include <config.h>
+#include "config.h"
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/plug-ins/svg/svg-import.c b/plug-ins/svg/svg-import.c
index 0d1ac0ee..f8b6ac0a 100644
--- a/plug-ins/svg/svg-import.c
+++ b/plug-ins/svg/svg-import.c
@@ -21,9 +21,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <stdio.h>
 #include <string.h>
diff --git a/plug-ins/svg/svg.c b/plug-ins/svg/svg.c
index df97fae4..2da38a6a 100644
--- a/plug-ins/svg/svg.c
+++ b/plug-ins/svg/svg.c
@@ -20,7 +20,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 #include "intl.h"
 #include "filter.h"
 #include "plug-ins.h"
diff --git a/plug-ins/vdx/vdx-export.c b/plug-ins/vdx/vdx-export.c
index c173ed8e..de65c762 100644
--- a/plug-ins/vdx/vdx-export.c
+++ b/plug-ins/vdx/vdx-export.c
@@ -24,9 +24,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <stdio.h>
 
diff --git a/plug-ins/vdx/vdx-import.c b/plug-ins/vdx/vdx-import.c
index 9b5d1d59..1b4f3fd6 100644
--- a/plug-ins/vdx/vdx-import.c
+++ b/plug-ins/vdx/vdx-import.c
@@ -19,9 +19,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <stdio.h>
 #include <errno.h>
diff --git a/plug-ins/vdx/vdx.c b/plug-ins/vdx/vdx.c
index 82ddc4b1..fbc71503 100644
--- a/plug-ins/vdx/vdx.c
+++ b/plug-ins/vdx/vdx.c
@@ -24,7 +24,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 #include "intl.h"
 #include "filter.h"
 #include "plug-ins.h"
diff --git a/plug-ins/wpg/wpg-import.c b/plug-ins/wpg/wpg-import.c
index 2e5b4ec3..b2590639 100644
--- a/plug-ins/wpg/wpg-import.c
+++ b/plug-ins/wpg/wpg-import.c
@@ -18,7 +18,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-#include <config.h>
+#include "config.h"
 
 #include <glib.h>
 #include <glib/gstdio.h>
diff --git a/plug-ins/wpg/wpg.c b/plug-ins/wpg/wpg.c
index 47ef0b5b..75ca7ef3 100644
--- a/plug-ins/wpg/wpg.c
+++ b/plug-ins/wpg/wpg.c
@@ -26,7 +26,7 @@
  * - the font setting needs improvement (maybe on Dia's side)
  */
 
-#include <config.h>
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
 #include <math.h>
diff --git a/plug-ins/xfig/xfig-common.c b/plug-ins/xfig/xfig-common.c
index 9ba855a8..90b5a055 100644
--- a/plug-ins/xfig/xfig-common.c
+++ b/plug-ins/xfig/xfig-common.c
@@ -1,6 +1,4 @@
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <stdio.h>
 /* Information used here is taken from the FIG Format 3.2 specification
diff --git a/plug-ins/xfig/xfig-export.c b/plug-ins/xfig/xfig-export.c
index 4ea32ba2..6b5d35fa 100644
--- a/plug-ins/xfig/xfig-export.c
+++ b/plug-ins/xfig/xfig-export.c
@@ -18,9 +18,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */ 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <stdio.h>
 /* Information used here is taken from the FIG Format 3.2 specification
diff --git a/plug-ins/xfig/xfig-import.c b/plug-ins/xfig/xfig-import.c
index 2798167f..9f8c1ab4 100644
--- a/plug-ins/xfig/xfig-import.c
+++ b/plug-ins/xfig/xfig-import.c
@@ -22,9 +22,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
  
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <stdio.h>
 /* Information used here is taken from the FIG Format 3.2 specification
diff --git a/plug-ins/xfig/xfig.c b/plug-ins/xfig/xfig.c
index 10d68aad..6629bd63 100644
--- a/plug-ins/xfig/xfig.c
+++ b/plug-ins/xfig/xfig.c
@@ -22,7 +22,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 #include "intl.h"
 #include "filter.h"
 #include "plug-ins.h"
diff --git a/plug-ins/xslt/xslt.c b/plug-ins/xslt/xslt.c
index 88f9695d..20c28e4e 100644
--- a/plug-ins/xslt/xslt.c
+++ b/plug-ins/xslt/xslt.c
@@ -22,7 +22,7 @@
  *
  */
 
-#include <config.h>
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
diff --git a/tests/test-svg.c b/tests/test-svg.c
index 290cba42..14be24d4 100644
--- a/tests/test-svg.c
+++ b/tests/test-svg.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <string.h>