diff --git a/extras/Introjucer/Source/Application/jucer_CommonHeaders.h b/extras/Introjucer/Source/Application/jucer_CommonHeaders.h
index 17e3735453..f2760cbbfd 100644
--- a/extras/Introjucer/Source/Application/jucer_CommonHeaders.h
+++ b/extras/Introjucer/Source/Application/jucer_CommonHeaders.h
@@ -41,9 +41,9 @@ const char* const projectItemDragType   = "Project Items";
 const char* const drawableItemDragType  = "Drawable Items";
 const char* const componentItemDragType = "Components";
 
-const char* const sourceFileExtensions          = "cpp;mm;m;c;cc;cxx";
+const char* const sourceFileExtensions          = "cpp;mm;m;c;cc;cxx;s";
 const char* const headerFileExtensions          = "h;hpp;hxx;hh;inl";
-const char* const sourceOrHeaderFileExtensions  = "cpp;mm;m;c;cc;cxx;h;hpp;hxx;hh;inl";
+const char* const sourceOrHeaderFileExtensions  = "cpp;mm;m;c;cc;cxx;h;hpp;hxx;hh;s;inl";
 
 enum ColourIds
 {
diff --git a/extras/Introjucer/Source/Project Saving/jucer_ProjectExporter.cpp b/extras/Introjucer/Source/Project Saving/jucer_ProjectExporter.cpp
index 24ce650c95..05654658c2 100644
--- a/extras/Introjucer/Source/Project Saving/jucer_ProjectExporter.cpp	
+++ b/extras/Introjucer/Source/Project Saving/jucer_ProjectExporter.cpp	
@@ -140,14 +140,14 @@ bool ProjectExporter::canProjectBeLaunched (Project* project)
 }
 
 //==============================================================================
-ProjectExporter::ProjectExporter (Project& p, const ValueTree& settings_)
+ProjectExporter::ProjectExporter (Project& p, const ValueTree& state)
     : xcodeIsBundle (false),
       xcodeCreatePList (false),
       xcodeCanUseDwarf (true),
       makefileIsDLL (false),
       msvcIsDLL (false),
       msvcIsWindowsSubsystem (true),
-      settings (settings_),
+      settings (state),
       project (p),
       projectType (p.getProjectType()),
       projectName (p.getTitle()),
@@ -172,7 +172,7 @@ RelativePath ProjectExporter::rebaseFromProjectFolderToBuildTarget (const Relati
 
 bool ProjectExporter::shouldFileBeCompiledByDefault (const RelativePath& file) const
 {
-    return file.hasFileExtension ("cpp;cc;c;cxx");
+    return file.hasFileExtension ("cpp;cc;c;cxx;s");
 }
 
 void ProjectExporter::createPropertyEditors (PropertyListBuilder& props)