diff --git a/src/meshlabplugins/edit_quality/eqhandle.h b/src/meshlabplugins/edit_quality/eqhandle.h
index 9c836ec5c..8541372a0 100644
--- a/src/meshlabplugins/edit_quality/eqhandle.h
+++ b/src/meshlabplugins/edit_quality/eqhandle.h
@@ -27,8 +27,8 @@ FIRST RELEASE
 
 ****************************************************************************/
 
-#ifndef _EQHANDLE_H_
-#define _EQHANDLE_H_
+#ifndef MESHLAB_EQHANDLE_H
+#define MESHLAB_EQHANDLE_H
 
 #include "handle.h"
 #include <QDoubleSpinBox>
@@ -111,4 +111,4 @@ public slots:
 	void setXBySpinBoxValueChanged (double spinBoxValue); // changing equalizer spinboxes moves the connected handle
 };
 
-#endif // EQHANDLE_H
\ No newline at end of file
+#endif // MESHLAB_EQHANDLE_H
diff --git a/src/meshlabplugins/edit_quality/handle.h b/src/meshlabplugins/edit_quality/handle.h
index 5a904b726..a11506f57 100644
--- a/src/meshlabplugins/edit_quality/handle.h
+++ b/src/meshlabplugins/edit_quality/handle.h
@@ -27,8 +27,8 @@ FIRST RELEASE
 
 ****************************************************************************/
 
-#ifndef _HANDLE_H_
-#define _HANDLE_H_
+#ifndef MESHLAB_HANDLE_H
+#define MESHLAB_HANDLE_H
 
 #include <QGraphicsObject>
 #include <limits>
@@ -70,4 +70,4 @@ private slots:
 
 };
 
-#endif // HANDLE_H
+#endif // MESHLAB_HANDLE_H
diff --git a/src/meshlabplugins/edit_quality/qualitymapper.h b/src/meshlabplugins/edit_quality/qualitymapper.h
index 1e97acb17..43ccdda64 100644
--- a/src/meshlabplugins/edit_quality/qualitymapper.h
+++ b/src/meshlabplugins/edit_quality/qualitymapper.h
@@ -27,8 +27,8 @@ FIRST RELEASE
 
 ****************************************************************************/
 
-#ifndef _QUALITY_MAPPER_PLUGIN_H_
-#define _QUALITY_MAPPER_PLUGIN_H_
+#ifndef MESHLAB_QUALITY_MAPPER_PLUGIN_H
+#define MESHLAB_QUALITY_MAPPER_PLUGIN_H
 
 #include <QObject>
 #include <QAction>
@@ -62,4 +62,4 @@ public:
 	bool haveToPick;
 };
 
-#endif
+#endif // MESHLAB_QUALITY_MAPPER_PLUGIN_H
diff --git a/src/meshlabplugins/edit_quality/qualitymapperdialog.h b/src/meshlabplugins/edit_quality/qualitymapperdialog.h
index 4a08537ff..05b2ccd10 100644
--- a/src/meshlabplugins/edit_quality/qualitymapperdialog.h
+++ b/src/meshlabplugins/edit_quality/qualitymapperdialog.h
@@ -27,8 +27,8 @@ FIRST RELEASE
 
 ****************************************************************************/
 
-#ifndef _QUALITYMAPPER_DIALOG_H_
-#define _QUALITYMAPPER_DIALOG_H_
+#ifndef MESHLAB_QUALITY_MAPPER_PLUGIN_H
+#define MESHLAB_QUALITY_MAPPER_PLUGIN_H
 
 #include <QDockWidget>
 #include <QGraphicsItem>
@@ -236,4 +236,4 @@ private slots:
 
 bool TfHandleCompare(TFHandle*h1, TFHandle*h2);
 
-#endif // QUALITYMAPPERDIALOG_H
+#endif // MESHLAB_QUALITY_MAPPER_PLUGIN_H
diff --git a/src/meshlabplugins/edit_quality/tfhandle.h b/src/meshlabplugins/edit_quality/tfhandle.h
index 60ca38226..ff779fcd3 100644
--- a/src/meshlabplugins/edit_quality/tfhandle.h
+++ b/src/meshlabplugins/edit_quality/tfhandle.h
@@ -27,8 +27,8 @@ FIRST RELEASE
 
 ****************************************************************************/
 
