From bc5d8352097368369a1f3231067eb02c24ed62c1 Mon Sep 17 00:00:00 2001
From: Andreas Schenk <andreas_schenk@hms.harvard.edu>
Date: Mon, 9 Jul 2012 00:13:29 -0400
Subject: [PATCH] fixed include file order in unit tests to compile on windows
 fixed BOOST_TEST_DYNLINK define for some unit tests

---
 modules/geom/tests/test_composite2.cc      |  2 +-
 modules/geom/tests/test_composite3.cc      |  5 +++--
 modules/geom/tests/test_mat2.cc            |  6 +++---
 modules/geom/tests/test_mat3.cc            |  6 +++---
 modules/geom/tests/test_mat4.cc            |  6 +++---
 modules/geom/tests/test_op2.cc             |  6 +++---
 modules/geom/tests/test_op3.cc             |  7 ++++---
 modules/geom/tests/test_op4.cc             |  7 ++++---
 modules/geom/tests/test_quat.cc            |  7 ++++---
 modules/geom/tests/test_vec2.cc            |  6 +++---
 modules/geom/tests/test_vec3.cc            |  7 ++++---
 modules/geom/tests/test_vec4.cc            |  5 +++--
 modules/io/tests/test_clustal.cc           |  5 +++--
 modules/io/tests/test_io_crd.cc            |  7 ++++---
 modules/io/tests/test_io_dcd.cc            |  7 ++++---
 modules/io/tests/test_io_img.cc            |  6 ++++--
 modules/io/tests/test_io_pdb.cc            | 11 ++++++-----
 modules/io/tests/test_io_sdf.cc            | 11 ++++++-----
 modules/io/tests/test_iomanager.cc         |  2 +-
 modules/io/tests/test_mmcif_info.cc        |  8 ++++----
 modules/io/tests/test_mmcif_reader.cc      |  9 +++++----
 modules/io/tests/test_star_parser.cc       |  9 +++++----
 modules/mol/base/tests/test_atom_groups.cc |  4 ++--
 modules/mol/base/tests/test_chain.cc       |  7 ++++---
 modules/mol/base/tests/test_conn.cc        |  2 +-
 modules/mol/base/tests/test_delete.cc      |  4 ++--
 modules/mol/base/tests/test_entity.cc      |  6 +++---
 modules/mol/base/tests/test_ics.cc         |  4 ++--
 modules/mol/base/tests/test_iterators.cc   |  4 ++--
 modules/mol/base/tests/test_residue.cc     |  6 +++---
 modules/mol/base/tests/test_surface.cc     |  5 +++--
 31 files changed, 102 insertions(+), 85 deletions(-)

diff --git a/modules/geom/tests/test_composite2.cc b/modules/geom/tests/test_composite2.cc
index acec86fb9..612d73b0a 100644
--- a/modules/geom/tests/test_composite2.cc
+++ b/modules/geom/tests/test_composite2.cc
@@ -20,12 +20,12 @@
 
 #include <ost/geom/geom.hh>
 
-#include "helper.hh"
 
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
 #include <boost/test/auto_unit_test.hpp>
 
+#include "helper.hh"
 using namespace geom;
 
 BOOST_AUTO_TEST_SUITE( geom );
diff --git a/modules/geom/tests/test_composite3.cc b/modules/geom/tests/test_composite3.cc
index 317068280..a9fb6ea4d 100644
--- a/modules/geom/tests/test_composite3.cc
+++ b/modules/geom/tests/test_composite3.cc
@@ -20,14 +20,15 @@
 #include <cmath>
 #include <ost/geom/geom.hh>
 
-#include "helper.hh"
-using namespace geom;
 
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
 #include <boost/test/auto_unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 
+#include "helper.hh"
+using namespace geom;
+
 BOOST_AUTO_TEST_SUITE( geom );
 
 BOOST_AUTO_TEST_CASE(init_composite3)
diff --git a/modules/geom/tests/test_mat2.cc b/modules/geom/tests/test_mat2.cc
index 613b01ee0..c0f2e429f 100644
--- a/modules/geom/tests/test_mat2.cc
+++ b/modules/geom/tests/test_mat2.cc
@@ -19,13 +19,13 @@
 
 #include <ost/geom/geom.hh>
 
