2 files changed, 6 insertions(+), 4 deletions(-)

M cc_macro.c
M include_expansion.c

@@ 827,7 827,8 @@ void macro_directive()
 				return;
 			}
 
-			eat_current_token();
+//			eat_current_token();
+			macro_token = macro_token->next;
 		}
 	}
 	else

@@ 90,9 90,10 @@ void expand_includes(struct token_list* token, int depth)
 	hold = stage1_preprocess(hold, depth);
 
 	/* Now wire that shit up */
-	reset = i->next;
-	i->next = hold;
-	hold->prev = i->next;
+	require(NULL != i->next->next, "#include missing line feed at end of statement\n");
+	reset = i->next->next;
+	i->next->next = hold;
+	hold->prev = i->next->next;
 	while(NULL != hold->next) hold = hold->next;
 	hold->next = reset;
 	reset->prev = hold;