-#ifndef _TFHANDLE_H_
-#define _TFHANDLE_H_
+#ifndef MESHLAB_TFHANDLE_H
+#define MESHLAB_TFHANDLE_H
 
 #include "handle.h"
 #include "common/transferfunction.h"
@@ -80,4 +80,4 @@ private slots:
 
 };
 
-#endif // EQHANDLE_H
\ No newline at end of file
+#endif // MESHLAB_TFHANDLE_H
diff --git a/src/meshlabplugins/filter_isoparametrization/defines.h b/src/meshlabplugins/filter_isoparametrization/defines.h
index 423a68fe4..5463a7ada 100644
--- a/src/meshlabplugins/filter_isoparametrization/defines.h
+++ b/src/meshlabplugins/filter_isoparametrization/defines.h
@@ -1,5 +1,5 @@
-#ifndef _ISO_DEFINES
-#define _ISO_DEFINES
+#ifndef MESHLAB_ISO_DEFINES_H
+#define MESHLAB_ISO_DEFINES_H
 
 #define abstraction_num 10
 #define flip_factor 1.5f
@@ -10,4 +10,4 @@
 #define _MESHLAB
 
 
-#endif
+#endif // MESHLAB_ISO_DEFINES_H
diff --git a/src/meshlabplugins/filter_isoparametrization/diam_parametrization.h b/src/meshlabplugins/filter_isoparametrization/diam_parametrization.h
index e5dd6ea42..06cefb3f3 100644
--- a/src/meshlabplugins/filter_isoparametrization/diam_parametrization.h
+++ b/src/meshlabplugins/filter_isoparametrization/diam_parametrization.h
@@ -1,5 +1,5 @@
-#ifndef _DIAMONDPARA
-#define _DIAMONDPARA
+#ifndef MESHLAB_DIAMONDPARA_H
+#define MESHLAB_DIAMONDPARA_H
 
 #include <algorithm>
 #include <ctime>
@@ -553,4 +553,4 @@ public:
     }
 
 };
-#endif
+#endif // MESHLAB_DIAMONDPARA_H
diff --git a/src/meshlabplugins/filter_isoparametrization/diam_topology.h b/src/meshlabplugins/filter_isoparametrization/diam_topology.h
index 83e63e368..a026f3e98 100644
--- a/src/meshlabplugins/filter_isoparametrization/diam_topology.h
+++ b/src/meshlabplugins/filter_isoparametrization/diam_topology.h
@@ -1,5 +1,5 @@
-#ifndef _DIAMONDTOPOLOGY
-#define _DIAMONDTOPOLOGY
+#ifndef MESHLAB_DIAMONDTOPOLOGY
+#define MESHLAB_DIAMONDTOPOLOGY
 
 #include <algorithm>
 #include <ctime>
@@ -172,4 +172,4 @@ public:
 	}
 
 };
-#endif
\ No newline at end of file
+#endif // MESHLAB_DIAMONDTOPOLOGY
diff --git a/src/meshlabplugins/filter_isoparametrization/diamond_sampler.h b/src/meshlabplugins/filter_isoparametrization/diamond_sampler.h
index 2330ec3d6..e6c63974c 100644
--- a/src/meshlabplugins/filter_isoparametrization/diamond_sampler.h
+++ b/src/meshlabplugins/filter_isoparametrization/diamond_sampler.h
@@ -1,5 +1,5 @@
-#ifndef _DIAMSAMPLER
-#define _DIAMSAMPLER
+#ifndef MESHLAB_DIAMSAMPLER
+#define MESHLAB_DIAMSAMPLER
 #include <stat_remeshing.h>
 #include <vcg/complex/algorithms/clean.h>
 
@@ -222,4 +222,4 @@ public:
 
 
 };
-#endif
+#endif // MESHLAB_DIAMSAMPLER
diff --git a/src/meshlabplugins/filter_isoparametrization/iso_transfer.h b/src/meshlabplugins/filter_isoparametrization/iso_transfer.h
index c7e671456..7f9cccb6b 100644
--- a/src/meshlabplugins/filter_isoparametrization/iso_transfer.h
+++ b/src/meshlabplugins/filter_isoparametrization/iso_transfer.h
@@ -1,5 +1,5 @@
-#ifndef _ISO_TRANSFER
-#define _ISO_TRANSFER
+#ifndef MESHLAB_ISO_TRANSFER
+#define MESHLAB_ISO_TRANSFER
 
 #include <iso_parametrization.h>
 
@@ -132,4 +132,4 @@ class IsoTransfer
 
 };
 
