1 files changed, 2 insertions, 2 deletions
diff --git a/src/makefile/mod.rs b/src/makefile/mod.rs
index d9c9b46..94a104a 100644
--- a/src/makefile/mod.rs
+++ b/src/makefile/mod.rs
@@ -22,9 +22,9 @@ mod target;
 mod token;
 
 use command_line::CommandLine;
-use conditional::{ConditionalLine, ConditionalState};
+use conditional::{Line as ConditionalLine, State as ConditionalState};
 use inference_rules::InferenceRule;
-use r#macro::{MacroSet, MacroSource};
+use r#macro::{Set as MacroSet, Source as MacroSource};
 use target::Target;
 use token::{tokenize, Token, TokenString};