diff --git a/index.php b/index.php
index c00d4fa4d..c406dd8c0 100644
--- a/index.php
+++ b/index.php
@@ -1,7 +1,6 @@
 <?php
 
-	define('APP_INDEX_ROOT_FILE', str_replace('\\', '/', __FILE__));
-	define('APP_INDEX_ROOT_PATH', rtrim(dirname(APP_INDEX_ROOT_FILE), '/').'/');
+	define('APP_INDEX_ROOT_PATH', str_replace('\\', '/', rtrim(dirname(__FILE__), '\\/').'/'));
 
 	$sCustomDataPath = '';
 	if (file_exists(APP_INDEX_ROOT_PATH.'include.php'))
diff --git a/rainloop/v/0.0.0/app/handle.php b/rainloop/v/0.0.0/app/handle.php
index b6ca9191e..83651b463 100644
--- a/rainloop/v/0.0.0/app/handle.php
+++ b/rainloop/v/0.0.0/app/handle.php
@@ -38,7 +38,7 @@ if (!\defined('RAINLOOP_APP_ROOT_PATH'))
 
 		if (!$oException)
 		{
-			if (defined('APP_CALLER_AS_API') && APP_CALLER_AS_API)
+			if (defined('RAINLOOP_INCLUDE_AS_API') && RAINLOOP_INCLUDE_AS_API)
 			{
 				\RainLoop\Api::Handle();
 			}
diff --git a/rainloop/v/0.0.0/index.php b/rainloop/v/0.0.0/index.php
index c3742274b..bc915a1e6 100644
--- a/rainloop/v/0.0.0/index.php
+++ b/rainloop/v/0.0.0/index.php
@@ -6,9 +6,6 @@
 		define('APP_INDEX_FILE', 'index.php');
 		define('APP_VERSION_ROOT_PATH', APP_INDEX_ROOT_PATH.'rainloop/v/'.APP_VERSION.'/');
 
-		define('APP_CALLER_ROOT_FILE', !empty($_SERVER['SCRIPT_FILENAME']) ? str_replace('\\', '/', $_SERVER['SCRIPT_FILENAME']) : '');
-		define('APP_CALLER_AS_API', APP_CALLER_ROOT_FILE !== APP_INDEX_ROOT_FILE);
-
 		if (function_exists('date_default_timezone_set'))
 		{
 			date_default_timezone_set('UTC');