-#endif
+#endif // MESHLAB_ISO_TRANSFER
diff --git a/src/meshlabplugins/filter_isoparametrization/local_optimization.h b/src/meshlabplugins/filter_isoparametrization/local_optimization.h
index 35dea117e..17c163a43 100644
--- a/src/meshlabplugins/filter_isoparametrization/local_optimization.h
+++ b/src/meshlabplugins/filter_isoparametrization/local_optimization.h
@@ -1,5 +1,5 @@
-#ifndef _LOCAL_OPTIMIZATION
-#define _LOCAL_OPTIMIZATION
+#ifndef MESHLAB_LOCAL_OPTIMIZATION
+#define MESHLAB_LOCAL_OPTIMIZATION
 
 #include "statistics.h"
 
@@ -344,4 +344,4 @@ bool SmartOptimizeStar(typename MeshType::VertexType *center,MeshType &base_doma
 		OptimizeStar<MeshType>(center,base_domain,accuracy,En);
 	return true;
 }
-#endif
+#endif // MESHLAB_LOCAL_OPTIMIZATION
diff --git a/src/meshlabplugins/filter_isoparametrization/opt_patch.h b/src/meshlabplugins/filter_isoparametrization/opt_patch.h
index f802c4f5c..bf29da5d2 100644
--- a/src/meshlabplugins/filter_isoparametrization/opt_patch.h
+++ b/src/meshlabplugins/filter_isoparametrization/opt_patch.h
@@ -1,5 +1,5 @@
-#ifndef _OPT_PATCHES
-#define _OPT_PATCHES
+#ifndef MESHLAB_OPT_PATCHES
+#define MESHLAB_OPT_PATCHES
 
 #include <algorithm>
 #include <vcg/complex/complex.h>
@@ -498,4 +498,4 @@ void OptimizePatches()
 	}
 
 };
-#endif
+#endif // MESHLAB_OPT_PATCHES
diff --git a/src/meshlabplugins/filter_isoparametrization/parametrizator.h b/src/meshlabplugins/filter_isoparametrization/parametrizator.h
index fad5cfb7a..f72e2bf26 100644
--- a/src/meshlabplugins/filter_isoparametrization/parametrizator.h
+++ b/src/meshlabplugins/filter_isoparametrization/parametrizator.h
@@ -1,5 +1,5 @@
-#ifndef _PARAMETRIZATOR
-#define _PARAMETRIZATOR
+#ifndef MESHLAB_PARAMETRIZATOR
+#define MESHLAB_PARAMETRIZATOR
 
 #include <defines.h>
 
@@ -1273,4 +1273,4 @@ public:
 
 };
 
-#endif
+#endif // MESHLAB_PARAMETRIZATOR
diff --git a/src/meshlabplugins/filter_isoparametrization/statistics.h b/src/meshlabplugins/filter_isoparametrization/statistics.h
index 63df7318a..e443e32bf 100644
--- a/src/meshlabplugins/filter_isoparametrization/statistics.h
+++ b/src/meshlabplugins/filter_isoparametrization/statistics.h
@@ -1,5 +1,5 @@
-#ifndef _ISO_STATISTICS
-#define _ISO_STATISTICS
+#ifndef MESHLAB_ISO_STATISTICS
+#define MESHLAB_ISO_STATISTICS
 
 #include <iso_parametrization.h>
 
@@ -322,4 +322,4 @@ typename MeshType::ScalarType ApproxL2Error(MeshType &mesh)
         return sum;
     }
 
-#endif
+#endif // MESHLAB_ISO_STATISTICS
diff --git a/src/meshlabplugins/filter_isoparametrization/texcoord_optimization.h b/src/meshlabplugins/filter_isoparametrization/texcoord_optimization.h
index d561498df..c81c7fb04 100644
--- a/src/meshlabplugins/filter_isoparametrization/texcoord_optimization.h
+++ b/src/meshlabplugins/filter_isoparametrization/texcoord_optimization.h
@@ -1,7 +1,7 @@
 // to be included in the library
 
-#ifndef __VCGLIB__TEXTCOOORD_OPTIMIZATION
-#define __VCGLIB__TEXTCOOORD_OPTIMIZATION
+#ifndef MESHLAB_VCGLIB__TEXTCOOORD_OPTIMIZATION
+#define MESHLAB_VCGLIB__TEXTCOOORD_OPTIMIZATION
 
 
 #include <vcg/container/simple_temporary_data.h>