diff --git a/examples/code_fragments/img/modulate_image.py b/examples/code_fragments/img/modulate_image.py
deleted file mode 100644
index 1222f9b1634df0601a4f2ca0be65d3e65a634eac..0000000000000000000000000000000000000000
--- a/examples/code_fragments/img/modulate_image.py
+++ /dev/null
@@ -1,23 +0,0 @@
-import math
-import ost.img.alg
-
-class modulator(img.RealFunction):
-    def __init__(self,f):
-        img.RealFunction.__init__(self)
-        self.f = f
-        
-    def Func(self,point):
-        return math.sin(point[0]*self.f)*math.sin(point[1]*self.f)
-
-im = img.CreateImage(img.Size(400,200))
-im.ApplyIP(img.alg.Randomize())
-
-im2 = im * modulator( 0.1 )
-
-im2.SetSpatialOrigin(img.Point(0,200))
-
-im3 = img.CreateImage(img.Size(400,400))
-im3.Paste(im)
-im3.Paste(im2)
-
-v=gui.CreateDataViewer(im3,"Modulated Image")
diff --git a/modules/geom/src/composite2.cc b/modules/geom/src/composite2.cc
index b72d334ddd4bbd7ae0885dd7af55e4792281dfaa..8a6aec909cdd9a9a8bbda1ffbf49e20add92f770 100644
--- a/modules/geom/src/composite2.cc
+++ b/modules/geom/src/composite2.cc
@@ -291,15 +291,17 @@ Polygon2::circular_iterator Polygon2::FindSegment(std::vector<Vec2>::const_itera
 }
 void Polygon2::Erase(circular_iterator first,circular_iterator last)
 {
+  std::vector<Vec2>::iterator vfirst=first,vlast=last;
   if(first!=cbegin()){
     for(circular_iterator it=first;it!=last;++it){
       if(it==cbegin()){ //special case with wrap around
-        std::vector<Vec2>::erase(first,end());
-        std::vector<Vec2>::erase(begin(),last);
+        std::vector<Vec2>::iterator vbegin=begin(),vend=end();
+        std::vector<Vec2>::erase(vfirst,vend);
+        std::vector<Vec2>::erase(vbegin,vlast);
       }
     }
   }
-  std::vector<Vec2>::erase(first,last);
+  std::vector<Vec2>::erase(vfirst,vlast);
 }
 
 Circle2::Circle2():
diff --git a/modules/gfx/src/gfx_object.hh b/modules/gfx/src/gfx_object.hh
index e0e8f5b829f735fc611e918644205e0a171201cf..03d76a8c4e719861452c7b1c9e1bc8f2b5226d75 100644
--- a/modules/gfx/src/gfx_object.hh
+++ b/modules/gfx/src/gfx_object.hh
@@ -26,6 +26,7 @@
 #ifdef check
 #undef check
 #endif
+#ifndef Q_MOC_RUN
 #include <boost/ptr_container/ptr_vector.hpp>
 
 #include <vector>
@@ -41,7 +42,7 @@
 #include "vertex_array.hh"
 #include "input.hh"
 #include "exporter_fw.hh"
