diff --git a/demo/kitchen-sink/docs/cpp.cpp b/demo/kitchen-sink/docs/cpp.cpp
index 1dd9e4f3..a2ebdaa2 100644
--- a/demo/kitchen-sink/docs/cpp.cpp
+++ b/demo/kitchen-sink/docs/cpp.cpp
@@ -16,6 +16,12 @@
 #include <boost/asio/io_service.hpp>
 #include "boost/asio/io_service.hpp"
 
+#include \
+   \
+   "iostream" \
+   "string" \
+   <vector>
+   
 using namespace std;
 
 int main ()
diff --git a/lib/ace/mode/c_cpp_highlight_rules.js b/lib/ace/mode/c_cpp_highlight_rules.js
index 427951c6..e75b25db 100644
--- a/lib/ace/mode/c_cpp_highlight_rules.js
+++ b/lib/ace/mode/c_cpp_highlight_rules.js
@@ -145,6 +145,10 @@ var c_cppHighlightRules = function() {
                 token : "constant.other.multiline",
                 regex : /\\/
             },
+            {
+                token : "constant.other.multiline",
+                regex : /.*\\/
+            },
             {
                 token : "constant.other",
                 regex : "\\s*<.+?>",
@@ -160,10 +164,6 @@ var c_cppHighlightRules = function() {
                 regex : "\\s*['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']",
                 next : "start"
             },
-            {
-                token : "constant.other.multiline",
-                regex : /.*\\/
-            },
             // "\" implies multiline, while "/" implies comment
             {
                 token : "constant.other",