[evolution] Bug #646109 - Fix use of include <config.h> to make sure translations work



commit 756c8abcb840b8da588031f4a0d7e1fc979fab70
Author: Milan Crha <mcrha redhat com>
Date:   Fri May 27 15:23:07 2011 +0200

    Bug #646109 - Fix use of include <config.h> to make sure translations work

 a11y/gal-a11y-util.c                               |    2 ++
 .../gui/contact-editor/e-contact-editor-fullname.c |    3 +++
 addressbook/gui/contact-editor/e-contact-editor.c  |    2 ++
 .../gui/contact-editor/e-contact-quick-add.c       |    3 +++
 addressbook/gui/contact-editor/test-editor.c       |    4 +++-
 .../contact-list-editor/e-contact-list-editor.c    |    2 ++
 .../gui/contact-list-editor/e-contact-list-model.c |    3 +++
 addressbook/gui/merging/eab-contact-compare.c      |    3 +++
 addressbook/gui/merging/eab-contact-merging.c      |    2 ++
 addressbook/gui/widgets/e-addressbook-model.c      |    3 +++
 .../gui/widgets/e-addressbook-reflow-adapter.c     |    3 +++
 addressbook/gui/widgets/e-addressbook-selector.c   |    4 ++++
 .../gui/widgets/e-addressbook-table-adapter.c      |    3 +++
 addressbook/gui/widgets/e-addressbook-view.c       |    2 ++
 addressbook/gui/widgets/e-minicard-label.c         |    2 ++
 addressbook/gui/widgets/e-minicard-view-widget.c   |    2 ++
 addressbook/gui/widgets/e-minicard-view.c          |    2 ++
 addressbook/gui/widgets/e-minicard.c               |    3 +++
 addressbook/gui/widgets/ea-addressbook-view.c      |    2 ++
 addressbook/gui/widgets/ea-addressbook.c           |    4 ++++
 addressbook/gui/widgets/ea-minicard-view.c         |    3 +++
 addressbook/gui/widgets/ea-minicard.c              |    3 +++
 addressbook/gui/widgets/eab-gui-util.c             |    2 ++
 addressbook/gui/widgets/gal-view-minicard.c        |    2 ++
 addressbook/importers/evolution-csv-importer.c     |    3 +++
 addressbook/printing/e-contact-print.c             |    2 ++
 addressbook/printing/test-print.c                  |    4 +++-
 .../evolution-addressbook-export-list-cards.c      |    2 ++
 addressbook/tools/evolution-addressbook-export.c   |    2 ++
 addressbook/util/eab-book-util.c                   |    3 +++
 calendar/gui/alarm-notify/alarm-notify-dialog.c    |    3 +++
 calendar/gui/alarm-notify/alarm-notify.c           |    2 +-
 calendar/gui/alarm-notify/alarm.c                  |    3 +++
 calendar/gui/alarm-notify/config-data.c            |    2 +-
 calendar/gui/alarm-notify/notify-main.c            |    3 +++
 calendar/gui/dialogs/e-send-options-utils.c        |    5 +++++
 calendar/gui/e-alarm-list.c                        |    3 +++
 calendar/gui/e-cal-component-preview.c             |    4 ++++
 calendar/gui/e-calendar-selector.c                 |    4 ++++
 calendar/gui/e-date-time-list.c                    |    4 ++++
 calendar/gui/e-day-view-layout.c                   |    2 ++
 calendar/gui/e-day-view.c                          |    1 +
 calendar/gui/e-meeting-attendee.h                  |    4 ----
 calendar/gui/e-meeting-time-sel-item.c             |    1 +
 calendar/gui/e-meeting-types.h                     |    4 ----
 calendar/gui/e-meeting-utils.h                     |    4 ----
 calendar/gui/e-memo-list-selector.c                |    4 ++++
 calendar/gui/e-month-view.c                        |    4 ++++
 calendar/gui/e-select-names-editable.c             |    3 +++
 calendar/gui/e-select-names-renderer.c             |    2 ++
 calendar/gui/e-task-list-selector.c                |    4 ++++
 calendar/gui/e-timezone-entry.c                    |    3 +++
 calendar/gui/e-week-view-layout.c                  |    2 ++
 calendar/gui/ea-cal-view-event.c                   |    4 ++++
 calendar/gui/ea-cal-view.c                         |    4 ++++
 calendar/gui/ea-calendar-helpers.c                 |    4 ++++
 calendar/gui/ea-calendar.c                         |    4 ++++
 calendar/gui/ea-day-view-cell.c                    |    4 ++++
 calendar/gui/ea-day-view-main-item.c               |    4 ++++
 calendar/gui/ea-day-view.c                         |    4 ++++
 calendar/gui/ea-gnome-calendar.c                   |    4 ++++
 calendar/gui/ea-jump-button.c                      |    4 ++++
 calendar/gui/ea-week-view-cell.c                   |    4 ++++
 calendar/gui/ea-week-view-main-item.c              |    4 ++++
 calendar/gui/ea-week-view.c                        |    4 ++++
 capplet/anjal-settings-main.c                      |    6 ++++--
 capplet/settings/anjal-mail-view.c                 |    2 +-
 capplet/settings/mail-account-view.c               |    2 +-
 capplet/settings/mail-capplet-shell.c              |    2 +-
 capplet/settings/mail-settings-view.c              |    2 +-
 capplet/settings/mail-view.c                       |    3 ++-
 composer/e-composer-actions.c                      |    4 ++++
 composer/e-composer-activity.c                     |    4 ++++
 composer/e-composer-common.h                       |    4 ----
 composer/e-composer-from-header.c                  |    4 ++++
 composer/e-composer-header-table.c                 |    4 ++++
 composer/e-composer-header.c                       |    4 ++++
 composer/e-composer-name-header.c                  |    4 ++++
 composer/e-composer-post-header.c                  |    4 ++++
 composer/e-composer-private.c                      |    4 ++++
 composer/e-composer-text-header.c                  |    4 ++++
 e-util/e-account-utils.c                           |    4 ++++
 e-util/e-activity.c                                |    4 ++++
 e-util/e-alert-dialog.c                            |    4 ++++
 e-util/e-alert-sink.c                              |    4 ++++
 e-util/e-alert.c                                   |    2 ++
 e-util/e-bit-array.c                               |    2 ++
 e-util/e-categories-config.c                       |    4 ++++
 e-util/e-datetime-format.c                         |    4 ++++
 e-util/e-dialog-widgets.c                          |    2 ++
 e-util/e-extensible.c                              |    4 ++++
 e-util/e-extension.c                               |    4 ++++
 e-util/e-file-utils.c                              |    2 ++
 e-util/e-html-utils.c                              |    4 ++++
 e-util/e-icon-factory.c                            |    2 ++
 e-util/e-import.c                                  |    4 ++++
 e-util/e-module.c                                  |    4 ++++
 e-util/e-plugin-ui.c                               |    4 ++++
 e-util/e-plugin-util.c                             |    4 ++++
 e-util/e-plugin.c                                  |    2 ++
 e-util/e-poolv.c                                   |    4 ++++
 e-util/e-print.c                                   |    4 ++++
 e-util/e-selection.c                               |    4 ++++
 e-util/e-signature-list.c                          |    5 ++++-
 e-util/e-signature-utils.c                         |    4 ++++
 e-util/e-sorter-array.c                            |    2 ++
 e-util/e-sorter.c                                  |    2 ++
 e-util/e-text-event-processor-emacs-like.c         |    2 ++
 e-util/e-text-event-processor.c                    |    2 ++
 e-util/e-ui-manager.c                              |    4 ++++
 e-util/e-unicode.c                                 |    2 ++
 e-util/e-util.c                                    |    2 ++
 e-util/e-win32-defaults.c                          |    4 ++++
 e-util/e-win32-reloc.c                             |    2 ++
 e-util/e-xml-utils.c                               |    2 ++
 e-util/gconf-bridge.c                              |    2 ++
 filter/e-filter-file.c                             |    2 ++
 filter/e-rule-context.c                            |    2 ++
 libgnomecanvas/gailcanvas.c                        |    4 ++++
 libgnomecanvas/gailcanvasgroup.c                   |    4 ++++
 libgnomecanvas/gailcanvasgroupfactory.c            |    4 ++++
 libgnomecanvas/gailcanvasitem.c                    |    4 ++++
 libgnomecanvas/gailcanvasitemfactory.c             |    4 ++++
 libgnomecanvas/gailcanvastext.c                    |    4 ++++
 libgnomecanvas/gailcanvastextfactory.c             |    4 ++++
 libgnomecanvas/gailcanvaswidget.c                  |    4 ++++
 libgnomecanvas/gailcanvaswidgetfactory.c           |    4 ++++
 libgnomecanvas/gnome-canvas-pixbuf.c               |    3 +++
 libgnomecanvas/gnome-canvas-rect.c                 |    4 ++++
 libgnomecanvas/gnome-canvas-rich-text.c            |    4 ++++
 libgnomecanvas/gnome-canvas-text.c                 |    3 +++
 libgnomecanvas/gnome-canvas-util.c                 |    2 ++
 libgnomecanvas/gnome-canvas-widget.c               |    3 +++
 libgnomecanvas/gnome-canvas.c                      |    2 ++
 mail/e-mail-attachment-bar.c                       |    4 ++++
 mail/e-mail-backend.c                              |    4 ++++
 mail/e-mail-browser.c                              |    4 ++++
 mail/e-mail-display.c                              |    5 ++++-
 mail/e-mail-folder-pane.c                          |    4 ++++
 mail/e-mail-folder-utils.c                         |    5 ++++-
 mail/e-mail-label-action.c                         |    4 ++++
 mail/e-mail-label-dialog.c                         |    4 ++++
 mail/e-mail-label-list-store.c                     |    4 ++++
 mail/e-mail-label-manager.c                        |    4 ++++
 mail/e-mail-label-tree-view.c                      |    4 ++++
 mail/e-mail-local.c                                |    4 ++++
 mail/e-mail-message-pane.c                         |    4 ++++
 mail/e-mail-migrate.c                              |    4 ++++
 mail/e-mail-notebook-view.c                        |    2 +-
 mail/e-mail-pane.c                                 |    2 +-
 mail/e-mail-paned-view.c                           |    2 +-
 mail/e-mail-reader-utils.c                         |    4 ++++
 mail/e-mail-reader.c                               |    4 ++++
 mail/e-mail-session-utils.c                        |    5 ++++-
 mail/e-mail-session.c                              |    2 ++
 mail/e-mail-sidebar.c                              |    4 ++++
 mail/e-mail-store-utils.c                          |    5 ++++-
 mail/e-mail-store.c                                |    4 ++++
 mail/e-mail-tab-picker.c                           |    2 +-
 mail/e-mail-tab.c                                  |    2 +-
 mail/e-mail-view.c                                 |    2 +-
 mail/em-folder-selector.c                          |    4 ++++
 mail/em-folder-tree-model.c                        |    4 ++++
 mail/em-junk.c                                     |    4 ++++
 mail/em-subscription-editor.c                      |    5 ++++-
 mail/mail-folder-cache.c                           |    2 +-
 mail/mail-mt.c                                     |    2 ++
 mail/mail-ops.c                                    |    2 ++
 mail/mail-tools.c                                  |    2 ++
 mail/mail-vfolder.c                                |    3 +++
 mail/message-list.c                                |    2 ++
 modules/addressbook/addressbook-config.c           |    2 ++
 modules/addressbook/autocompletion-config.c        |    4 ++++
 modules/addressbook/e-book-config-hook.c           |    4 ++++
 modules/addressbook/e-book-shell-backend.c         |    6 ++++--
 modules/addressbook/e-book-shell-content.c         |    4 ++++
 modules/addressbook/e-book-shell-migrate.c         |    2 ++
 modules/addressbook/e-book-shell-settings.c        |    4 ++++
 modules/addressbook/e-book-shell-sidebar.c         |    4 ++++
 modules/addressbook/e-book-shell-view-actions.c    |    4 ++++
 modules/addressbook/e-book-shell-view-private.c    |    4 ++++
 modules/addressbook/e-book-shell-view.c            |    4 ++++
 modules/addressbook/eab-composer-util.c            |    4 ++++
 modules/addressbook/evolution-module-addressbook.c |    4 ++++
 modules/calendar/e-cal-attachment-handler.c        |    4 ++++
 modules/calendar/e-cal-config-calendar-item.c      |    4 ++++
 modules/calendar/e-cal-config-comp-editor.c        |    4 ++++
 modules/calendar/e-cal-config-date-edit.c          |    4 ++++
 modules/calendar/e-cal-config-hook.c               |    4 ++++
 modules/calendar/e-cal-config-meeting-store.c      |    4 ++++
 .../calendar/e-cal-config-meeting-time-selector.c  |    4 ++++
 modules/calendar/e-cal-config-model.c              |    4 ++++
 modules/calendar/e-cal-config-view.c               |    4 ++++
 modules/calendar/e-cal-event-hook.c                |    4 ++++
 modules/calendar/e-cal-shell-backend.c             |    4 ++++
 modules/calendar/e-cal-shell-content.c             |    4 ++++
 modules/calendar/e-cal-shell-migrate.c             |    4 ++++
 modules/calendar/e-cal-shell-settings.c            |    4 ++++
 modules/calendar/e-cal-shell-sidebar.c             |    4 ++++
 modules/calendar/e-cal-shell-view-actions.c        |    4 ++++
 modules/calendar/e-cal-shell-view-memopad.c        |    4 ++++
 modules/calendar/e-cal-shell-view-private.c        |    4 ++++
 modules/calendar/e-cal-shell-view-taskpad.c        |    4 ++++
 modules/calendar/e-cal-shell-view.c                |    4 ++++
 modules/calendar/e-calendar-preferences.c          |    5 ++++-
 modules/calendar/e-memo-shell-backend.c            |    4 ++++
 modules/calendar/e-memo-shell-content.c            |    4 ++++
 modules/calendar/e-memo-shell-migrate.c            |    4 ++++
 modules/calendar/e-memo-shell-sidebar.c            |    4 ++++
 modules/calendar/e-memo-shell-view-actions.c       |    4 ++++
 modules/calendar/e-memo-shell-view-private.c       |    4 ++++
 modules/calendar/e-memo-shell-view.c               |    4 ++++
 modules/calendar/e-task-shell-backend.c            |    4 ++++
 modules/calendar/e-task-shell-content.c            |    4 ++++
 modules/calendar/e-task-shell-migrate.c            |    4 ++++
 modules/calendar/e-task-shell-sidebar.c            |    4 ++++
 modules/calendar/e-task-shell-view-actions.c       |    4 ++++
 modules/calendar/e-task-shell-view-private.c       |    4 ++++
 modules/calendar/e-task-shell-view.c               |    4 ++++
 modules/calendar/evolution-module-calendar.c       |    4 ++++
 modules/composer-autosave/e-autosave-utils.c       |    4 ++++
 modules/composer-autosave/e-composer-autosave.c    |    4 ++++
 modules/composer-autosave/e-composer-registry.c    |    4 ++++
 .../evolution-composer-autosave.c                  |    4 ++++
 modules/connman/evolution-connman.c                |    4 ++++
 modules/mail/e-mail-attachment-handler.c           |    4 ++++
 modules/mail/e-mail-config-format-html.c           |    4 ++++
 modules/mail/e-mail-config-hook.c                  |    4 ++++
 modules/mail/e-mail-config-reader.c                |    4 ++++
 modules/mail/e-mail-config-web-view.c              |    4 ++++
 modules/mail/e-mail-event-hook.c                   |    4 ++++
 modules/mail/e-mail-junk-hook.c                    |    4 ++++
 modules/mail/e-mail-shell-backend.c                |    4 ++++
 modules/mail/e-mail-shell-content.c                |    4 ++++
 modules/mail/e-mail-shell-settings.c               |    4 ++++
 modules/mail/e-mail-shell-sidebar.c                |    4 ++++
 modules/mail/e-mail-shell-view-actions.c           |    4 ++++
 modules/mail/e-mail-shell-view-private.c           |    4 ++++
 modules/mail/e-mail-shell-view.c                   |    4 ++++
 modules/mail/em-account-prefs.c                    |    4 ++--
 modules/mail/evolution-module-mail.c               |    4 ++++
 modules/mailto-handler/evolution-mailto-handler.c  |    3 +++
 .../network-manager/evolution-network-manager.c    |    4 ++++
 modules/offline-alert/evolution-offline-alert.c    |    4 ++++
 modules/plugin-lib/e-plugin-lib.c                  |    4 ++++
 modules/plugin-lib/evolution-module-plugin-lib.c   |    2 ++
 modules/plugin-manager/evolution-plugin-manager.c  |    3 +++
 modules/plugin-mono/e-plugin-mono.c                |    4 ++++
 modules/plugin-mono/evolution-module-plugin-mono.c |    2 ++
 modules/plugin-python/e-plugin-python.c            |    4 ++++
 .../plugin-python/evolution-module-plugin-python.c |    2 ++
 modules/startup-wizard/evolution-startup-wizard.c  |    3 +++
 plugins/addressbook-file/addressbook-file.c        |    4 ++++
 plugins/attachment-reminder/attachment-reminder.c  |    4 ++++
 plugins/audio-inline/audio-inline.c                |    2 +-
 plugins/bbdb/gaimbuddies.c                         |    4 ++++
 plugins/bogo-junk-plugin/bf-junk-filter.c          |    2 +-
 plugins/caldav/caldav-browse-server.c              |    2 +-
 plugins/caldav/caldav-source.c                     |    2 +-
 plugins/calendar-file/calendar-file.c              |    4 ++++
 plugins/calendar-http/calendar-http.c              |    4 ++++
 plugins/calendar-weather/calendar-weather.c        |    4 ++++
 plugins/contacts-map/contacts-map.c                |    5 +++++
 plugins/default-source/default-source.c            |    4 ++++
 .../google-account-setup/google-contacts-source.c  |    3 +++
 plugins/google-account-setup/google-source.c       |    2 +-
 plugins/image-inline/image-inline.c                |    2 +-
 plugins/mail-to-task/mail-to-task.c                |    2 +-
 plugins/mark-all-read/mark-all-read.c              |    1 +
 plugins/prefer-plain/prefer-plain.c                |    2 +-
 plugins/publish-calendar/publish-format-fb.c       |    4 ++++
 plugins/publish-calendar/publish-format-ical.c     |    4 ++++
 plugins/publish-calendar/publish-location.c        |    4 ++++
 plugins/publish-calendar/url-editor-dialog.c       |    4 ++++
 plugins/save-calendar/format-handler.h             |    4 ----
 plugins/templates/templates.c                      |    4 ++++
 plugins/tnef-attachments/tnef-plugin.c             |    2 +-
 plugins/vcard-inline/vcard-inline.c                |    2 +-
 .../webdav-account-setup/webdav-contacts-source.c  |    2 +-
 shell/e-shell-backend.c                            |    4 ++++
 shell/e-shell-common.h                             |    4 ----
 shell/e-shell-content.c                            |    4 ++++
 shell/e-shell-meego.c                              |    4 ++++
 shell/e-shell-migrate.c                            |    4 ++++
 shell/e-shell-searchbar.c                          |    5 ++++-
 shell/e-shell-settings.c                           |    4 ++++
 shell/e-shell-sidebar.c                            |    4 ++++
 shell/e-shell-switcher.c                           |    4 ++++
 shell/e-shell-taskbar.c                            |    4 ++++
 shell/e-shell-utils.c                              |    4 ++++
 shell/e-shell-view.c                               |    4 ++++
 shell/e-shell-window-actions.c                     |    4 ++++
 shell/e-shell-window-private.c                     |    4 ++++
 shell/e-shell-window.c                             |    4 ++++
 shell/e-shell.c                                    |    4 ++++
 smclient/eggdesktopfile.c                          |    2 +-
 smclient/eggsmclient-win32.c                       |    4 +++-
 smclient/eggsmclient-xsmp.c                        |    4 +++-
 smclient/eggsmclient.c                             |    4 +++-
 widgets/menus/gal-define-views-dialog.c            |    2 ++
 widgets/menus/gal-define-views-model.c             |    2 ++
 widgets/menus/gal-view-collection.c                |    2 ++
 widgets/menus/gal-view-etable.c                    |    2 ++
 widgets/menus/gal-view-factory-etable.c            |    2 ++
 widgets/menus/gal-view-factory.c                   |    5 ++++-
 widgets/menus/gal-view-instance-save-as-dialog.c   |    2 ++
 widgets/menus/gal-view-instance.c                  |    2 ++
 widgets/menus/gal-view-new-dialog.c                |    2 ++
 widgets/menus/gal-view.c                           |    5 ++++-
 widgets/misc/e-account-combo-box.c                 |    4 ++++
 widgets/misc/e-account-manager.c                   |    4 ++++
 widgets/misc/e-account-tree-view.c                 |    4 ++++
 widgets/misc/e-action-combo-box.c                  |    4 ++++
 widgets/misc/e-activity-bar.c                      |    4 ++++
 widgets/misc/e-activity-proxy.c                    |    4 ++++
 widgets/misc/e-alert-bar.c                         |    5 ++++-
 widgets/misc/e-attachment-button.c                 |    4 ++++
 widgets/misc/e-attachment-dialog.c                 |    4 ++++
 widgets/misc/e-attachment-handler-image.c          |    4 ++++
 widgets/misc/e-attachment-handler-sendto.c         |    5 ++++-
 widgets/misc/e-attachment-handler.c                |    4 ++++
 widgets/misc/e-attachment-icon-view.c              |    4 ++++
 widgets/misc/e-attachment-paned.c                  |    4 ++++
 widgets/misc/e-attachment-store.c                  |    5 ++++-
 widgets/misc/e-attachment-tree-view.c              |    4 ++++
 widgets/misc/e-attachment-view.c                   |    5 ++++-
 widgets/misc/e-attachment.c                        |    5 ++++-
 widgets/misc/e-buffer-tagger.c                     |    4 ++++
 widgets/misc/e-canvas-background.c                 |    2 ++
 widgets/misc/e-canvas-utils.c                      |    4 ++++
 widgets/misc/e-canvas-vbox.c                       |    2 ++
 widgets/misc/e-canvas.c                            |    2 ++
 widgets/misc/e-charset-combo-box.c                 |    4 ++++
 widgets/misc/e-combo-cell-editable.c               |    3 +++
 widgets/misc/e-focus-tracker.c                     |    5 ++++-
 widgets/misc/e-hinted-entry.c                      |    4 ++++
 widgets/misc/e-hsv-utils.c                         |    2 ++
 widgets/misc/e-image-chooser.c                     |    2 ++
 widgets/misc/e-import-assistant.c                  |    4 ++++
 widgets/misc/e-map.c                               |    3 +++
 widgets/misc/e-menu-tool-action.c                  |    4 ++++
 widgets/misc/e-menu-tool-button.c                  |    4 ++++
 widgets/misc/e-online-button.c                     |    4 ++++
 widgets/misc/e-paned.c                             |    5 ++++-
 widgets/misc/e-picture-gallery.c                   |    4 ++++
 widgets/misc/e-popup-action.c                      |    4 ++++
 widgets/misc/e-popup-menu.c                        |    2 ++
 widgets/misc/e-port-entry.c                        |    5 ++++-
 widgets/misc/e-preferences-window.c                |    4 ++++
 widgets/misc/e-preview-pane.c                      |    4 ++++
 widgets/misc/e-printable.c                         |    2 ++
 widgets/misc/e-search-bar.c                        |    4 ++++
 widgets/misc/e-selectable.c                        |    4 ++++
 widgets/misc/e-selection-model-array.c             |    2 ++
 widgets/misc/e-selection-model-simple.c            |    2 ++
 widgets/misc/e-selection-model.c                   |    2 ++
 widgets/misc/e-signature-editor.c                  |    4 ++++
 widgets/misc/e-signature-manager.c                 |    4 ++++
 widgets/misc/e-signature-preview.c                 |    4 ++++
 widgets/misc/e-signature-script-dialog.c           |    4 ++++
 widgets/misc/e-signature-tree-view.c               |    4 ++++
 widgets/misc/e-url-entry.h                         |    4 ----
 widgets/misc/e-web-view-preview.c                  |    5 ++++-
 widgets/misc/e-web-view.c                          |    5 ++++-
 widgets/misc/ea-calendar-cell.c                    |    4 ++++
 widgets/misc/ea-calendar-item.c                    |    4 ++++
 widgets/misc/ea-cell-table.c                       |    4 ++++
 widgets/misc/ea-widgets.c                          |    4 ++++
 widgets/table/e-cell-checkbox.c                    |    2 ++
 widgets/table/e-cell-combo.c                       |    2 ++
 widgets/table/e-cell-date.c                        |    2 ++
 widgets/table/e-cell-hbox.c                        |    2 ++
 widgets/table/e-cell-number.c                      |    2 ++
 widgets/table/e-cell-pixbuf.c                      |    2 ++
 widgets/table/e-cell-popup.c                       |    2 ++
 widgets/table/e-cell-size.c                        |    2 ++
 widgets/table/e-cell-text.c                        |    2 ++
 widgets/table/e-cell-toggle.c                      |    2 ++
 widgets/table/e-cell-tree.c                        |    2 ++
 widgets/table/e-cell-vbox.c                        |    2 ++
 widgets/table/e-cell.c                             |    3 +++
 widgets/table/e-table-click-to-add.c               |    2 ++
 widgets/table/e-table-col.c                        |    2 ++
 widgets/table/e-table-column-specification.c       |    2 ++
 widgets/table/e-table-config.c                     |    2 ++
 widgets/table/e-table-extras.c                     |    2 ++
 widgets/table/e-table-field-chooser-dialog.c       |    2 ++
 widgets/table/e-table-field-chooser-item.c         |    2 ++
 widgets/table/e-table-field-chooser.c              |    2 ++
 widgets/table/e-table-group-container.c            |    2 ++
 widgets/table/e-table-group-leaf.c                 |    2 ++
 widgets/table/e-table-group.c                      |    2 ++
 widgets/table/e-table-header-item.c                |    2 ++
 widgets/table/e-table-header-utils.c               |    2 ++
 widgets/table/e-table-header.c                     |    2 ++
 widgets/table/e-table-item.c                       |    2 ++
 widgets/table/e-table-memory-callbacks.c           |    2 ++
 widgets/table/e-table-memory-store.c               |    2 ++
 widgets/table/e-table-memory.c                     |    2 ++
 widgets/table/e-table-model.c                      |    2 ++
 widgets/table/e-table-one.c                        |    2 ++
 widgets/table/e-table-search.c                     |    2 ++
 widgets/table/e-table-selection-model.c            |    2 ++
 widgets/table/e-table-sort-info.c                  |    2 ++
 widgets/table/e-table-sorted-variable.c            |    2 ++
 widgets/table/e-table-sorted.c                     |    2 ++
 widgets/table/e-table-sorter.c                     |    2 ++
 widgets/table/e-table-sorting-utils.c              |    2 ++
 widgets/table/e-table-specification.c              |    2 ++
 widgets/table/e-table-state.c                      |    2 ++
 widgets/table/e-table-subset-variable.c            |    2 ++
 widgets/table/e-table-subset.c                     |    2 ++
 widgets/table/e-table-utils.c                      |    2 ++
 widgets/table/e-table-without.c                    |    2 ++
 widgets/table/e-table.c                            |    2 ++
 widgets/table/e-tree-memory-callbacks.c            |    2 ++
 widgets/table/e-tree-memory.c                      |    2 ++
 widgets/table/e-tree-model.c                       |    2 ++
 widgets/table/e-tree-selection-model.c             |    2 ++
 widgets/table/e-tree-sorted.c                      |    2 ++
 widgets/table/e-tree-table-adapter.c               |    2 ++
 widgets/table/e-tree.c                             |    2 ++
 widgets/table/gal-a11y-e-cell-popup.c              |    2 ++
 widgets/table/gal-a11y-e-cell-registry.c           |    2 ++
 widgets/table/gal-a11y-e-cell-toggle.c             |    4 ++++
 widgets/table/gal-a11y-e-cell-tree.c               |    2 ++
 widgets/table/gal-a11y-e-cell-vbox.c               |    2 ++
 widgets/table/gal-a11y-e-cell.c                    |    2 ++
 .../table/gal-a11y-e-table-click-to-add-factory.c  |    2 ++
 widgets/table/gal-a11y-e-table-click-to-add.c      |    2 ++
 widgets/table/gal-a11y-e-table-column-header.c     |    3 +++
 widgets/table/gal-a11y-e-table-factory.c           |    2 ++
 widgets/table/gal-a11y-e-table-item-factory.c      |    2 ++
 widgets/table/gal-a11y-e-table-item.c              |    2 ++
 widgets/table/gal-a11y-e-table.c                   |    2 ++
 widgets/table/gal-a11y-e-tree-factory.c            |    2 ++
 widgets/table/gal-a11y-e-tree.c                    |    2 ++
 widgets/text/e-reflow-model.c                      |    3 +++
 widgets/text/e-reflow.c                            |    3 +++
 widgets/text/e-text-model-repos.c                  |    4 ++++
 widgets/text/e-text-model.c                        |    2 ++
 widgets/text/e-text.c                              |    2 ++
 widgets/text/gal-a11y-e-text-factory.c             |    3 +++
 widgets/text/gal-a11y-e-text.c                     |    2 ++
 444 files changed, 1358 insertions(+), 85 deletions(-)
