From 65bc1032eed2982dfef58cc4295ff7ba031696e4 Mon Sep 17 00:00:00 2001
From: valerio <valerio@5a81b35b-ba03-0410-adc8-b2c5c5119f08>
Date: Mon, 1 Mar 2010 12:46:12 +0000
Subject: [PATCH] Removed IPLT in include guards

git-svn-id: https://dng.biozentrum.unibas.ch/svn/openstructure/trunk@1745 5a81b35b-ba03-0410-adc8-b2c5c5119f08
---
 modules/gui/pymod/data_viewer_proxy.hh        |  4 ++--
 modules/gui/src/data_viewer/data_viewer.hh    |  4 ++--
 .../gui/src/data_viewer/data_viewer_panel.hh  |  4 ++--
 modules/gui/src/data_viewer/draw_overlay.hh   |  4 ++--
 .../gui/src/data_viewer/drawing_functions.hh  |  4 ++--
 modules/gui/src/data_viewer/img2qt.hh         |  4 ++--
 modules/gui/src/data_viewer/info_panel.hh     |  4 ++--
 modules/gui/src/data_viewer/mask_overlay.hh   |  4 ++--
 modules/gui/src/data_viewer/overlay.hh        |  4 ++--
 modules/gui/src/data_viewer/overlay_base.hh   |  4 ++--
 .../gui/src/data_viewer/overlay_base_fw.hh    |  4 ++--
 .../gui/src/data_viewer/overlay_manager.hh    |  4 ++--
 .../gui/src/data_viewer/overlay_manager_fw.hh |  4 ++--
 .../src/data_viewer/overlay_manager_gui.hh    |  4 ++--
 .../data_viewer/overlay_manager_observer.hh   |  4 ++--
 .../gui/src/data_viewer/pointlist_overlay.hh  |  4 ++--
 .../src/data_viewer/pointlist_overlay_base.hh |  4 ++--
 modules/gui/src/data_viewer/strategies.hh     |  4 ++--
 modules/gui/src/data_viewer/strategies_fw.hh  |  4 ++--
 .../gui/src/data_viewer/viewer_normalizer.hh  |  4 ++--
 modules/img/alg/src/alg_mirror.hh             |  4 ++--
 modules/img/alg/src/alg_shift.hh              |  4 ++--
 modules/img/alg/src/alg_transform.hh          |  4 ++--
 modules/img/alg/src/anisotropic.hh            |  4 ++--
 modules/img/alg/src/auto_correlate.hh         |  4 ++--
 modules/img/alg/src/clear.hh                  |  4 ++--
 modules/img/alg/src/conjugate.hh              |  4 ++--
 modules/img/alg/src/convolute.hh              |  4 ++--
 modules/img/alg/src/correlate.hh              |  4 ++--
 modules/img/alg/src/cross_correlate.hh        |  4 ++--
 modules/img/alg/src/custom_transformer.hh     |  4 ++--
 modules/img/alg/src/density_slice.hh          |  4 ++--
 modules/img/alg/src/dft.hh                    |  4 ++--
 modules/img/alg/src/discrete_shrink.hh        |  4 ++--
 modules/img/alg/src/fft.hh                    |  4 ++--
 modules/img/alg/src/fftw_helper.hh            |  4 ++--
 modules/img/alg/src/fill.hh                   |  4 ++--
 modules/img/alg/src/filter.hh                 |  4 ++--
 modules/img/alg/src/fourier_filters.hh        |  4 ++--
 modules/img/alg/src/gaussian.hh               |  4 ++--
 .../alg/src/gaussian_gradient_magnitude.hh    |  4 ++--
 modules/img/alg/src/gaussian_laplacian.hh     |  4 ++--
 modules/img/alg/src/line_average.hh           |  4 ++--
 modules/img/alg/src/line_iterator.hh          |  4 ++--
 modules/img/alg/src/local_sigma_threshold.hh  |  4 ++--
 modules/img/alg/src/negate.hh                 |  4 ++--
 modules/img/alg/src/norm.hh                   |  4 ++--
 modules/img/alg/src/norm_linear.hh            |  4 ++--
 modules/img/alg/src/norm_log.hh               |  4 ++--
 modules/img/alg/src/polar.hh                  |  4 ++--
 modules/img/alg/src/power_spectrum.hh         |  4 ++--
 modules/img/alg/src/randomize.hh              |  4 ++--
 modules/img/alg/src/rscrosscorr.hh            |  4 ++--
 modules/img/alg/src/stat.hh                   |  4 ++--
 modules/img/alg/src/stat_min_max.hh           |  4 ++--
 modules/img/alg/src/transcendentals.hh        | 22 +++++++++----------
 modules/img/alg/src/transform.hh              |  4 ++--
 modules/img/alg/src/transform_fw.hh           |  4 ++--
 modules/img/alg/src/transformations.hh        |  4 ++--
 modules/img/alg/tests/test_utils.hh           |  4 ++--
 modules/img/base/src/algorithm.hh             |  4 ++--
 modules/img/base/src/base.hh                  |  4 ++--
 modules/img/base/src/data.hh                  |  4 ++--
 modules/img/base/src/data_algorithm.hh        |  4 ++--
 modules/img/base/src/data_observer.hh         |  4 ++--
 modules/img/base/src/data_types.hh            |  4 ++--
 modules/img/base/src/debug.hh                 |  4 ++--
 modules/img/base/src/extent.hh                |  4 ++--
 modules/img/base/src/extent_iterator.hh       |  4 ++--
 modules/img/base/src/function.hh              |  4 ++--
 modules/img/base/src/function_base.hh         |  4 ++--
 modules/img/base/src/function_fw.hh           |  4 ++--
 modules/img/base/src/function_impl.hh         |  4 ++--
 modules/img/base/src/image.hh                 |  4 ++--
 modules/img/base/src/image_factory.hh         |  4 ++--
 modules/img/base/src/image_fw.hh              |  4 ++--
 modules/img/base/src/image_handle.hh          |  4 ++--
 modules/img/base/src/image_handle_fw.hh       |  4 ++--
 modules/img/base/src/image_impl.hh            |  4 ++--
 modules/img/base/src/image_list.hh            |  4 ++--
 modules/img/base/src/image_state.hh           |  4 ++--
 modules/img/base/src/image_state/binop.cc     |  2 +-
 modules/img/base/src/image_state/binop.hh     |  4 ++--
 modules/img/base/src/image_state/dispatch.hh  |  4 ++--
 .../img/base/src/image_state/dispatch_fw.hh   |  4 ++--
 .../img/base/src/image_state/image_state.hh   |  4 ++--
 .../src/image_state/image_state_algorithm.hh  |  4 ++--
 .../base/src/image_state/image_state_def.hh   |  4 ++--
 .../src/image_state/image_state_factory.hh    |  4 ++--
 .../base/src/image_state/image_state_fft.hh   |  4 ++--
 .../base/src/image_state/image_state_fw.hh    |  4 ++--
 .../base/src/image_state/image_state_impl.cc  |  2 +-
 .../base/src/image_state/image_state_inst.hh  |  4 ++--
 .../src/image_state/image_state_visitor.hh    |  4 ++--
 .../src/image_state/image_state_visitor_fw.hh |  4 ++--
 modules/img/base/src/image_state/index.hh     |  4 ++--
 modules/img/base/src/image_state/type_fw.hh   |  4 ++--
 .../img/base/src/image_state/value_holder.cc  |  2 +-
 modules/img/base/src/image_state_fw.hh        |  4 ++--
 modules/img/base/src/mask.hh                  |  4 ++--
 modules/img/base/src/normalizer_fw.hh         |  4 ++--
 modules/img/base/src/normalizer_impl.hh       |  4 ++--
 modules/img/base/src/null_data.hh             |  4 ++--
 modules/img/base/src/null_function.hh         |  4 ++--
 modules/img/base/src/observable.hh            |  4 ++--
 modules/img/base/src/paste_impl.hh            |  4 ++--
 modules/img/base/src/peak.hh                  |  4 ++--
 modules/img/base/src/physical_units.hh        |  4 ++--
 modules/img/base/src/pixel_sampling.hh        |  4 ++--
 modules/img/base/src/point.hh                 |  4 ++--
 .../img/base/src/raster_image/raster_image.hh |  4 ++--
 modules/img/base/src/size.hh                  |  4 ++--
 modules/img/base/src/util.cc                  |  2 +-
 modules/img/base/src/util.hh                  |  4 ++--
 modules/img/base/src/value_util.hh            |  4 ++--
 modules/img/base/src/vecmat.hh                |  4 ++--
 modules/img/base/src/version.hh               |  4 ++--
 modules/img/base/tests/test_data.hh           |  4 ++--
 modules/img/base/tests/test_extent.hh         |  4 ++--
 modules/img/base/tests/test_function.hh       |  4 ++--
 modules/img/base/tests/test_image.hh          |  4 ++--
 modules/img/base/tests/test_image_factory.hh  |  4 ++--
 modules/img/base/tests/test_image_impl.hh     |  4 ++--
 .../base/tests/test_image_state_visitor.hh    |  4 ++--
 modules/img/base/tests/test_index.hh          |  4 ++--
 modules/img/base/tests/test_point.hh          |  4 ++--
 modules/img/base/tests/test_sampling.hh       |  4 ++--
 modules/img/base/tests/test_size.hh           |  4 ++--
 modules/img/base/tests/test_transform.hh      |  4 ++--
 modules/img/base/tests/test_utils.hh          |  4 ++--
 modules/img/base/tests/test_value_holder.hh   |  4 ++--
 modules/io/src/img/image_format.hh            |  4 ++--
 modules/io/src/img/image_format_conversion.cc |  2 +-
 modules/io/src/img/image_io_plugin.hh         |  4 ++--
 134 files changed, 272 insertions(+), 272 deletions(-)

diff --git a/modules/gui/pymod/data_viewer_proxy.hh b/modules/gui/pymod/data_viewer_proxy.hh
index aaf21719c..39a5f6c83 100644
--- a/modules/gui/pymod/data_viewer_proxy.hh
+++ b/modules/gui/pymod/data_viewer_proxy.hh
@@ -24,8 +24,8 @@
   Authors: Ansgar Philippsen, Andreas Schenk
 */
 
-#ifndef IPLT_GUI_DATA_VIEWER_PROXY_H
-#define IPLT_GUI_DATA_VIEWER_PROXY_H
+#ifndef IMG_GUI_DATA_VIEWER_PROXY_H
+#define IMG_GUI_DATA_VIEWER_PROXY_H
 
 #include <boost/shared_ptr.hpp>
 
diff --git a/modules/gui/src/data_viewer/data_viewer.hh b/modules/gui/src/data_viewer/data_viewer.hh
index c53ffcb0d..9130159a0 100644
--- a/modules/gui/src/data_viewer/data_viewer.hh
+++ b/modules/gui/src/data_viewer/data_viewer.hh
@@ -22,8 +22,8 @@
   Authors: Ansgar Philippsen, Andreas Schenk
 */
 
-#ifndef IPLT_GUI_DATA_VIEWER_H
-#define IPLT_GUI_DATA_VIEWER_H
+#ifndef IMG_GUI_DATA_VIEWER_H
+#define IMG_GUI_DATA_VIEWER_H
 
 #include <map>
 
diff --git a/modules/gui/src/data_viewer/data_viewer_panel.hh b/modules/gui/src/data_viewer/data_viewer_panel.hh
index 93633bb6f..3d3e6e960 100644
--- a/modules/gui/src/data_viewer/data_viewer_panel.hh
+++ b/modules/gui/src/data_viewer/data_viewer_panel.hh
@@ -17,8 +17,8 @@
 // along with this library; if not, write to the Free Software Foundation, Inc.,
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
-#ifndef IPLT_DATA_VIEWER_PANEL_HH
-#define IPLT_DATA_VIEWER_PANEL_HH
+#ifndef IMG_DATA_VIEWER_PANEL_HH
+#define IMG_DATA_VIEWER_PANEL_HH
 
 #include <ost/gui/module_config.hh>
 #include "data_viewer_panel_base.hh"