-#include "helper.hh"
-using namespace geom;
-
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
 #include <boost/test/auto_unit_test.hpp>
 
+#include "helper.hh"
+using namespace geom;
+
 BOOST_AUTO_TEST_SUITE( geom );
 
 
diff --git a/modules/geom/tests/test_mat3.cc b/modules/geom/tests/test_mat3.cc
index 381271a43..7481e519e 100644
--- a/modules/geom/tests/test_mat3.cc
+++ b/modules/geom/tests/test_mat3.cc
@@ -19,13 +19,13 @@
 
 #include <ost/geom/geom.hh>
 
-#include "helper.hh"
-using namespace geom;
-
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
 #include <boost/test/auto_unit_test.hpp>
 
+#include "helper.hh"
+using namespace geom;
+
 BOOST_AUTO_TEST_SUITE( geom );
 
 BOOST_AUTO_TEST_CASE(init_mat3)
diff --git a/modules/geom/tests/test_mat4.cc b/modules/geom/tests/test_mat4.cc
index 2b3160dbf..64c0eff7a 100644
--- a/modules/geom/tests/test_mat4.cc
+++ b/modules/geom/tests/test_mat4.cc
@@ -19,13 +19,13 @@
 
 #include <ost/geom/geom.hh>
 
-#include "helper.hh"
-using namespace geom;
-
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
 #include <boost/test/auto_unit_test.hpp>
 
+#include "helper.hh"
+using namespace geom;
+
 BOOST_AUTO_TEST_SUITE( geom );
 
 BOOST_AUTO_TEST_CASE(init_mat4)
diff --git a/modules/geom/tests/test_op2.cc b/modules/geom/tests/test_op2.cc
index 2815b3e65..fd52c6f3b 100644
--- a/modules/geom/tests/test_op2.cc
+++ b/modules/geom/tests/test_op2.cc
@@ -19,13 +19,13 @@
 
 #include <ost/geom/geom.hh>
 
-#include "helper.hh"
-using namespace geom;
-
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
 #include <boost/test/auto_unit_test.hpp>
 
+#include "helper.hh"
+using namespace geom;
+
 BOOST_AUTO_TEST_SUITE( geom );
 
 BOOST_AUTO_TEST_CASE(vecmat_mult2)
diff --git a/modules/geom/tests/test_op3.cc b/modules/geom/tests/test_op3.cc
index 1d4660b4e..b37013a8c 100644
--- a/modules/geom/tests/test_op3.cc
+++ b/modules/geom/tests/test_op3.cc
@@ -19,13 +19,14 @@
 
 #include <ost/geom/geom.hh>
 
-#include "helper.hh"
-using namespace geom;
-
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
 #include <boost/test/auto_unit_test.hpp>
 
+#include "helper.hh"
+using namespace geom;
+
+
 BOOST_AUTO_TEST_SUITE( geom );
 
 BOOST_AUTO_TEST_CASE(vecmat_mult3)
diff --git a/modules/geom/tests/test_op4.cc b/modules/geom/tests/test_op4.cc
index df5995eca..b9c4beeed 100644
--- a/modules/geom/tests/test_op4.cc
+++ b/modules/geom/tests/test_op4.cc
@@ -19,13 +19,14 @@
 
 #include <ost/geom/geom.hh>
 
-#include "helper.hh"
-using namespace geom;
-
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
 #include <boost/test/auto_unit_test.hpp>
 
+
+#include "helper.hh"
+using namespace geom;
+
 BOOST_AUTO_TEST_SUITE( geom );
 
 BOOST_AUTO_TEST_CASE(vecmat_mult4)
diff --git a/modules/geom/tests/test_quat.cc b/modules/geom/tests/test_quat.cc
index cfd36460b..54b8cea33 100644
--- a/modules/geom/tests/test_quat.cc
+++ b/modules/geom/tests/test_quat.cc
@@ -19,14 +19,15 @@
 
 #include <ost/geom/geom.hh>
 
-#include "helper.hh"
-using namespace geom;
-
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
 #include <boost/test/auto_unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 
+#include "helper.hh"
+using namespace geom;
+
+
 BOOST_AUTO_TEST_SUITE( geom );
 
 BOOST_AUTO_TEST_CASE(init_quat)
