diff -uNr a/smg_comms/manifest b/smg_comms/manifest
--- a/smg_comms/manifest 32a691949af3fb21eaf17c73269d01a30cb9f940ee5662772eb2c5e67a8352aedc07b8a7cba6a6d7f7be1e42559e003b82bbeb97fb059ffb579bcc33a9ab2693
+++ b/smg_comms/manifest d2b7f28699fad80481c0aee017e1c4586e4cf7ef24b5438702cea800952c55101c7fa1a52cc10bac7367ebbb0a9a5c286872ea634d4e5c25848eaf15dc70c63b
@@ -6,3 +6,4 @@
 548433 smg_comms_packing_rsa diana_coman Packing/Unpacking RSA messages <-> RSA packets of Eulora's communication protocol.
 548894 smg_comms_80cols diana_coman Changes tests for RSA to read the key from a file in order to avoid lines > 80 columns in the code itself.
 549511 smg_comms_skeys_smsgs diana_coman Defines data structures and message types as well as methods for reading/writing Serpent keysets to/from Serpent messages.
+549765 smg_comms_fix_mpi_inline bvt Fixes MPI inline function declaration to avoid multiple symbol definitions.
diff -uNr a/smg_comms/mpi/include/mpi-inline.h b/smg_comms/mpi/include/mpi-inline.h
--- a/smg_comms/mpi/include/mpi-inline.h 2ea77d3e9c3d040649368883bdcaeca474685ef6968e358cdd744647292902e584e34949caba771cb43145f3ac1fce64932cf2e7d48ad514b84ee81fe5492c58
+++ b/smg_comms/mpi/include/mpi-inline.h 8f590124ba95f30d9034f2a1f4fbacd178e3b1cc02c519ddf89c92584363a7873e50a2373520928f6ede58272c6e4a19096beab866332f462541d47f3f60149c
@@ -24,7 +24,7 @@
 #define G10_MPI_INLINE_H
 
 #ifndef G10_MPI_INLINE_DECL
-#define G10_MPI_INLINE_DECL  extern __inline__
+#define G10_MPI_INLINE_DECL  inline
 #endif
 
 G10_MPI_INLINE_DECL  mpi_limb_t
diff -uNr a/smg_comms/mpi/include/mpi-internal.h b/smg_comms/mpi/include/mpi-internal.h
--- a/smg_comms/mpi/include/mpi-internal.h 0ec90eeed7bb58e2d737fddaf5cd8101cfb114c9d0824457384e5c199b4e1a75f1762bcd465cd4b675fe19da36197ee9bff0d3e24ed6b9e4c26a1a05ffc7386e
+++ b/smg_comms/mpi/include/mpi-internal.h f121afe17c859244a11f27c6479508ad5fc957d2aebbb2f0ce42e939cf0098a526acf5c6c4821171ac94e14f0e1100d070d944231ed7c370dd1ce86d7ad09e4a
@@ -195,19 +195,19 @@
 
 
 /*-- mpihelp-add.c --*/
-mpi_limb_t mpihelp_add_1(mpi_ptr_t res_ptr,  mpi_ptr_t s1_ptr,
+inline mpi_limb_t mpihelp_add_1(mpi_ptr_t res_ptr,  mpi_ptr_t s1_ptr,
 			 mpi_size_t s1_size, mpi_limb_t s2_limb );
 mpi_limb_t mpihelp_add_n( mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
 			  mpi_ptr_t s2_ptr,  mpi_size_t size);
-mpi_limb_t mpihelp_add(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size,
+inline mpi_limb_t mpihelp_add(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size,
 		       mpi_ptr_t s2_ptr, mpi_size_t s2_size);
 
 /*-- mpihelp-sub.c --*/
-mpi_limb_t mpihelp_sub_1( mpi_ptr_t res_ptr,  mpi_ptr_t s1_ptr,
+inline mpi_limb_t mpihelp_sub_1( mpi_ptr_t res_ptr,  mpi_ptr_t s1_ptr,
 			  mpi_size_t s1_size, mpi_limb_t s2_limb );
 mpi_limb_t mpihelp_sub_n( mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
 			  mpi_ptr_t s2_ptr, mpi_size_t size);
-mpi_limb_t mpihelp_sub(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size,
+inline mpi_limb_t mpihelp_sub(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size,
 		       mpi_ptr_t s2_ptr, mpi_size_t s2_size);
 
 /*-- mpihelp-cmp.c --*/