diff --git a/src/bindings/mono/efl_mono/efl_libs.cs.in b/src/bindings/mono/efl_mono/efl_libs.cs.in
index 87aee83a1e..9626c06244 100644
--- a/src/bindings/mono/efl_mono/efl_libs.cs.in
+++ b/src/bindings/mono/efl_mono/efl_libs.cs.in
@@ -5,7 +5,7 @@ namespace efl {
 /// <summary>
 /// Define the name of the libraries to be passed to DllImport statements.
 /// </summary>
-public class Libs {
+public static class Libs {
     public const string Efl = "@EFL_DL_MONO@";
     public const string Ecore = "@ECORE_DL_MONO@";
     public const string Eina = "@EINA_DL_MONO@";
diff --git a/src/bindings/mono/eina_mono/eina_config.cs b/src/bindings/mono/eina_mono/eina_config.cs
index 833b7d5da8..e9efea369f 100644
--- a/src/bindings/mono/eina_mono/eina_config.cs
+++ b/src/bindings/mono/eina_mono/eina_config.cs
@@ -11,7 +11,7 @@ namespace Eina
 /// Manage the initialization and cleanup for eina.
 /// <para>Since EFL 1.23.</para>
 /// </summary>
-public class Config
+public static class Config
 {
     [DllImport(efl.Libs.Eina)] private static extern int eina_init();
     [DllImport(efl.Libs.Eina)] private static extern int eina_shutdown();
diff --git a/src/bindings/mono/eina_mono/eina_log.cs b/src/bindings/mono/eina_mono/eina_log.cs
index ca9ee12939..4d67bbbe04 100644
--- a/src/bindings/mono/eina_mono/eina_log.cs
+++ b/src/bindings/mono/eina_mono/eina_log.cs
@@ -12,7 +12,7 @@ namespace Eina
 /// <summary>EFL Logging facilities.
 /// <para>Since EFL 1.23.</para>
 /// </summary>
-public class Log
+public static class Log
 {
     [DllImport(efl.Libs.Eina)] private static extern void eina_log_print(
             int domain,
@@ -64,7 +64,7 @@ public class Log
     /// <summary>The colors to be used by the logging system.
     /// <para>Since EFL 1.23.</para>
     /// </summary>
-    public class Color
+    public static class Color
     {
         /// <summary>Light red
         /// <para>Since EFL 1.23.</para>
diff --git a/src/bindings/mono/eldbus_mono/eldbus_common.cs b/src/bindings/mono/eldbus_mono/eldbus_common.cs
index 99a7aef6e5..34f6482c9e 100644
--- a/src/bindings/mono/eldbus_mono/eldbus_common.cs
+++ b/src/bindings/mono/eldbus_mono/eldbus_common.cs
@@ -163,7 +163,7 @@ public static class Argument
     /// The type of a byte.
     /// <para>Since EFL 1.23.</para>
     /// </summary>
-    public class ByteType
+    public static class ByteType
     {
         /// <summary>
         /// The code of the byte.
@@ -181,7 +181,7 @@ public static class Argument
     /// The type of a boolean
     /// <para>Since EFL 1.23.</para>
     /// </summary>
-    public class BooleanType
+    public static class BooleanType
     {
         /// <summary>
         /// The code of the boolean.
@@ -199,7 +199,7 @@ public static class Argument
     /// The type of a Int16.
     /// <para>Since EFL 1.23.</para>
     /// </summary>
-    public class Int16Type
+    public static class Int16Type
     {
         /// <summary>
         /// The code of the Int16.
@@ -217,7 +217,7 @@ public static class Argument
     /// The type of an unsigned Int16.
     /// <para>Since EFL 1.23.</para>
     /// </summary>
-    public class UInt16Type
+    public static class UInt16Type
     {
         /// <summary>
         /// The code of the unsigned Int16.
@@ -235,7 +235,7 @@ public static class Argument
     /// The type of a Int32.
     /// <para>Since EFL 1.23.</para>
     /// </summary>
-    public class Int32Type
+    public static class Int32Type
     {
         /// <summary>
         /// The code of the Int32.
@@ -253,7 +253,7 @@ public static class Argument
     /// The type of an unsigned Int32.
     /// <para>Since EFL 1.23.</para>
     /// </summary>
-    public class UInt32Type
+    public static class UInt32Type
     {
         /// <summary>
         /// The code of the unsigned Int32.
@@ -271,7 +271,7 @@ public static class Argument
     /// The type of a Int64.
     /// <para>Since EFL 1.23.</para>
     /// </summary>
-    public class Int64Type
+    public static class Int64Type
     {
         /// <summary>
         /// The code of the Int64.
@@ -289,7 +289,7 @@ public static class Argument
     /// The type of an unsigned Int64.
     /// <para>Since EFL 1.23.</para>
     /// </summary>
-    public class UInt64Type
+    public static class UInt64Type
     {
         /// <summary>
         /// The code of the unsigned Int64.
@@ -307,7 +307,7 @@ public static class Argument
     /// The type of the double.
     /// <para>Since EFL 1.23.</para>
     /// </summary>
-    public class DoubleType
+    public static class DoubleType
     {
         /// <summary>
         /// The code of the double.
@@ -325,7 +325,7 @@ public static class Argument
     /// The type of a string.
     /// <para>Since EFL 1.23.</para>
     /// </summary>
-    public class StringType
+    public static class StringType
     {
         /// <summary>
         /// The code of the string.
@@ -343,7 +343,7 @@ public static class Argument
     /// The type of an object path.
     /// <para>Since EFL 1.23.</para>
     /// </summary>
-    public class ObjectPathType
+    public static class ObjectPathType
     {
         /// <summary>
         /// The code of the object path.
@@ -361,7 +361,7 @@ public static class Argument
     /// The type of a signature.
     /// <para>Since EFL 1.23.</para>
     /// </summary>
-    public class SignatureType
+    public static class SignatureType
     {
         /// <summary>
         /// The code of the signature.
@@ -379,7 +379,7 @@ public static class Argument
     /// The type of a array.
     /// <para>Since EFL 1.23.</para>
     /// </summary>
-    public class ArrayType
+    public static class ArrayType
     {
         /// <summary>
         /// The code of the array.
@@ -397,7 +397,7 @@ public static class Argument
     /// The type of a struct.
     /// <para>Since EFL 1.23.</para>
     /// </summary>
-    public class StructType
+    public static class StructType
     {
         /// <summary>
         /// The code of the struct.
@@ -415,7 +415,7 @@ public static class Argument
     /// The type of a variant.
     /// <para>Since EFL 1.23.</para>
     /// </summary>
-    public class VariantType
+    public static class VariantType
     {
         /// <summary>
         /// The code of the variant.
@@ -433,7 +433,7 @@ public static class Argument
     /// The type of a dictionary.
     /// <para>Since EFL 1.23.</para>
     /// </summary>
-    public class DictEntryType
+    public static class DictEntryType
     {
         /// <summary>
         /// The code of the dictionary.
@@ -451,7 +451,7 @@ public static class Argument
     /// The type of an unix file descriptor.
     /// <para>Since EFL 1.23.</para>
     /// </summary>
-    public class UnixFdType
+    public static class UnixFdType
     {
         /// <summary>
         /// The code of unix fd.
diff --git a/src/bindings/mono/eo_mono/FunctionWrapper.cs b/src/bindings/mono/eo_mono/FunctionWrapper.cs
index 11560bd8b8..1ea2097729 100644
--- a/src/bindings/mono/eo_mono/FunctionWrapper.cs
+++ b/src/bindings/mono/eo_mono/FunctionWrapper.cs
@@ -12,7 +12,7 @@ namespace Eo
 ///This class has a platform-dependent implementation on whether it
 ///is compiled for Windows (using LoadLibrary/GetProcAddress) or Unix
 ///(dlopen/dlsym).</summary>
-public partial class FunctionInterop
+public static partial class FunctionInterop
 {
     ///<summary>Loads a function pointer from the given module.</summary>
     ///<param name="moduleName">The name of the module containing the function.</param>
diff --git a/src/bindings/mono/eo_mono/FunctionWrapper_Unix.cs b/src/bindings/mono/eo_mono/FunctionWrapper_Unix.cs
index 65ae60b6bf..0069fc6698 100644
--- a/src/bindings/mono/eo_mono/FunctionWrapper_Unix.cs
+++ b/src/bindings/mono/eo_mono/FunctionWrapper_Unix.cs
@@ -7,7 +7,7 @@ namespace Efl
 namespace Eo
 {
 
-public partial class FunctionInterop
+public static partial class FunctionInterop
 {
     [DllImport(efl.Libs.Libdl)]
     private static extern IntPtr dlsym(IntPtr handle, string symbol);
diff --git a/src/bindings/mono/eo_mono/FunctionWrapper_Windows.cs b/src/bindings/mono/eo_mono/FunctionWrapper_Windows.cs
index dcf2091b71..7eda66aade 100644
--- a/src/bindings/mono/eo_mono/FunctionWrapper_Windows.cs
+++ b/src/bindings/mono/eo_mono/FunctionWrapper_Windows.cs
@@ -7,7 +7,7 @@ namespace Efl
 namespace Eo
 {
 
-public partial class FunctionInterop
+public static partial class FunctionInterop
 {
     [DllImport(efl.Libs.Libdl)]
     public static extern IntPtr GetProcAddress(IntPtr handle, string symbol);
diff --git a/src/bindings/mono/eo_mono/iwrapper.cs b/src/bindings/mono/eo_mono/iwrapper.cs
index d1aa7be3f5..676bcef4b1 100644
--- a/src/bindings/mono/eo_mono/iwrapper.cs
+++ b/src/bindings/mono/eo_mono/iwrapper.cs
@@ -17,7 +17,7 @@ namespace Efl
 namespace Eo
 {
 
-public class Globals
+public static class Globals
 {
     /// <summary>Represents the type of the native Efl_Class.</summary>
     public enum EflClassType