diff --git a/modules/gui/src/data_viewer/draw_overlay.hh b/modules/gui/src/data_viewer/draw_overlay.hh
index 8c9ef182b..efdbc1a58 100644
--- a/modules/gui/src/data_viewer/draw_overlay.hh
+++ b/modules/gui/src/data_viewer/draw_overlay.hh
@@ -22,8 +22,8 @@
   Authors: Ansgar Philippsen, Andreas Schenk
 */
 
-#ifndef IPLT_GUI_DRAW_OVERLAY_H
-#define IPLT_GUI_DRAW_OVERLAY_H
+#ifndef IMG_GUI_DRAW_OVERLAY_H
+#define IMG_GUI_DRAW_OVERLAY_H
 
 #include <ost/img/image_handle.hh>
 
diff --git a/modules/gui/src/data_viewer/drawing_functions.hh b/modules/gui/src/data_viewer/drawing_functions.hh
index 4bc62784c..c27e66345 100644
--- a/modules/gui/src/data_viewer/drawing_functions.hh
+++ b/modules/gui/src/data_viewer/drawing_functions.hh
@@ -22,8 +22,8 @@
   Authors: Andreas Schenk, Ansgar Philippsen
 */
 
-#ifndef IPLT_GUI_DRAWING_FUNCTIONS_HH_
-#define IPLT_GUI_DRAWING_FUNCTIONS_HH_
+#ifndef IMG_GUI_DRAWING_FUNCTIONS_HH_
+#define IMG_GUI_DRAWING_FUNCTIONS_HH_
 
 #include <QPainter>
 #include <QPoint>
diff --git a/modules/gui/src/data_viewer/img2qt.hh b/modules/gui/src/data_viewer/img2qt.hh
index 4c8b9bd8b..6c6d2b9ce 100644
--- a/modules/gui/src/data_viewer/img2qt.hh
+++ b/modules/gui/src/data_viewer/img2qt.hh
@@ -23,8 +23,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_GUI_IMG2QT_HH
-#define IPLT_GUI_IMG2QT_HH
+#ifndef IMG_GUI_IMG2QT_HH
+#define IMG_GUI_IMG2QT_HH
 
 #include <ost/geom/geom.hh>
 #include <ost/img/normalizer_impl.hh>
diff --git a/modules/gui/src/data_viewer/info_panel.hh b/modules/gui/src/data_viewer/info_panel.hh
index 0c40bc31d..388248dab 100644
--- a/modules/gui/src/data_viewer/info_panel.hh
+++ b/modules/gui/src/data_viewer/info_panel.hh
@@ -22,8 +22,8 @@
   Authors: Ansgar Philippsen, Andreas Schenk
 */
 
-#ifndef IPLT_GUI_DATAVIEWER_INFO_PANEL_H_
-#define IPLT_GUI_DATAVIEWER_INFO_PANEL_H_
+#ifndef IMG_GUI_DATAVIEWER_INFO_PANEL_H_
+#define IMG_GUI_DATAVIEWER_INFO_PANEL_H_
 
 #include <QWidget>
 #include <QLabel>
diff --git a/modules/gui/src/data_viewer/mask_overlay.hh b/modules/gui/src/data_viewer/mask_overlay.hh
index bb1014cdf..e274f3157 100644
--- a/modules/gui/src/data_viewer/mask_overlay.hh
+++ b/modules/gui/src/data_viewer/mask_overlay.hh
@@ -22,8 +22,8 @@
   Authors: Ansgar Philippsen, Andreas Schenk
 */
 
-#ifndef IPLT_GUI_MASK_OVERLAY_HH_
-#define IPLT_GUI_MASK_OVERLAY_HH_
+#ifndef IMG_GUI_MASK_OVERLAY_HH_
+#define IMG_GUI_MASK_OVERLAY_HH_
 
 #include <ost/geom/geom.hh>
 #include <ost/img/image_handle.hh>
diff --git a/modules/gui/src/data_viewer/overlay.hh b/modules/gui/src/data_viewer/overlay.hh
index 17f1be68d..76486b8fe 100644
--- a/modules/gui/src/data_viewer/overlay.hh
+++ b/modules/gui/src/data_viewer/overlay.hh
@@ -23,8 +23,8 @@
 */
 
 
-#ifndef IPLT_GUI_OVERLAY_HH
-#define IPLT_GUI_OVERLAY_HH
+#ifndef IMG_GUI_OVERLAY_HH
+#define IMG_GUI_OVERLAY_HH
 
 #include "overlay_base.hh"
 #include "overlay_manager.hh"
diff --git a/modules/gui/src/data_viewer/overlay_base.hh b/modules/gui/src/data_viewer/overlay_base.hh
index dd33e9d87..edef14985 100644
--- a/modules/gui/src/data_viewer/overlay_base.hh
+++ b/modules/gui/src/data_viewer/overlay_base.hh
@@ -22,8 +22,8 @@
   Authors: Ansgar Philippsen, Andreas Schenk
 */
 
-#ifndef IPLT_GUI_OVERLAY_BASE_H
-#define IPLT_GUI_OVERLAY_BASE_H
+#ifndef IMG_GUI_OVERLAY_BASE_H
+#define IMG_GUI_OVERLAY_BASE_H
 
 #include <QObject>
 #include <QEvent>
diff --git a/modules/gui/src/data_viewer/overlay_base_fw.hh b/modules/gui/src/data_viewer/overlay_base_fw.hh
index c198b10f5..e568434a2 100644
--- a/modules/gui/src/data_viewer/overlay_base_fw.hh
+++ b/modules/gui/src/data_viewer/overlay_base_fw.hh
@@ -22,8 +22,8 @@
   Authors: Andreas Schenk, Ansgar Philippsen
 */
 
-#ifndef IPLT_GUI_OVERLAY_BASE_FW_H
-#define IPLT_GUI_OVERLAY_BASE_FW_H
+#ifndef IMG_GUI_OVERLAY_BASE_FW_H
+#define IMG_GUI_OVERLAY_BASE_FW_H
 
 #include <boost/shared_ptr.hpp>
 
diff --git a/modules/gui/src/data_viewer/overlay_manager.hh b/modules/gui/src/data_viewer/overlay_manager.hh
index 1a0a654d8..033d78663 100644
--- a/modules/gui/src/data_viewer/overlay_manager.hh
+++ b/modules/gui/src/data_viewer/overlay_manager.hh
@@ -22,8 +22,8 @@
   Authors: Ansgar Philippsen, Andreas Schenk
 */
 
-#ifndef IPLT_GUI_OVERLAY_MANAGER_HH
-#define IPLT_GUI_OVERLAY_MANAGER_HH
+#ifndef IMG_GUI_OVERLAY_MANAGER_HH
+#define IMG_GUI_OVERLAY_MANAGER_HH
 
 #include <vector>
 #include <list>
diff --git a/modules/gui/src/data_viewer/overlay_manager_fw.hh b/modules/gui/src/data_viewer/overlay_manager_fw.hh
index 0b7ee9daa..4c2e25d14 100644
--- a/modules/gui/src/data_viewer/overlay_manager_fw.hh
+++ b/modules/gui/src/data_viewer/overlay_manager_fw.hh
@@ -22,8 +22,8 @@
   Authors: Ansgar Philippsen
 */
 
-#ifndef IPLT_GUI_OVERLAY_MANAGER_FW_HH
-#define IPLT_GUI_OVERLAY_MANAGER_FW_HH
+#ifndef IMG_GUI_OVERLAY_MANAGER_FW_HH
+#define IMG_GUI_OVERLAY_MANAGER_FW_HH
 
 #include <boost/shared_ptr.hpp>
 
diff --git a/modules/gui/src/data_viewer/overlay_manager_gui.hh b/modules/gui/src/data_viewer/overlay_manager_gui.hh
index 83a4b1b63..b12adca5a 100644
--- a/modules/gui/src/data_viewer/overlay_manager_gui.hh
+++ b/modules/gui/src/data_viewer/overlay_manager_gui.hh
@@ -23,8 +23,8 @@
   Authors: Ansgar Philippsen, Andreas Schenk
 */
 
-#ifndef IPLT_OV_GUI_OVDIALOG_H
-#define IPLT_OV_GUI_OVDIALOG_H
+#ifndef IMG_OV_GUI_OVDIALOG_H
+#define IMG_OV_GUI_OVDIALOG_H
 
 #include <QWidget>
 #include <QRadioButton>
diff --git a/modules/gui/src/data_viewer/overlay_manager_observer.hh b/modules/gui/src/data_viewer/overlay_manager_observer.hh
index fad9b7198..4c2de7267 100644
--- a/modules/gui/src/data_viewer/overlay_manager_observer.hh
+++ b/modules/gui/src/data_viewer/overlay_manager_observer.hh
@@ -22,8 +22,8 @@
   Authors: Ansgar Philippsen
 */
 
-#ifndef IPLT_GUI_OVERLAY_MANAGER_OBSERVER_H
-#define IPLT_GUI_OVERLAY_MANAGER_OBSERVER_H
+#ifndef IMG_GUI_OVERLAY_MANAGER_OBSERVER_H
+#define IMG_GUI_OVERLAY_MANAGER_OBSERVER_H
 
 #include "overlay_manager_fw.hh"
 
diff --git a/modules/gui/src/data_viewer/pointlist_overlay.hh b/modules/gui/src/data_viewer/pointlist_overlay.hh
index fd107f330..1095f2191 100644
--- a/modules/gui/src/data_viewer/pointlist_overlay.hh
+++ b/modules/gui/src/data_viewer/pointlist_overlay.hh
@@ -22,8 +22,8 @@
   Authors: Andreas Schenk, Ansgar Philippsen
 */
 
-#ifndef IPLT_POINTLIST_OVERLAY_HH
-#define IPLT_POINTLIST_OVERLAY_HH
+#ifndef IMG_POINTLIST_OVERLAY_HH
+#define IMG_POINTLIST_OVERLAY_HH
 
 #include <ost/img/point_list.hh>
 
diff --git a/modules/gui/src/data_viewer/pointlist_overlay_base.hh b/modules/gui/src/data_viewer/pointlist_overlay_base.hh
index d8433890a..dc8b3da07 100644
--- a/modules/gui/src/data_viewer/pointlist_overlay_base.hh
+++ b/modules/gui/src/data_viewer/pointlist_overlay_base.hh
@@ -23,8 +23,8 @@
   Authors: Ansgar Philippsen, Andreas Schenk
 */
 
-#ifndef IPLT_POINTLIST_OVERLAY_BASE_HH
-#define IPLT_POINTLIST_OVERLAY_BASE_HH
+#ifndef IMG_POINTLIST_OVERLAY_BASE_HH
+#define IMG_POINTLIST_OVERLAY_BASE_HH
 
 #include <QColor>
 #include <QAction>
diff --git a/modules/gui/src/data_viewer/strategies.hh b/modules/gui/src/data_viewer/strategies.hh
index 5d6c99971..a6abb3d38 100644
--- a/modules/gui/src/data_viewer/strategies.hh
+++ b/modules/gui/src/data_viewer/strategies.hh
@@ -22,8 +22,8 @@
     Authors: Andreas Schenk, Ansgar Philippsen
 */
 
-#ifndef IPLT_GUI_STRATEGIES_HH_
-#define IPLT_GUI_STRATEGIES_HH_
+#ifndef IMG_GUI_STRATEGIES_HH_
+#define IMG_GUI_STRATEGIES_HH_
 
 #include <QPainter>
 #include <QPoint>
diff --git a/modules/gui/src/data_viewer/strategies_fw.hh b/modules/gui/src/data_viewer/strategies_fw.hh
index 22f03f77c..78aba1887 100644
--- a/modules/gui/src/data_viewer/strategies_fw.hh
+++ b/modules/gui/src/data_viewer/strategies_fw.hh
@@ -18,8 +18,8 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
 
