diff --git a/test/tools/rebuild-debugger/Main.hx b/test/tools/rebuild-debugger/Main.hx
new file mode 100644
index 000000000..a71cf3b3e
--- /dev/null
+++ b/test/tools/rebuild-debugger/Main.hx
@@ -0,0 +1 @@
+function main() {}
diff --git a/test/tools/rebuild-debugger/build-0-no-debugger.hxml b/test/tools/rebuild-debugger/build-0-no-debugger.hxml
new file mode 100644
index 000000000..b484e67e7
--- /dev/null
+++ b/test/tools/rebuild-debugger/build-0-no-debugger.hxml
@@ -0,0 +1,2 @@
+-m Main
+--cpp bin
diff --git a/test/tools/rebuild-debugger/build-1-debugger.hxml b/test/tools/rebuild-debugger/build-1-debugger.hxml
new file mode 100644
index 000000000..364ae2e8b
--- /dev/null
+++ b/test/tools/rebuild-debugger/build-1-debugger.hxml
@@ -0,0 +1,3 @@
+-m Main
+--cpp bin
+-D HXCPP_DEBUGGER
diff --git a/tools/hxcpp/FileGroup.hx b/tools/hxcpp/FileGroup.hx
index 355e41588..5fbd333e4 100644
--- a/tools/hxcpp/FileGroup.hx
+++ b/tools/hxcpp/FileGroup.hx
@@ -204,18 +204,18 @@ class FileGroup
       var result = new Array<String>();
       for(def in contents.split("\n"))
       {
-         var name = def.split("=")[0];//.toLowerCase();
-         if (name.indexOf("hxcpp_link")>=0)
+         var name = def.split("=")[0];
+         if (name.indexOf("HXCPP_LINK")>=0)
          {
             // Only effects linking, not compiling
          }
-         else if (name=="hxcpp_verbose" || name=="hxcpp_silent" || name=="hxcpp_quiet" || name=="hxcpp_times" || name=="hxcpp_neko_buildtool" || name=="hxcpp_link_no_tool_depends" )
+         else if (name=="HXCPP_VERBOSE" || name=="HXCPP_SILENT" || name=="HXCPP_QUIET" || name=="HXCPP_TIMES" || name=="HXCPP_NEKO_BUILDTOOL")
          {
             // Does not affect build
          }
-         else if (name.indexOf("hxcpp")>=0 || name=="scriptable" || name.indexOf("dll")>=0 || name=="no_console" ||
-            name.substr(0,8)=="android-" || name.substr(0,4)=="ndkv" || name=="toolchain" || name=="platform" ||
-              name=="toolchain_version" || name=="android_ndk_root" )
+         else if (name.indexOf("hxcpp")>=0 || name.indexOf("HXCPP")>=0 || name=="scriptable" || name.indexOf("dll")>=0 || name=="no_console" ||
+            name.substr(0,8)=="android-" || name.substr(0,4)=="NDKV" || name=="toolchain" || name=="PLATFORM" ||
+              name=="TOOLCHAIN_VERSION" || name=="ANDROID_NDK_ROOT" )
             result.push(def);
       }