---
diff --git a/a11y/gal-a11y-util.c b/a11y/gal-a11y-util.c
index ec2a506..5bc91b7 100644
--- a/a11y/gal-a11y-util.c
+++ b/a11y/gal-a11y-util.c
@@ -21,7 +21,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include "gal-a11y-util.h"
 
diff --git a/addressbook/gui/contact-editor/e-contact-editor-fullname.c b/addressbook/gui/contact-editor/e-contact-editor-fullname.c
index 1ca6014..21eddb1 100644
--- a/addressbook/gui/contact-editor/e-contact-editor-fullname.c
+++ b/addressbook/gui/contact-editor/e-contact-editor-fullname.c
@@ -20,7 +20,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
+
 #include <glib/gi18n.h>
 
 #include "e-util/e-util.h"
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index f6e7f0f..4cdf1e2 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include "eab-editor.h"
 #include "e-contact-editor.h"
diff --git a/addressbook/gui/contact-editor/e-contact-quick-add.c b/addressbook/gui/contact-editor/e-contact-quick-add.c
index cc74968..44f6354 100644
--- a/addressbook/gui/contact-editor/e-contact-quick-add.c
+++ b/addressbook/gui/contact-editor/e-contact-quick-add.c
@@ -20,7 +20,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
+
 #include <ctype.h>
 #include <string.h>
 #include <gtk/gtk.h>
diff --git a/addressbook/gui/contact-editor/test-editor.c b/addressbook/gui/contact-editor/test-editor.c
index 857d6ff..2f54bd5 100644
--- a/addressbook/gui/contact-editor/test-editor.c
+++ b/addressbook/gui/contact-editor/test-editor.c
@@ -20,7 +20,9 @@
  *
  */
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <stdlib.h>
 #include <gtk/gtk.h>
diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.c b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
index 2616b84..212b87f 100644
--- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c
+++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include "e-contact-list-editor.h"
 #include <e-util/e-util-private.h>
diff --git a/addressbook/gui/contact-list-editor/e-contact-list-model.c b/addressbook/gui/contact-list-editor/e-contact-list-model.c
index 723ce1d..1a0cc6d 100644
--- a/addressbook/gui/contact-list-editor/e-contact-list-model.c
+++ b/addressbook/gui/contact-list-editor/e-contact-list-model.c
@@ -19,7 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
+
 #include <string.h>
 
 #include "e-contact-list-model.h"
diff --git a/addressbook/gui/merging/eab-contact-compare.c b/addressbook/gui/merging/eab-contact-compare.c
index 82dcf6e..4e226e7 100644
--- a/addressbook/gui/merging/eab-contact-compare.c
+++ b/addressbook/gui/merging/eab-contact-compare.c
@@ -21,7 +21,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
+
 #include <ctype.h>
 #include <string.h>
 #include <libedataserverui/e-book-auth-util.h>
diff --git a/addressbook/gui/merging/eab-contact-merging.c b/addressbook/gui/merging/eab-contact-merging.c
index 25a4a47..49e9968 100644
--- a/addressbook/gui/merging/eab-contact-merging.c
+++ b/addressbook/gui/merging/eab-contact-merging.c
@@ -23,7 +23,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include "eab-contact-merging.h"
 #include "eab-contact-compare.h"
diff --git a/addressbook/gui/widgets/e-addressbook-model.c b/addressbook/gui/widgets/e-addressbook-model.c
index 73d6776..c2c21bd 100644
--- a/addressbook/gui/widgets/e-addressbook-model.c
+++ b/addressbook/gui/widgets/e-addressbook-model.c
@@ -20,7 +20,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
+
 #include <string.h>
 #include <glib/gi18n.h>
 #include "e-addressbook-model.h"
diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
index 48daaaa..0561b76 100644
--- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
+++ b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
@@ -16,7 +16,10 @@
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
+
 #include <string.h>
 
 #include <glib/gi18n.h>
diff --git a/addressbook/gui/widgets/e-addressbook-selector.c b/addressbook/gui/widgets/e-addressbook-selector.c
index a39750c..76b0e98 100644
--- a/addressbook/gui/widgets/e-addressbook-selector.c
+++ b/addressbook/gui/widgets/e-addressbook-selector.c
@@ -18,6 +18,10 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-addressbook-selector.h"
 
 #include <e-util/e-selection.h>
diff --git a/addressbook/gui/widgets/e-addressbook-table-adapter.c b/addressbook/gui/widgets/e-addressbook-table-adapter.c
index e60ae92..e246118 100644
--- a/addressbook/gui/widgets/e-addressbook-table-adapter.c
+++ b/addressbook/gui/widgets/e-addressbook-table-adapter.c
@@ -19,7 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
+
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include "e-addressbook-model.h"
diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c
index 8deca49..321a9fd 100644
--- a/addressbook/gui/widgets/e-addressbook-view.c
+++ b/addressbook/gui/widgets/e-addressbook-view.c
@@ -21,7 +21,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <glib/gi18n.h>
 #include <table/e-table.h>
diff --git a/addressbook/gui/widgets/e-minicard-label.c b/addressbook/gui/widgets/e-minicard-label.c
index fd4e692..967853d 100644
--- a/addressbook/gui/widgets/e-minicard-label.c
+++ b/addressbook/gui/widgets/e-minicard-label.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include "e-minicard-label.h"
 
diff --git a/addressbook/gui/widgets/e-minicard-view-widget.c b/addressbook/gui/widgets/e-minicard-view-widget.c
index 3f8dd1f..1508e06 100644
--- a/addressbook/gui/widgets/e-minicard-view-widget.c
+++ b/addressbook/gui/widgets/e-minicard-view-widget.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <gtk/gtk.h>
 #include <misc/e-canvas-background.h>
diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c
index 880bf92..a00b038 100644
--- a/addressbook/gui/widgets/e-minicard-view.c
+++ b/addressbook/gui/widgets/e-minicard-view.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include "e-minicard-view.h"
 
diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c
index ea91b57..98cf1c2 100644
--- a/addressbook/gui/widgets/e-minicard.c
+++ b/addressbook/gui/widgets/e-minicard.c
@@ -20,7 +20,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
+
 #include <string.h>
 #include <gdk/gdkkeysyms.h>
 #include <glib/gi18n.h>
diff --git a/addressbook/gui/widgets/ea-addressbook-view.c b/addressbook/gui/widgets/ea-addressbook-view.c
index f0096e6..46a54a4 100644
--- a/addressbook/gui/widgets/ea-addressbook-view.c
+++ b/addressbook/gui/widgets/ea-addressbook-view.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <glib/gi18n.h>
 #include "ea-addressbook-view.h"
diff --git a/addressbook/gui/widgets/ea-addressbook.c b/addressbook/gui/widgets/ea-addressbook.c
index 8ac2607..20bca97 100644
--- a/addressbook/gui/widgets/ea-addressbook.c
+++ b/addressbook/gui/widgets/ea-addressbook.c
@@ -20,6 +20,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <text/e-text.h>
 #include "a11y/ea-factory.h"
 #include "ea-addressbook.h"
diff --git a/addressbook/gui/widgets/ea-minicard-view.c b/addressbook/gui/widgets/ea-minicard-view.c
index cc35d57..a6cd1f7 100644
--- a/addressbook/gui/widgets/ea-minicard-view.c
+++ b/addressbook/gui/widgets/ea-minicard-view.c
@@ -20,7 +20,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
+
 #include <string.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
diff --git a/addressbook/gui/widgets/ea-minicard.c b/addressbook/gui/widgets/ea-minicard.c
index 9bf6742..e218286 100644
--- a/addressbook/gui/widgets/ea-minicard.c
+++ b/addressbook/gui/widgets/ea-minicard.c
@@ -20,7 +20,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
+
 #include <string.h>
 #include <glib/gi18n.h>
 #include "ea-minicard.h"
diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c
index 280758f..ae6467b 100644
--- a/addressbook/gui/widgets/eab-gui-util.c
+++ b/addressbook/gui/widgets/eab-gui-util.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <unistd.h>
 #include <fcntl.h>
diff --git a/addressbook/gui/widgets/gal-view-minicard.c b/addressbook/gui/widgets/gal-view-minicard.c
index 383a562..6033b34 100644
--- a/addressbook/gui/widgets/gal-view-minicard.c
+++ b/addressbook/gui/widgets/gal-view-minicard.c
@@ -23,7 +23,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <libxml/parser.h>
 #include <e-util/e-xml-utils.h>
diff --git a/addressbook/importers/evolution-csv-importer.c b/addressbook/importers/evolution-csv-importer.c
index 6d3fd00..28d9f2d 100644
--- a/addressbook/importers/evolution-csv-importer.c
+++ b/addressbook/importers/evolution-csv-importer.c
@@ -22,7 +22,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
+
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>
diff --git a/addressbook/printing/e-contact-print.c b/addressbook/printing/e-contact-print.c
index 0ddda15..05f1101 100644
--- a/addressbook/printing/e-contact-print.c
+++ b/addressbook/printing/e-contact-print.c
@@ -19,7 +19,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <ctype.h>
 #include <sys/types.h>
diff --git a/addressbook/printing/test-print.c b/addressbook/printing/test-print.c
index bd2f222..7747318 100644
--- a/addressbook/printing/test-print.c
+++ b/addressbook/printing/test-print.c
@@ -20,7 +20,9 @@
  *
  */
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <stdlib.h>
 #include <gtk/gtk.h>
diff --git a/addressbook/tools/evolution-addressbook-export-list-cards.c b/addressbook/tools/evolution-addressbook-export-list-cards.c
index 544f2cd..15b570e 100644
--- a/addressbook/tools/evolution-addressbook-export-list-cards.c
+++ b/addressbook/tools/evolution-addressbook-export-list-cards.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <string.h>
 #include <sys/types.h>
diff --git a/addressbook/tools/evolution-addressbook-export.c b/addressbook/tools/evolution-addressbook-export.c
index 9c495e5..6d945d4 100644
--- a/addressbook/tools/evolution-addressbook-export.c
+++ b/addressbook/tools/evolution-addressbook-export.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <string.h>
 #include <glib.h>
diff --git a/addressbook/util/eab-book-util.c b/addressbook/util/eab-book-util.c
index 81f4860..261398d 100644
--- a/addressbook/util/eab-book-util.c
+++ b/addressbook/util/eab-book-util.c
@@ -21,7 +21,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
+
 #include "eab-book-util.h"
 
 #include <string.h>
diff --git a/calendar/gui/alarm-notify/alarm-notify-dialog.c b/calendar/gui/alarm-notify/alarm-notify-dialog.c
index 8860f25..eac9424 100644
--- a/calendar/gui/alarm-notify/alarm-notify-dialog.c
+++ b/calendar/gui/alarm-notify/alarm-notify-dialog.c
@@ -22,7 +22,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
+
 #include <stdio.h>
 #include <string.h>
 #include <glib/gi18n.h>
diff --git a/calendar/gui/alarm-notify/alarm-notify.c b/calendar/gui/alarm-notify/alarm-notify.c
index 26c84bb..96e8a17 100644
--- a/calendar/gui/alarm-notify/alarm-notify.c
+++ b/calendar/gui/alarm-notify/alarm-notify.c
@@ -21,7 +21,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <string.h>
diff --git a/calendar/gui/alarm-notify/alarm.c b/calendar/gui/alarm-notify/alarm.c
index a19f363..95d1d7b 100644
--- a/calendar/gui/alarm-notify/alarm.c
+++ b/calendar/gui/alarm-notify/alarm.c
@@ -23,7 +23,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
+
 #include <unistd.h>
 #include <time.h>
 #include <fcntl.h>
diff --git a/calendar/gui/alarm-notify/config-data.c b/calendar/gui/alarm-notify/config-data.c
index 2aab3ce..e1fe1f4 100644
--- a/calendar/gui/alarm-notify/config-data.c
+++ b/calendar/gui/alarm-notify/config-data.c
@@ -22,7 +22,7 @@
  *
  */
 
-#ifdef HAVE_CONFIOH
+#ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
 
diff --git a/calendar/gui/alarm-notify/notify-main.c b/calendar/gui/alarm-notify/notify-main.c
index db74af8..a420074 100644
--- a/calendar/gui/alarm-notify/notify-main.c
+++ b/calendar/gui/alarm-notify/notify-main.c
@@ -23,7 +23,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
+
 #include <glib/gi18n.h>
 
 #include "alarm-notify.h"
diff --git a/calendar/gui/dialogs/e-send-options-utils.c b/calendar/gui/dialogs/e-send-options-utils.c
index b21352d..72104a1 100644
--- a/calendar/gui/dialogs/e-send-options-utils.c
+++ b/calendar/gui/dialogs/e-send-options-utils.c
@@ -22,7 +22,12 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-send-options-utils.h"
+
 #include <glib.h>
 #include <string.h>
 
diff --git a/calendar/gui/e-alarm-list.c b/calendar/gui/e-alarm-list.c
index 4132cb7..3a1efc3 100644
--- a/calendar/gui/e-alarm-list.c
+++ b/calendar/gui/e-alarm-list.c
@@ -22,7 +22,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
+
 #include <string.h>
 #include <glib/gi18n.h>
 #include <libecal/e-cal-time-util.h>
diff --git a/calendar/gui/e-cal-component-preview.c b/calendar/gui/e-cal-component-preview.c
index ebcc290..c964a6f 100644
--- a/calendar/gui/e-cal-component-preview.c
+++ b/calendar/gui/e-cal-component-preview.c
@@ -22,6 +22,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-cal-component-preview.h"
 
 #include <string.h>
diff --git a/calendar/gui/e-calendar-selector.c b/calendar/gui/e-calendar-selector.c
index 8f9c063..86d42ae 100644
--- a/calendar/gui/e-calendar-selector.c
+++ b/calendar/gui/e-calendar-selector.c
@@ -18,6 +18,10 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-calendar-selector.h"
 
 #include <libecal/e-cal.h>
diff --git a/calendar/gui/e-date-time-list.c b/calendar/gui/e-date-time-list.c
index 3735338..404fac9 100644
--- a/calendar/gui/e-date-time-list.c
+++ b/calendar/gui/e-date-time-list.c
@@ -22,6 +22,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <string.h>
 #include <libedataserver/e-time-utils.h>
 #include "e-date-time-list.h"
diff --git a/calendar/gui/e-day-view-layout.c b/calendar/gui/e-day-view-layout.c
index bdb5197..a4cdece 100644
--- a/calendar/gui/e-day-view-layout.c
+++ b/calendar/gui/e-day-view-layout.c
@@ -26,7 +26,9 @@
  * used for printing.
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include "e-day-view-layout.h"
 #include "e-util/e-bit-array.h"
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index af28e3c..a9d4302 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -21,6 +21,7 @@
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
+
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/calendar/gui/e-meeting-attendee.h b/calendar/gui/e-meeting-attendee.h
index d24b013..145e28c 100644
--- a/calendar/gui/e-meeting-attendee.h
+++ b/calendar/gui/e-meeting-attendee.h
@@ -24,10 +24,6 @@
 #ifndef _E_MEETING_ATTENDEE_H_
 #define _E_MEETING_ATTENDEE_H_
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <gtk/gtk.h>
 #include <libecal/e-cal-component.h>
 #include "e-meeting-types.h"