-#ifndef IPLT_GUI_STRATEGIES_FW_H
-#define IPLT_GUI_STRATEGIES_FW_HH
+#ifndef IMG_GUI_STRATEGIES_FW_H
+#define IMG_GUI_STRATEGIES_FW_HH
 
 #include <boost/shared_ptr.hpp>
 
diff --git a/modules/gui/src/data_viewer/viewer_normalizer.hh b/modules/gui/src/data_viewer/viewer_normalizer.hh
index a4223a1c6..a185516ff 100644
--- a/modules/gui/src/data_viewer/viewer_normalizer.hh
+++ b/modules/gui/src/data_viewer/viewer_normalizer.hh
@@ -23,8 +23,8 @@
   Authors: Ansgar Philippsen, Andreas Schenk
 */
 
-#ifndef IPLT_GUI_VIEWER_NORMALIZER_HH
-#define IPLT_GUI_VIEWER_NORMALIZER_HH
+#ifndef IMG_GUI_VIEWER_NORMALIZER_HH
+#define IMG_GUI_VIEWER_NORMALIZER_HH
 
 
 #include <boost/shared_ptr.hpp>
diff --git a/modules/img/alg/src/alg_mirror.hh b/modules/img/alg/src/alg_mirror.hh
index 1826a0e2c..d98435920 100644
--- a/modules/img/alg/src/alg_mirror.hh
+++ b/modules/img/alg/src/alg_mirror.hh
@@ -18,8 +18,8 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
 
-#ifndef IPLT_ALG_TRANSFORM_MIRROR_HH
-#define IPLT_ALG_TRANSFORM_MIRROR_HH
+#ifndef IMG_ALG_TRANSFORM_MIRROR_HH
+#define IMG_ALG_TRANSFORM_MIRROR_HH
 
 #include <ost/img/image_state.hh>
 #include <ost/img/value_util.hh>
diff --git a/modules/img/alg/src/alg_shift.hh b/modules/img/alg/src/alg_shift.hh
index 993f363fb..014484bd0 100644
--- a/modules/img/alg/src/alg_shift.hh
+++ b/modules/img/alg/src/alg_shift.hh
@@ -18,8 +18,8 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
 
-#ifndef IPLT_ALG_TRANSFORM_SHIFT_HH
-#define IPLT_ALG_TRANSFORM_SHIFT_HH
+#ifndef IMG_ALG_TRANSFORM_SHIFT_HH
+#define IMG_ALG_TRANSFORM_SHIFT_HH
 
 #include <ost/img/image_state.hh>
 #include <ost/img/value_util.hh>
diff --git a/modules/img/alg/src/alg_transform.hh b/modules/img/alg/src/alg_transform.hh
index 35116a180..be066cf1c 100644
--- a/modules/img/alg/src/alg_transform.hh
+++ b/modules/img/alg/src/alg_transform.hh
@@ -18,8 +18,8 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
 
-#ifndef IPLT_ALG_TRANSFORM_ALG_TRANSFORM_HH
-#define IPLT_ALG_TRANSFORM_ALG_TRANSFORM__HH
+#ifndef IMG_ALG_TRANSFORM_ALG_TRANSFORM_HH
+#define IMG_ALG_TRANSFORM_ALG_TRANSFORM__HH
 
 #include <ost/img/image_state.hh>
 #include <ost/img/value_util.hh>
diff --git a/modules/img/alg/src/anisotropic.hh b/modules/img/alg/src/anisotropic.hh
index 4a9e22a95..7bf9ea53a 100644
--- a/modules/img/alg/src/anisotropic.hh
+++ b/modules/img/alg/src/anisotropic.hh
@@ -22,8 +22,8 @@
   authors: Giani Signorell, Ansgar Philippsen
 */
 
-#ifndef IPLT_ALG_FILTER_ANISOTROPIC_H
-#define IPLT_ALG_FILTER_ANISOTROPIC_H
+#ifndef IMG_ALG_FILTER_ANISOTROPIC_H
+#define IMG_ALG_FILTER_ANISOTROPIC_H
 
 #include "gaussian.hh"
 
diff --git a/modules/img/alg/src/auto_correlate.hh b/modules/img/alg/src/auto_correlate.hh
index 9b72a6dc7..542372032 100644
--- a/modules/img/alg/src/auto_correlate.hh
+++ b/modules/img/alg/src/auto_correlate.hh
@@ -18,8 +18,8 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
 
-#ifndef IPLT_ALG_AUTOCORRELATE_HH
-#define IPLT_ALG_AUTOCORRELATE_HH
+#ifndef IMG_ALG_AUTOCORRELATE_HH
+#define IMG_ALG_AUTOCORRELATE_HH
 
 #include <ost/img/image_state.hh>
 #include <ost/img/alg/module_config.hh>
diff --git a/modules/img/alg/src/clear.hh b/modules/img/alg/src/clear.hh
index f44f54f5c..ec15cf337 100644
--- a/modules/img/alg/src/clear.hh
+++ b/modules/img/alg/src/clear.hh
@@ -18,8 +18,8 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
 
-#ifndef IPLT_ALG_CLEAR_HH
-#define IPLT_ALG_CLEAR_HH
+#ifndef IMG_ALG_CLEAR_HH
+#define IMG_ALG_CLEAR_HH
 
 #include <ost/img/image.hh>
 #include <ost/img/image_state.hh>
diff --git a/modules/img/alg/src/conjugate.hh b/modules/img/alg/src/conjugate.hh
index 640b16195..49a86341f 100644
--- a/modules/img/alg/src/conjugate.hh
+++ b/modules/img/alg/src/conjugate.hh
@@ -18,8 +18,8 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
 
-#ifndef IPLT_ALG_COMMON_CONJ_HH
-#define IPLT_ALG_COMMON_CONJ_HH
+#ifndef IMG_ALG_COMMON_CONJ_HH
+#define IMG_ALG_COMMON_CONJ_HH
 
 #include <ost/img/image.hh>
 #include <ost/img/image_state.hh>
diff --git a/modules/img/alg/src/convolute.hh b/modules/img/alg/src/convolute.hh
index 06d831e8b..32b7cdae8 100644
--- a/modules/img/alg/src/convolute.hh
+++ b/modules/img/alg/src/convolute.hh
@@ -18,8 +18,8 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
 
-#ifndef IPLT_ALG_CONVOLUTE_HH
-#define IPLT_ALG_CONVOLUTE_HH
+#ifndef IMG_ALG_CONVOLUTE_HH
+#define IMG_ALG_CONVOLUTE_HH
 
 #include <ost/img/image_state.hh>
 #include <ost/img/alg/module_config.hh>
diff --git a/modules/img/alg/src/correlate.hh b/modules/img/alg/src/correlate.hh
index e328b2818..0a2210ccd 100644
--- a/modules/img/alg/src/correlate.hh
+++ b/modules/img/alg/src/correlate.hh
@@ -18,8 +18,8 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
 
-#ifndef IPLT_ALG_CORRELATE_HH
-#define IPLT_ALG_CORRELATE_HH
+#ifndef IMG_ALG_CORRELATE_HH
+#define IMG_ALG_CORRELATE_HH
 
 #include <ost/img/image_state.hh>
 #include <ost/img/alg/module_config.hh>
diff --git a/modules/img/alg/src/cross_correlate.hh b/modules/img/alg/src/cross_correlate.hh
index 57f2d1183..a63384380 100644
--- a/modules/img/alg/src/cross_correlate.hh
+++ b/modules/img/alg/src/cross_correlate.hh
@@ -21,8 +21,8 @@
 /*
   author: Andreas Schenk
 */
-#ifndef IPLT_ALG_CROSS_CORRELATE_HH
-#define IPLT_ALG_CROSS_CORRELATE_HH
+#ifndef IMG_ALG_CROSS_CORRELATE_HH
+#define IMG_ALG_CROSS_CORRELATE_HH
 
 #include <ost/img/algorithm.hh>
 #include <ost/img/alg/module_config.hh>
diff --git a/modules/img/alg/src/custom_transformer.hh b/modules/img/alg/src/custom_transformer.hh
index f12533d81..d96cb17ed 100644
--- a/modules/img/alg/src/custom_transformer.hh
+++ b/modules/img/alg/src/custom_transformer.hh
@@ -24,8 +24,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_CUSTOM_TRANSFORMER_IMPL_HH
-#define IPLT_CUSTOM_TRANSFORMER_IMPL_HH
+#ifndef IMG_CUSTOM_TRANSFORMER_IMPL_HH
+#define IMG_CUSTOM_TRANSFORMER_IMPL_HH
 
 #include <ost/message.hh>
 
diff --git a/modules/img/alg/src/density_slice.hh b/modules/img/alg/src/density_slice.hh
index 315de118f..c2d353a67 100644
--- a/modules/img/alg/src/density_slice.hh
+++ b/modules/img/alg/src/density_slice.hh
@@ -22,8 +22,8 @@
   Author: Andreas Schenk
 */
 
-#ifndef IPLT_ALG_DENSITY_SLICE_HH
-#define IPLT_ALG_DENSITY_SLICE_HH
+#ifndef IMG_ALG_DENSITY_SLICE_HH
+#define IMG_ALG_DENSITY_SLICE_HH
 
 #include <ost/img/image_state.hh>
 #include <ost/img/image_state/image_state_algorithm.hh>
diff --git a/modules/img/alg/src/dft.hh b/modules/img/alg/src/dft.hh
index 4c6aff95a..fd94d68e9 100644
--- a/modules/img/alg/src/dft.hh
+++ b/modules/img/alg/src/dft.hh
@@ -18,8 +18,8 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
 
-#ifndef IPLT_ALG_DFT_HH
-#define IPLT_ALG_DFT_HH
+#ifndef IMG_ALG_DFT_HH
+#define IMG_ALG_DFT_HH
 
 #include <ost/img/algorithm.hh>
 #include <ost/img/image_state.hh>
diff --git a/modules/img/alg/src/discrete_shrink.hh b/modules/img/alg/src/discrete_shrink.hh
index cfd13b108..a794bd82e 100644
--- a/modules/img/alg/src/discrete_shrink.hh
+++ b/modules/img/alg/src/discrete_shrink.hh
@@ -18,8 +18,8 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
 
-#ifndef IPLT_ALG_DISCRETE_SHRINK_HH
-#define IPLT_ALG_DISCRETE_SHRINK_HH
+#ifndef IMG_ALG_DISCRETE_SHRINK_HH
+#define IMG_ALG_DISCRETE_SHRINK_HH
 
 #include <ost/img/image.hh>
 #include <ost/img/image_state.hh>
diff --git a/modules/img/alg/src/fft.hh b/modules/img/alg/src/fft.hh
index 59f1774ef..465a6e58b 100644
--- a/modules/img/alg/src/fft.hh
+++ b/modules/img/alg/src/fft.hh
@@ -18,8 +18,8 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
 
-#ifndef IPLT_ALG_FFT_HH
-#define IPLT_ALG_FFT_HH
+#ifndef IMG_ALG_FFT_HH
+#define IMG_ALG_FFT_HH
 
 #include <ost/message.hh>
 
diff --git a/modules/img/alg/src/fftw_helper.hh b/modules/img/alg/src/fftw_helper.hh
index c080a5dbb..ab130188b 100644
--- a/modules/img/alg/src/fftw_helper.hh
+++ b/modules/img/alg/src/fftw_helper.hh
@@ -19,8 +19,8 @@
 /*
 Author: Juergen Haas
 */
-#ifndef IPLT_ALG_FFTW_HELPER_HH
-#define IPLT_ALG_FFTW_HELPER_HH
+#ifndef IMG_ALG_FFTW_HELPER_HH
+#define IMG_ALG_FFTW_HELPER_HH
 
 #include <ost/config.hh>
 
diff --git a/modules/img/alg/src/fill.hh b/modules/img/alg/src/fill.hh
index 27f88107f..be6b9ae09 100644
--- a/modules/img/alg/src/fill.hh
+++ b/modules/img/alg/src/fill.hh
@@ -18,8 +18,8 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
 
