8 files changed, 10 insertions, 11 deletions

diff --git a/src/ragel/content_disposition.rl b/src/ragel/content_disposition.rl
index 5aca57db5..614d54c68 100644
--- a/src/ragel/content_disposition.rl
+++ b/src/ragel/content_disposition.rl
@@ -1,6 +1,5 @@
 %%{
   machine content_disposition;
-  include smtp_whitespace "smtp_whitespace.rl";
 
   # https://tools.ietf.org/html/rfc2045#section-5.1
 
diff --git a/src/ragel/content_disposition_parser.rl b/src/ragel/content_disposition_parser.rl
index 71b999ce4..c35d2b232 100644
--- a/src/ragel/content_disposition_parser.rl
+++ b/src/ragel/content_disposition_parser.rl
@@ -86,7 +86,7 @@
     }
   }
 
-
+  include smtp_whitespace "smtp_whitespace.rl";
   include content_disposition "content_disposition.rl";
 
   main := content_disposition;
diff --git a/src/ragel/smtp_addr_parser.rl b/src/ragel/smtp_addr_parser.rl
index 91b100af7..737b4ddcd 100644
--- a/src/ragel/smtp_addr_parser.rl
+++ b/src/ragel/smtp_addr_parser.rl
@@ -2,6 +2,8 @@
 
   machine smtp_addr_parser;
 
+
+
   action IP6_start {}
   action IP6_end {}
   action IP4_start {}
@@ -73,6 +75,8 @@
     }
   }
 
+  include smtp_ip "smtp_ip.rl";
+  include smtp_whitespace "smtp_whitespace.rl";
   include smtp_address "smtp_address.rl";
 
   main := SMTPAddr;
diff --git a/src/ragel/smtp_address.rl b/src/ragel/smtp_address.rl
index 736c28b0e..4ea64eddf 100644
--- a/src/ragel/smtp_address.rl
+++ b/src/ragel/smtp_address.rl
@@ -1,9 +1,6 @@
 %%{
   machine smtp_address;
 
-  include smtp_ip "smtp_ip.rl";
-  include smtp_whitespace "smtp_whitespace.rl";
-
   # SMTP address spec
   # Obtained from: https://tools.ietf.org/html/rfc5321#section-4.1.2
 
diff --git a/src/ragel/smtp_date.rl b/src/ragel/smtp_date.rl
index 69227ef1e..35ed7499c 100644
--- a/src/ragel/smtp_date.rl
+++ b/src/ragel/smtp_date.rl
@@ -1,8 +1,6 @@
 %%{
   machine smtp_date;
 
-  include smtp_whitespace "smtp_whitespace.rl";
-
   # SMTP date spec
   # Obtained from: http://tools.ietf.org/html/rfc5322#section_3.3
 
diff --git a/src/ragel/smtp_date_parser.rl b/src/ragel/smtp_date_parser.rl
index 84b63f1bd..bc6e5c8f0 100644
--- a/src/ragel/smtp_date_parser.rl
+++ b/src/ragel/smtp_date_parser.rl
@@ -1,6 +1,7 @@
 %%{
 
   machine smtp_date_parser;
+  include smtp_whitespace "smtp_whitespace.rl";
   include smtp_date "smtp_date.rl";
 
   main := date_time;
diff --git a/src/ragel/smtp_received.rl b/src/ragel/smtp_received.rl
index cd912db4d..12aaeb08c 100644
--- a/src/ragel/smtp_received.rl
+++ b/src/ragel/smtp_received.rl
@@ -1,10 +1,6 @@
 %%{
   machine smtp_received;
 
-  include smtp_whitespace "smtp_whitespace.rl";
-  include smtp_ip "smtp_ip.rl";
-  include smtp_date "smtp_date.rl";
-  include smtp_address"smtp_address.rl";
 
   # http://tools.ietf.org/html/rfc5321#section-4.4
 
diff --git a/src/ragel/smtp_received_parser.rl b/src/ragel/smtp_received_parser.rl
index c1cd9bc38..565a20b7f 100644
--- a/src/ragel/smtp_received_parser.rl
+++ b/src/ragel/smtp_received_parser.rl
@@ -225,6 +225,10 @@
     }
   }
 
+  include smtp_whitespace "smtp_whitespace.rl";
+  include smtp_ip "smtp_ip.rl";
+  include smtp_date "smtp_date.rl";
+  include smtp_address"smtp_address.rl";
   include smtp_received "smtp_received.rl";
 
   main := Received;