diff --git a/calendar/gui/e-meeting-time-sel-item.c b/calendar/gui/e-meeting-time-sel-item.c
index 0ac891c..65cbc39 100644
--- a/calendar/gui/e-meeting-time-sel-item.c
+++ b/calendar/gui/e-meeting-time-sel-item.c
@@ -22,6 +22,7 @@
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
+
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/calendar/gui/e-meeting-types.h b/calendar/gui/e-meeting-types.h
index 49ddaf2..a2952a8 100644
--- a/calendar/gui/e-meeting-types.h
+++ b/calendar/gui/e-meeting-types.h
@@ -24,10 +24,6 @@
 #ifndef _E_MEETING_TYPES_H_
 #define _E_MEETING_TYPES_H_
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <glib.h>
 #include "e-meeting-types.h"
 
diff --git a/calendar/gui/e-meeting-utils.h b/calendar/gui/e-meeting-utils.h
index 1777d2c..250437d 100644
--- a/calendar/gui/e-meeting-utils.h
+++ b/calendar/gui/e-meeting-utils.h
@@ -24,10 +24,6 @@
 #ifndef _E_MEETING_UTILS_H_
 #define _E_MEETING_UTILS_H_
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <glib.h>
 #include "e-meeting-types.h"
 
diff --git a/calendar/gui/e-memo-list-selector.c b/calendar/gui/e-memo-list-selector.c
index 91c6b7f..bb41412 100644
--- a/calendar/gui/e-memo-list-selector.c
+++ b/calendar/gui/e-memo-list-selector.c
@@ -18,6 +18,10 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-memo-list-selector.h"
 
 #include <string.h>
diff --git a/calendar/gui/e-month-view.c b/calendar/gui/e-month-view.c
index 45ff2bd..ca8fe3a 100644
--- a/calendar/gui/e-month-view.c
+++ b/calendar/gui/e-month-view.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-month-view.h"
 
 #include <libecal/e-cal-time-util.h>
diff --git a/calendar/gui/e-select-names-editable.c b/calendar/gui/e-select-names-editable.c
index 52d6b82..6b541e1 100644
--- a/calendar/gui/e-select-names-editable.c
+++ b/calendar/gui/e-select-names-editable.c
@@ -20,7 +20,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
+
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <libebook/e-destination.h>
diff --git a/calendar/gui/e-select-names-renderer.c b/calendar/gui/e-select-names-renderer.c
index a2e4ec6..3e92636 100644
--- a/calendar/gui/e-select-names-renderer.c
+++ b/calendar/gui/e-select-names-renderer.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include "e-util/e-util.h"
 
diff --git a/calendar/gui/e-task-list-selector.c b/calendar/gui/e-task-list-selector.c
index 7e12125..6967648 100644
--- a/calendar/gui/e-task-list-selector.c
+++ b/calendar/gui/e-task-list-selector.c
@@ -18,6 +18,10 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-task-list-selector.h"
 
 #include <string.h>
diff --git a/calendar/gui/e-timezone-entry.c b/calendar/gui/e-timezone-entry.c
index e1f8edb..3318e66 100644
--- a/calendar/gui/e-timezone-entry.c
+++ b/calendar/gui/e-timezone-entry.c
@@ -28,7 +28,10 @@
  * timezone.
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
+
 #include <widgets/e-timezone-dialog/e-timezone-dialog.h>
 #include <glib/gi18n.h>
 #include "e-timezone-entry.h"
diff --git a/calendar/gui/e-week-view-layout.c b/calendar/gui/e-week-view-layout.c
index c381ea3..0b776ad 100644
--- a/calendar/gui/e-week-view-layout.c
+++ b/calendar/gui/e-week-view-layout.c
@@ -21,7 +21,9 @@
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include "e-week-view-layout.h"
 #include "calendar-config.h"
diff --git a/calendar/gui/ea-cal-view-event.c b/calendar/gui/ea-cal-view-event.c
index fd26c76..bd73d59 100644
--- a/calendar/gui/ea-cal-view-event.c
+++ b/calendar/gui/ea-cal-view-event.c
@@ -20,6 +20,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "ea-cal-view-event.h"
 #include "ea-calendar-helpers.h"
 #include "ea-day-view.h"
diff --git a/calendar/gui/ea-cal-view.c b/calendar/gui/ea-cal-view.c
index 15381ee..e663a37 100644
--- a/calendar/gui/ea-cal-view.c
+++ b/calendar/gui/ea-cal-view.c
@@ -20,6 +20,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "ea-cal-view.h"
 #include "ea-calendar-helpers.h"
 #include "e-day-view.h"
diff --git a/calendar/gui/ea-calendar-helpers.c b/calendar/gui/ea-calendar-helpers.c
index 38ebf75..2ec6d93 100644
--- a/calendar/gui/ea-calendar-helpers.c
+++ b/calendar/gui/ea-calendar-helpers.c
@@ -21,6 +21,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "ea-calendar-helpers.h"
 #include "ea-cal-view-event.h"
 #include "ea-jump-button.h"
diff --git a/calendar/gui/ea-calendar.c b/calendar/gui/ea-calendar.c
index 577a223..dbc20fd 100644
--- a/calendar/gui/ea-calendar.c
+++ b/calendar/gui/ea-calendar.c
@@ -20,6 +20,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <text/e-text.h>
 #include <libgnomecanvas/libgnomecanvas.h>
 #include "ea-calendar-helpers.h"
diff --git a/calendar/gui/ea-day-view-cell.c b/calendar/gui/ea-day-view-cell.c
index 6a8489f..bb2c32d 100644
--- a/calendar/gui/ea-day-view-cell.c
+++ b/calendar/gui/ea-day-view-cell.c
@@ -21,6 +21,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "ea-day-view-cell.h"
 #include "ea-day-view-main-item.h"
 #include "ea-day-view.h"
diff --git a/calendar/gui/ea-day-view-main-item.c b/calendar/gui/ea-day-view-main-item.c
index 4d36044..6ea15a4 100644
--- a/calendar/gui/ea-day-view-main-item.c
+++ b/calendar/gui/ea-day-view-main-item.c
@@ -21,6 +21,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "ea-day-view-main-item.h"
 #include "e-day-view-top-item.h"
 #include "ea-day-view.h"
diff --git a/calendar/gui/ea-day-view.c b/calendar/gui/ea-day-view.c
index ea20475..1314a77 100644
--- a/calendar/gui/ea-day-view.c
+++ b/calendar/gui/ea-day-view.c
@@ -20,6 +20,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "ea-day-view.h"
 #include "ea-cal-view-event.h"
 
diff --git a/calendar/gui/ea-gnome-calendar.c b/calendar/gui/ea-gnome-calendar.c
index e8f7eae..76a5a00 100644
--- a/calendar/gui/ea-gnome-calendar.c
+++ b/calendar/gui/ea-gnome-calendar.c
@@ -21,6 +21,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "ea-gnome-calendar.h"
 #include "e-calendar-view.h"
 #include <string.h>
diff --git a/calendar/gui/ea-jump-button.c b/calendar/gui/ea-jump-button.c
index 3b7d6e7..7a31c09 100644
--- a/calendar/gui/ea-jump-button.c
+++ b/calendar/gui/ea-jump-button.c
@@ -21,6 +21,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "ea-jump-button.h"
 #include "ea-calendar-helpers.h"
 #include "ea-week-view.h"
diff --git a/calendar/gui/ea-week-view-cell.c b/calendar/gui/ea-week-view-cell.c
index ff77e60..299c730 100644
--- a/calendar/gui/ea-week-view-cell.c
+++ b/calendar/gui/ea-week-view-cell.c
@@ -22,6 +22,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "ea-week-view-cell.h"
 #include "ea-week-view-main-item.h"
 #include "a11y/ea-factory.h"
diff --git a/calendar/gui/ea-week-view-main-item.c b/calendar/gui/ea-week-view-main-item.c
index 2be13ee..b0487b7 100644
--- a/calendar/gui/ea-week-view-main-item.c
+++ b/calendar/gui/ea-week-view-main-item.c
@@ -21,6 +21,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "ea-week-view-main-item.h"
 #include "ea-week-view.h"
 #include "ea-week-view-cell.h"
diff --git a/calendar/gui/ea-week-view.c b/calendar/gui/ea-week-view.c
index 7f60009..ec9c5af 100644
--- a/calendar/gui/ea-week-view.c
+++ b/calendar/gui/ea-week-view.c
@@ -20,6 +20,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "ea-week-view.h"
 #include "ea-cal-view-event.h"
 #include "ea-calendar-helpers.h"
diff --git a/capplet/anjal-settings-main.c b/capplet/anjal-settings-main.c
index 07dbda2..5a03ec6 100644
--- a/capplet/anjal-settings-main.c
+++ b/capplet/anjal-settings-main.c
@@ -22,6 +22,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <locale.h>
@@ -29,8 +33,6 @@
 #include <string.h>
 #include <stdio.h>
 
-#include <config.h>
-
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <libedataserverui/e-passwords.h>
diff --git a/capplet/settings/anjal-mail-view.c b/capplet/settings/anjal-mail-view.c
index 21a8f0a..eb8a06e 100644
--- a/capplet/settings/anjal-mail-view.c
+++ b/capplet/settings/anjal-mail-view.c
@@ -21,7 +21,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#  include <config.h>
+#include <config.h>
 #endif
 
 #include "anjal-mail-view.h"
diff --git a/capplet/settings/mail-account-view.c b/capplet/settings/mail-account-view.c
index 128e0f1..eac32cc 100644
--- a/capplet/settings/mail-account-view.c
+++ b/capplet/settings/mail-account-view.c
@@ -21,7 +21,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#  include <config.h>
+#include <config.h>
 #endif
 
 #include <glib/gi18n.h>
diff --git a/capplet/settings/mail-capplet-shell.c b/capplet/settings/mail-capplet-shell.c
index 2908531..a22bb88 100644
--- a/capplet/settings/mail-capplet-shell.c
+++ b/capplet/settings/mail-capplet-shell.c
@@ -24,7 +24,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#  include <config.h>
+#include <config.h>
 #endif
 
 #include <gtk/gtkx.h>
diff --git a/capplet/settings/mail-settings-view.c b/capplet/settings/mail-settings-view.c
index 01a984d..3ae2c6d 100644
--- a/capplet/settings/mail-settings-view.c
+++ b/capplet/settings/mail-settings-view.c
@@ -21,7 +21,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#  include <config.h>
+#include <config.h>
 #endif
 
 #include <glib/gi18n.h>
diff --git a/capplet/settings/mail-view.c b/capplet/settings/mail-view.c
index 67a86d7..279b83c 100644
--- a/capplet/settings/mail-view.c
+++ b/capplet/settings/mail-view.c
@@ -21,8 +21,9 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#  include <config.h>
+#include <config.h>
 #endif
+
 #include <glib/gi18n.h>
 #include "mail/em-utils.h"
 #include "mail/mail-send-recv.h"
diff --git a/composer/e-composer-actions.c b/composer/e-composer-actions.c
index bbd2aac..163270f 100644
--- a/composer/e-composer-actions.c
+++ b/composer/e-composer-actions.c
@@ -16,6 +16,10 @@
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-composer-actions.h"
 #include "e-composer-private.h"
 
