diff --git a/modules/mol/mm/src/block_modifiers.hh b/modules/mol/mm/src/block_modifiers.hh
index b9da2f9a77999dd0ff0eeb960b4591e81f5e0d98..4212e496bb65d5133816f019025369441ecc6ade 100644
--- a/modules/mol/mm/src/block_modifiers.hh
+++ b/modules/mol/mm/src/block_modifiers.hh
@@ -17,8 +17,8 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
 
-#ifndef BLOCK_MODIFIERS
-#define BLOCK_MODIFIERS
+#ifndef OST_MM_BLOCK_MODIFIERS
+#define OST_MM_BLOCK_MODIFIERS
 
 #include <ost/mol/residue_handle.hh>
 #include <ost/mol/mm/buildingblock.hh>
diff --git a/modules/mol/mm/src/buildingblock.hh b/modules/mol/mm/src/buildingblock.hh
index f3283605ab353c86d3a411eceab9aca449d64571..aa28327d4b03f278665b3fe9d4ff9307d9298e40 100644
--- a/modules/mol/mm/src/buildingblock.hh
+++ b/modules/mol/mm/src/buildingblock.hh
@@ -17,8 +17,8 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
 
-#ifndef OST_FORCE_FIELD_BUILDING_BLOCK_HH
-#define OST_FORCE_FIELD_BUILDING_BLOCK_HH
+#ifndef OST_MM_BUILDING_BLOCK_HH
+#define OST_MM_BUILDING_BLOCK_HH
 
 #include <vector>
 #include <limits>
diff --git a/modules/mol/mm/src/ff_reader.hh b/modules/mol/mm/src/ff_reader.hh
index f07a74a8c75666408de21a6ea00f84e15aceb6eb..957e4457922c6a017c4a6983accc733a412f786f 100644
--- a/modules/mol/mm/src/ff_reader.hh
+++ b/modules/mol/mm/src/ff_reader.hh
@@ -17,8 +17,8 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
 
-#ifndef OST_FORCEFIELD_READER_HH
-#define OST_FORCEFIELD_READER_HH
+#ifndef OST_MM_FORCEFIELD_READER_HH
+#define OST_MM_FORCEFIELD_READER_HH
 
 #include <fstream>
 
diff --git a/modules/mol/mm/src/forcefield.hh b/modules/mol/mm/src/forcefield.hh
index 094e7208cc5da4c3a3f4c2706c1771c21d26b371..3c65e37fea4673f5f7f4dba2dae582e3871ad269 100644
--- a/modules/mol/mm/src/forcefield.hh
+++ b/modules/mol/mm/src/forcefield.hh
@@ -17,8 +17,8 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
 
-#ifndef OST_FORCE_FIELD_HH
-#define OST_FORCE_FIELD_HH
+#ifndef OST_MM_FORCE_FIELD_HH
+#define OST_MM_FORCE_FIELD_HH
 
 #include <vector>
 #include <algorithm>
diff --git a/modules/mol/mm/src/gromacs_block_modifiers.hh b/modules/mol/mm/src/gromacs_block_modifiers.hh
index 086b93f998739fe341f3111acb36c5e27569274c..af8fbbdc2ade9a8d9fcaf65d286fe68e3589c068 100644
--- a/modules/mol/mm/src/gromacs_block_modifiers.hh
+++ b/modules/mol/mm/src/gromacs_block_modifiers.hh
@@ -17,8 +17,8 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
 
-#ifndef GROMCACS_BLOCK_MODIFIERS
-#define GROMCACS_BLOCK_MODIFIERS
+#ifndef OST_MM_GROMCACS_BLOCK_MODIFIERS_HH
+#define OST_MM_GROMCACS_BLOCK_MODIFIERS_HH
 
 
 #include <boost/shared_ptr.hpp>
diff --git a/modules/mol/mm/src/heuristic_block_modifiers.hh b/modules/mol/mm/src/heuristic_block_modifiers.hh
index 29fd0d2d89fc0777b6fdb31a3f43412a847342be..facf818e52cf0290761cc1fd076c0f7fb62e617d 100644
--- a/modules/mol/mm/src/heuristic_block_modifiers.hh
+++ b/modules/mol/mm/src/heuristic_block_modifiers.hh
@@ -17,8 +17,8 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
 