-
+#endif
 namespace ost { namespace gfx {
 
 class Scene; // fw decl
diff --git a/modules/gui/src/data_viewer/strategies_fw.hh b/modules/gui/src/data_viewer/strategies_fw.hh
index 5678eb337f776f98de9905756d0f40205eb6a577..f66a4e66a9cce121e1e433ebf272944842f9d974 100644
--- a/modules/gui/src/data_viewer/strategies_fw.hh
+++ b/modules/gui/src/data_viewer/strategies_fw.hh
@@ -18,7 +18,7 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
 
-#ifndef IMG_GUI_STRATEGIES_FW_H
+#ifndef IMG_GUI_STRATEGIES_FW_HH
 #define IMG_GUI_STRATEGIES_FW_HH
 
 #include <boost/shared_ptr.hpp>
diff --git a/modules/gui/src/scene_win/entity_node.hh b/modules/gui/src/scene_win/entity_node.hh
index 8b716ec1170ea81577556da46918cb8461164b29..a9e58912440c0afcf7a963f66662e9f15c938f15 100644
--- a/modules/gui/src/scene_win/entity_node.hh
+++ b/modules/gui/src/scene_win/entity_node.hh
@@ -19,6 +19,8 @@
 #ifndef OST_GUI_SCENE_WIN_ENTITY_NODE_HH
 #define OST_GUI_SCENE_WIN_ENTITY_NODE_HH
 
+#ifndef Q_MOC_RUN
+
 #include <ost/gfx/gfx_node_fw.hh>
 #include <ost/gfx/gfx_node.hh>
 
@@ -27,6 +29,7 @@
 
 #include <ost/gui/module_config.hh>
 #include <ost/gui/scene_win/gfx_scene_node.hh>
+#endif
 
 /*
   Author: Stefan Scheuber
diff --git a/modules/gui/src/sequence_viewer/alignment_view_object.hh b/modules/gui/src/sequence_viewer/alignment_view_object.hh
index 37d38e9f7314564b3f8bbb0418b468525306f95b..9c96d31c5b4da314e75ada911350b50c0276946f 100644
--- a/modules/gui/src/sequence_viewer/alignment_view_object.hh
+++ b/modules/gui/src/sequence_viewer/alignment_view_object.hh
@@ -23,11 +23,14 @@
   Author: Stefan Scheuber
  */
 
+#ifndef Q_MOC_RUN
+
 #include <ost/seq/alignment_handle.hh>
 
 #include <ost/gfx/gradient.hh>
 
 #include "sequence_view_object.hh"
+#endif
 
 namespace ost { namespace gui {
 
diff --git a/modules/gui/src/sequence_viewer/sequence_delegate.hh b/modules/gui/src/sequence_viewer/sequence_delegate.hh
index e70dc118bd2dbd3d0a23e309f6b74a55fc1c2769..491669d4777d822f84053a9bc815dad5704cf5cd 100644
--- a/modules/gui/src/sequence_viewer/sequence_delegate.hh
+++ b/modules/gui/src/sequence_viewer/sequence_delegate.hh
@@ -23,10 +23,12 @@
   Author: Stefan Scheuber
  */
 
+#ifndef Q_MOC_RUN
 
 #include "sequence_model.hh"
 #include <QItemDelegate>
 #include <QModelIndex>
+#endif
 
 namespace ost { namespace gui {
 
diff --git a/modules/gui/src/sequence_viewer/sequence_model.hh b/modules/gui/src/sequence_viewer/sequence_model.hh
index aa3f0f44e73d303d87d29b080f04dba72feec80f..ce605c8f4dab661672bd2b089872e954871bdcd1 100644
--- a/modules/gui/src/sequence_viewer/sequence_model.hh
+++ b/modules/gui/src/sequence_viewer/sequence_model.hh
@@ -23,6 +23,7 @@
   Author: Stefan Scheuber
  */
 
+#ifndef Q_MOC_RUN
 
 #include <ost/mol/chain_view.hh>
 
@@ -37,6 +38,8 @@
 
 #include <QAbstractTableModel>
 #include <QItemSelection>
+#endif
+
 namespace ost { namespace gui {
 
 class SequenceModel : public QAbstractTableModel
diff --git a/modules/gui/src/sequence_viewer/sequence_view_object.hh b/modules/gui/src/sequence_viewer/sequence_view_object.hh
index 19398db99dc25a8b03bb1671bd022bffe6b4cf64..c3addfe409bb7926dd972f3a3a79b64ba3ddbb9b 100644
--- a/modules/gui/src/sequence_viewer/sequence_view_object.hh
+++ b/modules/gui/src/sequence_viewer/sequence_view_object.hh
@@ -23,6 +23,7 @@
   Author: Stefan Scheuber
  */
 
+#ifndef Q_MOC_RUN
 
 #include <ost/mol/entity_handle.hh>
 
@@ -38,7 +39,7 @@
 #include "seq_text_painter.hh"
 
 #include "base_view_object.hh"
-
+#endif
 
 namespace ost { namespace gui {
 
diff --git a/modules/gui/src/sequence_viewer/sequence_viewer.hh b/modules/gui/src/sequence_viewer/sequence_viewer.hh
index bce3c41e59224078785fe290c7d583ad03971c3e..bd780a3b9cd157000fec19fe0779134979eb9666 100644
--- a/modules/gui/src/sequence_viewer/sequence_viewer.hh
+++ b/modules/gui/src/sequence_viewer/sequence_viewer.hh
@@ -23,6 +23,7 @@
   Author: Stefan Scheuber
  */
 
+#ifndef Q_MOC_RUN
 
 #include <ost/seq/alignment_handle.hh>
 
@@ -39,6 +40,7 @@
 #include <QToolBar>
 #include <QModelIndex>
 #include <QItemSelection>
+#endif
 
 namespace ost { 
 
diff --git a/modules/img/alg/src/alg_transform.hh b/modules/img/alg/src/alg_transform.hh
index 5e461d95c32a5cc682781b8afc8736dd969d6db1..3729437992ad56c8d94cf1a0615a857db370d6ce 100644
--- a/modules/img/alg/src/alg_transform.hh
+++ b/modules/img/alg/src/alg_transform.hh
@@ -19,7 +19,7 @@
 //------------------------------------------------------------------------------
 
 #ifndef IMG_ALG_TRANSFORM_ALG_TRANSFORM_HH
-#define 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/io/src/mol/mmcif_reader.cc b/modules/io/src/mol/mmcif_reader.cc
index d6af7a25800df040c52d0d111dfb44ba993eadd8..a4c9ca313f3dcdeb5f1434884cb57c00d72ab9df 100644
--- a/modules/io/src/mol/mmcif_reader.cc
+++ b/modules/io/src/mol/mmcif_reader.cc
@@ -799,7 +799,7 @@ void MMCifReader::ParseCitation(const std::vector<StringRef>& columns)
     }
   }
   if (indices_[PDBX_DATABASE_ID_PUBMED] != -1) {
-    if (columns[indices_[PDBX_DATABASE_ID_PUBMED]][0]!='?') {
+    if (!is_undef(columns[indices_[PDBX_DATABASE_ID_PUBMED]])) {
       cit.SetPubMed(this->TryGetInt(columns[indices_[PDBX_DATABASE_ID_PUBMED]],
                                     "citation.pdbx_database_id_PubMed"));
     }
@@ -1085,7 +1085,7 @@ void MMCifReader::ParseStruct(const std::vector<StringRef>& columns)
   }
 
   if (indices_[PDBX_FORMULA_WEIGHT] != -1) {
-    if (columns[indices_[PDBX_FORMULA_WEIGHT]][0] != '?') {
+    if (!is_undef(columns[indices_[PDBX_FORMULA_WEIGHT]])) {
       details.SetMass(this->TryGetReal(columns[indices_[PDBX_FORMULA_WEIGHT]],
                                        "struct.pdbx_formula_weight"));
     }