-#ifndef IPLT_ALG_FILL_HH
-#define IPLT_ALG_FILL_HH
+#ifndef IMG_ALG_FILL_HH
+#define IMG_ALG_FILL_HH
 
 #include <ost/img/image.hh>
 #include <ost/img/image_state.hh>
diff --git a/modules/img/alg/src/filter.hh b/modules/img/alg/src/filter.hh
index 5f4308308..b7be07ecf 100644
--- a/modules/img/alg/src/filter.hh
+++ b/modules/img/alg/src/filter.hh
@@ -24,8 +24,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_ALG_FILTER_H
-#define IPLT_ALG_FILTER_H
+#ifndef IMG_ALG_FILTER_H
+#define IMG_ALG_FILTER_H
 
 #include "gaussian.hh"
 #include "gaussian_gradient_magnitude.hh"
diff --git a/modules/img/alg/src/fourier_filters.hh b/modules/img/alg/src/fourier_filters.hh
index 1d8f14cf6..12ea09995 100644
--- a/modules/img/alg/src/fourier_filters.hh
+++ b/modules/img/alg/src/fourier_filters.hh
@@ -23,8 +23,8 @@
 */
 
 
-#ifndef IPLT_ALG_FILTER_FOURIER_FILTERS_H
-#define IPLT_ALG_FILTER_FOURIER_FILTERS_H
+#ifndef IMG_ALG_FILTER_FOURIER_FILTERS_H
+#define IMG_ALG_FILTER_FOURIER_FILTERS_H
 
 #include <ost/img/algorithm.hh>
 #include <ost/img/image_state.hh>
diff --git a/modules/img/alg/src/gaussian.hh b/modules/img/alg/src/gaussian.hh
index 4be921f60..6bfa922d7 100644
--- a/modules/img/alg/src/gaussian.hh
+++ b/modules/img/alg/src/gaussian.hh
@@ -27,9 +27,9 @@
 
 
 
-#ifndef IPLT_ALG_FILTER_GAUSSIAN_H
+#ifndef IMG_ALG_FILTER_GAUSSIAN_H
 
-#define IPLT_ALG_FILTER_GAUSSIAN_H
+#define IMG_ALG_FILTER_GAUSSIAN_H
 
 
 
diff --git a/modules/img/alg/src/gaussian_gradient_magnitude.hh b/modules/img/alg/src/gaussian_gradient_magnitude.hh
index bd9ce6a7b..dd72f474f 100644
--- a/modules/img/alg/src/gaussian_gradient_magnitude.hh
+++ b/modules/img/alg/src/gaussian_gradient_magnitude.hh
@@ -22,8 +22,8 @@
   Authors: Giani Signorell, Ansgar Philippsen, Valerio Mariani
 */
 
-#ifndef IPLT_ALG_FILTER_GAUSSIAN_GRADIENT_MAGNITUDE_H
-#define IPLT_ALG_FILTER_GAUSSIAN_GRADIENT_MAGNITUDE_H
+#ifndef IMG_ALG_FILTER_GAUSSIAN_GRADIENT_MAGNITUDE_H
+#define IMG_ALG_FILTER_GAUSSIAN_GRADIENT_MAGNITUDE_H
 
 #include <ost/img/algorithm.hh>
 #include <ost/img/image_state.hh>
diff --git a/modules/img/alg/src/gaussian_laplacian.hh b/modules/img/alg/src/gaussian_laplacian.hh
index c38e0d151..5d724dac4 100644
--- a/modules/img/alg/src/gaussian_laplacian.hh
+++ b/modules/img/alg/src/gaussian_laplacian.hh
@@ -22,8 +22,8 @@
   Authors: Giani Signorell, Ansgar Philippsen, Valerio Mariani
 */
 
-#ifndef IPLT_ALG_FILTER_GAUSSIAN_LAPLACIAN_H
-#define IPLT_ALG_FILTER_GAUSSIAN_LAPLACIAN_H
+#ifndef IMG_ALG_FILTER_GAUSSIAN_LAPLACIAN_H
+#define IMG_ALG_FILTER_GAUSSIAN_LAPLACIAN_H
 
 #include <ost/img/algorithm.hh>
 #include <ost/img/image_state.hh>
diff --git a/modules/img/alg/src/line_average.hh b/modules/img/alg/src/line_average.hh
index 3067c46f2..c3123493f 100644
--- a/modules/img/alg/src/line_average.hh
+++ b/modules/img/alg/src/line_average.hh
@@ -17,8 +17,8 @@
 // along with this library; if not, write to the Free Software Foundation, Inc.,
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
-#ifndef IPLT_ALG_LINE_AVERAGE_HH
-#define IPLT_ALG_LINE_AVERAGE_HH
+#ifndef IMG_ALG_LINE_AVERAGE_HH
+#define IMG_ALG_LINE_AVERAGE_HH
 
 #include <ost/img/extent.hh>
 #include <ost/img/image_state.hh>
diff --git a/modules/img/alg/src/line_iterator.hh b/modules/img/alg/src/line_iterator.hh
index 84a23e1a3..fdc941f62 100644
--- a/modules/img/alg/src/line_iterator.hh
+++ b/modules/img/alg/src/line_iterator.hh
@@ -22,8 +22,8 @@
   Authors: Ansgar Philippsen, Giani Signorell
 */
 
-#ifndef IPLT_ALG_FILTER_LINE_ITERATOR_H
-#define IPLT_ALG_FILTER_LINE_ITERATOR_H
+#ifndef IMG_ALG_FILTER_LINE_ITERATOR_H
+#define IMG_ALG_FILTER_LINE_ITERATOR_H
 
 #include <ost/img/alg/module_config.hh>
 #include <ost/img/extent.hh>
diff --git a/modules/img/alg/src/local_sigma_threshold.hh b/modules/img/alg/src/local_sigma_threshold.hh
index e3e45c98a..e5ad49dce 100644
--- a/modules/img/alg/src/local_sigma_threshold.hh
+++ b/modules/img/alg/src/local_sigma_threshold.hh
@@ -17,8 +17,8 @@
 // along with this library; if not, write to the Free Software Foundation, Inc.,
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
-#ifndef IPLT_ALG_COMMON_LOCAL_SIGMA_THRES
-#define IPLT_ALG_COMMON_LOCAL_SIGMA_THRES
+#ifndef IMG_ALG_COMMON_LOCAL_SIGMA_THRES
+#define IMG_ALG_COMMON_LOCAL_SIGMA_THRES
 
 #include <ost/img/image_state.hh>
 #include <ost/img/image_state/image_state_algorithm.hh>
diff --git a/modules/img/alg/src/negate.hh b/modules/img/alg/src/negate.hh
index d2fea6207..64db574f3 100644
--- a/modules/img/alg/src/negate.hh
+++ b/modules/img/alg/src/negate.hh
@@ -18,8 +18,8 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
 
-#ifndef IPLT_ALG_NEGATE_HH
-#define IPLT_ALG_NEGATE_HH
+#ifndef IMG_ALG_NEGATE_HH
+#define IMG_ALG_NEGATE_HH
 
 #include <ost/img/image.hh>
 #include <ost/img/image_state.hh>
diff --git a/modules/img/alg/src/norm.hh b/modules/img/alg/src/norm.hh
index 3bffb6f7f..1f9baf9e8 100644
--- a/modules/img/alg/src/norm.hh
+++ b/modules/img/alg/src/norm.hh
@@ -22,8 +22,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_NORM_IMPL_H
-#define IPLT_NORM_IMPL_H
+#ifndef IMG_NORM_IMPL_H
+#define IMG_NORM_IMPL_H
 
 // TODO: apply actual normalization to image
 
diff --git a/modules/img/alg/src/norm_linear.hh b/modules/img/alg/src/norm_linear.hh
index 7b1668928..0fd1058dc 100644
--- a/modules/img/alg/src/norm_linear.hh
+++ b/modules/img/alg/src/norm_linear.hh
@@ -22,8 +22,8 @@
   Authors: Ansgar Philippsen, Andreas Schenk
 */
 
-#ifndef IPLT_NORM_LINEAR_H
-#define IPLT_NORM_LINEAR_H
+#ifndef IMG_NORM_LINEAR_H
+#define IMG_NORM_LINEAR_H
 
 #include <ost/img/normalizer_impl.hh>
 #include <ost/img/alg/module_config.hh>
diff --git a/modules/img/alg/src/norm_log.hh b/modules/img/alg/src/norm_log.hh
index 586134847..e1e22a921 100644
--- a/modules/img/alg/src/norm_log.hh
+++ b/modules/img/alg/src/norm_log.hh
@@ -22,8 +22,8 @@
   Authors: Ansgar Philippsen, Andreas Schenk
 */
 
-#ifndef IPLT_NORM_LOG_H
-#define IPLT_NORM_LOG_H
+#ifndef IMG_NORM_LOG_H
+#define IMG_NORM_LOG_H
 
 #include <ost/img/normalizer_impl.hh>
 #include <ost/img/alg/module_config.hh>
diff --git a/modules/img/alg/src/polar.hh b/modules/img/alg/src/polar.hh
index 28aa496ea..5ba7625ec 100644
--- a/modules/img/alg/src/polar.hh
+++ b/modules/img/alg/src/polar.hh
@@ -17,8 +17,8 @@
 // along with this library; if not, write to the Free Software Foundation, Inc.,
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
-#ifndef IPLT_ALG_POLAR_HH
-#define IPLT_ALG_POLAR_HH
+#ifndef IMG_ALG_POLAR_HH
+#define IMG_ALG_POLAR_HH
 
 #include <ost/base.hh>
 #include <ost/img/algorithm.hh>
diff --git a/modules/img/alg/src/power_spectrum.hh b/modules/img/alg/src/power_spectrum.hh
index 49cffa5eb..39816afc8 100644
--- a/modules/img/alg/src/power_spectrum.hh
+++ b/modules/img/alg/src/power_spectrum.hh
@@ -18,8 +18,8 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
 
-#ifndef IPLT_ALG_POWERSPECTRUM_HH
-#define IPLT_ALG_POWERSPECTRUM_HH
+#ifndef IMG_ALG_POWERSPECTRUM_HH
+#define IMG_ALG_POWERSPECTRUM_HH
 
 #include <ost/img/image_state.hh>
 
diff --git a/modules/img/alg/src/randomize.hh b/modules/img/alg/src/randomize.hh
index 06d088ecd..739413500 100644
--- a/modules/img/alg/src/randomize.hh
+++ b/modules/img/alg/src/randomize.hh
@@ -18,8 +18,8 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
 
-#ifndef IPLT_ALG_RANDOMIZE_HH
-#define IPLT_ALG_RANDOMIZE_HH
+#ifndef IMG_ALG_RANDOMIZE_HH
+#define IMG_ALG_RANDOMIZE_HH
 
 #include <ost/img/image_state.hh>
 #include <ost/img/value_util.hh>
diff --git a/modules/img/alg/src/rscrosscorr.hh b/modules/img/alg/src/rscrosscorr.hh
index 4a4e7a297..77b87381f 100644
--- a/modules/img/alg/src/rscrosscorr.hh
+++ b/modules/img/alg/src/rscrosscorr.hh
@@ -1,5 +1,5 @@
-#ifndef IPLT_ALG_REAL_SPACE_CROSSCORR_HH
-#define IPLT_ALG_REAL_SPACE_CROSSCORR_HH
+#ifndef IMG_ALG_REAL_SPACE_CROSSCORR_HH
+#define IMG_ALG_REAL_SPACE_CROSSCORR_HH
 
 #include <ost/img/image.hh>
 
diff --git a/modules/img/alg/src/stat.hh b/modules/img/alg/src/stat.hh
index 37f98ccef..a2050fb99 100644
--- a/modules/img/alg/src/stat.hh
+++ b/modules/img/alg/src/stat.hh
@@ -22,8 +22,8 @@
   Authors: Andreas Schenk, Ansgar Philippsen
 */
 