diff --git a/modules/geom/tests/test_vec2.cc b/modules/geom/tests/test_vec2.cc
index db5d68173..c7cb014de 100644
--- a/modules/geom/tests/test_vec2.cc
+++ b/modules/geom/tests/test_vec2.cc
@@ -19,13 +19,13 @@
 
 #include <ost/geom/geom.hh>
 
-#include "helper.hh"
-using namespace geom;
-
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
 #include <boost/test/auto_unit_test.hpp>
 
+#include "helper.hh"
+using namespace geom;
+
 BOOST_AUTO_TEST_SUITE( geom );
   
 BOOST_AUTO_TEST_CASE(init_vec2)
diff --git a/modules/geom/tests/test_vec3.cc b/modules/geom/tests/test_vec3.cc
index 2d166b988..9b2a4cc8b 100644
--- a/modules/geom/tests/test_vec3.cc
+++ b/modules/geom/tests/test_vec3.cc
@@ -19,13 +19,14 @@
 
 #include <ost/geom/geom.hh>
 
-#include "helper.hh"
-using namespace geom;
-
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
 #include <boost/test/auto_unit_test.hpp>
 
+#include "helper.hh"
+using namespace geom;
+
+
 BOOST_AUTO_TEST_SUITE( geom );
   
 BOOST_AUTO_TEST_CASE(init_vec3)
diff --git a/modules/geom/tests/test_vec4.cc b/modules/geom/tests/test_vec4.cc
index 665e2f168..f39988a41 100644
--- a/modules/geom/tests/test_vec4.cc
+++ b/modules/geom/tests/test_vec4.cc
@@ -19,13 +19,14 @@
 
 #include <ost/geom/geom.hh>
 
-#include "helper.hh"
-using namespace geom;
 
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
 #include <boost/test/auto_unit_test.hpp>
 
+#include "helper.hh"
+using namespace geom;
+
 BOOST_AUTO_TEST_SUITE( geom );
 
 BOOST_AUTO_TEST_CASE(init_vec4)
diff --git a/modules/io/tests/test_clustal.cc b/modules/io/tests/test_clustal.cc
index 0f8b4d63b..b9ebf221b 100644
--- a/modules/io/tests/test_clustal.cc
+++ b/modules/io/tests/test_clustal.cc
@@ -21,12 +21,13 @@
   Author: Marco Biasini
  */
 
-#include <ost/io/seq/clustal_io_handler.hh>
-#include <ost/io/seq/load.hh>
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
 #include <boost/test/auto_unit_test.hpp>
 
+#include <ost/io/seq/clustal_io_handler.hh>
+#include <ost/io/seq/load.hh>
+
 using namespace ost;
 using namespace ost::io;
 const static String MOUSE="MFQAFPGDYDSGSRCSSSPSAESQYLSSVDSFGSPPTAAASQECAGLGEMPGSFVPTVTAITTSQDLQWLVQPTLISSMAQSQGQPLASQPPAVDPYDMPGTSYSTPGLSAYSTGGASGS";
diff --git a/modules/io/tests/test_io_crd.cc b/modules/io/tests/test_io_crd.cc
index 5fa943c87..b317e936b 100644
--- a/modules/io/tests/test_io_crd.cc
+++ b/modules/io/tests/test_io_crd.cc
@@ -16,13 +16,14 @@
 // along with this library; if not, write to the Free Software Foundation, Inc.,
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
+#include <boost/test/auto_unit_test.hpp>
+
 #include <ost/test_utils/compare_files.hh>
 #include <ost/mol/mol.hh>
 #include <ost/io/mol/entity_io_crd_handler.hh>
 #include <ost/io/save_entity.hh>
-#define BOOST_TEST_DYN_LINK
-#include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 
 using namespace ost;
 using namespace ost::io;
diff --git a/modules/io/tests/test_io_dcd.cc b/modules/io/tests/test_io_dcd.cc
index b326d381b..016555e69 100644
--- a/modules/io/tests/test_io_dcd.cc
+++ b/modules/io/tests/test_io_dcd.cc
@@ -17,6 +17,10 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
 
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
+#include <boost/test/auto_unit_test.hpp>
+
 #include <ost/io/mol/dcd_io.hh>
 #include <ost/mol/entity_handle.hh>
 #include <ost/mol/residue_handle.hh>
