diff --git a/HistogramItem.cc b/HistogramItem.cc
index 6e3e1b7577b63798995bcffe49107326581047f5..89d0bf46a33ba85379f0eece282d5b42e88b3d4f 100644
--- a/HistogramItem.cc
+++ b/HistogramItem.cc
@@ -1,5 +1,5 @@
 
-#ifdef USE_QWT
+#ifdef WITH_QWT
 
 #include <qstring.h>
 #include <qpainter.h>
@@ -89,24 +89,24 @@ QColor HistogramItem::color(uint i) const
 QwtDoubleRect HistogramItem::boundingRect() const
 {
     QwtDoubleRect rect = d_data->data.boundingRect();
-    if ( !rect.isValid() ) 
+    if ( !rect.isValid() )
         return rect;
 
-    if ( d_data->attributes & Xfy ) 
+    if ( d_data->attributes & Xfy )
     {
-        rect = QwtDoubleRect( rect.y(), rect.x(), 
+        rect = QwtDoubleRect( rect.y(), rect.x(),
             rect.height(), rect.width() );
 
-        if ( rect.left() > d_data->reference ) 
+        if ( rect.left() > d_data->reference )
             rect.setLeft( d_data->reference );
-        else if ( rect.right() < d_data->reference ) 
+        else if ( rect.right() < d_data->reference )
             rect.setRight( d_data->reference );
-    } 
-    else 
+    }
+    else
     {
-        if ( rect.bottom() < d_data->reference ) 
+        if ( rect.bottom() < d_data->reference )
             rect.setBottom( d_data->reference );
-        else if ( rect.top() > d_data->reference ) 
+        else if ( rect.top() > d_data->reference )
             rect.setTop( d_data->reference );
     }
 
@@ -137,7 +137,7 @@ bool HistogramItem::testHistogramAttribute(HistogramAttribute attribute) const
     return d_data->attributes & attribute;
 }
 
-void HistogramItem::draw(QPainter *painter, const QwtScaleMap &xMap, 
+void HistogramItem::draw(QPainter *painter, const QwtScaleMap &xMap,
     const QwtScaleMap &yMap, const QRect &) const
 {
     const QwtIntervalData &iData = d_data->data;
@@ -250,22 +250,22 @@ void HistogramItem::drawBar(QPainter *painter,
 
    painter->setPen(QPen(dark, 2));
 #if QT_VERSION >= 0x040000
-   QwtPainter::drawLine(painter, 
+   QwtPainter::drawLine(painter,
       r.left() + 1, r.bottom(), r.right() + 1, r.bottom());
 #else
-   QwtPainter::drawLine(painter, 
+   QwtPainter::drawLine(painter,
       r.left(), r.bottom(), r.right() + 1, r.bottom());
 #endif
 
    painter->setPen(QPen(light, 1));
 
 #if QT_VERSION >= 0x040000
-   QwtPainter::drawLine(painter, 
+   QwtPainter::drawLine(painter,
       r.left(), r.top() + 1, r.left(), r.bottom());
    QwtPainter::drawLine(painter,
       r.left() + 1, r.top() + 2, r.left() + 1, r.bottom() - 1);
 #else
-   QwtPainter::drawLine(painter, 
+   QwtPainter::drawLine(painter,
       r.left(), r.top() + 1, r.left(), r.bottom() + 1);
    QwtPainter::drawLine(painter,
       r.left() + 1, r.top() + 2, r.left() + 1, r.bottom());
@@ -274,18 +274,18 @@ void HistogramItem::drawBar(QPainter *painter,
    painter->setPen(QPen(dark, 1));
 
 #if QT_VERSION >= 0x040000
-   QwtPainter::drawLine(painter, 
+   QwtPainter::drawLine(painter,
       r.right() + 1, r.top() + 1, r.right() + 1, r.bottom());
-   QwtPainter::drawLine(painter, 
+   QwtPainter::drawLine(painter,
       r.right(), r.top() + 2, r.right(), r.bottom() - 1);
 #else
-   QwtPainter::drawLine(painter, 
+   QwtPainter::drawLine(painter,
       r.right() + 1, r.top() + 1, r.right() + 1, r.bottom() + 1);
-   QwtPainter::drawLine(painter, 
+   QwtPainter::drawLine(painter,
       r.right(), r.top() + 2, r.right(), r.bottom());
 #endif
 
    painter->restore();
 }
 
-#endif // USE_QWT
+#endif // WITH_QWT
diff --git a/QwtFunctionPlot.cc b/QwtFunctionPlot.cc
index 79e301e27e817f05d990cb6c958094469bf2253a..8bfd6e5d522d5856d96a7f15ebd97e52ba6ef12e 100644
--- a/QwtFunctionPlot.cc
+++ b/QwtFunctionPlot.cc
@@ -6,7 +6,7 @@
 
 //== INCLUDES =================================================================
 
-#ifdef USE_QWT
+#ifdef WITH_QWT
 
 #include "QwtFunctionPlot.hh"
 
@@ -235,4 +235,4 @@ void QwtFunctionPlot::replot()
 } // namespace db
 //=============================================================================
 
-#endif // USE_QWT
+#endif // WITH_QWT
diff --git a/QwtFunctionPlot.hh b/QwtFunctionPlot.hh
index bba5f05bf23414f84d0d3d89556e7264290e1f84..ab8b64f39d357a8578cca4c3c4d06febbe02e94a 100644
--- a/QwtFunctionPlot.hh
+++ b/QwtFunctionPlot.hh
@@ -14,7 +14,7 @@
 #ifndef ACG_QWTFUNCTIONPLOT_HH
 #define ACG_QWTFUNCTIONPLOT_HH
 
-#ifdef USE_QWT
+#ifdef WITH_QWT
 
 //== INCLUDES =================================================================
 
@@ -104,7 +104,7 @@ private:
 //=============================================================================
 } // namespace ACG
 
-#endif // USE_QWT
+#endif // WITH_QWT
 
 //=============================================================================
 #endif // ACG_QWTFUNCTIONPLOT_HH defined