-#ifndef IPLT_ALG_STAT_H
-#define IPLT_ALG_STAT_H
+#ifndef IMG_ALG_STAT_H
+#define IMG_ALG_STAT_H
 
 #include <iosfwd>
 
diff --git a/modules/img/alg/src/stat_min_max.hh b/modules/img/alg/src/stat_min_max.hh
index 6b0d0d991..1b61ecf9b 100644
--- a/modules/img/alg/src/stat_min_max.hh
+++ b/modules/img/alg/src/stat_min_max.hh
@@ -22,8 +22,8 @@
   Authors: Andreas Schenk, Ansgar Philippsen
 */
 
-#ifndef IPLT_ALG_STAT_MIN_MAX_H
-#define IPLT_ALG_STAT_MIN_MAX_H
+#ifndef IMG_ALG_STAT_MIN_MAX_H
+#define IMG_ALG_STAT_MIN_MAX_H
 
 #include <iosfwd>
 
diff --git a/modules/img/alg/src/transcendentals.hh b/modules/img/alg/src/transcendentals.hh
index 34e695a13..27f51c816 100644
--- a/modules/img/alg/src/transcendentals.hh
+++ b/modules/img/alg/src/transcendentals.hh
@@ -28,15 +28,15 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_ALG_TRANS_HH
-#define IPLT_ALG_TRANS_HH
+#ifndef IMG_ALG_TRANS_HH
+#define IMG_ALG_TRANS_HH
 
 #include <ost/img/image.hh>
 #include <ost/img/image_state.hh>
 #include <ost/img/alg/module_config.hh>
 
 