@@ -24,9 +28,6 @@
 #include <ost/mol/atom_handle.hh>
 #include <ost/mol/xcs_editor.hh>
 #include <ost/mol/coord_group.hh>
-#define BOOST_TEST_DYN_LINK
-#include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 
 using namespace ost;
 using namespace ost::io;
diff --git a/modules/io/tests/test_io_img.cc b/modules/io/tests/test_io_img.cc
index 890a7a9c2..78093264b 100644
--- a/modules/io/tests/test_io_img.cc
+++ b/modules/io/tests/test_io_img.cc
@@ -16,12 +16,14 @@
 // along with this library; if not, write to the Free Software Foundation, Inc.,
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
+#include <boost/test/auto_unit_test.hpp>
+
 #include <map>
 #include <ost/io/load_map.hh>
 #include <ost/img/image_factory.hh>
 #include <ost/img/alg/randomize.hh>
-#define BOOST_TEST_DYN_LINK
-#include <boost/test/unit_test.hpp>
 #include  <ost/io/img/map_io_df3_handler.hh>
 #include  <ost/io/img/map_io_dat_handler.hh>
 #include  <ost/io/img/map_io_dx_handler.hh>
diff --git a/modules/io/tests/test_io_pdb.cc b/modules/io/tests/test_io_pdb.cc
index 9b5b6691f..9268778ff 100644
--- a/modules/io/tests/test_io_pdb.cc
+++ b/modules/io/tests/test_io_pdb.cc
@@ -16,6 +16,12 @@
 // along with this library; if not, write to the Free Software Foundation, Inc.,
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
+#include <boost/test/auto_unit_test.hpp>
+#include <boost/test/floating_point_comparison.hpp>
+using boost::unit_test_framework::test_suite;
+
 #include <ost/test_utils/compare_files.hh>
 #include <ost/geom/vec_mat_predicates.hh>
 
@@ -31,11 +37,6 @@
 #include <ost/log.hh>
 
 #include <ost/io/io_exception.hh>
-#define BOOST_TEST_DYN_LINK
-#include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
-using boost::unit_test_framework::test_suite;
 
 using namespace ost;
 using namespace ost::io;
diff --git a/modules/io/tests/test_io_sdf.cc b/modules/io/tests/test_io_sdf.cc
index dcf7df6da..289bdfea3 100644
--- a/modules/io/tests/test_io_sdf.cc
+++ b/modules/io/tests/test_io_sdf.cc
@@ -16,11 +16,6 @@
 // along with this library; if not, write to the Free Software Foundation, Inc.,
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
-#include <ost/test_utils/compare_files.hh>
-#include <ost/mol/mol.hh>
-#include <ost/io/mol/entity_io_sdf_handler.hh>
-#include <ost/io/save_entity.hh>
-#include <ost/io/io_exception.hh>
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
@@ -29,6 +24,12 @@
 #include <boost/algorithm/string.hpp>
 using boost::unit_test_framework::test_suite;
 
+#include <ost/test_utils/compare_files.hh>
+#include <ost/mol/mol.hh>
+#include <ost/io/mol/entity_io_sdf_handler.hh>
+#include <ost/io/save_entity.hh>
+#include <ost/io/io_exception.hh>
+
 using namespace ost;
 using namespace ost::io;
 
diff --git a/modules/io/tests/test_iomanager.cc b/modules/io/tests/test_iomanager.cc
index fc4cc0366..b6e79f1fc 100644
--- a/modules/io/tests/test_iomanager.cc
+++ b/modules/io/tests/test_iomanager.cc
@@ -16,11 +16,11 @@
 // along with this library; if not, write to the Free Software Foundation, Inc.,
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
-#include <ost/io/io_manager.hh>
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
 #include <boost/test/auto_unit_test.hpp>
 using boost::unit_test_framework::test_suite;
+#include <ost/io/io_manager.hh>
 
 
 using namespace ost;
