diff --git a/modules/io/src/io_manager.cc b/modules/io/src/io_manager.cc
index 3c7123c35493bef4859755c1859bdfe2cc158e33..b48b679537b4a23ce3862e873e0058cb287dce76 100644
--- a/modules/io/src/io_manager.cc
+++ b/modules/io/src/io_manager.cc
@@ -17,13 +17,13 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
 #include <ost/io/io_manager.hh>
-#include  <ost/io/mol/entity_io_pdb_handler.hh>
+#include <ost/io/mol/entity_io_pdb_handler.hh>
 #include <ost/io/mol/entity_io_crd_handler.hh>
 #include <ost/io/mol/entity_io_sdf_handler.hh>
 #include <ost/io/seq/fasta_io_handler.hh>
 #include <ost/io/seq/promod_io_handler.hh>
 #include <ost/io/mol/surface_io_msms_handler.hh>
-#include  <ost/io/seq/clustal_io_handler.hh>
+#include <ost/io/seq/clustal_io_handler.hh>
 #if OST_IMG_ENABLED
 #  include  <ost/io/img/map_io_dx_handler.hh>
 #  include  <ost/io/img/map_io_spi_handler.hh>
@@ -251,6 +251,8 @@ const MapIOFList& IOManager::GetAvailableMapHandler() const
   return map_io_list_;
 }
 
+#endif //OST_IMG_ENABLED
+
 void IOManager::RegisterFactory(const EntityIOHandlerFactoryBaseP& f) 
 {
   entity_iohf_list_.push_back(f);
diff --git a/modules/io/src/io_manager.hh b/modules/io/src/io_manager.hh
index f23c60ec746f0f1be6df4785a0236184a1f355dc..a320f01ce5eef4d042b69cf40c1e9d07dbd2558d 100644
--- a/modules/io/src/io_manager.hh
+++ b/modules/io/src/io_manager.hh
@@ -36,16 +36,16 @@
 #include <ost/io/io_exception.hh>
 namespace ost { namespace io {
 
-/// \brief Central registry for input/output handlers
-class DLLEXPORT_OST_IO IOManager {
-  typedef std::vector<EntityIOHandlerFactoryBaseP> EntityIOHFList;
-  typedef std::vector<SequenceIOHandlerFactoryBasePtr> AlignmentIOFList;  
-  typedef std::vector<SurfaceIOHandlerFactoryBasePtr> SurfaceIOFList;  
+typedef std::vector<EntityIOHandlerFactoryBaseP> EntityIOHFList;
+typedef std::vector<SequenceIOHandlerFactoryBasePtr> AlignmentIOFList;
+typedef std::vector<SurfaceIOHandlerFactoryBasePtr> SurfaceIOFList;
 
 #if OST_IMG_ENABLED
   typedef std::vector<MapIOHandlerFactoryBasePtr> MapIOFList;  
 #endif
 
+/// \brief Central registry for input/output handlers
+class DLLEXPORT_OST_IO IOManager {
 public:
   /// \brief get entity io handler that is able to import the given file.
   ///
@@ -125,7 +125,6 @@ public:
                                              const ImageFormatBase& format);
 
   const MapIOFList& GetAvailableMapHandler() const;
-
   //@}
 #endif