diff --git a/composer/e-composer-activity.c b/composer/e-composer-activity.c
index 6c285f2..ee46d9b 100644
--- a/composer/e-composer-activity.c
+++ b/composer/e-composer-activity.c
@@ -16,6 +16,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-composer-private.h"
 
 struct _EComposerActivityPrivate {
diff --git a/composer/e-composer-common.h b/composer/e-composer-common.h
index 28affba..661797e 100644
--- a/composer/e-composer-common.h
+++ b/composer/e-composer-common.h
@@ -21,10 +21,6 @@
 #ifndef E_COMPOSER_COMMON
 #define E_COMPOSER_COMMON
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <gtk/gtk.h>
 
 #endif /* E_COMPOSER_COMMON */
diff --git a/composer/e-composer-from-header.c b/composer/e-composer-from-header.c
index 856d36a..0b56971 100644
--- a/composer/e-composer-from-header.c
+++ b/composer/e-composer-from-header.c
@@ -18,6 +18,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-composer-from-header.h"
 
 /* Convenience macro */
diff --git a/composer/e-composer-header-table.c b/composer/e-composer-header-table.c
index efac8a1..78404a6 100644
--- a/composer/e-composer-header-table.c
+++ b/composer/e-composer-header-table.c
@@ -15,6 +15,10 @@
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-composer-header-table.h"
 
 #include <string.h>
diff --git a/composer/e-composer-header.c b/composer/e-composer-header.c
index f3f2f28..d6a270a 100644
--- a/composer/e-composer-header.c
+++ b/composer/e-composer-header.c
@@ -20,6 +20,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-composer-header.h"
 
 #include <glib/gi18n.h>
diff --git a/composer/e-composer-name-header.c b/composer/e-composer-name-header.c
index 3589dea..dcaecab 100644
--- a/composer/e-composer-name-header.c
+++ b/composer/e-composer-name-header.c
@@ -18,6 +18,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-msg-composer.h"
 #include "e-composer-name-header.h"
 
diff --git a/composer/e-composer-post-header.c b/composer/e-composer-post-header.c
index 000ed7c..fd08c67 100644
--- a/composer/e-composer-post-header.c
+++ b/composer/e-composer-post-header.c
@@ -18,6 +18,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-composer-post-header.h"
 
 #include <string.h>
diff --git a/composer/e-composer-private.c b/composer/e-composer-private.c
index 46206a4..08cdd47 100644
--- a/composer/e-composer-private.c
+++ b/composer/e-composer-private.c
@@ -17,6 +17,10 @@
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-composer-private.h"
 #include "e-util/e-util-private.h"
 
diff --git a/composer/e-composer-text-header.c b/composer/e-composer-text-header.c
index d92901d..28df51e 100644
--- a/composer/e-composer-text-header.c
+++ b/composer/e-composer-text-header.c
@@ -19,6 +19,10 @@
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-composer-text-header.h"
 
 /* Convenience macro */
diff --git a/e-util/e-account-utils.c b/e-util/e-account-utils.c
index 0172abc..ec733ed 100644
--- a/e-util/e-account-utils.c
+++ b/e-util/e-account-utils.c
@@ -20,6 +20,10 @@
  * @include: e-util/e-account-utils.h
  **/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-account-utils.h"
 
 #include <string.h>
diff --git a/e-util/e-activity.c b/e-util/e-activity.c
index 2e3a078..2c0ba6a 100644
--- a/e-util/e-activity.c
+++ b/e-util/e-activity.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-activity.h"
 
 #include <stdarg.h>
diff --git a/e-util/e-alert-dialog.c b/e-util/e-alert-dialog.c
index 83ef05c..8696588 100644
--- a/e-util/e-alert-dialog.c
+++ b/e-util/e-alert-dialog.c
@@ -21,6 +21,10 @@
  * Copyright (C) 2009 Intel Corporation
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-alert-dialog.h"
 
 #include "e-util.h"
diff --git a/e-util/e-alert-sink.c b/e-util/e-alert-sink.c
index 2a8db40..ae3a736 100644
--- a/e-util/e-alert-sink.c
+++ b/e-util/e-alert-sink.c
@@ -25,6 +25,10 @@
  * usually by displaying them to the user.
  **/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-alert-sink.h"
 
 #include "e-alert-dialog.h"
diff --git a/e-util/e-alert.c b/e-util/e-alert.c
index 3554fd2..5ef7c57 100644
--- a/e-util/e-alert.c
+++ b/e-util/e-alert.c
@@ -22,7 +22,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <string.h>
 #include <sys/types.h>
diff --git a/e-util/e-bit-array.c b/e-util/e-bit-array.c
index ad65131..4761182 100644
--- a/e-util/e-bit-array.c
+++ b/e-util/e-bit-array.c
@@ -21,7 +21,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <gtk/gtk.h>
 
diff --git a/e-util/e-categories-config.c b/e-util/e-categories-config.c
index 44d5dc2..b8d772c 100644
--- a/e-util/e-categories-config.c
+++ b/e-util/e-categories-config.c
@@ -20,6 +20,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-categories-config.h"
 
 #include <string.h>
diff --git a/e-util/e-datetime-format.c b/e-util/e-datetime-format.c
index 3748a47..8b354cf 100644
--- a/e-util/e-datetime-format.c
+++ b/e-util/e-datetime-format.c
@@ -18,6 +18,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
diff --git a/e-util/e-dialog-widgets.c b/e-util/e-dialog-widgets.c
index 0948f2f..9a47e81 100644
--- a/e-util/e-dialog-widgets.c
+++ b/e-util/e-dialog-widgets.c
@@ -22,7 +22,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <math.h>
 #include <string.h>
diff --git a/e-util/e-extensible.c b/e-util/e-extensible.c
index 909003f..a7523de 100644
--- a/e-util/e-extensible.c
+++ b/e-util/e-extensible.c
@@ -56,6 +56,10 @@
  * </informalexample>
  **/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-extensible.h"
 
 #include <e-util/e-util.h>
diff --git a/e-util/e-extension.c b/e-util/e-extension.c
index baf6b49..88912bc 100644
--- a/e-util/e-extension.c
+++ b/e-util/e-extension.c
@@ -39,6 +39,10 @@
  *    registered in the library module's e_module_load() function.
  **/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-extension.h"
 
 struct _EExtensionPrivate {
diff --git a/e-util/e-file-utils.c b/e-util/e-file-utils.c
index 49fd4a0..f89bff6 100644
--- a/e-util/e-file-utils.c
+++ b/e-util/e-file-utils.c
@@ -21,7 +21,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/e-util/e-html-utils.c b/e-util/e-html-utils.c
index ceac32f..e2cdd8f 100644
--- a/e-util/e-html-utils.c
+++ b/e-util/e-html-utils.c
@@ -20,6 +20,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <ctype.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/e-util/e-icon-factory.c b/e-util/e-icon-factory.c
index a374a6d..afb879a 100644
--- a/e-util/e-icon-factory.c
+++ b/e-util/e-icon-factory.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/e-util/e-import.c b/e-util/e-import.c
index b5fbe27..4b55895 100644
--- a/e-util/e-import.c
+++ b/e-util/e-import.c
@@ -20,6 +20,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #ifdef HAVE_IMPORT_H
 #include <import.h>
 #endif
diff --git a/e-util/e-module.c b/e-util/e-module.c
index cc397a9..b3e90aa 100644
--- a/e-util/e-module.c
+++ b/e-util/e-module.c
@@ -25,6 +25,10 @@
  * @include: e-util/e-module.h
  **/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-module.h"
 
 #include <glib/gi18n.h>
diff --git a/e-util/e-plugin-ui.c b/e-util/e-plugin-ui.c
index a6ecb83..745a931 100644
--- a/e-util/e-plugin-ui.c
+++ b/e-util/e-plugin-ui.c
@@ -15,6 +15,10 @@
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-plugin-ui.h"
 
 #include "e-util.h"
diff --git a/e-util/e-plugin-util.c b/e-util/e-plugin-util.c
index 4e04bc3..dbceeb6 100644
--- a/e-util/e-plugin-util.c
+++ b/e-util/e-plugin-util.c
@@ -16,6 +16,10 @@
  * Copyright (C) 1999-2010 Novell, Inc. (www.novell.com)
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
diff --git a/e-util/e-plugin.c b/e-util/e-plugin.c
index 17e4b50..e0f1aec 100644
--- a/e-util/e-plugin.c
+++ b/e-util/e-plugin.c
@@ -16,7 +16,9 @@
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <sys/types.h>
 #include <string.h>
diff --git a/e-util/e-poolv.c b/e-util/e-poolv.c
index acd0a1a..b30149d 100644
--- a/e-util/e-poolv.c
+++ b/e-util/e-poolv.c
@@ -16,6 +16,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-poolv.h"
 
 #include <string.h>
diff --git a/e-util/e-print.c b/e-util/e-print.c
index dd5a56a..e50ffd8 100644
--- a/e-util/e-print.c
+++ b/e-util/e-print.c
@@ -21,6 +21,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-print.h"
 
 #include <stdio.h>
diff --git a/e-util/e-selection.c b/e-util/e-selection.c
index 3d8922a..1c5d11b 100644
--- a/e-util/e-selection.c
+++ b/e-util/e-selection.c
@@ -25,6 +25,10 @@
  * @include: e-util/e-selection.h
  **/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-selection.h"
 
 #include <string.h>
diff --git a/e-util/e-signature-list.c b/e-util/e-signature-list.c
index bb2029a..43c943a 100644
--- a/e-util/e-signature-list.c
+++ b/e-util/e-signature-list.c
@@ -21,9 +21,12 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-signature-list.h"
 
-#include <config.h>
 #include <string.h>
 
 #include <libedataserver/e-uid.h>
diff --git a/e-util/e-signature-utils.c b/e-util/e-signature-utils.c
index 8c19079..fca51d3 100644
--- a/e-util/e-signature-utils.c
+++ b/e-util/e-signature-utils.c
@@ -17,6 +17,10 @@
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-signature-utils.h"
 
 #include <errno.h>
diff --git a/e-util/e-sorter-array.c b/e-util/e-sorter-array.c
index 21d3838..074d45d 100644
--- a/e-util/e-sorter-array.c
+++ b/e-util/e-sorter-array.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/e-util/e-sorter.c b/e-util/e-sorter.c
index 74838e3..9e255e8 100644
--- a/e-util/e-sorter.c
+++ b/e-util/e-sorter.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/e-util/e-text-event-processor-emacs-like.c b/e-util/e-text-event-processor-emacs-like.c
index 554ea5f..84e7c9e 100644
--- a/e-util/e-text-event-processor-emacs-like.c
+++ b/e-util/e-text-event-processor-emacs-like.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <string.h>
 
diff --git a/e-util/e-text-event-processor.c b/e-util/e-text-event-processor.c
index 9e2b2d6..e5624f9 100644
--- a/e-util/e-text-event-processor.c
+++ b/e-util/e-text-event-processor.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <glib/gi18n.h>
 
diff --git a/e-util/e-ui-manager.c b/e-util/e-ui-manager.c
index 5219662..35e14a3 100644
--- a/e-util/e-ui-manager.c
+++ b/e-util/e-ui-manager.c
@@ -25,6 +25,10 @@
  * which influences the parsing of UI definitions.
  **/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-ui-manager.h"
 #include "e-util-private.h"
 
diff --git a/e-util/e-unicode.c b/e-util/e-unicode.c
index a287cd8..de22525 100644
--- a/e-util/e-unicode.c
+++ b/e-util/e-unicode.c
@@ -22,7 +22,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/e-util/e-util.c b/e-util/e-util.c
index b7dd93a..4b47f64 100644
--- a/e-util/e-util.c
+++ b/e-util/e-util.c
@@ -25,7 +25,9 @@
  * @include: e-util/e-util.h
  **/
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/e-util/e-win32-defaults.c b/e-util/e-win32-defaults.c
index 7fe216f..a510ebf 100644
--- a/e-util/e-win32-defaults.c
+++ b/e-util/e-win32-defaults.c
@@ -21,6 +21,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <windows.h>
 
 #include "e-win32-defaults.h"
diff --git a/e-util/e-win32-reloc.c b/e-util/e-win32-reloc.c
index bfe903b..86d1a53 100644
--- a/e-util/e-win32-reloc.c
+++ b/e-util/e-win32-reloc.c
@@ -21,7 +21,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <windows.h>
 #include <string.h>
diff --git a/e-util/e-xml-utils.c b/e-util/e-xml-utils.c
index 443f59f..0c34f48 100644
--- a/e-util/e-xml-utils.c
+++ b/e-util/e-xml-utils.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/e-util/gconf-bridge.c b/e-util/gconf-bridge.c
index 2207cab..9741f6c 100644
--- a/e-util/gconf-bridge.c
+++ b/e-util/gconf-bridge.c
@@ -19,7 +19,9 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <gtk/gtk.h>
 #include <glib/gi18n-lib.h>
diff --git a/filter/e-filter-file.c b/filter/e-filter-file.c
index d9f87ce..a5199fe 100644
--- a/filter/e-filter-file.c
+++ b/filter/e-filter-file.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <string.h>
 #include <sys/types.h>
diff --git a/filter/e-rule-context.c b/filter/e-rule-context.c
index e03501c..9621349 100644
--- a/filter/e-rule-context.c
+++ b/filter/e-rule-context.c
@@ -22,7 +22,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <string.h>
 #include <sys/types.h>
diff --git a/libgnomecanvas/gailcanvas.c b/libgnomecanvas/gailcanvas.c
index 41e8852..ca60f26 100644
--- a/libgnomecanvas/gailcanvas.c
+++ b/libgnomecanvas/gailcanvas.c
@@ -17,6 +17,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <gtk/gtk.h>
 #include <libgnomecanvas/gnome-canvas.h>
 #include <libgnomecanvas/gnome-canvas-text.h>
diff --git a/libgnomecanvas/gailcanvasgroup.c b/libgnomecanvas/gailcanvasgroup.c
index 0296997..5de5837 100644
--- a/libgnomecanvas/gailcanvasgroup.c
+++ b/libgnomecanvas/gailcanvasgroup.c
@@ -17,6 +17,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <gtk/gtk.h>
 #include <libgnomecanvas/gnome-canvas.h>
 #include "gailcanvasgroup.h"
diff --git a/libgnomecanvas/gailcanvasgroupfactory.c b/libgnomecanvas/gailcanvasgroupfactory.c
index 612dccf..8c208f8 100644
--- a/libgnomecanvas/gailcanvasgroupfactory.c
+++ b/libgnomecanvas/gailcanvasgroupfactory.c
@@ -17,6 +17,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <gtk/gtk.h>
 #include "gailcanvasgroupfactory.h"
 #include "gailcanvasgroup.h"
diff --git a/libgnomecanvas/gailcanvasitem.c b/libgnomecanvas/gailcanvasitem.c
index e676447..377c6fe 100644
--- a/libgnomecanvas/gailcanvasitem.c
+++ b/libgnomecanvas/gailcanvasitem.c
@@ -17,6 +17,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <math.h>
 #include <gtk/gtk.h>
 #include <libgnomecanvas/gnome-canvas.h>
diff --git a/libgnomecanvas/gailcanvasitemfactory.c b/libgnomecanvas/gailcanvasitemfactory.c
index 376e917..66435d2 100644
--- a/libgnomecanvas/gailcanvasitemfactory.c
+++ b/libgnomecanvas/gailcanvasitemfactory.c
@@ -17,6 +17,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <gtk/gtk.h>
 #include "gailcanvasitemfactory.h"
 #include "gailcanvasitem.h"
diff --git a/libgnomecanvas/gailcanvastext.c b/libgnomecanvas/gailcanvastext.c
index 0cbecac..6d070d5 100644
--- a/libgnomecanvas/gailcanvastext.c
+++ b/libgnomecanvas/gailcanvastext.c
@@ -17,6 +17,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <gtk/gtk.h>
 #include <libgnomecanvas/libgnomecanvas.h>
 #include "gailcanvasitem.h"
diff --git a/libgnomecanvas/gailcanvastextfactory.c b/libgnomecanvas/gailcanvastextfactory.c
index 2cbb97c..1fe39ab 100644
--- a/libgnomecanvas/gailcanvastextfactory.c
+++ b/libgnomecanvas/gailcanvastextfactory.c
@@ -17,6 +17,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <gtk/gtk.h>
 #include "gailcanvastextfactory.h"
 #include "gailcanvastext.h"
diff --git a/libgnomecanvas/gailcanvaswidget.c b/libgnomecanvas/gailcanvaswidget.c
index 3e61924..cc5e7fa 100644
--- a/libgnomecanvas/gailcanvaswidget.c
+++ b/libgnomecanvas/gailcanvaswidget.c
@@ -17,6 +17,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <gtk/gtk.h>
 #include <libgnomecanvas/gnome-canvas.h>
 #include <libgnomecanvas/gnome-canvas-widget.h>
diff --git a/libgnomecanvas/gailcanvaswidgetfactory.c b/libgnomecanvas/gailcanvaswidgetfactory.c
index fa799c3..d636de9 100644
--- a/libgnomecanvas/gailcanvaswidgetfactory.c
+++ b/libgnomecanvas/gailcanvaswidgetfactory.c
@@ -17,6 +17,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "gailcanvaswidgetfactory.h"
 #include "gailcanvaswidget.h"
 
diff --git a/libgnomecanvas/gnome-canvas-pixbuf.c b/libgnomecanvas/gnome-canvas-pixbuf.c
index fbe673d..31f348c 100644
--- a/libgnomecanvas/gnome-canvas-pixbuf.c
+++ b/libgnomecanvas/gnome-canvas-pixbuf.c
@@ -20,7 +20,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
+
 #include <math.h>
 #include <libgnomecanvas/gnome-canvas.h>
 #include <libgnomecanvas/gnome-canvas-util.h>
diff --git a/libgnomecanvas/gnome-canvas-rect.c b/libgnomecanvas/gnome-canvas-rect.c
index b90dc4c..42fc617 100644
--- a/libgnomecanvas/gnome-canvas-rect.c
+++ b/libgnomecanvas/gnome-canvas-rect.c
@@ -18,6 +18,10 @@
 /* These includes are set up for standalone compile. If/when this codebase
    is integrated into libgnomeui, the includes will need to change. */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <math.h>
 #include <string.h>
 
diff --git a/libgnomecanvas/gnome-canvas-rich-text.c b/libgnomecanvas/gnome-canvas-rich-text.c
index 2bd4c77..036cce8 100644
--- a/libgnomecanvas/gnome-canvas-rich-text.c
+++ b/libgnomecanvas/gnome-canvas-rich-text.c
@@ -20,6 +20,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <math.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/libgnomecanvas/gnome-canvas-text.c b/libgnomecanvas/gnome-canvas-text.c
index 35a109b..b61ce2a 100644
--- a/libgnomecanvas/gnome-canvas-text.c
+++ b/libgnomecanvas/gnome-canvas-text.c
@@ -35,7 +35,10 @@
  * Port to Pango co-done by Gergõ Érdi <cactus cactus rulez org>
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
+
 #include <math.h>
 #include <string.h>
 #include "gnome-canvas-text.h"
diff --git a/libgnomecanvas/gnome-canvas-util.c b/libgnomecanvas/gnome-canvas-util.c
index 569a22e..43126c3 100644
--- a/libgnomecanvas/gnome-canvas-util.c
+++ b/libgnomecanvas/gnome-canvas-util.c
@@ -32,7 +32,9 @@
  * Author: Federico Mena <federico nuclecu unam mx>
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 /* needed for M_PI_2 under 'gcc -ansi -predantic' on GNU/Linux */
 #ifndef _BSD_SOURCE
diff --git a/libgnomecanvas/gnome-canvas-widget.c b/libgnomecanvas/gnome-canvas-widget.c
index 8d34911..fd5693c 100644
--- a/libgnomecanvas/gnome-canvas-widget.c
+++ b/libgnomecanvas/gnome-canvas-widget.c
@@ -32,7 +32,10 @@
  * Author: Federico Mena <federico nuclecu unam mx>
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
+
 #include <math.h>
 #include "gnome-canvas-widget.h"
 
diff --git a/libgnomecanvas/gnome-canvas.c b/libgnomecanvas/gnome-canvas.c
index 0ea1e30..bf4f186 100644
--- a/libgnomecanvas/gnome-canvas.c
+++ b/libgnomecanvas/gnome-canvas.c
@@ -77,7 +77,9 @@
  * - Add more image loading techniques to work around imlib deficiencies.
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <math.h>
 #include <string.h>
diff --git a/mail/e-mail-attachment-bar.c b/mail/e-mail-attachment-bar.c
index 786fda2..17a7ae1 100644
--- a/mail/e-mail-attachment-bar.c
+++ b/mail/e-mail-attachment-bar.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-mail-attachment-bar.h"
 
 #include <glib/gi18n.h>
diff --git a/mail/e-mail-backend.c b/mail/e-mail-backend.c
index 11362e5..0ae8706 100644
--- a/mail/e-mail-backend.c
+++ b/mail/e-mail-backend.c
@@ -22,6 +22,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-mail-backend.h"
 
 #include <string.h>
diff --git a/mail/e-mail-browser.c b/mail/e-mail-browser.c
index 3678092..e24e695 100644
--- a/mail/e-mail-browser.c
+++ b/mail/e-mail-browser.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-mail-browser.h"
 
 #include <string.h>
diff --git a/mail/e-mail-display.c b/mail/e-mail-display.c
index 78a6324..ed88fec 100644
--- a/mail/e-mail-display.c
+++ b/mail/e-mail-display.c
@@ -19,9 +19,12 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-mail-display.h"
 
-#include <config.h>
 #include <glib/gi18n.h>
 
 #include "e-util/e-util.h"
diff --git a/mail/e-mail-folder-pane.c b/mail/e-mail-folder-pane.c
index 0e55fc5..e9aa029 100644
--- a/mail/e-mail-folder-pane.c
+++ b/mail/e-mail-folder-pane.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-mail-folder-pane.h"
 
 #include <string.h>
diff --git a/mail/e-mail-folder-utils.c b/mail/e-mail-folder-utils.c
index f621d74..659d51e 100644
--- a/mail/e-mail-folder-utils.c
+++ b/mail/e-mail-folder-utils.c
@@ -16,9 +16,12 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-mail-folder-utils.h"
 
-#include <config.h>
 #include <glib/gi18n-lib.h>
 
 #include "mail/mail-tools.h"
diff --git a/mail/e-mail-label-action.c b/mail/e-mail-label-action.c
index f83055b..0eb1dc9 100644
--- a/mail/e-mail-label-action.c
+++ b/mail/e-mail-label-action.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-mail-label-action.h"
 
 struct _EMailLabelActionPrivate {
diff --git a/mail/e-mail-label-dialog.c b/mail/e-mail-label-dialog.c
index 534ab9e..cb29cc6 100644
--- a/mail/e-mail-label-dialog.c
+++ b/mail/e-mail-label-dialog.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-mail-label-dialog.h"
 
 #include <glib/gi18n.h>
diff --git a/mail/e-mail-label-list-store.c b/mail/e-mail-label-list-store.c
index c0774e4..f604893 100644
--- a/mail/e-mail-label-list-store.c
+++ b/mail/e-mail-label-list-store.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-mail-label-list-store.h"
 
 #include <glib/gi18n.h>
diff --git a/mail/e-mail-label-manager.c b/mail/e-mail-label-manager.c
index 0a21017..e5fd6eb 100644
--- a/mail/e-mail-label-manager.c
+++ b/mail/e-mail-label-manager.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-mail-label-manager.h"
 
 #include <glib/gi18n.h>
diff --git a/mail/e-mail-label-tree-view.c b/mail/e-mail-label-tree-view.c
index 0d5baab..e5a8e50 100644
--- a/mail/e-mail-label-tree-view.c
+++ b/mail/e-mail-label-tree-view.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-mail-label-tree-view.h"
 
 #include <glib/gi18n.h>
diff --git a/mail/e-mail-local.c b/mail/e-mail-local.c
index 46acb9f..cebbd4d 100644
--- a/mail/e-mail-local.c
+++ b/mail/e-mail-local.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-mail-local.h"
 
 #include <glib/gi18n.h>
diff --git a/mail/e-mail-message-pane.c b/mail/e-mail-message-pane.c
index 0a23429..e77974b 100644
--- a/mail/e-mail-message-pane.c
+++ b/mail/e-mail-message-pane.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-mail-message-pane.h"
 
 #include <string.h>
diff --git a/mail/e-mail-migrate.c b/mail/e-mail-migrate.c
index de74f81..6fef0b9 100644
--- a/mail/e-mail-migrate.c
+++ b/mail/e-mail-migrate.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-mail-migrate.h"
 
 #include <stdio.h>
diff --git a/mail/e-mail-notebook-view.c b/mail/e-mail-notebook-view.c
index 74b9ead..895f0a9 100644
--- a/mail/e-mail-notebook-view.c
+++ b/mail/e-mail-notebook-view.c
@@ -21,7 +21,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#  include <config.h>
+#include <config.h>
 #endif
 
 #include <glib.h>
diff --git a/mail/e-mail-pane.c b/mail/e-mail-pane.c
index ca25d81..2ed275a 100644
--- a/mail/e-mail-pane.c
+++ b/mail/e-mail-pane.c
@@ -21,7 +21,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#  include <config.h>
+#include <config.h>
 #endif
 
 #include <glib.h>
diff --git a/mail/e-mail-paned-view.c b/mail/e-mail-paned-view.c
index 6d38100..f562bee 100644
--- a/mail/e-mail-paned-view.c
+++ b/mail/e-mail-paned-view.c
@@ -21,7 +21,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#  include <config.h>
+#include <config.h>
 #endif
 
 #include <glib.h>
diff --git a/mail/e-mail-reader-utils.c b/mail/e-mail-reader-utils.c
index 1fe121d..178b6ae 100644
--- a/mail/e-mail-reader-utils.c
+++ b/mail/e-mail-reader-utils.c
@@ -21,6 +21,10 @@
 
 /* Miscellaneous utility functions used by EMailReader actions. */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-mail-reader-utils.h"
 
 #include <glib/gi18n.h>
diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c
index 91e303e..9d32ddb 100644
--- a/mail/e-mail-reader.c
+++ b/mail/e-mail-reader.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-mail-reader.h"
 
 #include <glib/gi18n.h>
diff --git a/mail/e-mail-session-utils.c b/mail/e-mail-session-utils.c
index 2baf263..573fd5f 100644
--- a/mail/e-mail-session-utils.c
+++ b/mail/e-mail-session-utils.c
@@ -16,9 +16,12 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-mail-session-utils.h"
 
-#include <config.h>
 #include <glib/gi18n-lib.h>
 
 #include <mail/mail-tools.h>
diff --git a/mail/e-mail-session.c b/mail/e-mail-session.c
index 05f0fa0..ffcfc2e 100644
--- a/mail/e-mail-session.c
+++ b/mail/e-mail-session.c
@@ -25,7 +25,9 @@
 
 /* mail-session.c: handles the session information and resource manipulation */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <errno.h>
 #include <stdlib.h>
diff --git a/mail/e-mail-sidebar.c b/mail/e-mail-sidebar.c
index 5f62851..32edd0e 100644
--- a/mail/e-mail-sidebar.c
+++ b/mail/e-mail-sidebar.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-mail-sidebar.h"
 
 #include <string.h>
diff --git a/mail/e-mail-store-utils.c b/mail/e-mail-store-utils.c
index 52aecdc..c0d2466 100644
--- a/mail/e-mail-store-utils.c
+++ b/mail/e-mail-store-utils.c
@@ -16,9 +16,12 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-mail-store-utils.h"
 
-#include <config.h>
 #include <glib/gi18n-lib.h>
 
 typedef struct _AsyncContext AsyncContext;
diff --git a/mail/e-mail-store.c b/mail/e-mail-store.c
index 7a9c74c..08c676d 100644
--- a/mail/e-mail-store.c
+++ b/mail/e-mail-store.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-mail-store.h"
 
 #include <glib/gi18n.h>
diff --git a/mail/e-mail-tab-picker.c b/mail/e-mail-tab-picker.c
index b6ad1c7..5bf1732 100644
--- a/mail/e-mail-tab-picker.c
+++ b/mail/e-mail-tab-picker.c
@@ -17,7 +17,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include "e-mail-tab-picker.h"
diff --git a/mail/e-mail-tab.c b/mail/e-mail-tab.c
index 04d0aa2..213e545 100644
--- a/mail/e-mail-tab.c
+++ b/mail/e-mail-tab.c
@@ -17,7 +17,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <math.h>
diff --git a/mail/e-mail-view.c b/mail/e-mail-view.c
index d1a3503..90c74d7 100644
--- a/mail/e-mail-view.c
+++ b/mail/e-mail-view.c
@@ -21,7 +21,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#  include <config.h>
+#include <config.h>
 #endif
 
 #include "e-mail-view.h"
diff --git a/mail/em-folder-selector.c b/mail/em-folder-selector.c
index b01b305..0ff74c0 100644
--- a/mail/em-folder-selector.c
+++ b/mail/em-folder-selector.c
@@ -21,6 +21,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <string.h>
 #include <glib/gi18n.h>
 #include <e-util/e-util.h>
diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c
index 72cd4cc..1a04a34 100644
--- a/mail/em-folder-tree-model.c
+++ b/mail/em-folder-tree-model.c
@@ -20,6 +20,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "em-folder-tree-model.h"
 
 #include <stdio.h>
diff --git a/mail/em-junk.c b/mail/em-junk.c
index 6af215e..1026e4d 100644
--- a/mail/em-junk.c
+++ b/mail/em-junk.c
@@ -22,6 +22,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "em-junk.h"
 
 GQuark
diff --git a/mail/em-subscription-editor.c b/mail/em-subscription-editor.c
index d2027dc..db52c31 100644
--- a/mail/em-subscription-editor.c
+++ b/mail/em-subscription-editor.c
@@ -16,9 +16,12 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "em-subscription-editor.h"
 
-#include <config.h>
 #include <string.h>
 #include <glib/gi18n-lib.h>
 
diff --git a/mail/mail-folder-cache.c b/mail/mail-folder-cache.c
index dcfa9d7..f87819e 100644
--- a/mail/mail-folder-cache.c
+++ b/mail/mail-folder-cache.c
@@ -29,7 +29,7 @@
  **/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <string.h>
diff --git a/mail/mail-mt.c b/mail/mail-mt.c
index 53ff132..24c54c7 100644
--- a/mail/mail-mt.c
+++ b/mail/mail-mt.c
@@ -15,7 +15,9 @@
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <stdio.h>
 #include <string.h>
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index 988c9fa..fdf8472 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -25,7 +25,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <errno.h>
 
diff --git a/mail/mail-tools.c b/mail/mail-tools.c
index 7e4441a..7c7708b 100644
--- a/mail/mail-tools.c
+++ b/mail/mail-tools.c
@@ -22,7 +22,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c
index 526e0ea..12ddb0e 100644
--- a/mail/mail-vfolder.c
+++ b/mail/mail-vfolder.c
@@ -20,7 +20,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
+
 #include <string.h>
 
 #include <glib.h>
diff --git a/mail/message-list.c b/mail/message-list.c
index 9adf2b4..5bcef28 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -22,7 +22,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/modules/addressbook/addressbook-config.c b/modules/addressbook/addressbook-config.c
index 93577a0..9c48c9d 100644
--- a/modules/addressbook/addressbook-config.c
+++ b/modules/addressbook/addressbook-config.c
@@ -25,7 +25,9 @@
 
 /*#define STANDALONE*/
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <string.h>
 #include <stdlib.h>
diff --git a/modules/addressbook/autocompletion-config.c b/modules/addressbook/autocompletion-config.c
index 05b2b98..d445063 100644
--- a/modules/addressbook/autocompletion-config.c
+++ b/modules/addressbook/autocompletion-config.c
@@ -22,6 +22,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "autocompletion-config.h"
 
 #include <gtk/gtk.h>
diff --git a/modules/addressbook/e-book-config-hook.c b/modules/addressbook/e-book-config-hook.c
index 3f9e729..1ea83c9 100644
--- a/modules/addressbook/e-book-config-hook.c
+++ b/modules/addressbook/e-book-config-hook.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-book-config-hook.h"
 
 #include "e-util/e-config.h"
diff --git a/modules/addressbook/e-book-shell-backend.c b/modules/addressbook/e-book-shell-backend.c
index 4de5d1e..f9dba4c 100644
--- a/modules/addressbook/e-book-shell-backend.c
+++ b/modules/addressbook/e-book-shell-backend.c
@@ -19,9 +19,11 @@
  *
  */
 
-#include "e-book-shell-backend.h"
-
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
+
+#include "e-book-shell-backend.h"
 
 #include <string.h>
 #include <glib/gi18n.h>
diff --git a/modules/addressbook/e-book-shell-content.c b/modules/addressbook/e-book-shell-content.c
index 0f46a22..bb0c4a0 100644
--- a/modules/addressbook/e-book-shell-content.c
+++ b/modules/addressbook/e-book-shell-content.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-book-shell-content.h"
 
 #include <glib/gi18n.h>
diff --git a/modules/addressbook/e-book-shell-migrate.c b/modules/addressbook/e-book-shell-migrate.c
index 7b91a04..c23add1 100644
--- a/modules/addressbook/e-book-shell-migrate.c
+++ b/modules/addressbook/e-book-shell-migrate.c
@@ -22,7 +22,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <string.h>
 #include <sys/types.h>
diff --git a/modules/addressbook/e-book-shell-settings.c b/modules/addressbook/e-book-shell-settings.c
index d8d86b5..6be121d 100644
--- a/modules/addressbook/e-book-shell-settings.c
+++ b/modules/addressbook/e-book-shell-settings.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-book-shell-settings.h"
 
 void
diff --git a/modules/addressbook/e-book-shell-sidebar.c b/modules/addressbook/e-book-shell-sidebar.c
index 5505563..def7507 100644
--- a/modules/addressbook/e-book-shell-sidebar.c
+++ b/modules/addressbook/e-book-shell-sidebar.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-book-shell-sidebar.h"
 
 #include <string.h>
diff --git a/modules/addressbook/e-book-shell-view-actions.c b/modules/addressbook/e-book-shell-view-actions.c
index fc7c841..b8e6c4f 100644
--- a/modules/addressbook/e-book-shell-view-actions.c
+++ b/modules/addressbook/e-book-shell-view-actions.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-book-shell-view-private.h"
 
 #include <e-util/e-alert-dialog.h>
diff --git a/modules/addressbook/e-book-shell-view-private.c b/modules/addressbook/e-book-shell-view-private.c
index 9228905..8a05d26 100644
--- a/modules/addressbook/e-book-shell-view-private.c
+++ b/modules/addressbook/e-book-shell-view-private.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-util/e-util-private.h"
 
 #include "e-book-shell-view-private.h"
diff --git a/modules/addressbook/e-book-shell-view.c b/modules/addressbook/e-book-shell-view.c
index 3a325b0..57b86c8 100644
--- a/modules/addressbook/e-book-shell-view.c
+++ b/modules/addressbook/e-book-shell-view.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-book-shell-view-private.h"
 
 static gpointer parent_class;
diff --git a/modules/addressbook/eab-composer-util.c b/modules/addressbook/eab-composer-util.c
index a7237eb..629f5a6 100644
--- a/modules/addressbook/eab-composer-util.c
+++ b/modules/addressbook/eab-composer-util.c
@@ -16,6 +16,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "eab-composer-util.h"
 
 #include <string.h>
diff --git a/modules/addressbook/evolution-module-addressbook.c b/modules/addressbook/evolution-module-addressbook.c
index 73b3634..f38c8e2 100644
--- a/modules/addressbook/evolution-module-addressbook.c
+++ b/modules/addressbook/evolution-module-addressbook.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-book-config-hook.h"
 
 #include "e-book-shell-backend.h"
diff --git a/modules/calendar/e-cal-attachment-handler.c b/modules/calendar/e-cal-attachment-handler.c
index 14c9efb..c1b0387 100644
--- a/modules/calendar/e-cal-attachment-handler.c
+++ b/modules/calendar/e-cal-attachment-handler.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-cal-attachment-handler.h"
 
 #include <glib/gi18n.h>
diff --git a/modules/calendar/e-cal-config-calendar-item.c b/modules/calendar/e-cal-config-calendar-item.c
index fba37b3..09895c0 100644
--- a/modules/calendar/e-cal-config-calendar-item.c
+++ b/modules/calendar/e-cal-config-calendar-item.c
@@ -16,6 +16,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-cal-config-calendar-item.h"
 
 #include <shell/e-shell.h>
diff --git a/modules/calendar/e-cal-config-comp-editor.c b/modules/calendar/e-cal-config-comp-editor.c
index ba23a05..b522975 100644
--- a/modules/calendar/e-cal-config-comp-editor.c
+++ b/modules/calendar/e-cal-config-comp-editor.c
@@ -16,6 +16,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-cal-config-comp-editor.h"
 
 #include <shell/e-shell.h>
diff --git a/modules/calendar/e-cal-config-date-edit.c b/modules/calendar/e-cal-config-date-edit.c
index 05a2947..d595497 100644
--- a/modules/calendar/e-cal-config-date-edit.c
+++ b/modules/calendar/e-cal-config-date-edit.c
@@ -16,6 +16,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-cal-config-date-edit.h"
 
 #include <shell/e-shell.h>
diff --git a/modules/calendar/e-cal-config-hook.c b/modules/calendar/e-cal-config-hook.c
index e3d9678..80050fc 100644
--- a/modules/calendar/e-cal-config-hook.c
+++ b/modules/calendar/e-cal-config-hook.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-cal-config-hook.h"
 
 #include "e-util/e-config.h"
diff --git a/modules/calendar/e-cal-config-meeting-store.c b/modules/calendar/e-cal-config-meeting-store.c
index ba1a107..f9a91da 100644
--- a/modules/calendar/e-cal-config-meeting-store.c
+++ b/modules/calendar/e-cal-config-meeting-store.c
@@ -16,6 +16,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-cal-config-meeting-store.h"
 
 #include <shell/e-shell.h>
diff --git a/modules/calendar/e-cal-config-meeting-time-selector.c b/modules/calendar/e-cal-config-meeting-time-selector.c
index fb03618..23eef11 100644
--- a/modules/calendar/e-cal-config-meeting-time-selector.c
+++ b/modules/calendar/e-cal-config-meeting-time-selector.c
@@ -16,6 +16,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-cal-config-meeting-time-selector.h"
 
 #include <shell/e-shell.h>
diff --git a/modules/calendar/e-cal-config-model.c b/modules/calendar/e-cal-config-model.c
index 47a3ff6..f42e4a9 100644
--- a/modules/calendar/e-cal-config-model.c
+++ b/modules/calendar/e-cal-config-model.c
@@ -16,6 +16,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-cal-config-model.h"
 
 #include <shell/e-shell.h>
diff --git a/modules/calendar/e-cal-config-view.c b/modules/calendar/e-cal-config-view.c
index 60ee4a5..ecc3587 100644
--- a/modules/calendar/e-cal-config-view.c
+++ b/modules/calendar/e-cal-config-view.c
@@ -16,6 +16,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-cal-config-view.h"
 
 #include <shell/e-shell.h>
diff --git a/modules/calendar/e-cal-event-hook.c b/modules/calendar/e-cal-event-hook.c
index d90162d..67db069 100644
--- a/modules/calendar/e-cal-event-hook.c
+++ b/modules/calendar/e-cal-event-hook.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-cal-event-hook.h"
 
 #include "e-util/e-event.h"
diff --git a/modules/calendar/e-cal-shell-backend.c b/modules/calendar/e-cal-shell-backend.c
index d0f97ca..51ed54b 100644
--- a/modules/calendar/e-cal-shell-backend.c
+++ b/modules/calendar/e-cal-shell-backend.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-cal-shell-backend.h"
 
 #include <string.h>
diff --git a/modules/calendar/e-cal-shell-content.c b/modules/calendar/e-cal-shell-content.c
index e35057b..e85f920 100644
--- a/modules/calendar/e-cal-shell-content.c
+++ b/modules/calendar/e-cal-shell-content.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-cal-shell-content.h"
 
 #include <string.h>
diff --git a/modules/calendar/e-cal-shell-migrate.c b/modules/calendar/e-cal-shell-migrate.c
index 7913522..3c9f79a 100644
--- a/modules/calendar/e-cal-shell-migrate.c
+++ b/modules/calendar/e-cal-shell-migrate.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-cal-shell-migrate.h"
 
 #include <string.h>
diff --git a/modules/calendar/e-cal-shell-settings.c b/modules/calendar/e-cal-shell-settings.c
index 30fc1c4..4d105bc 100644
--- a/modules/calendar/e-cal-shell-settings.c
+++ b/modules/calendar/e-cal-shell-settings.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-cal-shell-settings.h"
 
 #include <gconf/gconf-client.h>
diff --git a/modules/calendar/e-cal-shell-sidebar.c b/modules/calendar/e-cal-shell-sidebar.c
index 9f9bc45..d49b143 100644
--- a/modules/calendar/e-cal-shell-sidebar.c
+++ b/modules/calendar/e-cal-shell-sidebar.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-cal-shell-sidebar.h"
 
 #include <string.h>
diff --git a/modules/calendar/e-cal-shell-view-actions.c b/modules/calendar/e-cal-shell-view-actions.c
index ceeab0b..c82f003 100644
--- a/modules/calendar/e-cal-shell-view-actions.c
+++ b/modules/calendar/e-cal-shell-view-actions.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-util/e-alert-dialog.h"
 #include "e-cal-shell-view-private.h"
 
diff --git a/modules/calendar/e-cal-shell-view-memopad.c b/modules/calendar/e-cal-shell-view-memopad.c
index 2f625df..84d14cf 100644
--- a/modules/calendar/e-cal-shell-view-memopad.c
+++ b/modules/calendar/e-cal-shell-view-memopad.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-cal-shell-view-private.h"
 
 /* Much of this file is based on e-memo-shell-view-actions.c. */
diff --git a/modules/calendar/e-cal-shell-view-private.c b/modules/calendar/e-cal-shell-view-private.c
index 29a743b..1ae493c 100644
--- a/modules/calendar/e-cal-shell-view-private.c
+++ b/modules/calendar/e-cal-shell-view-private.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-util/e-util-private.h"
 
 #include "e-cal-shell-view-private.h"
diff --git a/modules/calendar/e-cal-shell-view-taskpad.c b/modules/calendar/e-cal-shell-view-taskpad.c
index 8afff2c..48fd850 100644
--- a/modules/calendar/e-cal-shell-view-taskpad.c
+++ b/modules/calendar/e-cal-shell-view-taskpad.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-cal-shell-view-private.h"
 
 /* Much of this file is based on e-task-shell-view-actions.c. */
diff --git a/modules/calendar/e-cal-shell-view.c b/modules/calendar/e-cal-shell-view.c
index b325160..1706fa0 100644
--- a/modules/calendar/e-cal-shell-view.c
+++ b/modules/calendar/e-cal-shell-view.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-cal-shell-view-private.h"
 
 static gpointer parent_class;
diff --git a/modules/calendar/e-calendar-preferences.c b/modules/calendar/e-calendar-preferences.c
index 328fba4..ec15e3c 100644
--- a/modules/calendar/e-calendar-preferences.c
+++ b/modules/calendar/e-calendar-preferences.c
@@ -22,9 +22,12 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-calendar-preferences.h"
 
-#include <config.h>
 #include <string.h>
 #include <glib/gi18n.h>
 
diff --git a/modules/calendar/e-memo-shell-backend.c b/modules/calendar/e-memo-shell-backend.c
index 488f300..e99e3e2 100644
--- a/modules/calendar/e-memo-shell-backend.c
+++ b/modules/calendar/e-memo-shell-backend.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-memo-shell-backend.h"
 
 #include <string.h>
diff --git a/modules/calendar/e-memo-shell-content.c b/modules/calendar/e-memo-shell-content.c
index f9224b1..5c964fc 100644
--- a/modules/calendar/e-memo-shell-content.c
+++ b/modules/calendar/e-memo-shell-content.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-memo-shell-content.h"
 
 #include <glib/gi18n.h>
diff --git a/modules/calendar/e-memo-shell-migrate.c b/modules/calendar/e-memo-shell-migrate.c
index efe71f6..f81af22 100644
--- a/modules/calendar/e-memo-shell-migrate.c
+++ b/modules/calendar/e-memo-shell-migrate.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-memo-shell-migrate.h"
 
 #include <string.h>
diff --git a/modules/calendar/e-memo-shell-sidebar.c b/modules/calendar/e-memo-shell-sidebar.c
index 4ad5d44..befe60c 100644
--- a/modules/calendar/e-memo-shell-sidebar.c
+++ b/modules/calendar/e-memo-shell-sidebar.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-memo-shell-sidebar.h"
 
 #include <string.h>
diff --git a/modules/calendar/e-memo-shell-view-actions.c b/modules/calendar/e-memo-shell-view-actions.c
index 660ad09..5930312 100644
--- a/modules/calendar/e-memo-shell-view-actions.c
+++ b/modules/calendar/e-memo-shell-view-actions.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-util/e-alert-dialog.h"
 #include "e-memo-shell-view-private.h"
 
diff --git a/modules/calendar/e-memo-shell-view-private.c b/modules/calendar/e-memo-shell-view-private.c
index f4049d7..36f09fd 100644
--- a/modules/calendar/e-memo-shell-view-private.c
+++ b/modules/calendar/e-memo-shell-view-private.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-util/e-util-private.h"
 
 #include "e-memo-shell-view-private.h"
diff --git a/modules/calendar/e-memo-shell-view.c b/modules/calendar/e-memo-shell-view.c
index c6d620d..6679b34 100644
--- a/modules/calendar/e-memo-shell-view.c
+++ b/modules/calendar/e-memo-shell-view.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-memo-shell-view-private.h"
 
 static gpointer parent_class;
diff --git a/modules/calendar/e-task-shell-backend.c b/modules/calendar/e-task-shell-backend.c
index 193f3be..b9f95b3 100644
--- a/modules/calendar/e-task-shell-backend.c
+++ b/modules/calendar/e-task-shell-backend.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-task-shell-backend.h"
 
 #include <string.h>
diff --git a/modules/calendar/e-task-shell-content.c b/modules/calendar/e-task-shell-content.c
index b7937fb..2287ee8 100644
--- a/modules/calendar/e-task-shell-content.c
+++ b/modules/calendar/e-task-shell-content.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-task-shell-content.h"
 
 #include <glib/gi18n.h>
diff --git a/modules/calendar/e-task-shell-migrate.c b/modules/calendar/e-task-shell-migrate.c
index d9b5aa7..bf2d07e 100644
--- a/modules/calendar/e-task-shell-migrate.c
+++ b/modules/calendar/e-task-shell-migrate.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-task-shell-migrate.h"
 
 #include <string.h>
diff --git a/modules/calendar/e-task-shell-sidebar.c b/modules/calendar/e-task-shell-sidebar.c
index f152acf..098726a 100644
--- a/modules/calendar/e-task-shell-sidebar.c
+++ b/modules/calendar/e-task-shell-sidebar.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-task-shell-sidebar.h"
 
 #include <string.h>
diff --git a/modules/calendar/e-task-shell-view-actions.c b/modules/calendar/e-task-shell-view-actions.c
index dce77b0..297120e 100644
--- a/modules/calendar/e-task-shell-view-actions.c
+++ b/modules/calendar/e-task-shell-view-actions.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-util/e-alert-dialog.h"
 #include "e-task-shell-view-private.h"
 
diff --git a/modules/calendar/e-task-shell-view-private.c b/modules/calendar/e-task-shell-view-private.c
index 5567cf9..0ce8339 100644
--- a/modules/calendar/e-task-shell-view-private.c
+++ b/modules/calendar/e-task-shell-view-private.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-task-shell-view-private.h"
 
 #include "widgets/menus/gal-view-factory-etable.h"
diff --git a/modules/calendar/e-task-shell-view.c b/modules/calendar/e-task-shell-view.c
index fd4f762..21004cc 100644
--- a/modules/calendar/e-task-shell-view.c
+++ b/modules/calendar/e-task-shell-view.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-task-shell-view-private.h"
 
 enum {
diff --git a/modules/calendar/evolution-module-calendar.c b/modules/calendar/evolution-module-calendar.c
index af972cf..ebc11b6 100644
--- a/modules/calendar/evolution-module-calendar.c
+++ b/modules/calendar/evolution-module-calendar.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-cal-attachment-handler.h"
 
 #include "e-cal-config-hook.h"
diff --git a/modules/composer-autosave/e-autosave-utils.c b/modules/composer-autosave/e-autosave-utils.c
index 70a609e..9c5eaa8 100644
--- a/modules/composer-autosave/e-autosave-utils.c
+++ b/modules/composer-autosave/e-autosave-utils.c
@@ -16,6 +16,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-autosave-utils.h"
 
 #include <errno.h>
diff --git a/modules/composer-autosave/e-composer-autosave.c b/modules/composer-autosave/e-composer-autosave.c
index b0a22ad..f257887 100644
--- a/modules/composer-autosave/e-composer-autosave.c
+++ b/modules/composer-autosave/e-composer-autosave.c
@@ -16,6 +16,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <e-util/e-extension.h>
 #include <e-util/e-alert-dialog.h>
 #include <composer/e-msg-composer.h>
diff --git a/modules/composer-autosave/e-composer-registry.c b/modules/composer-autosave/e-composer-registry.c
index a48464a..eef69f1 100644
--- a/modules/composer-autosave/e-composer-registry.c
+++ b/modules/composer-autosave/e-composer-registry.c
@@ -16,6 +16,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <glib/gstdio.h>
 #include <shell/e-shell.h>
 #include <shell/e-shell-window.h>
diff --git a/modules/composer-autosave/evolution-composer-autosave.c b/modules/composer-autosave/evolution-composer-autosave.c
index d7e32f2..323fed7 100644
--- a/modules/composer-autosave/evolution-composer-autosave.c
+++ b/modules/composer-autosave/evolution-composer-autosave.c
@@ -16,6 +16,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <gmodule.h>
 #include <glib-object.h>
 
diff --git a/modules/connman/evolution-connman.c b/modules/connman/evolution-connman.c
index 50b5cf3..eacb691 100644
--- a/modules/connman/evolution-connman.c
+++ b/modules/connman/evolution-connman.c
@@ -16,6 +16,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <gio/gio.h>
 
 #include <shell/e-shell.h>
diff --git a/modules/mail/e-mail-attachment-handler.c b/modules/mail/e-mail-attachment-handler.c
index 6b2efaf..69a9e8f 100644
--- a/modules/mail/e-mail-attachment-handler.c
+++ b/modules/mail/e-mail-attachment-handler.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-mail-attachment-handler.h"
 
 #include <glib/gi18n.h>
diff --git a/modules/mail/e-mail-config-format-html.c b/modules/mail/e-mail-config-format-html.c
index 7aa9367..23d448f 100644
--- a/modules/mail/e-mail-config-format-html.c
+++ b/modules/mail/e-mail-config-format-html.c
@@ -16,6 +16,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-mail-config-format-html.h"
 
 #include <shell/e-shell.h>
diff --git a/modules/mail/e-mail-config-hook.c b/modules/mail/e-mail-config-hook.c
index def986f..b247c90 100644
--- a/modules/mail/e-mail-config-hook.c
+++ b/modules/mail/e-mail-config-hook.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-mail-config-hook.h"
 
 #include "e-util/e-config.h"
diff --git a/modules/mail/e-mail-config-reader.c b/modules/mail/e-mail-config-reader.c
index 5aea86b..3837581 100644
--- a/modules/mail/e-mail-config-reader.c
+++ b/modules/mail/e-mail-config-reader.c
@@ -16,6 +16,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-mail-config-reader.h"
 
 #include <shell/e-shell.h>
diff --git a/modules/mail/e-mail-config-web-view.c b/modules/mail/e-mail-config-web-view.c
index d2c5ccf..b8a755b 100644
--- a/modules/mail/e-mail-config-web-view.c
+++ b/modules/mail/e-mail-config-web-view.c
@@ -16,6 +16,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-mail-config-web-view.h"
 
 #include <shell/e-shell.h>
diff --git a/modules/mail/e-mail-event-hook.c b/modules/mail/e-mail-event-hook.c
index becc806..cd1dc63 100644
--- a/modules/mail/e-mail-event-hook.c
+++ b/modules/mail/e-mail-event-hook.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-mail-event-hook.h"
 
 #include "e-util/e-event.h"
diff --git a/modules/mail/e-mail-junk-hook.c b/modules/mail/e-mail-junk-hook.c
index ac59195..4ccc404 100644
--- a/modules/mail/e-mail-junk-hook.c
+++ b/modules/mail/e-mail-junk-hook.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-mail-junk-hook.h"
 
 #include <glib/gi18n.h>
diff --git a/modules/mail/e-mail-shell-backend.c b/modules/mail/e-mail-shell-backend.c
index b95ce9d..cc75844 100644
--- a/modules/mail/e-mail-shell-backend.c
+++ b/modules/mail/e-mail-shell-backend.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-mail-shell-backend.h"
 
 #include <glib/gi18n.h>
diff --git a/modules/mail/e-mail-shell-content.c b/modules/mail/e-mail-shell-content.c
index 5657db1..fcb10e4 100644
--- a/modules/mail/e-mail-shell-content.c
+++ b/modules/mail/e-mail-shell-content.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-mail-shell-content.h"
 
 #include <glib/gi18n.h>
diff --git a/modules/mail/e-mail-shell-settings.c b/modules/mail/e-mail-shell-settings.c
index 44c1d79..d795749 100644
--- a/modules/mail/e-mail-shell-settings.c
+++ b/modules/mail/e-mail-shell-settings.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-mail-shell-settings.h"
 
 #include <gconf/gconf-client.h>
diff --git a/modules/mail/e-mail-shell-sidebar.c b/modules/mail/e-mail-shell-sidebar.c
index 643bc63..437df3e 100644
--- a/modules/mail/e-mail-shell-sidebar.c
+++ b/modules/mail/e-mail-shell-sidebar.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-mail-shell-sidebar.h"
 
 #include "mail/e-mail-backend.h"
diff --git a/modules/mail/e-mail-shell-view-actions.c b/modules/mail/e-mail-shell-view-actions.c
index c5f155d..a9fd726 100644
--- a/modules/mail/e-mail-shell-view-actions.c
+++ b/modules/mail/e-mail-shell-view-actions.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-mail-shell-view-private.h"
 
 static void
diff --git a/modules/mail/e-mail-shell-view-private.c b/modules/mail/e-mail-shell-view-private.c
index 32f8058..ee1c55e 100644
--- a/modules/mail/e-mail-shell-view-private.c
+++ b/modules/mail/e-mail-shell-view-private.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-mail-shell-view-private.h"
 
 #include "widgets/menus/gal-view-factory-etable.h"
diff --git a/modules/mail/e-mail-shell-view.c b/modules/mail/e-mail-shell-view.c
index 04c9d4d..c3abaeb 100644
--- a/modules/mail/e-mail-shell-view.c
+++ b/modules/mail/e-mail-shell-view.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-mail-shell-view-private.h"
 #include "filter/e-filter-input.h"
 
diff --git a/modules/mail/em-account-prefs.c b/modules/mail/em-account-prefs.c
index b5c4583..1caf517 100644
--- a/modules/mail/em-account-prefs.c
+++ b/modules/mail/em-account-prefs.c
@@ -24,12 +24,12 @@
  *     have access to.  The desire is to someday move account management
  *     completely out of the mailer, perhaps to evolution-data-server. */
 
-#include "em-account-prefs.h"
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
 
+#include "em-account-prefs.h"
+
 #include <glib/gi18n.h>
 
 #include "e-util/e-alert-dialog.h"
diff --git a/modules/mail/evolution-module-mail.c b/modules/mail/evolution-module-mail.c
index b7e2a77..ddb9d89 100644
--- a/modules/mail/evolution-module-mail.c
+++ b/modules/mail/evolution-module-mail.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-mail-attachment-handler.h"
 
 #include "e-mail-config-hook.h"
diff --git a/modules/mailto-handler/evolution-mailto-handler.c b/modules/mailto-handler/evolution-mailto-handler.c
index 3649309..797b429 100644
--- a/modules/mailto-handler/evolution-mailto-handler.c
+++ b/modules/mailto-handler/evolution-mailto-handler.c
@@ -16,7 +16,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
+
 #include <glib/gi18n-lib.h>
 
 #include <shell/e-shell.h>
diff --git a/modules/network-manager/evolution-network-manager.c b/modules/network-manager/evolution-network-manager.c
index 0ea86e1..79bcfba 100644
--- a/modules/network-manager/evolution-network-manager.c
+++ b/modules/network-manager/evolution-network-manager.c
@@ -16,6 +16,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <gio/gio.h>
 #include <NetworkManager/NetworkManager.h>
 
diff --git a/modules/offline-alert/evolution-offline-alert.c b/modules/offline-alert/evolution-offline-alert.c
index fa2a4ef..4c064ce 100644
--- a/modules/offline-alert/evolution-offline-alert.c
+++ b/modules/offline-alert/evolution-offline-alert.c
@@ -16,6 +16,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <shell/e-shell-view.h>
 #include <shell/e-shell-window-actions.h>
 #include <e-util/e-alert-sink.h>
diff --git a/modules/plugin-lib/e-plugin-lib.c b/modules/plugin-lib/e-plugin-lib.c
index 1bd7190..e962835 100644
--- a/modules/plugin-lib/e-plugin-lib.c
+++ b/modules/plugin-lib/e-plugin-lib.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-plugin-lib.h"
 
 #ifdef G_OS_WIN32
diff --git a/modules/plugin-lib/evolution-module-plugin-lib.c b/modules/plugin-lib/evolution-module-plugin-lib.c
index 833ca59..5e4704e 100644
--- a/modules/plugin-lib/evolution-module-plugin-lib.c
+++ b/modules/plugin-lib/evolution-module-plugin-lib.c
@@ -19,7 +19,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include "e-plugin-lib.h"
 
diff --git a/modules/plugin-manager/evolution-plugin-manager.c b/modules/plugin-manager/evolution-plugin-manager.c
index a7f7580..582f173 100644
--- a/modules/plugin-manager/evolution-plugin-manager.c
+++ b/modules/plugin-manager/evolution-plugin-manager.c
@@ -16,7 +16,10 @@
 
 /* A plugin manager ui */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
+
 #include <glib/gi18n-lib.h>
 
 #include <string.h>
diff --git a/modules/plugin-mono/e-plugin-mono.c b/modules/plugin-mono/e-plugin-mono.c
index 20a6dcf..bd54249 100644
--- a/modules/plugin-mono/e-plugin-mono.c
+++ b/modules/plugin-mono/e-plugin-mono.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-plugin-mono.h"
 
 #include <sys/types.h>
diff --git a/modules/plugin-mono/evolution-module-plugin-mono.c b/modules/plugin-mono/evolution-module-plugin-mono.c
index 75ad534..0a1bf42 100644
--- a/modules/plugin-mono/evolution-module-plugin-mono.c
+++ b/modules/plugin-mono/evolution-module-plugin-mono.c
@@ -19,7 +19,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include "e-plugin-mono.h"
 
diff --git a/modules/plugin-python/e-plugin-python.c b/modules/plugin-python/e-plugin-python.c
index c4bb9e6..aaa6fb2 100644
--- a/modules/plugin-python/e-plugin-python.c
+++ b/modules/plugin-python/e-plugin-python.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 /* Include <Python.h> first to avoid:
  * warning: "_POSIX_C_SOURCE" redefined */
 #include <Python.h>
diff --git a/modules/plugin-python/evolution-module-plugin-python.c b/modules/plugin-python/evolution-module-plugin-python.c
index 84ab3b3..7adeada 100644
--- a/modules/plugin-python/evolution-module-plugin-python.c
+++ b/modules/plugin-python/evolution-module-plugin-python.c
@@ -19,7 +19,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include "e-plugin-python.h"
 
diff --git a/modules/startup-wizard/evolution-startup-wizard.c b/modules/startup-wizard/evolution-startup-wizard.c
index 605e10c..7917557 100644
--- a/modules/startup-wizard/evolution-startup-wizard.c
+++ b/modules/startup-wizard/evolution-startup-wizard.c
@@ -16,7 +16,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
+
 #include <glib/gi18n-lib.h>
 
 #include <shell/e-shell.h>
diff --git a/plugins/addressbook-file/addressbook-file.c b/plugins/addressbook-file/addressbook-file.c
index cb74258..6c89227 100644
--- a/plugins/addressbook-file/addressbook-file.c
+++ b/plugins/addressbook-file/addressbook-file.c
@@ -20,6 +20,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <e-util/e-config.h>
 #include <addressbook/gui/widgets/eab-config.h>
 #include <libedataserver/e-source.h>
diff --git a/plugins/attachment-reminder/attachment-reminder.c b/plugins/attachment-reminder/attachment-reminder.c
index e21dd94..5c842d1 100644
--- a/plugins/attachment-reminder/attachment-reminder.c
+++ b/plugins/attachment-reminder/attachment-reminder.c
@@ -20,6 +20,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <string.h>
diff --git a/plugins/audio-inline/audio-inline.c b/plugins/audio-inline/audio-inline.c
index a454709..507bc95 100644
--- a/plugins/audio-inline/audio-inline.c
+++ b/plugins/audio-inline/audio-inline.c
@@ -21,7 +21,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <gtk/gtk.h>
diff --git a/plugins/bbdb/gaimbuddies.c b/plugins/bbdb/gaimbuddies.c
index 4056793..23be827 100644
--- a/plugins/bbdb/gaimbuddies.c
+++ b/plugins/bbdb/gaimbuddies.c
@@ -29,6 +29,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <glib.h>
 #include <libxml/tree.h>
 #include <libxml/parser.h>
diff --git a/plugins/bogo-junk-plugin/bf-junk-filter.c b/plugins/bogo-junk-plugin/bf-junk-filter.c
index 7d479ce..9785508 100644
--- a/plugins/bogo-junk-plugin/bf-junk-filter.c
+++ b/plugins/bogo-junk-plugin/bf-junk-filter.c
@@ -22,7 +22,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <signal.h>
diff --git a/plugins/caldav/caldav-browse-server.c b/plugins/caldav/caldav-browse-server.c
index 00bcdcf..9efa6b1 100644
--- a/plugins/caldav/caldav-browse-server.c
+++ b/plugins/caldav/caldav-browse-server.c
@@ -20,7 +20,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <glib/gi18n-lib.h>
diff --git a/plugins/caldav/caldav-source.c b/plugins/caldav/caldav-source.c
index ec15c70..4b6cae1 100644
--- a/plugins/caldav/caldav-source.c
+++ b/plugins/caldav/caldav-source.c
@@ -21,7 +21,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <glib/gi18n-lib.h>
diff --git a/plugins/calendar-file/calendar-file.c b/plugins/calendar-file/calendar-file.c
index df1d5b3..f162914 100644
--- a/plugins/calendar-file/calendar-file.c
+++ b/plugins/calendar-file/calendar-file.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <gtk/gtk.h>
 #include <e-util/e-config.h>
 #include <e-util/e-plugin-util.h>
diff --git a/plugins/calendar-http/calendar-http.c b/plugins/calendar-http/calendar-http.c
index 658f93d..43670f5 100644
--- a/plugins/calendar-http/calendar-http.c
+++ b/plugins/calendar-http/calendar-http.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <gtk/gtk.h>
 #include <e-util/e-config.h>
 #include <e-util/e-plugin-util.h>
diff --git a/plugins/calendar-weather/calendar-weather.c b/plugins/calendar-weather/calendar-weather.c
index 73ab8c8..6c03da3 100644
--- a/plugins/calendar-weather/calendar-weather.c
+++ b/plugins/calendar-weather/calendar-weather.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <gtk/gtk.h>
 #include <e-util/e-config.h>
 #include <e-util/e-icon-factory.h>
diff --git a/plugins/contacts-map/contacts-map.c b/plugins/contacts-map/contacts-map.c
index d195429..91433f7 100644
--- a/plugins/contacts-map/contacts-map.c
+++ b/plugins/contacts-map/contacts-map.c
@@ -19,6 +19,11 @@
  * Copyright (C) 2009 Cedric Bosdonnat (http://cedric.bosdonnat.free.fr)
  *
  */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "geo-utils.h"
 
 #include <glib/gi18n.h>
diff --git a/plugins/default-source/default-source.c b/plugins/default-source/default-source.c
index a938239..770dc25 100644
--- a/plugins/default-source/default-source.c
+++ b/plugins/default-source/default-source.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <gtk/gtk.h>
 
 #include <e-util/e-config.h>
diff --git a/plugins/google-account-setup/google-contacts-source.c b/plugins/google-account-setup/google-contacts-source.c
index 46f0d43..ee6154e 100644
--- a/plugins/google-account-setup/google-contacts-source.c
+++ b/plugins/google-account-setup/google-contacts-source.c
@@ -18,7 +18,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
+
 #include <string.h>
 
 #include <glib/gi18n-lib.h>
diff --git a/plugins/google-account-setup/google-source.c b/plugins/google-account-setup/google-source.c
index 335aece..f029024 100644
--- a/plugins/google-account-setup/google-source.c
+++ b/plugins/google-account-setup/google-source.c
@@ -23,7 +23,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <string.h>
diff --git a/plugins/image-inline/image-inline.c b/plugins/image-inline/image-inline.c
index 994726d..edb527c 100644
--- a/plugins/image-inline/image-inline.c
+++ b/plugins/image-inline/image-inline.c
@@ -20,7 +20,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <stdlib.h>
diff --git a/plugins/mail-to-task/mail-to-task.c b/plugins/mail-to-task/mail-to-task.c
index 1deca6d..3ebc818 100644
--- a/plugins/mail-to-task/mail-to-task.c
+++ b/plugins/mail-to-task/mail-to-task.c
@@ -25,7 +25,7 @@
 /* Convert a mail message into a task */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <glib/gi18n-lib.h>
diff --git a/plugins/mark-all-read/mark-all-read.c b/plugins/mark-all-read/mark-all-read.c
index 10ea043..4db7515 100644
--- a/plugins/mark-all-read/mark-all-read.c
+++ b/plugins/mark-all-read/mark-all-read.c
@@ -24,6 +24,7 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
+
 #include <string.h>
 #include <glib.h>
 #include <gtk/gtk.h>
diff --git a/plugins/prefer-plain/prefer-plain.c b/plugins/prefer-plain/prefer-plain.c
index 71bcd41..ce51ffe 100644
--- a/plugins/prefer-plain/prefer-plain.c
+++ b/plugins/prefer-plain/prefer-plain.c
@@ -21,7 +21,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <gtk/gtk.h>
diff --git a/plugins/publish-calendar/publish-format-fb.c b/plugins/publish-calendar/publish-format-fb.c
index 97c9008..2f9b062 100644
--- a/plugins/publish-calendar/publish-format-fb.c
+++ b/plugins/publish-calendar/publish-format-fb.c
@@ -20,6 +20,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <string.h>
 #include <time.h>
 #include <glib/gi18n.h>
diff --git a/plugins/publish-calendar/publish-format-ical.c b/plugins/publish-calendar/publish-format-ical.c
index 3031230..b4b5451 100644
--- a/plugins/publish-calendar/publish-format-ical.c
+++ b/plugins/publish-calendar/publish-format-ical.c
@@ -20,6 +20,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <string.h>
 #include <glib/gi18n.h>
 #include <gconf/gconf-client.h>
diff --git a/plugins/publish-calendar/publish-location.c b/plugins/publish-calendar/publish-location.c
index 8db5ccb..af539dd 100644
--- a/plugins/publish-calendar/publish-location.c
+++ b/plugins/publish-calendar/publish-location.c
@@ -21,6 +21,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "publish-location.h"
 #include <libxml/tree.h>
 #include <gconf/gconf-client.h>
diff --git a/plugins/publish-calendar/url-editor-dialog.c b/plugins/publish-calendar/url-editor-dialog.c
index 9c49dcb..ca6ade1 100644
--- a/plugins/publish-calendar/url-editor-dialog.c
+++ b/plugins/publish-calendar/url-editor-dialog.c
@@ -20,6 +20,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "url-editor-dialog.h"
 #include <libedataserverui/e-passwords.h>
 #include <libedataserver/e-url.h>
diff --git a/plugins/save-calendar/format-handler.h b/plugins/save-calendar/format-handler.h
index 7c69772..24df0a1 100644
--- a/plugins/save-calendar/format-handler.h
+++ b/plugins/save-calendar/format-handler.h
@@ -20,10 +20,6 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <glib.h>
 #include <gtk/gtk.h>
 #include <gio/gio.h>
diff --git a/plugins/templates/templates.c b/plugins/templates/templates.c
index 052ca89..57efaba 100644
--- a/plugins/templates/templates.c
+++ b/plugins/templates/templates.c
@@ -22,6 +22,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <gtk/gtk.h>
 #include <glib.h>
 #include <glib/gi18n.h>
diff --git a/plugins/tnef-attachments/tnef-plugin.c b/plugins/tnef-attachments/tnef-plugin.c
index 0a87418..1e600ff 100644
--- a/plugins/tnef-attachments/tnef-plugin.c
+++ b/plugins/tnef-attachments/tnef-plugin.c
@@ -20,7 +20,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 /* We include gi18n-lib.h so that we have strings translated directly for this package */
diff --git a/plugins/vcard-inline/vcard-inline.c b/plugins/vcard-inline/vcard-inline.c
index c4ab567..062f21e 100644
--- a/plugins/vcard-inline/vcard-inline.c
+++ b/plugins/vcard-inline/vcard-inline.c
@@ -17,7 +17,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <gtk/gtk.h>
diff --git a/plugins/webdav-account-setup/webdav-contacts-source.c b/plugins/webdav-account-setup/webdav-contacts-source.c
index 870fa46..81cf30c 100644
--- a/plugins/webdav-account-setup/webdav-contacts-source.c
+++ b/plugins/webdav-account-setup/webdav-contacts-source.c
@@ -19,7 +19,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <string.h>
diff --git a/shell/e-shell-backend.c b/shell/e-shell-backend.c
index b1dadce..d8af58c 100644
--- a/shell/e-shell-backend.c
+++ b/shell/e-shell-backend.c
@@ -27,6 +27,10 @@
  * @include: shell/e-shell-backend.h
  **/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-shell-backend.h"
 
 #include <errno.h>
diff --git a/shell/e-shell-common.h b/shell/e-shell-common.h
index 7ff3509..bb5529b 100644
--- a/shell/e-shell-common.h
+++ b/shell/e-shell-common.h
@@ -22,10 +22,6 @@
 #ifndef E_SHELL_COMMON_H
 #define E_SHELL_COMMON_H
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <gio/gio.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
diff --git a/shell/e-shell-content.c b/shell/e-shell-content.c
index d32671e..51ca37e 100644
--- a/shell/e-shell-content.c
+++ b/shell/e-shell-content.c
@@ -25,6 +25,10 @@
  * @include: shell/e-shell-content.h
  **/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-shell-content.h"
 
 #include <glib/gi18n.h>
diff --git a/shell/e-shell-meego.c b/shell/e-shell-meego.c
index 2c95bef..7bc23d5 100644
--- a/shell/e-shell-meego.c
+++ b/shell/e-shell-meego.c
@@ -21,6 +21,10 @@
  *	Chris Lord  <chris linux intel com>
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <glib.h>
 #include <e-shell-meego.h>
 
diff --git a/shell/e-shell-migrate.c b/shell/e-shell-migrate.c
index 6874c2e..5863e1c 100644
--- a/shell/e-shell-migrate.c
+++ b/shell/e-shell-migrate.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-shell-migrate.h"
 
 #include <errno.h>
diff --git a/shell/e-shell-searchbar.c b/shell/e-shell-searchbar.c
index cf2f6ef..e0c10c6 100644
--- a/shell/e-shell-searchbar.c
+++ b/shell/e-shell-searchbar.c
@@ -25,9 +25,12 @@
  * @include: shell/e-shell-searchbar.h
  **/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-shell-searchbar.h"
 
-#include <config.h>
 #include <glib/gi18n-lib.h>
 
 #include "e-util/e-util.h"
diff --git a/shell/e-shell-settings.c b/shell/e-shell-settings.c
index e43139a..5e5f342 100644
--- a/shell/e-shell-settings.c
+++ b/shell/e-shell-settings.c
@@ -25,6 +25,10 @@
  * @include: shell/e-shell-settings.h
  **/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-shell-settings.h"
 
 #include "e-util/gconf-bridge.h"
diff --git a/shell/e-shell-sidebar.c b/shell/e-shell-sidebar.c
index b72a210..abe37b7 100644
--- a/shell/e-shell-sidebar.c
+++ b/shell/e-shell-sidebar.c
@@ -25,6 +25,10 @@
  * @include: shell/e-shell-sidebar.h
  **/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-shell-sidebar.h"
 
 #include <e-util/e-alert-sink.h>
diff --git a/shell/e-shell-switcher.c b/shell/e-shell-switcher.c
index 594862d..f70697b 100644
--- a/shell/e-shell-switcher.c
+++ b/shell/e-shell-switcher.c
@@ -25,6 +25,10 @@
  * @include: shell/e-shell-switcher.h
  **/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-shell-switcher.h"
 
 #include <glib/gi18n.h>
diff --git a/shell/e-shell-taskbar.c b/shell/e-shell-taskbar.c
index 943a098..1ddbd35 100644
--- a/shell/e-shell-taskbar.c
+++ b/shell/e-shell-taskbar.c
@@ -25,6 +25,10 @@
  * @include: shell/e-shell-taskbar.h
  **/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-shell-taskbar.h"
 
 #include <e-shell-view.h>
diff --git a/shell/e-shell-utils.c b/shell/e-shell-utils.c
index 43ddd05..749eb22 100644
--- a/shell/e-shell-utils.c
+++ b/shell/e-shell-utils.c
@@ -25,6 +25,10 @@
  * @include: shell/e-shell-utils.h
  **/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-shell-utils.h"
 
 #include <glib/gi18n-lib.h>
diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c
index 43d8431..1084201 100644
--- a/shell/e-shell-view.c
+++ b/shell/e-shell-view.c
@@ -25,6 +25,10 @@
  * @include: shell/e-shell-view.h
  **/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-shell-view.h"
 
 #include <string.h>
diff --git a/shell/e-shell-window-actions.c b/shell/e-shell-window-actions.c
index 60792ba..cba0c52 100644
--- a/shell/e-shell-window-actions.c
+++ b/shell/e-shell-window-actions.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-shell-window-private.h"
 #include "e-preferences-window.h"
 
diff --git a/shell/e-shell-window-private.c b/shell/e-shell-window-private.c
index 6135294..105e45e 100644
--- a/shell/e-shell-window-private.c
+++ b/shell/e-shell-window-private.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-shell-window-private.h"
 
 static void
diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c
index 7d8e6c5..25dfe43 100644
--- a/shell/e-shell-window.c
+++ b/shell/e-shell-window.c
@@ -25,6 +25,10 @@
  * @include: shell/e-shell-window.h
  **/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-shell-window-private.h"
 
 enum {
diff --git a/shell/e-shell.c b/shell/e-shell.c
index 60f145e..dbcb55b 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -25,6 +25,10 @@
  * @include: shell/e-shell.h
  **/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-shell.h"
 
 #include <glib/gi18n.h>
diff --git a/smclient/eggdesktopfile.c b/smclient/eggdesktopfile.c
index 1d094ad..9020a26 100644
--- a/smclient/eggdesktopfile.c
+++ b/smclient/eggdesktopfile.c
@@ -22,7 +22,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include "eggdesktopfile.h"
diff --git a/smclient/eggsmclient-win32.c b/smclient/eggsmclient-win32.c
index 91a2571..caa06d8 100644
--- a/smclient/eggsmclient-win32.c
+++ b/smclient/eggsmclient-win32.c
@@ -46,7 +46,9 @@
  * which we also don't handle here.
  */
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "eggsmclient-private.h"
 #include <gdk/gdk.h>
diff --git a/smclient/eggsmclient-xsmp.c b/smclient/eggsmclient-xsmp.c
index fd6f83d..97d035d 100644
--- a/smclient/eggsmclient-xsmp.c
+++ b/smclient/eggsmclient-xsmp.c
@@ -21,7 +21,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "eggsmclient.h"
 #include "eggsmclient-private.h"
diff --git a/smclient/eggsmclient.c b/smclient/eggsmclient.c
index fde05ed..bbe3526 100644
--- a/smclient/eggsmclient.c
+++ b/smclient/eggsmclient.c
@@ -17,7 +17,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <string.h>
 #include <glib/gi18n.h>
diff --git a/widgets/menus/gal-define-views-dialog.c b/widgets/menus/gal-define-views-dialog.c
index 6605f22..ec31c44 100644
--- a/widgets/menus/gal-define-views-dialog.c
+++ b/widgets/menus/gal-define-views-dialog.c
@@ -21,7 +21,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <glib/gi18n.h>
 
diff --git a/widgets/menus/gal-define-views-model.c b/widgets/menus/gal-define-views-model.c
index 2ce1d46..b72a262 100644
--- a/widgets/menus/gal-define-views-model.c
+++ b/widgets/menus/gal-define-views-model.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <libxml/tree.h>
 #include <libxml/parser.h>
diff --git a/widgets/menus/gal-view-collection.c b/widgets/menus/gal-view-collection.c
index 42b5ff6..50a18e8 100644
--- a/widgets/menus/gal-view-collection.c
+++ b/widgets/menus/gal-view-collection.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <ctype.h>
 #include <string.h>
diff --git a/widgets/menus/gal-view-etable.c b/widgets/menus/gal-view-etable.c
index bb69aad..4a3a3fb 100644
--- a/widgets/menus/gal-view-etable.c
+++ b/widgets/menus/gal-view-etable.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include "table/e-table-config.h"
 
diff --git a/widgets/menus/gal-view-factory-etable.c b/widgets/menus/gal-view-factory-etable.c
index 054acb8..3d5d0d2 100644
--- a/widgets/menus/gal-view-factory-etable.c
+++ b/widgets/menus/gal-view-factory-etable.c
@@ -21,7 +21,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <glib/gi18n.h>
 #include "e-util/e-util.h"
diff --git a/widgets/menus/gal-view-factory.c b/widgets/menus/gal-view-factory.c
index 7dec441..0f311cf 100644
--- a/widgets/menus/gal-view-factory.c
+++ b/widgets/menus/gal-view-factory.c
@@ -20,9 +20,12 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "gal-view-factory.h"
 
-#include <config.h>
 #include <e-util/e-util.h>
 
 G_DEFINE_TYPE (GalViewFactory, gal_view_factory, G_TYPE_OBJECT)
diff --git a/widgets/menus/gal-view-instance-save-as-dialog.c b/widgets/menus/gal-view-instance-save-as-dialog.c
index 71f2218..49a0838 100644
--- a/widgets/menus/gal-view-instance-save-as-dialog.c
+++ b/widgets/menus/gal-view-instance-save-as-dialog.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <glib/gi18n.h>
 #include "e-util/e-util.h"
diff --git a/widgets/menus/gal-view-instance.c b/widgets/menus/gal-view-instance.c
index 9449182..2255708 100644
--- a/widgets/menus/gal-view-instance.c
+++ b/widgets/menus/gal-view-instance.c
@@ -21,7 +21,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <ctype.h>
 #include <string.h>
diff --git a/widgets/menus/gal-view-new-dialog.c b/widgets/menus/gal-view-new-dialog.c
index 278e096..4428cf6 100644
--- a/widgets/menus/gal-view-new-dialog.c
+++ b/widgets/menus/gal-view-new-dialog.c
@@ -21,7 +21,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <glib/gi18n.h>
 #include "e-util/e-util.h"
diff --git a/widgets/menus/gal-view.c b/widgets/menus/gal-view.c
index f31f219..b24be56 100644
--- a/widgets/menus/gal-view.c
+++ b/widgets/menus/gal-view.c
@@ -21,9 +21,12 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "gal-view.h"
 
-#include <config.h>
 #include <e-util/e-util.h>
 
 #define d(x)
diff --git a/widgets/misc/e-account-combo-box.c b/widgets/misc/e-account-combo-box.c
index e8b0bee..a649df5 100644
--- a/widgets/misc/e-account-combo-box.c
+++ b/widgets/misc/e-account-combo-box.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-account-combo-box.h"
 
 #include <string.h>
diff --git a/widgets/misc/e-account-manager.c b/widgets/misc/e-account-manager.c
index b252690..e4ee687 100644
--- a/widgets/misc/e-account-manager.c
+++ b/widgets/misc/e-account-manager.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-account-manager.h"
 
 #include <glib/gi18n.h>
diff --git a/widgets/misc/e-account-tree-view.c b/widgets/misc/e-account-tree-view.c
index 7dba811..18c39dc 100644
--- a/widgets/misc/e-account-tree-view.c
+++ b/widgets/misc/e-account-tree-view.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-account-tree-view.h"
 
 #include <glib/gi18n.h>
diff --git a/widgets/misc/e-action-combo-box.c b/widgets/misc/e-action-combo-box.c
index 9554a59..d34409b 100644
--- a/widgets/misc/e-action-combo-box.c
+++ b/widgets/misc/e-action-combo-box.c
@@ -18,6 +18,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-action-combo-box.h"
 
 #include <glib/gi18n.h>
diff --git a/widgets/misc/e-activity-bar.c b/widgets/misc/e-activity-bar.c
index 44e169f..5407814 100644
--- a/widgets/misc/e-activity-bar.c
+++ b/widgets/misc/e-activity-bar.c
@@ -16,6 +16,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-activity-bar.h"
 
 #define FEEDBACK_PERIOD		1 /* seconds */
diff --git a/widgets/misc/e-activity-proxy.c b/widgets/misc/e-activity-proxy.c
index 91dd576..f34807c 100644
--- a/widgets/misc/e-activity-proxy.c
+++ b/widgets/misc/e-activity-proxy.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-activity-proxy.h"
 
 #include <glib/gi18n.h>
diff --git a/widgets/misc/e-alert-bar.c b/widgets/misc/e-alert-bar.c
index 3ff4649..7ec731e 100644
--- a/widgets/misc/e-alert-bar.c
+++ b/widgets/misc/e-alert-bar.c
@@ -16,9 +16,12 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-alert-bar.h"
 
-#include <config.h>
 #include <glib/gi18n-lib.h>
 
 /* GTK_ICON_SIZE_DIALOG is a tad too big. */
diff --git a/widgets/misc/e-attachment-button.c b/widgets/misc/e-attachment-button.c
index f5ff2d0..88c965e 100644
--- a/widgets/misc/e-attachment-button.c
+++ b/widgets/misc/e-attachment-button.c
@@ -21,6 +21,10 @@
 
 /* Much of the popup menu logic here was ripped from GtkMenuToolButton. */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-attachment-button.h"
 
 struct _EAttachmentButtonPrivate {
diff --git a/widgets/misc/e-attachment-dialog.c b/widgets/misc/e-attachment-dialog.c
index 9064107..384322e 100644
--- a/widgets/misc/e-attachment-dialog.c
+++ b/widgets/misc/e-attachment-dialog.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-attachment-dialog.h"
 
 #include <glib/gi18n.h>
diff --git a/widgets/misc/e-attachment-handler-image.c b/widgets/misc/e-attachment-handler-image.c
index 16046b9..a66aa1d 100644
--- a/widgets/misc/e-attachment-handler-image.c
+++ b/widgets/misc/e-attachment-handler-image.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-attachment-handler-image.h"
 
 #include <glib/gi18n.h>
diff --git a/widgets/misc/e-attachment-handler-sendto.c b/widgets/misc/e-attachment-handler-sendto.c
index 2694e3d..f0fe698 100644
--- a/widgets/misc/e-attachment-handler-sendto.c
+++ b/widgets/misc/e-attachment-handler-sendto.c
@@ -18,9 +18,12 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-attachment-handler-sendto.h"
 
-#include <config.h>
 #include <errno.h>
 
 #include <glib/gi18n-lib.h>
diff --git a/widgets/misc/e-attachment-handler.c b/widgets/misc/e-attachment-handler.c
index 7f68331..054cd24 100644
--- a/widgets/misc/e-attachment-handler.c
+++ b/widgets/misc/e-attachment-handler.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-attachment-handler.h"
 
 struct _EAttachmentHandlerPrivate {
diff --git a/widgets/misc/e-attachment-icon-view.c b/widgets/misc/e-attachment-icon-view.c
index d5dd557..9dd7825 100644
--- a/widgets/misc/e-attachment-icon-view.c
+++ b/widgets/misc/e-attachment-icon-view.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-attachment-icon-view.h"
 
 #include <glib/gi18n.h>
diff --git a/widgets/misc/e-attachment-paned.c b/widgets/misc/e-attachment-paned.c
index 406e247..b842aec 100644
--- a/widgets/misc/e-attachment-paned.c
+++ b/widgets/misc/e-attachment-paned.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-attachment-paned.h"
 
 #include <glib/gi18n.h>
diff --git a/widgets/misc/e-attachment-store.c b/widgets/misc/e-attachment-store.c
index 696e092..a1e1fa2 100644
--- a/widgets/misc/e-attachment-store.c
+++ b/widgets/misc/e-attachment-store.c
@@ -19,10 +19,13 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-attachment-store.h"
 
 #include <errno.h>
-#include <config.h>
 #include <glib/gi18n.h>
 
 #include "e-util/e-util.h"
diff --git a/widgets/misc/e-attachment-tree-view.c b/widgets/misc/e-attachment-tree-view.c
index 7099a7e..5293120 100644
--- a/widgets/misc/e-attachment-tree-view.c
+++ b/widgets/misc/e-attachment-tree-view.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-attachment-tree-view.h"
 
 #include <glib/gi18n.h>
diff --git a/widgets/misc/e-attachment-view.c b/widgets/misc/e-attachment-view.c
index d22ccd5..98a5340 100644
--- a/widgets/misc/e-attachment-view.c
+++ b/widgets/misc/e-attachment-view.c
@@ -19,9 +19,12 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-attachment-view.h"
 
-#include <config.h>
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
 
diff --git a/widgets/misc/e-attachment.c b/widgets/misc/e-attachment.c
index 104ad5c..5073d58 100644
--- a/widgets/misc/e-attachment.c
+++ b/widgets/misc/e-attachment.c
@@ -19,10 +19,13 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-attachment.h"
 
 #include <errno.h>
-#include <config.h>
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
 
diff --git a/widgets/misc/e-buffer-tagger.c b/widgets/misc/e-buffer-tagger.c
index c6ddd99..cf2944f 100644
--- a/widgets/misc/e-buffer-tagger.c
+++ b/widgets/misc/e-buffer-tagger.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <glib/gi18n.h>
diff --git a/widgets/misc/e-canvas-background.c b/widgets/misc/e-canvas-background.c
index 431e0fd..10cddb4 100644
--- a/widgets/misc/e-canvas-background.c
+++ b/widgets/misc/e-canvas-background.c
@@ -22,7 +22,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <math.h>
 #include <stdio.h>
diff --git a/widgets/misc/e-canvas-utils.c b/widgets/misc/e-canvas-utils.c
index fda5cd8..4a697f8 100644
--- a/widgets/misc/e-canvas-utils.c
+++ b/widgets/misc/e-canvas-utils.c
@@ -21,6 +21,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-canvas-utils.h"
 
 void
diff --git a/widgets/misc/e-canvas-vbox.c b/widgets/misc/e-canvas-vbox.c
index ef9e7f0..1513e44 100644
--- a/widgets/misc/e-canvas-vbox.c
+++ b/widgets/misc/e-canvas-vbox.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <math.h>
 
diff --git a/widgets/misc/e-canvas.c b/widgets/misc/e-canvas.c
index e2d0fe7..c5d953b 100644
--- a/widgets/misc/e-canvas.c
+++ b/widgets/misc/e-canvas.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <gtk/gtk.h>
 
diff --git a/widgets/misc/e-charset-combo-box.c b/widgets/misc/e-charset-combo-box.c
index aecee9b..a2ec348 100644
--- a/widgets/misc/e-charset-combo-box.c
+++ b/widgets/misc/e-charset-combo-box.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-charset-combo-box.h"
 
 #include <glib/gi18n.h>
diff --git a/widgets/misc/e-combo-cell-editable.c b/widgets/misc/e-combo-cell-editable.c
index f108e71..49ce7ce 100644
--- a/widgets/misc/e-combo-cell-editable.c
+++ b/widgets/misc/e-combo-cell-editable.c
@@ -20,7 +20,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
+
 #include <gdk/gdkkeysyms.h>
 
 #include "e-combo-cell-editable.h"
diff --git a/widgets/misc/e-focus-tracker.c b/widgets/misc/e-focus-tracker.c
index ac4eaf3..1e7082b 100644
--- a/widgets/misc/e-focus-tracker.c
+++ b/widgets/misc/e-focus-tracker.c
@@ -19,9 +19,12 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-focus-tracker.h"
 
-#include <config.h>
 #include <glib/gi18n-lib.h>
 
 #include <misc/e-selectable.h>
diff --git a/widgets/misc/e-hinted-entry.c b/widgets/misc/e-hinted-entry.c
index 4885896..21a4fff 100644
--- a/widgets/misc/e-hinted-entry.c
+++ b/widgets/misc/e-hinted-entry.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-hinted-entry.h"
 
 struct _EHintedEntryPrivate {
diff --git a/widgets/misc/e-hsv-utils.c b/widgets/misc/e-hsv-utils.c
index 66bf296..81919a2 100644
--- a/widgets/misc/e-hsv-utils.c
+++ b/widgets/misc/e-hsv-utils.c
@@ -21,7 +21,9 @@
  * 02110-1301, USA.
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include "e-hsv-utils.h"
 
diff --git a/widgets/misc/e-image-chooser.c b/widgets/misc/e-image-chooser.c
index e21d1c6..932d4eb 100644
--- a/widgets/misc/e-image-chooser.c
+++ b/widgets/misc/e-image-chooser.c
@@ -19,7 +19,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <stdio.h>
 #include <string.h>
diff --git a/widgets/misc/e-import-assistant.c b/widgets/misc/e-import-assistant.c
index 5d612a9..3069692 100644
--- a/widgets/misc/e-import-assistant.c
+++ b/widgets/misc/e-import-assistant.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-import-assistant.h"
 
 #include <sys/types.h>
diff --git a/widgets/misc/e-map.c b/widgets/misc/e-map.c
index 6b90887..ef1d805 100644
--- a/widgets/misc/e-map.c
+++ b/widgets/misc/e-map.c
@@ -22,7 +22,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
+
 #include <math.h>
 #include <stdlib.h>
 #include <gdk/gdkkeysyms.h>
diff --git a/widgets/misc/e-menu-tool-action.c b/widgets/misc/e-menu-tool-action.c
index 6a6505b..3ed37cb 100644
--- a/widgets/misc/e-menu-tool-action.c
+++ b/widgets/misc/e-menu-tool-action.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-menu-tool-action.h"
 
 G_DEFINE_TYPE (
diff --git a/widgets/misc/e-menu-tool-button.c b/widgets/misc/e-menu-tool-button.c
index 8661eff..0c5ef95 100644
--- a/widgets/misc/e-menu-tool-button.c
+++ b/widgets/misc/e-menu-tool-button.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-menu-tool-button.h"
 
 G_DEFINE_TYPE (
diff --git a/widgets/misc/e-online-button.c b/widgets/misc/e-online-button.c
index 2b974f9..351413e 100644
--- a/widgets/misc/e-online-button.c
+++ b/widgets/misc/e-online-button.c
@@ -15,6 +15,10 @@
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-online-button.h"
 
 #include <glib/gi18n.h>
diff --git a/widgets/misc/e-paned.c b/widgets/misc/e-paned.c
index 6740d44..1ddb83f 100644
--- a/widgets/misc/e-paned.c
+++ b/widgets/misc/e-paned.c
@@ -19,9 +19,12 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-paned.h"
 
-#include <config.h>
 #include <glib/gi18n-lib.h>
 
 #define SYNC_REQUEST_NONE		0
diff --git a/widgets/misc/e-picture-gallery.c b/widgets/misc/e-picture-gallery.c
index b4eabe4..a657dbf 100644
--- a/widgets/misc/e-picture-gallery.c
+++ b/widgets/misc/e-picture-gallery.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-util/e-icon-factory.h"
 
 #include "e-picture-gallery.h"
diff --git a/widgets/misc/e-popup-action.c b/widgets/misc/e-popup-action.c
index 334a512..52813c5 100644
--- a/widgets/misc/e-popup-action.c
+++ b/widgets/misc/e-popup-action.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-popup-action.h"
 
 #include <glib/gi18n.h>
diff --git a/widgets/misc/e-popup-menu.c b/widgets/misc/e-popup-menu.c
index 7a74edb..d166ac0 100644
--- a/widgets/misc/e-popup-menu.c
+++ b/widgets/misc/e-popup-menu.c
@@ -22,7 +22,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <libintl.h>
 #include <string.h>
diff --git a/widgets/misc/e-port-entry.c b/widgets/misc/e-port-entry.c
index 5028a41..b00a90f 100644
--- a/widgets/misc/e-port-entry.c
+++ b/widgets/misc/e-port-entry.c
@@ -11,9 +11,12 @@
  *	Dan Vratil <dvratil redhat com>
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-port-entry.h"
 
-#include <config.h>
 #include <stddef.h>
 #include <string.h>
 #include <glib.h>
diff --git a/widgets/misc/e-preferences-window.c b/widgets/misc/e-preferences-window.c
index 49ce727..5b329eb 100644
--- a/widgets/misc/e-preferences-window.c
+++ b/widgets/misc/e-preferences-window.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-preferences-window.h"
 
 #include <glib/gi18n.h>
diff --git a/widgets/misc/e-preview-pane.c b/widgets/misc/e-preview-pane.c
index 5ae9991..1a7a319 100644
--- a/widgets/misc/e-preview-pane.c
+++ b/widgets/misc/e-preview-pane.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-preview-pane.h"
 
 #include <gdk/gdkkeysyms.h>
diff --git a/widgets/misc/e-printable.c b/widgets/misc/e-printable.c
index ba8be26..a918081 100644
--- a/widgets/misc/e-printable.c
+++ b/widgets/misc/e-printable.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <gtk/gtk.h>
 
diff --git a/widgets/misc/e-search-bar.c b/widgets/misc/e-search-bar.c
index f4709d1..db72c58 100644
--- a/widgets/misc/e-search-bar.c
+++ b/widgets/misc/e-search-bar.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-search-bar.h"
 
 #include <glib/gi18n.h>
diff --git a/widgets/misc/e-selectable.c b/widgets/misc/e-selectable.c
index 433cd21..b8e4337 100644
--- a/widgets/misc/e-selectable.c
+++ b/widgets/misc/e-selectable.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-selectable.h"
 
 G_DEFINE_INTERFACE (
diff --git a/widgets/misc/e-selection-model-array.c b/widgets/misc/e-selection-model-array.c
index e7185a0..a023ea5 100644
--- a/widgets/misc/e-selection-model-array.c
+++ b/widgets/misc/e-selection-model-array.c
@@ -21,7 +21,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <gtk/gtk.h>
 
diff --git a/widgets/misc/e-selection-model-simple.c b/widgets/misc/e-selection-model-simple.c
index 829363d..1bdd99c 100644
--- a/widgets/misc/e-selection-model-simple.c
+++ b/widgets/misc/e-selection-model-simple.c
@@ -21,7 +21,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include "e-util/e-util.h"
 
diff --git a/widgets/misc/e-selection-model.c b/widgets/misc/e-selection-model.c
index e41d44e..4f00369 100644
--- a/widgets/misc/e-selection-model.c
+++ b/widgets/misc/e-selection-model.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <gdk/gdkkeysyms.h>
 
diff --git a/widgets/misc/e-signature-editor.c b/widgets/misc/e-signature-editor.c
index 82d88ec..16efaa6 100644
--- a/widgets/misc/e-signature-editor.c
+++ b/widgets/misc/e-signature-editor.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-signature-editor.h"
 
 #include <string.h>
diff --git a/widgets/misc/e-signature-manager.c b/widgets/misc/e-signature-manager.c
index 8c21030..9e62c02 100644
--- a/widgets/misc/e-signature-manager.c
+++ b/widgets/misc/e-signature-manager.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-signature-manager.h"
 
 #include <glib/gi18n.h>
diff --git a/widgets/misc/e-signature-preview.c b/widgets/misc/e-signature-preview.c
index c48c929..a2c2352 100644
--- a/widgets/misc/e-signature-preview.c
+++ b/widgets/misc/e-signature-preview.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-signature-preview.h"
 
 #include <fcntl.h>
diff --git a/widgets/misc/e-signature-script-dialog.c b/widgets/misc/e-signature-script-dialog.c
index 367cc94..f864f82 100644
--- a/widgets/misc/e-signature-script-dialog.c
+++ b/widgets/misc/e-signature-script-dialog.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-signature-script-dialog.h"
 
 #include <glib/gi18n.h>
diff --git a/widgets/misc/e-signature-tree-view.c b/widgets/misc/e-signature-tree-view.c
index 8234675..914b03e 100644
--- a/widgets/misc/e-signature-tree-view.c
+++ b/widgets/misc/e-signature-tree-view.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-signature-tree-view.h"
 
 enum {
diff --git a/widgets/misc/e-url-entry.h b/widgets/misc/e-url-entry.h
index e5c8332..7b50f79 100644
--- a/widgets/misc/e-url-entry.h
+++ b/widgets/misc/e-url-entry.h
@@ -23,10 +23,6 @@
 #ifndef _E_URL_ENTRY_H_
 #define _E_URL_ENTRY_H_
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <gtk/gtk.h>
 
 G_BEGIN_DECLS
diff --git a/widgets/misc/e-web-view-preview.c b/widgets/misc/e-web-view-preview.c
index d53bdf4..763d313 100644
--- a/widgets/misc/e-web-view-preview.c
+++ b/widgets/misc/e-web-view-preview.c
@@ -19,9 +19,12 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-web-view-preview.h"
 
-#include <config.h>
 #include <string.h>
 #include <glib/gi18n-lib.h>
 
diff --git a/widgets/misc/e-web-view.c b/widgets/misc/e-web-view.c
index 54bd251..0c02743 100644
--- a/widgets/misc/e-web-view.c
+++ b/widgets/misc/e-web-view.c
@@ -16,9 +16,12 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-web-view.h"
 
-#include <config.h>
 #include <string.h>
 #include <glib/gi18n-lib.h>
 
diff --git a/widgets/misc/ea-calendar-cell.c b/widgets/misc/ea-calendar-cell.c
index cff30af..0d41575 100644
--- a/widgets/misc/ea-calendar-cell.c
+++ b/widgets/misc/ea-calendar-cell.c
@@ -21,6 +21,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <gtk/gtk.h>
 #include <e-util/e-util.h>
 #include "ea-calendar-cell.h"
diff --git a/widgets/misc/ea-calendar-item.c b/widgets/misc/ea-calendar-item.c
index 80eec98..a3acca0 100644
--- a/widgets/misc/ea-calendar-item.c
+++ b/widgets/misc/ea-calendar-item.c
@@ -20,6 +20,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <time.h>
 #include <string.h>
diff --git a/widgets/misc/ea-cell-table.c b/widgets/misc/ea-cell-table.c
index b183ef9..19c4ffb 100644
--- a/widgets/misc/ea-cell-table.c
+++ b/widgets/misc/ea-cell-table.c
@@ -20,6 +20,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "ea-cell-table.h"
 
 EaCellTable *
diff --git a/widgets/misc/ea-widgets.c b/widgets/misc/ea-widgets.c
index 9deede2..1b74d44 100644
--- a/widgets/misc/ea-widgets.c
+++ b/widgets/misc/ea-widgets.c
@@ -20,6 +20,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "a11y/ea-factory.h"
 #include "ea-calendar-item.h"
 #include "ea-widgets.h"
diff --git a/widgets/table/e-cell-checkbox.c b/widgets/table/e-cell-checkbox.c
index de26a5d..7969e2b 100644
--- a/widgets/table/e-cell-checkbox.c
+++ b/widgets/table/e-cell-checkbox.c
@@ -21,7 +21,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
diff --git a/widgets/table/e-cell-combo.c b/widgets/table/e-cell-combo.c
index b366c93..f759185 100644
--- a/widgets/table/e-cell-combo.c
+++ b/widgets/table/e-cell-combo.c
@@ -53,7 +53,9 @@
  *   close the popup, like the Escape key, or a button press outside the popup.
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <string.h>
 
diff --git a/widgets/table/e-cell-date.c b/widgets/table/e-cell-date.c
index 9040f80..fb3dd9f 100644
--- a/widgets/table/e-cell-date.c
+++ b/widgets/table/e-cell-date.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <sys/time.h>
 #include <time.h>
diff --git a/widgets/table/e-cell-hbox.c b/widgets/table/e-cell-hbox.c
index e268b23..c8485b9 100644
--- a/widgets/table/e-cell-hbox.c
+++ b/widgets/table/e-cell-hbox.c
@@ -24,7 +24,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <ctype.h>
 #include <math.h>
diff --git a/widgets/table/e-cell-number.c b/widgets/table/e-cell-number.c
index 72f25ce..7e9395b 100644
--- a/widgets/table/e-cell-number.c
+++ b/widgets/table/e-cell-number.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <sys/time.h>
 #include <unistd.h>
diff --git a/widgets/table/e-cell-pixbuf.c b/widgets/table/e-cell-pixbuf.c
index 45f1fb3..9a9e31c 100644
--- a/widgets/table/e-cell-pixbuf.c
+++ b/widgets/table/e-cell-pixbuf.c
@@ -21,7 +21,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <stdio.h>
 
diff --git a/widgets/table/e-cell-popup.c b/widgets/table/e-cell-popup.c
index 334e6be..b3ba9bd 100644
--- a/widgets/table/e-cell-popup.c
+++ b/widgets/table/e-cell-popup.c
@@ -29,7 +29,9 @@
  * popup.
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <gdk/gdkkeysyms.h>
 
diff --git a/widgets/table/e-cell-size.c b/widgets/table/e-cell-size.c
index d624cf6..d596713 100644
--- a/widgets/table/e-cell-size.c
+++ b/widgets/table/e-cell-size.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <sys/time.h>
 #include <unistd.h>
diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c
index e3d095c..9d65237 100644
--- a/widgets/table/e-cell-text.c
+++ b/widgets/table/e-cell-text.c
@@ -33,7 +33,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <stdio.h>
 #include <ctype.h>
diff --git a/widgets/table/e-cell-toggle.c b/widgets/table/e-cell-toggle.c
index 76fd452..8583446 100644
--- a/widgets/table/e-cell-toggle.c
+++ b/widgets/table/e-cell-toggle.c
@@ -22,7 +22,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
diff --git a/widgets/table/e-cell-tree.c b/widgets/table/e-cell-tree.c
index b06b3d4..77f25ae 100644
--- a/widgets/table/e-cell-tree.c
+++ b/widgets/table/e-cell-tree.c
@@ -28,7 +28,9 @@
  * 02110-1301, USA.
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <ctype.h>
 #include <math.h>
diff --git a/widgets/table/e-cell-vbox.c b/widgets/table/e-cell-vbox.c
index 1d36d4e..1c0cbc6 100644
--- a/widgets/table/e-cell-vbox.c
+++ b/widgets/table/e-cell-vbox.c
@@ -21,7 +21,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <ctype.h>
 #include <math.h>
diff --git a/widgets/table/e-cell.c b/widgets/table/e-cell.c
index 19c5e37..cbc0bfc 100644
--- a/widgets/table/e-cell.c
+++ b/widgets/table/e-cell.c
@@ -22,7 +22,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
+
 #include <gtk/gtk.h>
 #include "e-util/e-util.h"
 
diff --git a/widgets/table/e-table-click-to-add.c b/widgets/table/e-table-click-to-add.c
index 773aefc..662a9c5 100644
--- a/widgets/table/e-table-click-to-add.c
+++ b/widgets/table/e-table-click-to-add.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
diff --git a/widgets/table/e-table-col.c b/widgets/table/e-table-col.c
index 2eb688e..7296408 100644
--- a/widgets/table/e-table-col.c
+++ b/widgets/table/e-table-col.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <glib/gi18n.h>
 #include "e-util/e-util.h"
diff --git a/widgets/table/e-table-column-specification.c b/widgets/table/e-table-column-specification.c
index 9f7ea53..7fb0756 100644
--- a/widgets/table/e-table-column-specification.c
+++ b/widgets/table/e-table-column-specification.c
@@ -22,7 +22,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <stdlib.h>
 
diff --git a/widgets/table/e-table-config.c b/widgets/table/e-table-config.c
index 01d6260..9b85cd3 100644
--- a/widgets/table/e-table-config.c
+++ b/widgets/table/e-table-config.c
@@ -27,7 +27,9 @@
  *    Make Clear all work.
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/widgets/table/e-table-extras.c b/widgets/table/e-table-extras.c
index 75626aa..b07651a 100644
--- a/widgets/table/e-table-extras.c
+++ b/widgets/table/e-table-extras.c
@@ -22,7 +22,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/widgets/table/e-table-field-chooser-dialog.c b/widgets/table/e-table-field-chooser-dialog.c
index 9c24a64..b4ac8e5 100644
--- a/widgets/table/e-table-field-chooser-dialog.c
+++ b/widgets/table/e-table-field-chooser-dialog.c
@@ -21,7 +21,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <gtk/gtk.h>
 
diff --git a/widgets/table/e-table-field-chooser-item.c b/widgets/table/e-table-field-chooser-item.c
index 14a0803..451b038 100644
--- a/widgets/table/e-table-field-chooser-item.c
+++ b/widgets/table/e-table-field-chooser-item.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <string.h>
 
diff --git a/widgets/table/e-table-field-chooser.c b/widgets/table/e-table-field-chooser.c
index 20ecb6e..2f945bb 100644
--- a/widgets/table/e-table-field-chooser.c
+++ b/widgets/table/e-table-field-chooser.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <gtk/gtk.h>
 #include <libgnomecanvas/libgnomecanvas.h>
diff --git a/widgets/table/e-table-group-container.c b/widgets/table/e-table-group-container.c
index 564d484..0a93376 100644
--- a/widgets/table/e-table-group-container.c
+++ b/widgets/table/e-table-group-container.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
diff --git a/widgets/table/e-table-group-leaf.c b/widgets/table/e-table-group-leaf.c
index 7ec5530..46f30a9 100644
--- a/widgets/table/e-table-group-leaf.c
+++ b/widgets/table/e-table-group-leaf.c
@@ -21,7 +21,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <gtk/gtk.h>
 #include <libgnomecanvas/libgnomecanvas.h>
diff --git a/widgets/table/e-table-group.c b/widgets/table/e-table-group.c
index 0efc08d..8fd56bc 100644
--- a/widgets/table/e-table-group.c
+++ b/widgets/table/e-table-group.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <gtk/gtk.h>
 #include <libgnomecanvas/libgnomecanvas.h>
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index 12fc9b9..020f1d8 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -21,7 +21,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <string.h>
 #include <glib.h>
diff --git a/widgets/table/e-table-header-utils.c b/widgets/table/e-table-header-utils.c
index 8911867..174d20a 100644
--- a/widgets/table/e-table-header-utils.c
+++ b/widgets/table/e-table-header-utils.c
@@ -22,7 +22,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <string.h> /* strlen() */
 #include <glib.h>
diff --git a/widgets/table/e-table-header.c b/widgets/table/e-table-header.c
index e890d48..9950ee6 100644
--- a/widgets/table/e-table-header.c
+++ b/widgets/table/e-table-header.c
@@ -21,7 +21,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <string.h>
 
diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c
index 6da76cf..4b4299f 100644
--- a/widgets/table/e-table-item.c
+++ b/widgets/table/e-table-item.c
@@ -26,7 +26,9 @@
  * TODO:
  *   Add a border to the thing, so that focusing works properly.
  */
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <math.h>
 #include <stdio.h>
diff --git a/widgets/table/e-table-memory-callbacks.c b/widgets/table/e-table-memory-callbacks.c
index a68e9a2..bc85c7d 100644
--- a/widgets/table/e-table-memory-callbacks.c
+++ b/widgets/table/e-table-memory-callbacks.c
@@ -21,7 +21,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include "e-util/e-util.h"
 
diff --git a/widgets/table/e-table-memory-store.c b/widgets/table/e-table-memory-store.c
index 4cfd97e..dc77e13 100644
--- a/widgets/table/e-table-memory-store.c
+++ b/widgets/table/e-table-memory-store.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <string.h>
 
diff --git a/widgets/table/e-table-memory.c b/widgets/table/e-table-memory.c
index 166cfdb..cc62a6d 100644
--- a/widgets/table/e-table-memory.c
+++ b/widgets/table/e-table-memory.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <stdio.h>
 #include <errno.h>
diff --git a/widgets/table/e-table-model.c b/widgets/table/e-table-model.c
index 3bf5ec5..51d1a9d 100644
--- a/widgets/table/e-table-model.c
+++ b/widgets/table/e-table-model.c
@@ -21,7 +21,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <glib-object.h>
 
diff --git a/widgets/table/e-table-one.c b/widgets/table/e-table-one.c
index 69880b9..7683b93 100644
--- a/widgets/table/e-table-one.c
+++ b/widgets/table/e-table-one.c
@@ -21,7 +21,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include "e-util/e-util.h"
 
diff --git a/widgets/table/e-table-search.c b/widgets/table/e-table-search.c
index cf7edf3..955547f 100644
--- a/widgets/table/e-table-search.c
+++ b/widgets/table/e-table-search.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <string.h>
 
diff --git a/widgets/table/e-table-selection-model.c b/widgets/table/e-table-selection-model.c
index 18c0f5e..b8f33c6 100644
--- a/widgets/table/e-table-selection-model.c
+++ b/widgets/table/e-table-selection-model.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <string.h>
 
diff --git a/widgets/table/e-table-sort-info.c b/widgets/table/e-table-sort-info.c
index b238e6b..b488dbc 100644
--- a/widgets/table/e-table-sort-info.c
+++ b/widgets/table/e-table-sort-info.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <string.h>
 
diff --git a/widgets/table/e-table-sorted-variable.c b/widgets/table/e-table-sorted-variable.c
index f297020..0ed35c9 100644
--- a/widgets/table/e-table-sorted-variable.c
+++ b/widgets/table/e-table-sorted-variable.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/widgets/table/e-table-sorted.c b/widgets/table/e-table-sorted.c
index 73dbac1..61ea10c 100644
--- a/widgets/table/e-table-sorted.c
+++ b/widgets/table/e-table-sorted.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/widgets/table/e-table-sorter.c b/widgets/table/e-table-sorter.c
index 4727103..d74dbd3 100644
--- a/widgets/table/e-table-sorter.c
+++ b/widgets/table/e-table-sorter.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/widgets/table/e-table-sorting-utils.c b/widgets/table/e-table-sorting-utils.c
index 5254a5e..e654f94 100644
--- a/widgets/table/e-table-sorting-utils.c
+++ b/widgets/table/e-table-sorting-utils.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <string.h>
 #include <camel/camel.h>
diff --git a/widgets/table/e-table-specification.c b/widgets/table/e-table-specification.c
index 3324748..03a66f9 100644
--- a/widgets/table/e-table-specification.c
+++ b/widgets/table/e-table-specification.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/widgets/table/e-table-state.c b/widgets/table/e-table-state.c
index 2f58715..0bb311b 100644
--- a/widgets/table/e-table-state.c
+++ b/widgets/table/e-table-state.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/widgets/table/e-table-subset-variable.c b/widgets/table/e-table-subset-variable.c
index 78a980a..99fed4b 100644
--- a/widgets/table/e-table-subset-variable.c
+++ b/widgets/table/e-table-subset-variable.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/widgets/table/e-table-subset.c b/widgets/table/e-table-subset.c
index 77ea5fe..0387177 100644
--- a/widgets/table/e-table-subset.c
+++ b/widgets/table/e-table-subset.c
@@ -22,7 +22,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <stdlib.h>
 
diff --git a/widgets/table/e-table-utils.c b/widgets/table/e-table-utils.c
index 5787872..d84b244 100644
--- a/widgets/table/e-table-utils.c
+++ b/widgets/table/e-table-utils.c
@@ -21,7 +21,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <libintl.h>		/* This file uses dgettext() but no _() */
 #include <string.h>
diff --git a/widgets/table/e-table-without.c b/widgets/table/e-table-without.c
index 8a180ef..ea2554b 100644
--- a/widgets/table/e-table-without.c
+++ b/widgets/table/e-table-without.c
@@ -21,7 +21,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c
index d124154..3acf7c6 100644
--- a/widgets/table/e-table.c
+++ b/widgets/table/e-table.c
@@ -23,7 +23,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/widgets/table/e-tree-memory-callbacks.c b/widgets/table/e-tree-memory-callbacks.c
index 9c46cf7..7281f3d 100644
--- a/widgets/table/e-tree-memory-callbacks.c
+++ b/widgets/table/e-tree-memory-callbacks.c
@@ -21,7 +21,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <gtk/gtk.h>
 
diff --git a/widgets/table/e-tree-memory.c b/widgets/table/e-tree-memory.c
index 0fe0cb7..eec9333 100644
--- a/widgets/table/e-tree-memory.c
+++ b/widgets/table/e-tree-memory.c
@@ -21,7 +21,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <stdio.h>
 #include <errno.h>
diff --git a/widgets/table/e-tree-model.c b/widgets/table/e-tree-model.c
index 79197aa..8772e53 100644
--- a/widgets/table/e-tree-model.c
+++ b/widgets/table/e-tree-model.c
@@ -21,7 +21,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/widgets/table/e-tree-selection-model.c b/widgets/table/e-tree-selection-model.c
index f486f7e..dd00fca 100644
--- a/widgets/table/e-tree-selection-model.c
+++ b/widgets/table/e-tree-selection-model.c
@@ -21,7 +21,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include "table/e-tree-table-adapter.h"
 #include <glib/gi18n.h>
diff --git a/widgets/table/e-tree-sorted.c b/widgets/table/e-tree-sorted.c
index 9abb677..c92bb45 100644
--- a/widgets/table/e-tree-sorted.c
+++ b/widgets/table/e-tree-sorted.c
@@ -25,7 +25,9 @@
 
 /* FIXME: Overall e-tree-sorted.c needs to be made more efficient. */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <stdio.h>
 #include <errno.h>
diff --git a/widgets/table/e-tree-table-adapter.c b/widgets/table/e-tree-table-adapter.c
index e162030..56669ec 100644
--- a/widgets/table/e-tree-table-adapter.c
+++ b/widgets/table/e-tree-table-adapter.c
@@ -21,7 +21,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c
index 470fc07..fe9f3d7 100644
--- a/widgets/table/e-tree.c
+++ b/widgets/table/e-tree.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/widgets/table/gal-a11y-e-cell-popup.c b/widgets/table/gal-a11y-e-cell-popup.c
index 89894ab..f1c2540 100644
--- a/widgets/table/gal-a11y-e-cell-popup.c
+++ b/widgets/table/gal-a11y-e-cell-popup.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
diff --git a/widgets/table/gal-a11y-e-cell-registry.c b/widgets/table/gal-a11y-e-cell-registry.c
index 8638133..79ad4ca 100644
--- a/widgets/table/gal-a11y-e-cell-registry.c
+++ b/widgets/table/gal-a11y-e-cell-registry.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include "gal-a11y-e-cell.h"
 #include "gal-a11y-e-cell-registry.h"
diff --git a/widgets/table/gal-a11y-e-cell-toggle.c b/widgets/table/gal-a11y-e-cell-toggle.c
index c57d708..98fcdcd 100644
--- a/widgets/table/gal-a11y-e-cell-toggle.c
+++ b/widgets/table/gal-a11y-e-cell-toggle.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <gtk/gtk.h>
 
 #include "table/e-cell-toggle.h"
diff --git a/widgets/table/gal-a11y-e-cell-tree.c b/widgets/table/gal-a11y-e-cell-tree.c
index 808a611..70880fc 100644
--- a/widgets/table/gal-a11y-e-cell-tree.c
+++ b/widgets/table/gal-a11y-e-cell-tree.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <atk/atk.h>
 
diff --git a/widgets/table/gal-a11y-e-cell-vbox.c b/widgets/table/gal-a11y-e-cell-vbox.c
index 637a53e..bbe2785 100644
--- a/widgets/table/gal-a11y-e-cell-vbox.c
+++ b/widgets/table/gal-a11y-e-cell-vbox.c
@@ -22,7 +22,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <atk/atk.h>
 
diff --git a/widgets/table/gal-a11y-e-cell.c b/widgets/table/gal-a11y-e-cell.c
index 1cac917..0ba51dc 100644
--- a/widgets/table/gal-a11y-e-cell.c
+++ b/widgets/table/gal-a11y-e-cell.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <string.h>
 
diff --git a/widgets/table/gal-a11y-e-table-click-to-add-factory.c b/widgets/table/gal-a11y-e-table-click-to-add-factory.c
index 9c9390a..c71199c 100644
--- a/widgets/table/gal-a11y-e-table-click-to-add-factory.c
+++ b/widgets/table/gal-a11y-e-table-click-to-add-factory.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <atk/atk.h>
 
diff --git a/widgets/table/gal-a11y-e-table-click-to-add.c b/widgets/table/gal-a11y-e-table-click-to-add.c
index a118359..263af62 100644
--- a/widgets/table/gal-a11y-e-table-click-to-add.c
+++ b/widgets/table/gal-a11y-e-table-click-to-add.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <atk/atk.h>
 
diff --git a/widgets/table/gal-a11y-e-table-column-header.c b/widgets/table/gal-a11y-e-table-column-header.c
index 6eec994..a750335 100644
--- a/widgets/table/gal-a11y-e-table-column-header.c
+++ b/widgets/table/gal-a11y-e-table-column-header.c
@@ -21,7 +21,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
+
 #include <glib/gi18n.h>
 #include <atk/atkobject.h>
 #include <atk/atkregistry.h>
diff --git a/widgets/table/gal-a11y-e-table-factory.c b/widgets/table/gal-a11y-e-table-factory.c
index 5d9c4bb..e89bb79 100644
--- a/widgets/table/gal-a11y-e-table-factory.c
+++ b/widgets/table/gal-a11y-e-table-factory.c
@@ -21,7 +21,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include "gal-a11y-e-table.h"
 #include "gal-a11y-e-table-factory.h"
diff --git a/widgets/table/gal-a11y-e-table-item-factory.c b/widgets/table/gal-a11y-e-table-item-factory.c
index fb1b3a9..3aeab50 100644
--- a/widgets/table/gal-a11y-e-table-item-factory.c
+++ b/widgets/table/gal-a11y-e-table-item-factory.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <atk/atk.h>
 
diff --git a/widgets/table/gal-a11y-e-table-item.c b/widgets/table/gal-a11y-e-table-item.c
index 1d0add2..560ea3f 100644
--- a/widgets/table/gal-a11y-e-table-item.c
+++ b/widgets/table/gal-a11y-e-table-item.c
@@ -21,7 +21,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <string.h>
 
diff --git a/widgets/table/gal-a11y-e-table.c b/widgets/table/gal-a11y-e-table.c
index d04bda2..5db3f44 100644
--- a/widgets/table/gal-a11y-e-table.c
+++ b/widgets/table/gal-a11y-e-table.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include "a11y/gal-a11y-util.h"
 #include "table/e-table.h"
diff --git a/widgets/table/gal-a11y-e-tree-factory.c b/widgets/table/gal-a11y-e-tree-factory.c
index 8d19515..4e22c1c 100644
--- a/widgets/table/gal-a11y-e-tree-factory.c
+++ b/widgets/table/gal-a11y-e-tree-factory.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include "gal-a11y-e-tree.h"
 #include "gal-a11y-e-tree-factory.h"
diff --git a/widgets/table/gal-a11y-e-tree.c b/widgets/table/gal-a11y-e-tree.c
index d474f96..4507e21 100644
--- a/widgets/table/gal-a11y-e-tree.c
+++ b/widgets/table/gal-a11y-e-tree.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include "a11y/gal-a11y-util.h"
 #include "table/e-table-item.h"
diff --git a/widgets/text/e-reflow-model.c b/widgets/text/e-reflow-model.c
index d7a5ffe..f96d512 100644
--- a/widgets/text/e-reflow-model.c
+++ b/widgets/text/e-reflow-model.c
@@ -20,7 +20,10 @@
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
+
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include "e-util/e-util.h"
 
diff --git a/widgets/text/e-reflow.c b/widgets/text/e-reflow.c
index e6c5768..1b99d6a 100644
--- a/widgets/text/e-reflow.c
+++ b/widgets/text/e-reflow.c
@@ -19,7 +19,10 @@
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
+
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <math.h>
 #include <string.h>
diff --git a/widgets/text/e-text-model-repos.c b/widgets/text/e-text-model-repos.c
index 206ef3f..0b7a343 100644
--- a/widgets/text/e-text-model-repos.c
+++ b/widgets/text/e-text-model-repos.c
@@ -21,6 +21,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-text-model-repos.h"
 
 #define MODEL_CLAMP(model, pos) (CLAMP((pos), 0, strlen((model)->text)))
diff --git a/widgets/text/e-text-model.c b/widgets/text/e-text-model.c
index bb8669d..10f32b1 100644
--- a/widgets/text/e-text-model.c
+++ b/widgets/text/e-text-model.c
@@ -22,7 +22,9 @@
 
 #undef  PARANOID_DEBUGGING
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <ctype.h>
 #include <string.h>
diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c
index fe50f85..9c97a66 100644
--- a/widgets/text/e-text.c
+++ b/widgets/text/e-text.c
@@ -35,7 +35,9 @@
  * 02110-1301, USA.
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <math.h>
 #include <ctype.h>
diff --git a/widgets/text/gal-a11y-e-text-factory.c b/widgets/text/gal-a11y-e-text-factory.c
index 0c933c2..a1ffaa0 100644
--- a/widgets/text/gal-a11y-e-text-factory.c
+++ b/widgets/text/gal-a11y-e-text-factory.c
@@ -20,7 +20,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
+
 #include "text/e-text.h"
 #include "gal-a11y-e-text-factory.h"
 #include "gal-a11y-e-text.h"
diff --git a/widgets/text/gal-a11y-e-text.c b/widgets/text/gal-a11y-e-text.c
index aeb6e6b..a657543 100644
--- a/widgets/text/gal-a11y-e-text.c
+++ b/widgets/text/gal-a11y-e-text.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <string.h>
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]