diff --git a/modules/io/tests/test_mmcif_info.cc b/modules/io/tests/test_mmcif_info.cc
index 3f3e21baf..74fca9b43 100644
--- a/modules/io/tests/test_mmcif_info.cc
+++ b/modules/io/tests/test_mmcif_info.cc
@@ -17,14 +17,14 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
 
-#include <ost/io/io_exception.hh>
-#include <ost/io/mol/mmcif_info.hh>
-
-#define BOOST_AUTO_TEST_DYN_LINK
+#define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
 #include <boost/test/auto_unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 
+#include <ost/io/io_exception.hh>
+#include <ost/io/mol/mmcif_info.hh>
+
 using namespace ost;
 using namespace ost::io;
 
diff --git a/modules/io/tests/test_mmcif_reader.cc b/modules/io/tests/test_mmcif_reader.cc
index 76125e41d..67ef53d87 100644
--- a/modules/io/tests/test_mmcif_reader.cc
+++ b/modules/io/tests/test_mmcif_reader.cc
@@ -17,6 +17,11 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
 
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
+#include <boost/test/auto_unit_test.hpp>
+#include <boost/test/floating_point_comparison.hpp>
+
 #include <fstream>
 #include <ost/platform.hh>
 #include <ost/io/io_exception.hh>
@@ -24,10 +29,6 @@
 #include <ost/conop/conop.hh>
 #include <ost/conop/rule_based_builder.hh>
 
-#define BOOST_AUTO_TEST_DYN_LINK
-#include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
 
 
 using namespace ost;
diff --git a/modules/io/tests/test_star_parser.cc b/modules/io/tests/test_star_parser.cc
index 5561dd892..4d6118078 100644
--- a/modules/io/tests/test_star_parser.cc
+++ b/modules/io/tests/test_star_parser.cc
@@ -19,16 +19,17 @@
 /*
   Author: Marco Biasini
  */
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
+#include <boost/test/auto_unit_test.hpp>
+#include <boost/test/floating_point_comparison.hpp>
+
 #include <fstream>
 #include <math.h>
 #include <ost/mol/mol.hh>
 #include <ost/io/io_exception.hh>
 #include <ost/io/mol/star_parser.hh>
 
-#define BOOST_AUTO_TEST_DYN_LINK
-#include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
 
 
 using namespace ost;
diff --git a/modules/mol/base/tests/test_atom_groups.cc b/modules/mol/base/tests/test_atom_groups.cc
index fd55845fe..7514f57ac 100644
--- a/modules/mol/base/tests/test_atom_groups.cc
+++ b/modules/mol/base/tests/test_atom_groups.cc
@@ -19,11 +19,11 @@
 /*
  *  Authors: Marco Biasini, Juergen Haas
  */
-#include <ost/mol/mol.hh>
-#include <ost/message.hh>
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
 #include <boost/test/auto_unit_test.hpp>
+#include <ost/mol/mol.hh>
+#include <ost/message.hh>
 #include "dummy_ent.hh"
 
 
diff --git a/modules/mol/base/tests/test_chain.cc b/modules/mol/base/tests/test_chain.cc
index 39ffd35e2..c857cce09 100644
--- a/modules/mol/base/tests/test_chain.cc
+++ b/modules/mol/base/tests/test_chain.cc
@@ -19,13 +19,14 @@
 /*
  *  Authors: Marco Biasini, Juergen Haas
  */
-#include <ost/mol/mol.hh>
-#include <ost/message.hh>
-#include <ost/integrity_error.hh>
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
 #include <boost/test/auto_unit_test.hpp>
 
+#include <ost/mol/mol.hh>
+#include <ost/message.hh>
+#include <ost/integrity_error.hh>
+
 using namespace ost;
 using namespace ost::mol;
 
diff --git a/modules/mol/base/tests/test_conn.cc b/modules/mol/base/tests/test_conn.cc
index e9c5bcfe1..be08f357a 100644
--- a/modules/mol/base/tests/test_conn.cc
+++ b/modules/mol/base/tests/test_conn.cc
@@ -19,10 +19,10 @@
 /*
  *  Authors: Marco Biasini, Juergen Haas
  */
-#include <ost/mol/mol.hh>
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
 #include <boost/test/auto_unit_test.hpp>
+#include <ost/mol/mol.hh>
 
 using namespace ost;
 using namespace ost::mol;