-#ifndef HEURISTIC_BLOCK_MODIFIERS
-#define HEURISTIC_BLOCK_MODIFIERS
+#ifndef OST_MM_HEURISTIC_BLOCK_MODIFIERS_HH
+#define OST_MM_HEURISTIC_BLOCK_MODIFIERS_HH
 
 
 #include <boost/shared_ptr.hpp>
diff --git a/modules/mol/mm/src/modeller.hh b/modules/mol/mm/src/modeller.hh
index 17eecb02ae1c959eca6ceb4937c6388ca798704c..da2b721ed36c6a1fbc9de292ec5c36e78b6db1f7 100644
--- a/modules/mol/mm/src/modeller.hh
+++ b/modules/mol/mm/src/modeller.hh
@@ -17,8 +17,8 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
 
-#ifndef OST_MMMODELLER_HH
-#define OST_MMMODELLER_HH
+#ifndef OST_MM_MODELLER_HH
+#define OST_MM_MODELLER_HH
 
 
 #include <vector>
diff --git a/modules/mol/mm/src/simulation.hh b/modules/mol/mm/src/simulation.hh
index 08b5463ae494e8b2351ca659f13fb9940bdfb6d3..9abe038bdf533ffcf788210198f18edf094617a1 100644
--- a/modules/mol/mm/src/simulation.hh
+++ b/modules/mol/mm/src/simulation.hh
@@ -17,8 +17,8 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
 
-#ifndef OST_SIMULATION_HH
-#define OST_SIMULATION_HH
+#ifndef OST_MM_SIMULATION_HH
+#define OST_MM_SIMULATION_HH
 
 #include <vector>
 #include <map>
diff --git a/modules/mol/mm/src/state_extractor.hh b/modules/mol/mm/src/state_extractor.hh
index f866f3a708aadb42eb508448221f4f5f86b8fd52..38ecece645c0e343ce5812d3379ecbafa53a9290 100644
--- a/modules/mol/mm/src/state_extractor.hh
+++ b/modules/mol/mm/src/state_extractor.hh
@@ -17,8 +17,8 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
 
-#ifndef OST_STATE_EXTRACTOR_HH
-#define OST_STATE_EXTRACTOR_HH
+#ifndef OST_MM_STATE_EXTRACTOR_HH
+#define OST_MM_STATE_EXTRACTOR_HH
 
 #include <vector>
 
diff --git a/modules/mol/mm/src/steep.hh b/modules/mol/mm/src/steep.hh
index 1b059ffb0ea8dfbd16c42a5596fe0940ee04694d..1d58267104a74be5ddece2b2c8c03bafd285c254 100644
--- a/modules/mol/mm/src/steep.hh
+++ b/modules/mol/mm/src/steep.hh
@@ -17,8 +17,8 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
 
-#ifndef OST_STEEP_H_
-#define OST_STEEP_H_
+#ifndef OST_MM_STEEP_HH
+#define OST_MM_STEEP_HH
 
 #include <ost/base.hh>
 #include <cmath>
diff --git a/modules/mol/mm/src/system_creator.hh b/modules/mol/mm/src/system_creator.hh
index ad480ab2ddcd2da23a9a459017b2799e15f7a98f..274c9453b3c56e8bb928749f36fdb6e767f53949 100644
--- a/modules/mol/mm/src/system_creator.hh
+++ b/modules/mol/mm/src/system_creator.hh
@@ -17,8 +17,8 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
 
-#ifndef OST_SYSTEM_CREATOR_HH
-#define OST_SYSTEM_CREATOR_HH
+#ifndef OST_MM_SYSTEM_CREATOR_HH
+#define OST_MM_SYSTEM_CREATOR_HH
 
 #include <vector>
 #include <map>
diff --git a/modules/mol/mm/src/topology_creator.hh b/modules/mol/mm/src/topology_creator.hh
index ced7d790467b3cdafdaaa67b79ebbc9c70392e42..026abdc5cd4ba660c1f63848bf49b39157f0f2d7 100644
--- a/modules/mol/mm/src/topology_creator.hh
+++ b/modules/mol/mm/src/topology_creator.hh
@@ -17,8 +17,8 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
 
-#ifndef OST_TOPOLOGY_CREATOR_HH
-#define OST_TOPOLOGY_CREATOR_HH
+#ifndef OST_MM_TOPOLOGY_CREATOR_HH
+#define OST_MM_TOPOLOGY_CREATOR_HH
 
 #include <vector>
 #include <map>