diff --git a/haxe/ui/focus/BoxFocusApplicator.hx b/haxe/ui/focus/BoxFocusApplicator.hx
index 38499dbae..44d1d09b9 100644
--- a/haxe/ui/focus/BoxFocusApplicator.hx
+++ b/haxe/ui/focus/BoxFocusApplicator.hx
@@ -9,6 +9,8 @@ import haxe.ui.focus.FocusManager;
 import haxe.ui.focus.IFocusable;
 import haxe.ui.styles.elements.AnimationKeyFrame;
 import haxe.ui.styles.elements.Directive;
+import haxe.ui.styles.Value;
+import haxe.ui.styles.Dimension;
 
 class BoxFocusApplicator extends FocusApplicator {
     private var _box:Box = null;
diff --git a/haxe/ui/macros/LayoutMacros.hx b/haxe/ui/macros/LayoutMacros.macro.hx
similarity index 99%
rename from haxe/ui/macros/LayoutMacros.hx
rename to haxe/ui/macros/LayoutMacros.macro.hx
index 190c6d772..097359153 100644
--- a/haxe/ui/macros/LayoutMacros.hx
+++ b/haxe/ui/macros/LayoutMacros.macro.hx
@@ -1,13 +1,13 @@
 package haxe.ui.macros;
 
-#if macro
+
 import haxe.macro.Context;
 import haxe.macro.Expr;
 import haxe.macro.TypeTools;
 import haxe.ui.macros.helpers.ClassBuilder;
 import haxe.ui.macros.helpers.CodePos;
 import haxe.ui.util.StringUtil;
-#end
+
 
 class LayoutMacros {
     macro static function build():Array<Field> {
diff --git a/haxe/ui/macros/SchemaMacros.hx b/haxe/ui/macros/SchemaMacros.macro.hx
similarity index 100%
rename from haxe/ui/macros/SchemaMacros.hx
rename to haxe/ui/macros/SchemaMacros.macro.hx
diff --git a/haxe/ui/macros/helpers/ClassBuilder.hx b/haxe/ui/macros/helpers/ClassBuilder.macro.hx
similarity index 100%
rename from haxe/ui/macros/helpers/ClassBuilder.hx
rename to haxe/ui/macros/helpers/ClassBuilder.macro.hx
diff --git a/haxe/ui/macros/helpers/FieldBuilder.hx b/haxe/ui/macros/helpers/FieldBuilder.macro.hx
similarity index 100%
rename from haxe/ui/macros/helpers/FieldBuilder.hx
rename to haxe/ui/macros/helpers/FieldBuilder.macro.hx
diff --git a/haxe/ui/macros/helpers/FunctionBuilder.hx b/haxe/ui/macros/helpers/FunctionBuilder.macro.hx
similarity index 100%
rename from haxe/ui/macros/helpers/FunctionBuilder.hx
rename to haxe/ui/macros/helpers/FunctionBuilder.macro.hx
diff --git a/haxe/ui/macros/helpers/VarBuilder.hx b/haxe/ui/macros/helpers/VarBuilder.macro.hx
similarity index 100%
rename from haxe/ui/macros/helpers/VarBuilder.hx
rename to haxe/ui/macros/helpers/VarBuilder.macro.hx