diff --git a/modules/mol/base/tests/test_delete.cc b/modules/mol/base/tests/test_delete.cc
index 20799d4dd..2d5f2339c 100644
--- a/modules/mol/base/tests/test_delete.cc
+++ b/modules/mol/base/tests/test_delete.cc
@@ -19,11 +19,11 @@
 /*
  *  Authors: Marco Biasini, Juergen Haas
  */
-#include <ost/mol/mol.hh>
-#include <ost/log.hh>
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
 #include <boost/test/auto_unit_test.hpp>
+#include <ost/mol/mol.hh>
+#include <ost/log.hh>
 #include <ost/message.hh>
 #include <ost/geom/geom.hh>
 
diff --git a/modules/mol/base/tests/test_entity.cc b/modules/mol/base/tests/test_entity.cc
index 767b68bb3..89b6349be 100644
--- a/modules/mol/base/tests/test_entity.cc
+++ b/modules/mol/base/tests/test_entity.cc
@@ -20,14 +20,14 @@
  *  Authors: Marco Biasini, Juergen Haas
  */
  
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
+#include <boost/test/auto_unit_test.hpp>
 #include <ost/geom/vec_mat_predicates.hh>
 #include <ost/mol/chem_class.hh>
 #include <ost/mol/mol.hh>
 #include <ost/mol/property_id.hh>
 #include <cmath>
-#define BOOST_TEST_DYN_LINK
-#include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 
 #define CHECK_TRANSFORMED_ATOM_POSITION(ATOM,TARGET) \
    BOOST_CHECK(vec3_is_close(ATOM.GetPos(), TARGET,Real(0.1)))
diff --git a/modules/mol/base/tests/test_ics.cc b/modules/mol/base/tests/test_ics.cc
index c2285ee1b..231df43cd 100644
--- a/modules/mol/base/tests/test_ics.cc
+++ b/modules/mol/base/tests/test_ics.cc
@@ -19,12 +19,12 @@
 /*
  *  Authors: Marco Biasini, Juergen Haas
  */
-#include <ost/mol/mol.hh>
-#include <ost/log.hh>
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 #include <boost/test/auto_unit_test.hpp>
+#include <ost/mol/mol.hh>
+#include <ost/log.hh>
 #include <ost/message.hh>
 #include <ost/geom/geom.hh>
 
diff --git a/modules/mol/base/tests/test_iterators.cc b/modules/mol/base/tests/test_iterators.cc
index 829b15c96..47b24bb11 100644
--- a/modules/mol/base/tests/test_iterators.cc
+++ b/modules/mol/base/tests/test_iterators.cc
@@ -19,11 +19,11 @@
 /*
  *  Authors: Marco Biasini, Juergen Haas
  */
-#include <ost/mol/mol.hh>
-#include <ost/message.hh>
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
 #include <boost/test/auto_unit_test.hpp>
+#include <ost/mol/mol.hh>
+#include <ost/message.hh>
 #include <iostream>
 
 using namespace ost;
diff --git a/modules/mol/base/tests/test_residue.cc b/modules/mol/base/tests/test_residue.cc
index 7dca39081..89e8da339 100644
--- a/modules/mol/base/tests/test_residue.cc
+++ b/modules/mol/base/tests/test_residue.cc
@@ -19,12 +19,12 @@
 /*
  *  Authors: Marco Biasini, Juergen Haas
  */
-#include <ost/mol/mol.hh>
-
-#include <ost/message.hh>
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
 #include <boost/test/auto_unit_test.hpp>
+#include <ost/mol/mol.hh>
+
+#include <ost/message.hh>
 
 
 using namespace ost;
diff --git a/modules/mol/base/tests/test_surface.cc b/modules/mol/base/tests/test_surface.cc
index 18ab12a88..d48b79843 100644
--- a/modules/mol/base/tests/test_surface.cc
+++ b/modules/mol/base/tests/test_surface.cc
@@ -17,12 +17,13 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
  
-#include <ost/mol/surface_handle.hh>
-#include <cmath>
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
 #include <boost/test/auto_unit_test.hpp>
 
+#include <ost/mol/surface_handle.hh>
+#include <cmath>
+
 using namespace ost;
 using namespace ost::mol;
 
-- 
GitLab