diff --git a/Examples/test-suite/cpp_broken.i b/Examples/test-suite/cpp_broken.i
index a7857c2c0..988b785db 100644
--- a/Examples/test-suite/cpp_broken.i
+++ b/Examples/test-suite/cpp_broken.i
@@ -24,3 +24,46 @@ FIELD(b, NEXT_CONST);
 #define max(a,b) ((a) > (b) ? (a) : (b))
 %}
 
+
+// bug #940318
+%inline %{
+typedef enum {
+eZero = 0
+#define ONE 1
+} EFoo;
+%}
+
+
+// bug #754443
+
+%inline %{
+#define MAG_STYLE_BORDER_OFFS 0
+#define MAG_STYLE_BORDER_BITS 3
+#define MAG_STYLE_BORDER_MASK (((1UL<<MAG_STYLE_BORDER_BITS)-1)<<MAG_STYLE_BORDER_OFFS)
+
+/* these CANNOT be combined */
+#define MAG_STYLE_BORDER_NONE       (1 << MAG_STYLE_BORDER_OFFS)
+#define MAG_STYLE_BORDER_STATIC     (2 << MAG_STYLE_BORDER_OFFS)
+#define MAG_STYLE_BORDER_SIMPLE     (3 << MAG_STYLE_BORDER_OFFS)
+#define MAG_STYLE_BORDER_RAISED     (4 << MAG_STYLE_BORDER_OFFS)
+#define MAG_STYLE_BORDER_DOUBLE     (5 << MAG_STYLE_BORDER_OFFS)
+#define MAG_STYLE_BORDER_DEFAULT    MAG_STYLE_BORDER_SIMPLE
+
+
+#define MAG_STYLE_CAPTION_OFFS ( MAG_STYLE_BORDER_OFFS + MAG_STYLE_BORDER_BITS )
+#define MAG_STYLE_CAPTION_BITS 8
+#define MAG_STYLE_CAPTION_MASK (((1UL<<MAG_STYLE_CAPTION_BITS)-1)<<MAG_STYLE_CAPTION_OFFS)
+
+/* these CAN be combined */
+#define MAG_STYLE_CAPTION_NONE      ( 1 << ( 0 + MAG_STYLE_CAPTION_OFFS ))
+#define MAG_STYLE_CAPTION_PRESENT   ( 1 << ( 1 + MAG_STYLE_CAPTION_OFFS ))
+#define MAG_STYLE_CAPTION_SYSMENU   ( 1 << ( 2 + MAG_STYLE_CAPTION_OFFS ))
+#define MAG_STYLE_CAPTION_MINIMIZE  ( 1 << ( 3 + MAG_STYLE_CAPTION_OFFS ))
+#define MAG_STYLE_CAPTION_MAXIMIZE  ( 1 << ( 4 + MAG_STYLE_CAPTION_OFFS ))
+#define MAG_STYLE_CAPTION_RESIZE    ( 1 << ( 5 + MAG_STYLE_CAPTION_OFFS ))
+#define MAG_STYLE_CAPTION_TINYHOR   ( 1 << ( 6 + MAG_STYLE_CAPTION_OFFS ))
+#define MAG_STYLE_CAPTION_TINYVER   ( 1 << ( 7 + MAG_STYLE_CAPTION_OFFS ))
+#define MAG_STYLE_CAPTION_DEFAULT   ( MAG_STYLE_CAPTION_RESIZE + MAG_STYLE_CAPTION_MAXIMIZE + MAG_STYLE_CAPTION_MINIMIZE + MAG_STYLE_CAPTION_SYSMENU + MAG_STYLE_CAPTION_PRESENT )
+
+
+%}
diff --git a/Examples/test-suite/nested_comment.i b/Examples/test-suite/nested_comment.i
index 2c0ff4196..16f1b7af2 100644
--- a/Examples/test-suite/nested_comment.i
+++ b/Examples/test-suite/nested_comment.i
@@ -2,6 +2,7 @@
 
 // this example shows a problem with 'dump_nested' (parser.y).
 
+// bug #949654
 %inline %{
 typedef struct s1 {
 union {
@@ -19,3 +20,22 @@ char *name;
 } s2; 
 
 %}
+
+// bug #491476
+%inline %{
+struct {
+struct {
+int a;
+} a, b;
+} a;
+
+%}
+
+// bug #909387
+%inline %{
+struct foo {
+  struct happy; // no warning
+  struct sad { int x; }; // warning
+  happy *good(); // produces good code
+  sad *bad(); // produces bad code
+};
diff --git a/Examples/test-suite/preproc.i b/Examples/test-suite/preproc.i
index 3ef400f9b..4d5040dcb 100644
--- a/Examples/test-suite/preproc.i
+++ b/Examples/test-suite/preproc.i
@@ -283,4 +283,11 @@ inline const char* mangle ## #@__VA_ARGS__ () {
 const int endif = 1;
 const int define = 1;
 const int defined = 1; 
+int test(int defined)
+{
+  return defined;
+}
+ 
 %}
+
+