-#define IPLT_ALG_TRANSCENDENTALS_BLOCK(FF,NN,SS)                               \
+#define IMG_ALG_TRANSCENDENTALS_BLOCK(FF,NN,SS)                               \
 struct FF {					                                                           \
   FF() {}                                                                      \
   ~FF() {}                                                                     \
@@ -60,13 +60,13 @@ typedef ImageStateConstModIPAlgorithm<FF> NN;
 
 namespace ost { namespace img { namespace alg {
 
-IPLT_ALG_TRANSCENDENTALS_BLOCK(CosFnc,Cos,std::cos)
-IPLT_ALG_TRANSCENDENTALS_BLOCK(ExpFnc,Exp,std::exp)
-IPLT_ALG_TRANSCENDENTALS_BLOCK(LogFnc,Log,std::log)
-IPLT_ALG_TRANSCENDENTALS_BLOCK(Log10Fnc,Log10,std::log)
-IPLT_ALG_TRANSCENDENTALS_BLOCK(SinFnc,Sin,std::sin)
-IPLT_ALG_TRANSCENDENTALS_BLOCK(SqrtFnc,Sqrt,std::sqrt)
-IPLT_ALG_TRANSCENDENTALS_BLOCK(TanFnc,Tan,std::tan)
+IMG_ALG_TRANSCENDENTALS_BLOCK(CosFnc,Cos,std::cos)
+IMG_ALG_TRANSCENDENTALS_BLOCK(ExpFnc,Exp,std::exp)
+IMG_ALG_TRANSCENDENTALS_BLOCK(LogFnc,Log,std::log)
+IMG_ALG_TRANSCENDENTALS_BLOCK(Log10Fnc,Log10,std::log)
+IMG_ALG_TRANSCENDENTALS_BLOCK(SinFnc,Sin,std::sin)
+IMG_ALG_TRANSCENDENTALS_BLOCK(SqrtFnc,Sqrt,std::sqrt)
+IMG_ALG_TRANSCENDENTALS_BLOCK(TanFnc,Tan,std::tan)
 
 
 struct PowFnc {
@@ -90,7 +90,7 @@ typedef ImageStateConstModIPAlgorithm<PowFnc> Pow;
 
 }}} // ns
 
-#undef IPLT_ALG_TRANSCENDENTALS_BLOCK
+#undef IMG_ALG_TRANSCENDENTALS_BLOCK
 
 
 #endif
diff --git a/modules/img/alg/src/transform.hh b/modules/img/alg/src/transform.hh
index ffce44d54..9f5665daf 100644
--- a/modules/img/alg/src/transform.hh
+++ b/modules/img/alg/src/transform.hh
@@ -18,8 +18,8 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
 
-#ifndef IPLT_ALG_TRANSFORM_HH
-#define IPLT_ALG_TRANSFORM_HH
+#ifndef IMG_ALG_TRANSFORM_HH
+#define IMG_ALG_TRANSFORM_HH
 
 #include "alg_transform.hh"
 #include "alg_shift.hh"
diff --git a/modules/img/alg/src/transform_fw.hh b/modules/img/alg/src/transform_fw.hh
index c5f4416b6..fe10c3edb 100644
--- a/modules/img/alg/src/transform_fw.hh
+++ b/modules/img/alg/src/transform_fw.hh
@@ -24,7 +24,7 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_ALG_TRANSFORM_FW_H
-#define IPLT_ALG_TRANSFORM_FW_H
+#ifndef IMG_ALG_TRANSFORM_FW_H
+#define IMG_ALG_TRANSFORM_FW_H
 
 #endif
diff --git a/modules/img/alg/src/transformations.hh b/modules/img/alg/src/transformations.hh
index f2226a0fd..937bbbb45 100644
--- a/modules/img/alg/src/transformations.hh
+++ b/modules/img/alg/src/transformations.hh
@@ -24,8 +24,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_TRANSFORMATION_IMPL_HH
-#define IPLT_TRANSFORMATION_IMPL_HH
+#ifndef IMG_TRANSFORMATION_IMPL_HH
+#define IMG_TRANSFORMATION_IMPL_HH
 
 #include <ost/img/alg/module_config.hh>
 #include "transformation_base.hh"
diff --git a/modules/img/alg/tests/test_utils.hh b/modules/img/alg/tests/test_utils.hh
index cffaea498..0eb527642 100644
--- a/modules/img/alg/tests/test_utils.hh
+++ b/modules/img/alg/tests/test_utils.hh
@@ -22,8 +22,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_TEST_UTILS
-#define IPLT_TEST_UTILS
+#ifndef IMG_TEST_UTILS
+#define IMG_TEST_UTILS
 
 #include <iostream>
 
diff --git a/modules/img/base/src/algorithm.hh b/modules/img/base/src/algorithm.hh
index 1fd3edc3d..8e36c9f21 100644
--- a/modules/img/base/src/algorithm.hh
+++ b/modules/img/base/src/algorithm.hh
@@ -25,8 +25,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_ALGORITHM_H
-#define IPLT_ALGORITHM_H
+#ifndef IMG_ALGORITHM_H
+#define IMG_ALGORITHM_H
 
 #include <ost/img/module_config.hh>
 #include "data.hh"
diff --git a/modules/img/base/src/base.hh b/modules/img/base/src/base.hh
index 606b58836..5c86b2aa0 100644
--- a/modules/img/base/src/base.hh
+++ b/modules/img/base/src/base.hh
@@ -26,8 +26,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_BASE_H
-#define IPLT_BASE_H
+#ifndef IMG_BASE_H
+#define IMG_BASE_H
 
 #include <string>
 #include <cmath>
diff --git a/modules/img/base/src/data.hh b/modules/img/base/src/data.hh
index ecfecff13..7031c314a 100644
--- a/modules/img/base/src/data.hh
+++ b/modules/img/base/src/data.hh
@@ -24,8 +24,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_DATA_H
-#define IPLT_DATA_H
+#ifndef IMG_DATA_H
+#define IMG_DATA_H
 
 #include <cmath>
 
diff --git a/modules/img/base/src/data_algorithm.hh b/modules/img/base/src/data_algorithm.hh
index 2eaab697e..8445b21b1 100644
--- a/modules/img/base/src/data_algorithm.hh
+++ b/modules/img/base/src/data_algorithm.hh
@@ -24,8 +24,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_DATA_ALG_H
-#define IPLT_DATA_ALG_H
+#ifndef IMG_DATA_ALG_H
+#define IMG_DATA_ALG_H
 
 #include <ost/img/module_config.hh>
 #include "function_fw.hh"
diff --git a/modules/img/base/src/data_observer.hh b/modules/img/base/src/data_observer.hh
index fb384bf5d..72e72271f 100644
--- a/modules/img/base/src/data_observer.hh
+++ b/modules/img/base/src/data_observer.hh
@@ -24,8 +24,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_DATA_OBSERVER
-#define IPLT_DATA_OBSERVER
+#ifndef IMG_DATA_OBSERVER
+#define IMG_DATA_OBSERVER
 
 #include <boost/ref.hpp>
 
diff --git a/modules/img/base/src/data_types.hh b/modules/img/base/src/data_types.hh
index b8316fc94..52a5285e9 100644
--- a/modules/img/base/src/data_types.hh
+++ b/modules/img/base/src/data_types.hh
@@ -24,8 +24,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_DATA_TYPES_H
-#define IPLT_DATA_TYPES_H
+#ifndef IMG_DATA_TYPES_H
+#define IMG_DATA_TYPES_H
 
 #include <ost/base.hh>
 
diff --git a/modules/img/base/src/debug.hh b/modules/img/base/src/debug.hh
index b388238ea..dd980cd0b 100644
--- a/modules/img/base/src/debug.hh
+++ b/modules/img/base/src/debug.hh
@@ -22,8 +22,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_DEBUG_H
-#define IPLT_DEBUG_H
+#ifndef IMG_DEBUG_H
+#define IMG_DEBUG_H
 
 #include <iostream>
 #include <ctime>
diff --git a/modules/img/base/src/extent.hh b/modules/img/base/src/extent.hh
index e80f6c355..5f89c5ee8 100644
--- a/modules/img/base/src/extent.hh
+++ b/modules/img/base/src/extent.hh
@@ -24,8 +24,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_EXTENT_H
-#define IPLT_EXTENT_H
+#ifndef IMG_EXTENT_H
+#define IMG_EXTENT_H
 
 #include <ost/message.hh>
 #include <iosfwd>
diff --git a/modules/img/base/src/extent_iterator.hh b/modules/img/base/src/extent_iterator.hh
index 277326b4e..26365e408 100644
--- a/modules/img/base/src/extent_iterator.hh
+++ b/modules/img/base/src/extent_iterator.hh
@@ -24,8 +24,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_EXTENT_ITERATOR_H
-#define IPLT_EXTENT_ITERATOR_H
+#ifndef IMG_EXTENT_ITERATOR_H
+#define IMG_EXTENT_ITERATOR_H
 
 #include "point.hh"
 #include "data.hh"
diff --git a/modules/img/base/src/function.hh b/modules/img/base/src/function.hh
index 2672ae8df..5537e7051 100644
--- a/modules/img/base/src/function.hh
+++ b/modules/img/base/src/function.hh
@@ -26,8 +26,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_FUNCTION_H
-#define IPLT_FUNCTION_H
+#ifndef IMG_FUNCTION_H
+#define IMG_FUNCTION_H
 
 #include "function_base.hh"
 #include "function_impl.hh"
diff --git a/modules/img/base/src/function_base.hh b/modules/img/base/src/function_base.hh
index 7f679a741..efb654bd2 100644
--- a/modules/img/base/src/function_base.hh
+++ b/modules/img/base/src/function_base.hh
@@ -24,8 +24,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_FUNCTION_BASE_H
-#define IPLT_FUNCTION_BASE_H
+#ifndef IMG_FUNCTION_BASE_H
+#define IMG_FUNCTION_BASE_H
 
 #include "data.hh"
 #include "data_observer.hh"
diff --git a/modules/img/base/src/function_fw.hh b/modules/img/base/src/function_fw.hh
index de1bd3083..df183d2dc 100644
--- a/modules/img/base/src/function_fw.hh
+++ b/modules/img/base/src/function_fw.hh
@@ -24,8 +24,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_FUNCTION_FW_H
-#define IPLT_FUNCTION_FW_H
+#ifndef IMG_FUNCTION_FW_H
+#define IMG_FUNCTION_FW_H
 
 #include <ost/img/module_config.hh>
 
diff --git a/modules/img/base/src/function_impl.hh b/modules/img/base/src/function_impl.hh
index 1048c02ee..553b215d5 100644
--- a/modules/img/base/src/function_impl.hh
+++ b/modules/img/base/src/function_impl.hh
@@ -25,8 +25,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_FUNCTION_IMPL_H
-#define IPLT_FUNCTION_IMPL_H
+#ifndef IMG_FUNCTION_IMPL_H
+#define IMG_FUNCTION_IMPL_H
 
 #include <ost/img/module_config.hh>
 #include "function_base.hh"
diff --git a/modules/img/base/src/image.hh b/modules/img/base/src/image.hh
index 503e340ab..8b31ce8cb 100644
--- a/modules/img/base/src/image.hh
+++ b/modules/img/base/src/image.hh
@@ -25,8 +25,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_IMAGE_H
-#define IPLT_IMAGE_H
+#ifndef IMG_IMAGE_H
+#define IMG_IMAGE_H
 
 
 #include <ost/img/module_config.hh>
diff --git a/modules/img/base/src/image_factory.hh b/modules/img/base/src/image_factory.hh
index 03a56b24a..6f7862a97 100644
--- a/modules/img/base/src/image_factory.hh
+++ b/modules/img/base/src/image_factory.hh
@@ -25,8 +25,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_IMAGE_FACTORY_HH
-#define IPLT_IMAGE_FACTORY_HH
+#ifndef IMG_IMAGE_FACTORY_HH
+#define IMG_IMAGE_FACTORY_HH
 
 #include <ost/img/module_config.hh>
 #include "extent.hh"
diff --git a/modules/img/base/src/image_fw.hh b/modules/img/base/src/image_fw.hh
index ed8e1e1d8..3c528e89d 100644
--- a/modules/img/base/src/image_fw.hh
+++ b/modules/img/base/src/image_fw.hh
@@ -25,8 +25,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_IMAGE_FW_H
-#define IPLT_IMAGE_FW_H
+#ifndef IMG_IMAGE_FW_H
+#define IMG_IMAGE_FW_H
 
 #include <ost/img/module_config.hh>
 
diff --git a/modules/img/base/src/image_handle.hh b/modules/img/base/src/image_handle.hh
index 2bd869433..611939255 100644
--- a/modules/img/base/src/image_handle.hh
+++ b/modules/img/base/src/image_handle.hh
@@ -26,8 +26,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_IMAGE_HANDLE_H
-#define IPLT_IMAGE_HANDLE_H
+#ifndef IMG_IMAGE_HANDLE_H
+#define IMG_IMAGE_HANDLE_H
 
 #include <boost/shared_ptr.hpp>
 
diff --git a/modules/img/base/src/image_handle_fw.hh b/modules/img/base/src/image_handle_fw.hh
index fc1844ed8..810e921ee 100644
--- a/modules/img/base/src/image_handle_fw.hh
+++ b/modules/img/base/src/image_handle_fw.hh
@@ -24,8 +24,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_IMAGE_HANDLE_FW_H
-#define IPLT_IMAGE_HANDLE_FW_H
+#ifndef IMG_IMAGE_HANDLE_FW_H
+#define IMG_IMAGE_HANDLE_FW_H
 
 namespace ost { namespace img {
   class ImageHandle;
diff --git a/modules/img/base/src/image_impl.hh b/modules/img/base/src/image_impl.hh
index 96880f534..6748728c2 100644
--- a/modules/img/base/src/image_impl.hh
+++ b/modules/img/base/src/image_impl.hh
@@ -24,8 +24,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_IMAGE_IMPL_H
-#define IPLT_IMAGE_IMPL_H
+#ifndef IMG_IMAGE_IMPL_H
+#define IMG_IMAGE_IMPL_H
 
 #include <boost/shared_ptr.hpp>
 
diff --git a/modules/img/base/src/image_list.hh b/modules/img/base/src/image_list.hh
index f47c04dc9..c49a32844 100644
--- a/modules/img/base/src/image_list.hh
+++ b/modules/img/base/src/image_list.hh
@@ -22,8 +22,8 @@
   Author:Andreas Schenk
 */
 
-#ifndef IPLT_IMAGE_LIST_HH
-#define IPLT_IMAGE_LIST_HH
+#ifndef IMG_IMAGE_LIST_HH
+#define IMG_IMAGE_LIST_HH
 
 
 #include <ost/img/image.hh>
diff --git a/modules/img/base/src/image_state.hh b/modules/img/base/src/image_state.hh
index 35c0ec7b3..a6d4a0d5a 100644
--- a/modules/img/base/src/image_state.hh
+++ b/modules/img/base/src/image_state.hh
@@ -24,8 +24,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_IMAGE_STATE_H
-#define IPLT_IMAGE_STATE_H
+#ifndef IMG_IMAGE_STATE_H
+#define IMG_IMAGE_STATE_H
 
 
 #include "image_state/image_state_def.hh"
diff --git a/modules/img/base/src/image_state/binop.cc b/modules/img/base/src/image_state/binop.cc
index 6ebd30fc8..53521ed7f 100644
--- a/modules/img/base/src/image_state/binop.cc
+++ b/modules/img/base/src/image_state/binop.cc
@@ -22,7 +22,7 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_IMAGE_STATE_INST_H
+#ifndef IMG_IMAGE_STATE_INST_H
 #error "binop.cc must be included from image_state_inst.hh"
 #endif
 
diff --git a/modules/img/base/src/image_state/binop.hh b/modules/img/base/src/image_state/binop.hh
index 7c039fd7d..c3d2d3e5d 100644
--- a/modules/img/base/src/image_state/binop.hh
+++ b/modules/img/base/src/image_state/binop.hh
@@ -22,8 +22,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_IMAGE_STATE_BINOP_HH
-#define IPLT_IMAGE_STATE_BINOP_HH
+#ifndef IMG_IMAGE_STATE_BINOP_HH
+#define IMG_IMAGE_STATE_BINOP_HH
 
 #include "dispatch.hh"
 
diff --git a/modules/img/base/src/image_state/dispatch.hh b/modules/img/base/src/image_state/dispatch.hh
index 88f4061c6..4268854a3 100644
--- a/modules/img/base/src/image_state/dispatch.hh
+++ b/modules/img/base/src/image_state/dispatch.hh
@@ -22,8 +22,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_IMAGE_STATE_DISPATCH_HH
-#define IPLT_IMAGE_STATE_DISPATCH_HH
+#ifndef IMG_IMAGE_STATE_DISPATCH_HH
+#define IMG_IMAGE_STATE_DISPATCH_HH
 
 #include <ost/message.hh>
 #include <string>
diff --git a/modules/img/base/src/image_state/dispatch_fw.hh b/modules/img/base/src/image_state/dispatch_fw.hh
index bd6990944..ef5b5eb06 100644
--- a/modules/img/base/src/image_state/dispatch_fw.hh
+++ b/modules/img/base/src/image_state/dispatch_fw.hh
@@ -18,8 +18,8 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
 
-#ifndef IPLT_IMAGE_STATE_DISPATCH_FW_HH
-#define IPLT_IMAGE_STATE_DISPATCH_FW_HH
+#ifndef IMG_IMAGE_STATE_DISPATCH_FW_HH
+#define IMG_IMAGE_STATE_DISPATCH_FW_HH
 
 namespace ost { namespace img { namespace image_state { namespace dispatch {
 
diff --git a/modules/img/base/src/image_state/image_state.hh b/modules/img/base/src/image_state/image_state.hh
index 644218a7e..7354ad28d 100644
--- a/modules/img/base/src/image_state/image_state.hh
+++ b/modules/img/base/src/image_state/image_state.hh
@@ -24,8 +24,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_IMAGE_STATE_DETAIL_H
-#define IPLT_IMAGE_STATE_DETAIL_H
+#ifndef IMG_IMAGE_STATE_DETAIL_H
+#define IMG_IMAGE_STATE_DETAIL_H
 
 #include "image_state_base.hh"
 #include "image_state_impl.hh"
diff --git a/modules/img/base/src/image_state/image_state_algorithm.hh b/modules/img/base/src/image_state/image_state_algorithm.hh
index c7fbbadab..bd1e1f3f1 100644
--- a/modules/img/base/src/image_state/image_state_algorithm.hh
+++ b/modules/img/base/src/image_state/image_state_algorithm.hh
@@ -22,8 +22,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_IMAGE_STATE_ALGORITHM_HH
-#define IPLT_IMAGE_STATE_ALGORITHM_HH
+#ifndef IMG_IMAGE_STATE_ALGORITHM_HH
+#define IMG_IMAGE_STATE_ALGORITHM_HH
 
 #include <ost/img/image.hh>
 #include <ost/img/data_algorithm.hh>
diff --git a/modules/img/base/src/image_state/image_state_def.hh b/modules/img/base/src/image_state/image_state_def.hh
index 745079083..b4f44921e 100644
--- a/modules/img/base/src/image_state/image_state_def.hh
+++ b/modules/img/base/src/image_state/image_state_def.hh
@@ -24,8 +24,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_IMAGE_STATE_DEF_H
-#define IPLT_IMAGE_STATE_DEF_H
+#ifndef IMG_IMAGE_STATE_DEF_H
+#define IMG_IMAGE_STATE_DEF_H
 
 #include <ost/base.hh>
 
diff --git a/modules/img/base/src/image_state/image_state_factory.hh b/modules/img/base/src/image_state/image_state_factory.hh
index 0e9dd4f31..3a72f34fd 100644
--- a/modules/img/base/src/image_state/image_state_factory.hh
+++ b/modules/img/base/src/image_state/image_state_factory.hh
@@ -24,8 +24,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_IMAGE_STATE_FACTORY_H
-#define IPLT_IMAGE_STATE_FACTORY_H
+#ifndef IMG_IMAGE_STATE_FACTORY_H
+#define IMG_IMAGE_STATE_FACTORY_H
 
 #include <ost/img/data_types.hh>
 #include <ost/img/extent.hh>
diff --git a/modules/img/base/src/image_state/image_state_fft.hh b/modules/img/base/src/image_state/image_state_fft.hh
index 320105271..b86518c33 100644
--- a/modules/img/base/src/image_state/image_state_fft.hh
+++ b/modules/img/base/src/image_state/image_state_fft.hh
@@ -24,8 +24,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_IMAGE_STATE_FFT_H
-#define IPLT_IMAGE_STATE_FFT_H
+#ifndef IMG_IMAGE_STATE_FFT_H
+#define IMG_IMAGE_STATE_FFT_H
 
 #include <ost/message.hh>
 
diff --git a/modules/img/base/src/image_state/image_state_fw.hh b/modules/img/base/src/image_state/image_state_fw.hh
index bd7b29cf2..c1eb67f60 100644
--- a/modules/img/base/src/image_state/image_state_fw.hh
+++ b/modules/img/base/src/image_state/image_state_fw.hh
@@ -24,8 +24,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_IMAGE_STATE_DETAIL_FW
-#define IPLT_IMAGE_STATE_DETAIL_FW
+#ifndef IMG_IMAGE_STATE_DETAIL_FW
+#define IMG_IMAGE_STATE_DETAIL_FW
 
 #include "image_state_factory.hh"
 #include "image_state_visitor_fw.hh"
diff --git a/modules/img/base/src/image_state/image_state_impl.cc b/modules/img/base/src/image_state/image_state_impl.cc
index f31adf013..190728a10 100644
--- a/modules/img/base/src/image_state/image_state_impl.cc
+++ b/modules/img/base/src/image_state/image_state_impl.cc
@@ -29,7 +29,7 @@
 */
 
 
-#ifndef IPLT_IMAGE_STATE_INST_H
+#ifndef IMG_IMAGE_STATE_INST_H
 #error "image_state_impl.cc must be included from image_state_inst.hh"
 #endif
 
diff --git a/modules/img/base/src/image_state/image_state_inst.hh b/modules/img/base/src/image_state/image_state_inst.hh
index 3364d57a3..216d7219d 100644
--- a/modules/img/base/src/image_state/image_state_inst.hh
+++ b/modules/img/base/src/image_state/image_state_inst.hh
@@ -24,8 +24,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_IMAGE_STATE_INST_H
-#define IPLT_IMAGE_STATE_INST_H
+#ifndef IMG_IMAGE_STATE_INST_H
+#define IMG_IMAGE_STATE_INST_H
 
 /*
   At this point the various template instantiations
diff --git a/modules/img/base/src/image_state/image_state_visitor.hh b/modules/img/base/src/image_state/image_state_visitor.hh
index 5926a09e7..0f08c745e 100644
--- a/modules/img/base/src/image_state/image_state_visitor.hh
+++ b/modules/img/base/src/image_state/image_state_visitor.hh
@@ -22,8 +22,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_IMAGE_STATE_VISITOR_HH
-#define IPLT_IMAGE_STATE_VISITOR_HH
+#ifndef IMG_IMAGE_STATE_VISITOR_HH
+#define IMG_IMAGE_STATE_VISITOR_HH
 
 #include <ost/img/data_algorithm.hh>
 #include "image_state_impl.hh"
diff --git a/modules/img/base/src/image_state/image_state_visitor_fw.hh b/modules/img/base/src/image_state/image_state_visitor_fw.hh
index f7f1652d2..5e8a25124 100644
--- a/modules/img/base/src/image_state/image_state_visitor_fw.hh
+++ b/modules/img/base/src/image_state/image_state_visitor_fw.hh
@@ -24,8 +24,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_IMAGE_STATE_VISITOR_FW_H
-#define IPLT_IMAGE_STATE_VISITOR_FW_H
+#ifndef IMG_IMAGE_STATE_VISITOR_FW_H
+#define IMG_IMAGE_STATE_VISITOR_FW_H
 
 namespace ost { namespace img { namespace image_state {
 
diff --git a/modules/img/base/src/image_state/index.hh b/modules/img/base/src/image_state/index.hh
index beee95d52..6133adae5 100644
--- a/modules/img/base/src/image_state/index.hh
+++ b/modules/img/base/src/image_state/index.hh
@@ -24,8 +24,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_INDEX_H
-#define IPLT_INDEX_H
+#ifndef IMG_INDEX_H
+#define IMG_INDEX_H
 
 #include <iosfwd>
 
diff --git a/modules/img/base/src/image_state/type_fw.hh b/modules/img/base/src/image_state/type_fw.hh
index 1c71b921f..ace905046 100644
--- a/modules/img/base/src/image_state/type_fw.hh
+++ b/modules/img/base/src/image_state/type_fw.hh
@@ -24,8 +24,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_IMAGE_STATE_TYPE_FW_H
-#define IPLT_IMAGE_STATE_TYPE_FW_H
+#ifndef IMG_IMAGE_STATE_TYPE_FW_H
+#define IMG_IMAGE_STATE_TYPE_FW_H
 
 namespace ost { namespace img {
 
diff --git a/modules/img/base/src/image_state/value_holder.cc b/modules/img/base/src/image_state/value_holder.cc
index e9c96743f..c9245e423 100644
--- a/modules/img/base/src/image_state/value_holder.cc
+++ b/modules/img/base/src/image_state/value_holder.cc
@@ -24,7 +24,7 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_IMAGE_STATE_INST_H
+#ifndef IMG_IMAGE_STATE_INST_H
 #error "value_holder.cc must be included from image_state_inst.hh"
 #endif
 
diff --git a/modules/img/base/src/image_state_fw.hh b/modules/img/base/src/image_state_fw.hh
index 3e8ab9c38..849427159 100644
--- a/modules/img/base/src/image_state_fw.hh
+++ b/modules/img/base/src/image_state_fw.hh
@@ -24,8 +24,8 @@
   Author: Ansgar Philippsen 
 */
 
-#ifndef IPLT_IMAGE_STATE_FW_H
-#define IPLT_IMAGE_STATE_FW_H
+#ifndef IMG_IMAGE_STATE_FW_H
+#define IMG_IMAGE_STATE_FW_H
 
 #include "image_state/image_state_factory.hh"
 #include "image_state/image_state_visitor_fw.hh"
diff --git a/modules/img/base/src/mask.hh b/modules/img/base/src/mask.hh
index 798f062ed..a3bea792e 100644
--- a/modules/img/base/src/mask.hh
+++ b/modules/img/base/src/mask.hh
@@ -22,8 +22,8 @@
   Authors: Andreas Schenk, Ansgar Philippsen
 */
 
-#ifndef IPLT_MASK_HH_
-#define IPLT_MASK_HH_
+#ifndef IMG_MASK_HH_
+#define IMG_MASK_HH_
 
 #include <ost/message.hh> 
 #include "polygon_mask.hh" 
diff --git a/modules/img/base/src/normalizer_fw.hh b/modules/img/base/src/normalizer_fw.hh
index e401a9278..75b9af8d9 100644
--- a/modules/img/base/src/normalizer_fw.hh
+++ b/modules/img/base/src/normalizer_fw.hh
@@ -22,8 +22,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_NORMALIZER_FW_HH
-#define IPLT_NORMALIZER_FW_HH
+#ifndef IMG_NORMALIZER_FW_HH
+#define IMG_NORMALIZER_FW_HH
 
 #include <boost/shared_ptr.hpp>
 
diff --git a/modules/img/base/src/normalizer_impl.hh b/modules/img/base/src/normalizer_impl.hh
index 633b68ca9..838875cdd 100644
--- a/modules/img/base/src/normalizer_impl.hh
+++ b/modules/img/base/src/normalizer_impl.hh
@@ -24,8 +24,8 @@
   Authors: Ansgar Philippsen, Andreas Schenk
 */
 
-#ifndef IPLT_NORMALIZER_IMPL_H
-#define IPLT_NORMALIZER_IMPL_H
+#ifndef IMG_NORMALIZER_IMPL_H
+#define IMG_NORMALIZER_IMPL_H
 
 #include <boost/shared_ptr.hpp>
 
diff --git a/modules/img/base/src/null_data.hh b/modules/img/base/src/null_data.hh
index c492851d4..fff15d6f4 100644
--- a/modules/img/base/src/null_data.hh
+++ b/modules/img/base/src/null_data.hh
@@ -24,8 +24,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_NULL_DATA_H
-#define IPLT_NULL_DATA_H
+#ifndef IMG_NULL_DATA_H
+#define IMG_NULL_DATA_H
 
 #include "data.hh"
 #include "pixel_sampling.hh"
diff --git a/modules/img/base/src/null_function.hh b/modules/img/base/src/null_function.hh
index b7a570012..29087c848 100644
--- a/modules/img/base/src/null_function.hh
+++ b/modules/img/base/src/null_function.hh
@@ -24,8 +24,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_NULL_FUNCTION_H
-#define IPLT_NULL_FUNCTION_H
+#ifndef IMG_NULL_FUNCTION_H
+#define IMG_NULL_FUNCTION_H
 
 #include "function_base.hh"
 
diff --git a/modules/img/base/src/observable.hh b/modules/img/base/src/observable.hh
index 97f49358f..77c004110 100644
--- a/modules/img/base/src/observable.hh
+++ b/modules/img/base/src/observable.hh
@@ -24,8 +24,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_OBSERVABLE_H
-#define IPLT_OBSERVABLE_H
+#ifndef IMG_OBSERVABLE_H
+#define IMG_OBSERVABLE_H
 
 #include <list>
 #include "extent.hh" 
diff --git a/modules/img/base/src/paste_impl.hh b/modules/img/base/src/paste_impl.hh
index 2e403076f..91ae6c4d8 100644
--- a/modules/img/base/src/paste_impl.hh
+++ b/modules/img/base/src/paste_impl.hh
@@ -18,8 +18,8 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
 
-#ifndef IPLT_PASTE_IMPL_HH
-#define IPLT_PASTE_IMPL_HH
+#ifndef IMG_PASTE_IMPL_HH
+#define IMG_PASTE_IMPL_HH
 
 #include "image_state/image_state_algorithm.hh"
 
diff --git a/modules/img/base/src/peak.hh b/modules/img/base/src/peak.hh
index 3ec8c780c..a58c467bf 100644
--- a/modules/img/base/src/peak.hh
+++ b/modules/img/base/src/peak.hh
@@ -22,8 +22,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_ALG_PEAK_LIST_HH
-#define IPLT_ALG_PEAK_LIST_HH
+#ifndef IMG_ALG_PEAK_LIST_HH
+#define IMG_ALG_PEAK_LIST_HH
 
 #include <vector>
 
diff --git a/modules/img/base/src/physical_units.hh b/modules/img/base/src/physical_units.hh
index f0b676d12..f2e5ca615 100644
--- a/modules/img/base/src/physical_units.hh
+++ b/modules/img/base/src/physical_units.hh
@@ -17,8 +17,8 @@
 // along with this library; if not, write to the Free Software Foundation, Inc.,
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
-#ifndef IPLT_PHYSICS_UNITS_HH
-#define IPLT_PHYSICS_UNITS_HH
+#ifndef IMG_PHYSICS_UNITS_HH
+#define IMG_PHYSICS_UNITS_HH
 
 #include <boost/mpl/vector_c.hpp>
 #include<boost/mpl/placeholders.hpp>
diff --git a/modules/img/base/src/pixel_sampling.hh b/modules/img/base/src/pixel_sampling.hh
index 77949c9c1..02da611b7 100644
--- a/modules/img/base/src/pixel_sampling.hh
+++ b/modules/img/base/src/pixel_sampling.hh
@@ -24,8 +24,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_PIXEL_SAMPLING_H
-#define IPLT_PIXEL_SAMPLING_H
+#ifndef IMG_PIXEL_SAMPLING_H
+#define IMG_PIXEL_SAMPLING_H
 
 #include <ost/img/module_config.hh>
 #include <ost/img/data_types.hh>
diff --git a/modules/img/base/src/point.hh b/modules/img/base/src/point.hh
index 217477d09..abbd8a903 100644
--- a/modules/img/base/src/point.hh
+++ b/modules/img/base/src/point.hh
@@ -28,8 +28,8 @@
   TODO: use boost operator
 */
 
-#ifndef IPLT_POINT_H
-#define IPLT_POINT_H
+#ifndef IMG_POINT_H
+#define IMG_POINT_H
 
 #include <vector>
 #include <iosfwd>
diff --git a/modules/img/base/src/raster_image/raster_image.hh b/modules/img/base/src/raster_image/raster_image.hh
index e92255771..8840d742d 100644
--- a/modules/img/base/src/raster_image/raster_image.hh
+++ b/modules/img/base/src/raster_image/raster_image.hh
@@ -24,8 +24,8 @@
   Author: Ansgar Philippsen, Andreas Schenk
 */
 
-#ifndef IPLT_RASTER_IMAGE_H
-#define IPLT_RASTER_IMAGE_H
+#ifndef IMG_RASTER_IMAGE_H
+#define IMG_RASTER_IMAGE_H
 
 #include <ost/base.hh>
 #include <ost/img/vecmat.hh>
diff --git a/modules/img/base/src/size.hh b/modules/img/base/src/size.hh
index 539eda532..1ae38ce9d 100644
--- a/modules/img/base/src/size.hh
+++ b/modules/img/base/src/size.hh
@@ -24,8 +24,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_SIZE_H
-#define IPLT_SIZE_H
+#ifndef IMG_SIZE_H
+#define IMG_SIZE_H
 
 #include <iosfwd>
 
diff --git a/modules/img/base/src/util.cc b/modules/img/base/src/util.cc
index 3b2638ed3..2aa4955d8 100644
--- a/modules/img/base/src/util.cc
+++ b/modules/img/base/src/util.cc
@@ -22,7 +22,7 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_UTIL_H
+#ifndef IMG_UTIL_H
 #error "util.cc must be included from util.hh"
 #endif
 
diff --git a/modules/img/base/src/util.hh b/modules/img/base/src/util.hh
index 79132af88..adf577b6a 100644
--- a/modules/img/base/src/util.hh
+++ b/modules/img/base/src/util.hh
@@ -24,8 +24,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_UTIL_H
-#define IPLT_UTIL_H
+#ifndef IMG_UTIL_H
+#define IMG_UTIL_H
 
 #include <cmath>
 
diff --git a/modules/img/base/src/value_util.hh b/modules/img/base/src/value_util.hh
index 01785d6db..b17e42cff 100644
--- a/modules/img/base/src/value_util.hh
+++ b/modules/img/base/src/value_util.hh
@@ -24,8 +24,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_VALUE_UTIL_H
-#define IPLT_VALUE_UTIL_H
+#ifndef IMG_VALUE_UTIL_H
+#define IMG_VALUE_UTIL_H
 
 #include <time.h>
 #include <boost/random.hpp>
diff --git a/modules/img/base/src/vecmat.hh b/modules/img/base/src/vecmat.hh
index 8e70a64ff..0fe9d299d 100644
--- a/modules/img/base/src/vecmat.hh
+++ b/modules/img/base/src/vecmat.hh
@@ -24,8 +24,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_VECMAT_H
-#define IPLT_VECMAT_H
+#ifndef IMG_VECMAT_H
+#define IMG_VECMAT_H
 
 #include <cmath>
 #include <vector>
diff --git a/modules/img/base/src/version.hh b/modules/img/base/src/version.hh
index d095e109a..f893148f7 100644
--- a/modules/img/base/src/version.hh
+++ b/modules/img/base/src/version.hh
@@ -24,8 +24,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_VERSION_H
-#define IPLT_VERSION_H
+#ifndef IMG_VERSION_H
+#define IMG_VERSION_H
 
 #include <ost/img/module_config.hh>
 
diff --git a/modules/img/base/tests/test_data.hh b/modules/img/base/tests/test_data.hh
index 44c29ff48..1e72598ed 100644
--- a/modules/img/base/tests/test_data.hh
+++ b/modules/img/base/tests/test_data.hh
@@ -22,8 +22,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_TEST_DATA_H
-#define IPLT_TEST_DATA_H
+#ifndef IMG_TEST_DATA_H
+#define IMG_TEST_DATA_H
 
 #include <boost/test/unit_test.hpp>
 using boost::unit_test_framework::test_suite;
diff --git a/modules/img/base/tests/test_extent.hh b/modules/img/base/tests/test_extent.hh
index edd04671c..4d452b217 100644
--- a/modules/img/base/tests/test_extent.hh
+++ b/modules/img/base/tests/test_extent.hh
@@ -22,8 +22,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_TEST_EXTENT_H
-#define IPLT_TEST_EXTENT_H
+#ifndef IMG_TEST_EXTENT_H
+#define IMG_TEST_EXTENT_H
 
 #include <boost/test/unit_test.hpp>
 using boost::unit_test_framework::test_suite;
diff --git a/modules/img/base/tests/test_function.hh b/modules/img/base/tests/test_function.hh
index 3b968f717..4e1d05295 100644
--- a/modules/img/base/tests/test_function.hh
+++ b/modules/img/base/tests/test_function.hh
@@ -22,8 +22,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_TEST_FUNCTION_H
-#define IPLT_TEST_FUNCTION_H
+#ifndef IMG_TEST_FUNCTION_H
+#define IMG_TEST_FUNCTION_H
 
 #include <boost/test/unit_test.hpp>
 using boost::unit_test_framework::test_suite;
diff --git a/modules/img/base/tests/test_image.hh b/modules/img/base/tests/test_image.hh
index e79f738d9..7120d2338 100644
--- a/modules/img/base/tests/test_image.hh
+++ b/modules/img/base/tests/test_image.hh
@@ -22,8 +22,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_TEST_IMAGE_H
-#define IPLT_TEST_IMAGE_H
+#ifndef IMG_TEST_IMAGE_H
+#define IMG_TEST_IMAGE_H
 
 #include <boost/test/unit_test.hpp>
 using boost::unit_test_framework::test_suite;
diff --git a/modules/img/base/tests/test_image_factory.hh b/modules/img/base/tests/test_image_factory.hh
index 920d83bbc..6912f1369 100644
--- a/modules/img/base/tests/test_image_factory.hh
+++ b/modules/img/base/tests/test_image_factory.hh
@@ -22,8 +22,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_TEST_IMAGE_FACTORY_H
-#define IPLT_TEST_IMAGE_FACTORY_H
+#ifndef IMG_TEST_IMAGE_FACTORY_H
+#define IMG_TEST_IMAGE_FACTORY_H
 
 #include <boost/test/unit_test.hpp>
 using boost::unit_test_framework::test_suite;
diff --git a/modules/img/base/tests/test_image_impl.hh b/modules/img/base/tests/test_image_impl.hh
index c75c98493..5cbee44f5 100644
--- a/modules/img/base/tests/test_image_impl.hh
+++ b/modules/img/base/tests/test_image_impl.hh
@@ -22,8 +22,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_TEST_IMAGE_IMPL_H
-#define IPLT_TEST_IMAGE_IMPL_H
+#ifndef IMG_TEST_IMAGE_IMPL_H
+#define IMG_TEST_IMAGE_IMPL_H
 
 #include <boost/test/unit_test.hpp>
 using boost::unit_test_framework::test_suite;
diff --git a/modules/img/base/tests/test_image_state_visitor.hh b/modules/img/base/tests/test_image_state_visitor.hh
index 77e5f6e3c..6cbe26de8 100644
--- a/modules/img/base/tests/test_image_state_visitor.hh
+++ b/modules/img/base/tests/test_image_state_visitor.hh
@@ -22,8 +22,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_TEST_IMAGE_STATE_VISITOR_H
-#define IPLT_TEST_IMAGE_STATE_VISITOR_H
+#ifndef IMG_TEST_IMAGE_STATE_VISITOR_H
+#define IMG_TEST_IMAGE_STATE_VISITOR_H
 
 #include <boost/test/unit_test.hpp>
 using boost::unit_test_framework::test_suite;
diff --git a/modules/img/base/tests/test_index.hh b/modules/img/base/tests/test_index.hh
index f47680ac7..5056c4db2 100644
--- a/modules/img/base/tests/test_index.hh
+++ b/modules/img/base/tests/test_index.hh
@@ -22,8 +22,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_TEST_INDEX_H
-#define IPLT_TEST_INDEX_H
+#ifndef IMG_TEST_INDEX_H
+#define IMG_TEST_INDEX_H
 
 #include <boost/test/unit_test.hpp>
 using boost::unit_test_framework::test_suite;
diff --git a/modules/img/base/tests/test_point.hh b/modules/img/base/tests/test_point.hh
index 24d81a83b..1c5d20a57 100644
--- a/modules/img/base/tests/test_point.hh
+++ b/modules/img/base/tests/test_point.hh
@@ -22,8 +22,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_TEST_POINT_H
-#define IPLT_TEST_POINT_H
+#ifndef IMG_TEST_POINT_H
+#define IMG_TEST_POINT_H
 
 #include <boost/test/unit_test.hpp>
 using boost::unit_test_framework::test_suite;
diff --git a/modules/img/base/tests/test_sampling.hh b/modules/img/base/tests/test_sampling.hh
index db2eead87..6854438fc 100644
--- a/modules/img/base/tests/test_sampling.hh
+++ b/modules/img/base/tests/test_sampling.hh
@@ -22,8 +22,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_TEST_SAMPLING_H
-#define IPLT_TEST_SAMPLING_H
+#ifndef IMG_TEST_SAMPLING_H
+#define IMG_TEST_SAMPLING_H
 
 #include <boost/test/unit_test.hpp>
 using boost::unit_test_framework::test_suite;
diff --git a/modules/img/base/tests/test_size.hh b/modules/img/base/tests/test_size.hh
index ee4120b41..2a35c3e85 100644
--- a/modules/img/base/tests/test_size.hh
+++ b/modules/img/base/tests/test_size.hh
@@ -22,8 +22,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_TEST_SIZE_H
-#define IPLT_TEST_SIZE_H
+#ifndef IMG_TEST_SIZE_H
+#define IMG_TEST_SIZE_H
 
 #include <boost/test/unit_test.hpp>
 using boost::unit_test_framework::test_suite;
diff --git a/modules/img/base/tests/test_transform.hh b/modules/img/base/tests/test_transform.hh
index 335fd3fbb..cf6b002f7 100644
--- a/modules/img/base/tests/test_transform.hh
+++ b/modules/img/base/tests/test_transform.hh
@@ -22,8 +22,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_TEST_TRANSFORM_H
-#define IPLT_TEST_TRANSFORM_H
+#ifndef IMG_TEST_TRANSFORM_H
+#define IMG_TEST_TRANSFORM_H
 
 #include <boost/test/unit_test.hpp>
 using boost::unit_test_framework::test_suite;
diff --git a/modules/img/base/tests/test_utils.hh b/modules/img/base/tests/test_utils.hh
index a56394069..47bfb6c01 100644
--- a/modules/img/base/tests/test_utils.hh
+++ b/modules/img/base/tests/test_utils.hh
@@ -22,8 +22,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_TEST_UTILS
-#define IPLT_TEST_UTILS
+#ifndef IMG_TEST_UTILS
+#define IMG_TEST_UTILS
 
 #include <iostream>
 
diff --git a/modules/img/base/tests/test_value_holder.hh b/modules/img/base/tests/test_value_holder.hh
index f07bc7b08..6f2de7bb2 100644
--- a/modules/img/base/tests/test_value_holder.hh
+++ b/modules/img/base/tests/test_value_holder.hh
@@ -22,8 +22,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_TEST_VALUE_HOLDER_H
-#define IPLT_TEST_VALUE_HOLDER_H
+#ifndef IMG_TEST_VALUE_HOLDER_H
+#define IMG_TEST_VALUE_HOLDER_H
 
 #include <boost/test/unit_test.hpp>
 using boost::unit_test_framework::test_suite;
diff --git a/modules/io/src/img/image_format.hh b/modules/io/src/img/image_format.hh
index 5428337cd..5b5e2a9be 100644
--- a/modules/io/src/img/image_format.hh
+++ b/modules/io/src/img/image_format.hh
@@ -24,8 +24,8 @@
   Author: Andreas Schenk
 */
 
-#ifndef IPLT_IMAGE_FORMAT_H
-#define IPLT_IMAGE_FORMAT_H
+#ifndef IMG_IMAGE_FORMAT_H
+#define IMG_IMAGE_FORMAT_H
 
 #include <ost/img/data_types.hh>
 #include <ost/base.hh>
diff --git a/modules/io/src/img/image_format_conversion.cc b/modules/io/src/img/image_format_conversion.cc
index b64a612b2..54c29bcb2 100644
--- a/modules/io/src/img/image_format_conversion.cc
+++ b/modules/io/src/img/image_format_conversion.cc
@@ -24,7 +24,7 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_IMAGE_FORMAT_H
+#ifndef IMG_IMAGE_FORMAT_H
 #error "image_format_conversion.cc must be included from image_format.hh"
 #endif
 
diff --git a/modules/io/src/img/image_io_plugin.hh b/modules/io/src/img/image_io_plugin.hh
index 316de18eb..aadbf0b9b 100644
--- a/modules/io/src/img/image_io_plugin.hh
+++ b/modules/io/src/img/image_io_plugin.hh
@@ -25,8 +25,8 @@
   Authors: Ansgar Philippsen, Andreas Schenk
 */
 
-#ifndef IPLT_IMAGE_IO_PLUGIN
-#define IPLT_IMAGE_IO_PLUGIN
+#ifndef IMG_IMAGE_IO_PLUGIN
+#define IMG_IMAGE_IO_PLUGIN
 
 #include <boost/filesystem/operations.hpp>
 #include <boost/shared_ptr.hpp>
-- 
GitLab