diff --git a/tools/toolchains/arm.py b/tools/toolchains/arm.py
index 8f89d986ae..462369f591 100644
--- a/tools/toolchains/arm.py
+++ b/tools/toolchains/arm.py
@@ -119,21 +119,17 @@ class ARM(mbedToolchain):
     def get_compile_options(self, defines, includes):
         cmd = []
         
-        str = (' '.join(defines))+"|"+(' '.join(includes))
-        if len(str) > 160:
-            sum = md5(str).hexdigest()
-            options_file = join(self.temp_dir, "options_%s.txt" % sum)
-            if not exists(options_file):
-                with open(options_file, "wb") as f:
-                    cmd_list = ['-D%s' % d for d in defines]
-                    for c in includes:
-                        if c:
-                            cmd_list.append(('-I%s' % c) if not c.startswith('-') else c)                    
-                    string = " ".join(cmd_list).replace("\\", "/")
-                    f.write(string)
-            cmd.extend(['--via', options_file])
-        else:
-            cmd.extend(['-D%s' % d for d in defines] + ['-I%s' % i for i in includes])
+        sum = md5(' '.join(includes)).hexdigest()
+        options_file = join(self.temp_dir, "options_%s.txt" % sum)
+        if not exists(options_file):
+            with open(options_file, "wb") as f:
+                cmd_list = ['-D%s' % d for d in defines]
+                for c in includes:
+                    if c:
+                        cmd_list.append(('-I%s' % c) if not c.startswith('-') else c)                    
+                string = " ".join(cmd_list).replace("\\", "/")
+                f.write(string)
+        cmd.extend(['--via', options_file])
         
         return cmd
 
diff --git a/tools/toolchains/gcc.py b/tools/toolchains/gcc.py
index 8120f669d5..8fae2fb667 100644
--- a/tools/toolchains/gcc.py
+++ b/tools/toolchains/gcc.py
@@ -165,21 +165,17 @@ class GCC(mbedToolchain):
     def get_compile_options(self, defines, includes):
         cmd = []
         
-        str = (' '.join(defines))+"|"+(' '.join(includes))
-        if len(str) > 160:
-            sum = md5(str).hexdigest()
-            options_file = join(self.temp_dir, "options_%s.txt" % sum)
-            if not exists(options_file):
-                with open(options_file, "wb") as f:
-                    cmd_list = ['-D%s' % d for d in defines]
-                    for c in includes:
-                        if c:
-                            cmd_list.append(('-I%s' % c) if not c.startswith('-') else c)                    
-                    string = " ".join(cmd_list).replace("\\", "/")
-                    f.write(string)
-            cmd.extend(['@%s' % options_file])
-        else:
-            cmd.extend(['-D%s' % d for d in defines] + ['-I%s' % i for i in includes])
+        sum = md5(' '.join(includes)).hexdigest()
+        options_file = join(self.temp_dir, "options_%s.txt" % sum)
+        if not exists(options_file):
+            with open(options_file, "wb") as f:
+                cmd_list = ['-D%s' % d for d in defines]
+                for c in includes:
+                    if c:
+                        cmd_list.append(('-I%s' % c) if not c.startswith('-') else c)                    
+                string = " ".join(cmd_list).replace("\\", "/")
+                f.write(string)
+        cmd.extend(['@%s' % options_file])
         
         return cmd
 
diff --git a/tools/toolchains/iar.py b/tools/toolchains/iar.py
index 258830eaa0..c449d560a6 100644
--- a/tools/toolchains/iar.py
+++ b/tools/toolchains/iar.py
@@ -107,21 +107,17 @@ class IAR(mbedToolchain):
     def get_compile_options(self, defines, includes):
         cmd = []
         
-        str = (' '.join(defines))+"|"+(' '.join(includes))
-        if len(str) > 160:
-            sum = md5(str).hexdigest()
-            options_file = join(self.temp_dir, "options_%s.txt" % sum)
-            if not exists(options_file):
-                with open(options_file, "wb") as f:
-                    cmd_list = ['-D%s' % d for d in defines]
-                    for c in includes:
-                        if c:
-                            cmd_list.append(('-I%s' % c) if not c.startswith('-') else c)                    
-                    string = " ".join(cmd_list).replace("\\", "/")
-                    f.write(string)
-            cmd.extend(['-f', options_file])
-        else:
-            cmd.extend(['-D%s' % d for d in defines] + ['-I%s' % i for i in includes])
+        sum = md5(' '.join(includes)).hexdigest()
+        options_file = join(self.temp_dir, "options_%s.txt" % sum)
+        if not exists(options_file):
+            with open(options_file, "wb") as f:
+                cmd_list = ['-D%s' % d for d in defines]
+                for c in includes:
+                    if c:
+                        cmd_list.append(('-I%s' % c) if not c.startswith('-') else c)                    
+                string = " ".join(cmd_list).replace("\\", "/")
+                f.write(string)
+        cmd.extend(['-f', options_file])
         
         return cmd