diff --git a/inc/FeedParser.php b/inc/FeedParser.php
index f19dcad092e1794d4e6d4ebe40b7dbfd06ddb39c..f37888f01264a05fbd13b3f950389e9f8aad1b9e 100644
--- a/inc/FeedParser.php
+++ b/inc/FeedParser.php
@@ -5,7 +5,7 @@
  * @author Andreas Gohr <andi@splitbrain.org>
  */
 
-if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../').'/');
+if(!defined('DOKU_INC')) die('meh.');
 require_once(DOKU_INC.'inc/HTTPClient.php');
 require_once(DOKU_INC.'inc/SimplePie.php');
 
diff --git a/inc/HTTPClient.php b/inc/HTTPClient.php
index 6b3663eaa50bc58ec242145e0fd66b65990e8542..2385b1edd64bb020cfbcfd69cf68406df1f62318 100644
--- a/inc/HTTPClient.php
+++ b/inc/HTTPClient.php
@@ -6,8 +6,6 @@
  * @author     Andreas Goetz <cpuidle@gmx.de>
  */
 
-if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../').'/');
-require_once(DOKU_CONF.'dokuwiki.php');
 
 define('HTTP_NL',"\r\n");
 
diff --git a/inc/JSON.php b/inc/JSON.php
index 380b064cb45e43c07d4237429fb01a9aaacdbc46..16f1ce884c85995b7e45a17fe96751dfce455460 100644
--- a/inc/JSON.php
+++ b/inc/JSON.php
@@ -58,7 +58,7 @@
  */
 
 // for DokuWiki
-if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../').'/');
+if(!defined('DOKU_INC')) die('meh.');
 require_once(DOKU_INC.'inc/utf8.php');
 
 /**
diff --git a/inc/actions.php b/inc/actions.php
index 62b39efc2246dbc3f3fddeb12df676364d32c3b9..0a347f4728feeda1fdebe4940541a306998564c2 100644
--- a/inc/actions.php
+++ b/inc/actions.php
@@ -6,8 +6,8 @@
  * @author     Andreas Gohr <andi@splitbrain.org>
  */
 
-  if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../').'/');
-  require_once(DOKU_INC.'inc/template.php');
+if(!defined('DOKU_INC')) die('meh.');
+require_once(DOKU_INC.'inc/template.php');
 
 
 /**
diff --git a/inc/auth.php b/inc/auth.php
index 18f1ece898885a7dca2c61a48b99361aa32a854c..1d325b02ce52f45c45d70bda97680e073f38925b 100644
--- a/inc/auth.php
+++ b/inc/auth.php
@@ -9,7 +9,7 @@
  * @author     Andreas Gohr <andi@splitbrain.org>
  */
 
-  if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../').'/');
+  if(!defined('DOKU_INC')) die('meh.');
   require_once(DOKU_INC.'inc/common.php');
   require_once(DOKU_INC.'inc/io.php');
 
diff --git a/inc/cache.php b/inc/cache.php
index 50ab799e7079a273d5c7dc8f13aa1c36861b2002..3eecd8a75e92ea9bfcbab4469d2265124543f5ff 100644
--- a/inc/cache.php
+++ b/inc/cache.php
@@ -6,8 +6,7 @@
  * @author     Chris Smith <chris@jalakai.co.uk>
  */
 
-if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../').'/');
-
+if(!defined('DOKU_INC')) die('meh.');
 require_once(DOKU_INC.'inc/io.php');
 require_once(DOKU_INC.'inc/pageutils.php');
 require_once(DOKU_INC.'inc/parserutils.php');
diff --git a/inc/cliopts.php b/inc/cliopts.php
index 3623d35ad2d2f997ccdd8c7619722cec4932e952..a3698ab249536bc37be8eb7d08914bb35824a2bc 100644
--- a/inc/cliopts.php
+++ b/inc/cliopts.php
@@ -20,7 +20,6 @@
 // +----------------------------------------------------------------------+
 //
 
-if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../').'/');
 
 //------------------------------------------------------------------------------
 /**
diff --git a/inc/common.php b/inc/common.php
index 9f69203784bb3933fafd9806db1936fbe11900f8..bb1c45baa2124c80eef6f9a01684b66c96823f83 100644
--- a/inc/common.php
+++ b/inc/common.php
@@ -6,8 +6,7 @@
  * @author     Andreas Gohr <andi@splitbrain.org>
  */
 
-if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../').'/');
-require_once(DOKU_CONF.'dokuwiki.php');
+if(!defined('DOKU_INC')) die('meh.');
 require_once(DOKU_INC.'inc/io.php');
 require_once(DOKU_INC.'inc/changelog.php');
 require_once(DOKU_INC.'inc/utf8.php');
diff --git a/inc/confutils.php b/inc/confutils.php
index 1ef0942f82cb128bff04f42d9e61daea9ef1cf27..aeb5f6c60557104298de9ca54e77af2a550f61e4 100644
--- a/inc/confutils.php
+++ b/inc/confutils.php
@@ -6,7 +6,6 @@
  * @author     Harry Fuecks <hfuecks@gmail.com>
  */
 
-  if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../').'/');
 
 /**
  * Returns the (known) extension and mimetype of a given filename
diff --git a/inc/events.php b/inc/events.php
index b87bbadbcb2dd2b8365eb2dd3694c1fa5fd180da..1604c73c6b0c8ea385b9fc97c20667c6db15a63c 100644
--- a/inc/events.php
+++ b/inc/events.php
@@ -6,7 +6,7 @@
  * @author     Christopher Smith <chris@jalakai.co.uk>
  */
 
-if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../').'/');
+if(!defined('DOKU_INC')) die('meh.');
 require_once(DOKU_INC.'inc/pluginutils.php');
 
 class Doku_Event {
diff --git a/inc/form.php b/inc/form.php
index 767788ea465d446c220f2c3c6f49c9afaae9636b..8131ec17e587f4d30912a66c84a9b4265c51b421 100644
--- a/inc/form.php
+++ b/inc/form.php
@@ -6,7 +6,7 @@
  * @author     Tom N Harris <tnharris@whoopdedo.org>
  */
 
-if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../').'/');
+if(!defined('DOKU_INC')) die('meh.');
 if(!defined('NL')) define('NL',"\n");
 require_once(DOKU_INC.'inc/html.php');
 
diff --git a/inc/fulltext.php b/inc/fulltext.php
index a1dd1774dd3bac68097bfa73d710f658187467ed..74195c5345b934f8ccc5b56f12bbb98c894f1b87 100644
--- a/inc/fulltext.php
+++ b/inc/fulltext.php
@@ -6,8 +6,8 @@
  * @author     Andreas Gohr <andi@splitbrain.org>
  */
 
-  if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../').'/');
-  require_once(DOKU_INC.'inc/indexer.php');
+if(!defined('DOKU_INC')) die('meh.');
+require_once(DOKU_INC.'inc/indexer.php');
 
 
 /**
diff --git a/inc/html.php b/inc/html.php
index 636c93a13f8c3f424c1a9edb619e8ffe86472aec..982d01860bd9f12f1eec3e105f8a726436e7fef1 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -6,7 +6,7 @@
  * @author     Andreas Gohr <andi@splitbrain.org>
  */
 
-if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../').'/');
+if(!defined('DOKU_INC')) die('meh.');
 if(!defined('NL')) define('NL',"\n");
 require_once(DOKU_INC.'inc/parserutils.php');
 require_once(DOKU_INC.'inc/form.php');
diff --git a/inc/indexer.php b/inc/indexer.php
index 490ba1393ac56eea810fa95f34d6152109f5f239..2d019dc7752acc27723609046456e30b2f18471c 100644
--- a/inc/indexer.php
+++ b/inc/indexer.php
@@ -6,11 +6,10 @@
  * @author     Andreas Gohr <andi@splitbrain.org>
  */
 
-  if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../').'/');
-  require_once(DOKU_CONF.'dokuwiki.php');
-  require_once(DOKU_INC.'inc/io.php');
-  require_once(DOKU_INC.'inc/utf8.php');
-  require_once(DOKU_INC.'inc/parserutils.php');
+if(!defined('DOKU_INC')) die('meh.');
+require_once(DOKU_INC.'inc/io.php');
+require_once(DOKU_INC.'inc/utf8.php');
+require_once(DOKU_INC.'inc/parserutils.php');
 
 // set the minimum token length to use in the index (note, this doesn't apply to numeric tokens)
 if (!defined('IDX_MINWORDLENGTH')) define('IDX_MINWORDLENGTH',3);
diff --git a/inc/infoutils.php b/inc/infoutils.php
index 18de75c2832d34527f74be2503f6c1fa16b7f897..56526ac54857c52814f179d82ccda0eb9d611b69 100644
--- a/inc/infoutils.php
+++ b/inc/infoutils.php
@@ -5,7 +5,7 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * @author     Andreas Gohr <andi@splitbrain.org>
  */
-if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../').'/');
+if(!defined('DOKU_INC')) die('meh.');
 if(!defined('DOKU_MESSAGEURL')) define('DOKU_MESSAGEURL','http://update.dokuwiki.org/check/');
 require_once(DOKU_INC.'inc/HTTPClient.php');
 
diff --git a/inc/io.php b/inc/io.php
index 0256a663797f1052c0cbbb494b2ce1e8065d1b5c..1c0e8610479c2399bce9b41b9e7089f7718ba1d5 100644
--- a/inc/io.php
+++ b/inc/io.php
@@ -6,11 +6,11 @@
  * @author     Andreas Gohr <andi@splitbrain.org>
  */
 
-  if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../').'/');
-  require_once(DOKU_INC.'inc/common.php');
-  require_once(DOKU_INC.'inc/HTTPClient.php');
-  require_once(DOKU_INC.'inc/events.php');
-  require_once(DOKU_INC.'inc/utf8.php');
+if(!defined('DOKU_INC')) die('meh.');
+require_once(DOKU_INC.'inc/common.php');
+require_once(DOKU_INC.'inc/HTTPClient.php');
+require_once(DOKU_INC.'inc/events.php');
+require_once(DOKU_INC.'inc/utf8.php');
 
 /**
  * Removes empty directories
diff --git a/inc/mail.php b/inc/mail.php
index 4dfc77552e17ac183e05eb377762503421d53dff..f127ea9892bb8e47c2ab9d83ba0be6367fbd3767 100644
--- a/inc/mail.php
+++ b/inc/mail.php
@@ -6,14 +6,14 @@
  * @author     Andreas Gohr <andi@splitbrain.org>
  */
 
-  if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../').'/');
-  require_once(DOKU_INC.'inc/utf8.php');
-  require_once(DOKU_INC.'inc/EmailAddressValidator.php');
-
-  // end of line for mail lines - RFC822 says CRLF but postfix (and other MTAs?)
-  // think different
-  if(!defined('MAILHEADER_EOL')) define('MAILHEADER_EOL',"\n");
-  #define('MAILHEADER_ASCIIONLY',1);
+if(!defined('DOKU_INC')) die('meh.');
+require_once(DOKU_INC.'inc/utf8.php');
+require_once(DOKU_INC.'inc/EmailAddressValidator.php');
+
+// end of line for mail lines - RFC822 says CRLF but postfix (and other MTAs?)
+// think different
+if(!defined('MAILHEADER_EOL')) define('MAILHEADER_EOL',"\n");
+#define('MAILHEADER_ASCIIONLY',1);
 
 /**
  * Patterns for use in email detection and validation
diff --git a/inc/media.php b/inc/media.php
index 29b2ec986c5d4c67f7c719015887bcb0c00c2d70..de927354689efd0bf6761e9dba3dc4095346117e 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -6,9 +6,8 @@
  * @author     Andreas Gohr <andi@splitbrain.org>
  */
 
-if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../').'/');
+if(!defined('DOKU_INC')) die('meh.');
 if(!defined('NL')) define('NL',"\n");
-
 require_once(DOKU_INC.'inc/html.php');
 require_once(DOKU_INC.'inc/search.php');
 require_once(DOKU_INC.'inc/JpegMeta.php');
diff --git a/inc/parser/handler.php b/inc/parser/handler.php
index 2de8df7cbf0dd17e924310f1928c378ed7ebf476..5bcb3c2f09731c8491c359624ae90432969430cc 100644
--- a/inc/parser/handler.php
+++ b/inc/parser/handler.php
@@ -1,6 +1,5 @@
 <?php
-if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../../').'/');
-
+if(!defined('DOKU_INC')) die('meh.');
 if (!defined('DOKU_PARSER_EOL')) define('DOKU_PARSER_EOL',"\n");   // add this to make handling test cases simpler
 
 class Doku_Handler {
diff --git a/inc/parser/lexer.php b/inc/parser/lexer.php
index 375f9e5f97304e68f3eaf55cef9126f3c498b657..78a8d04f5a8a509cfc5f009474370c86c5b03818 100644
--- a/inc/parser/lexer.php
+++ b/inc/parser/lexer.php
@@ -13,7 +13,7 @@
 /**
 * Init path constant
 */
-if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../../').'/');
+if(!defined('DOKU_INC')) die('meh.');
 
 /**#@+
  * lexer mode constant
diff --git a/inc/parser/metadata.php b/inc/parser/metadata.php
index 5994a4dd1b2747426e5961affdd1b581a4f06b0c..48eb25f4d6bb55369a0b033b6eecd5cbe8bbfe20 100644
--- a/inc/parser/metadata.php
+++ b/inc/parser/metadata.php
@@ -4,8 +4,7 @@
  *
  * @author Esther Brunner <wikidesign@gmail.com>
  */
-
-if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../../').'/');
+if(!defined('DOKU_INC')) die('meh.');
 
 if ( !defined('DOKU_LF') ) {
     // Some whitespace to help View > Source
diff --git a/inc/parser/parser.php b/inc/parser/parser.php
index 4cf57b3bf384c73d233cb2fcadf3a6197c9dc867..3d62345a600ff98162a2ab2a371e1243f8a25063 100644
--- a/inc/parser/parser.php
+++ b/inc/parser/parser.php
@@ -1,7 +1,5 @@
 <?php
-
-if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../../').'/');
-
+if(!defined('DOKU_INC')) die('meh.');
 require_once DOKU_INC . 'inc/parser/lexer.php';
 require_once DOKU_INC . 'inc/parser/handler.php';
 
diff --git a/inc/parser/renderer.php b/inc/parser/renderer.php
index 92bbf51fb9ba723c7c841f500fbb94d16b7a481d..40b29035adfd6300b20795a55cbab4378b6ab420 100644
--- a/inc/parser/renderer.php
+++ b/inc/parser/renderer.php
@@ -5,8 +5,7 @@
  * @author Harry Fuecks <hfuecks@gmail.com>
  * @author Andreas Gohr <andi@splitbrain.org>
  */
-if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../../').'/');
-
+if(!defined('DOKU_INC')) die('meh.');
 require_once DOKU_INC . 'inc/parser/renderer.php';
 require_once DOKU_INC . 'inc/plugin.php';
 require_once DOKU_INC . 'inc/pluginutils.php';
diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php
index 58ff5e7b15f4e054b8a16b20f99f4a6978bb596d..4749c470d645f629c523bca90a9bb8ea34cda118 100644
--- a/inc/parser/xhtml.php
+++ b/inc/parser/xhtml.php
@@ -5,8 +5,7 @@
  * @author Harry Fuecks <hfuecks@gmail.com>
  * @author Andreas Gohr <andi@splitbrain.org>
  */
-
-if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../../').'/');
+if(!defined('DOKU_INC')) die('meh.');
 
 if ( !defined('DOKU_LF') ) {
     // Some whitespace to help View > Source
diff --git a/inc/parser/xhtmlsummary.php b/inc/parser/xhtmlsummary.php
index 2992b2a232d36de7265a6c970c190f710440e27b..b187fef019d7968cdb18ae9f8473b69e2f453606 100644
--- a/inc/parser/xhtmlsummary.php
+++ b/inc/parser/xhtmlsummary.php
@@ -1,6 +1,5 @@
 <?php
-if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../../').'/');
-
+if(!defined('DOKU_INC')) die('meh.');
 require_once DOKU_INC . 'inc/parser/xhtml.php';
 
 /**
diff --git a/inc/parserutils.php b/inc/parserutils.php
index ce4e8e9956ffa8ef88f18e5cc57424f658770363..7a023b159d2781270265bff5a43b0e2f821776ee 100644
--- a/inc/parserutils.php
+++ b/inc/parserutils.php
@@ -7,12 +7,11 @@
  * @author     Andreas Gohr <andi@splitbrain.org>
  */
 
-  if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../').'/');
-
-  require_once(DOKU_INC.'inc/confutils.php');
-  require_once(DOKU_INC.'inc/pageutils.php');
-  require_once(DOKU_INC.'inc/pluginutils.php');
-  require_once(DOKU_INC.'inc/cache.php');
+if(!defined('DOKU_INC')) die('meh.');
+require_once(DOKU_INC.'inc/confutils.php');
+require_once(DOKU_INC.'inc/pageutils.php');
+require_once(DOKU_INC.'inc/pluginutils.php');
+require_once(DOKU_INC.'inc/cache.php');
 
 /**
  * Returns the parsed Wikitext in XHTML for the given id and revision.
diff --git a/inc/search.php b/inc/search.php
index 35e5a358acc46cfadcbf6e807c2a155387e5d5cb..e8af8f64aecf5fa2d8c3a8d6c3cc38508a14749b 100644
--- a/inc/search.php
+++ b/inc/search.php
@@ -6,8 +6,8 @@
  * @author     Andreas Gohr <andi@splitbrain.org>
  */
 
-  if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../').'/');
-  require_once(DOKU_INC.'inc/common.php');
+if(!defined('DOKU_INC')) die('meh.');
+require_once(DOKU_INC.'inc/common.php');
 
 /**
  * recurse direcory
@@ -55,7 +55,7 @@ function search(&$data,$base,$func,$opts,$dir='',$lvl=1){
 
 /**
  * Wrapper around call_user_func_array.
- * 
+ *
  * @deprecated
  */
 function search_callback($func,&$data,$base,$file,$type,$lvl,$opts){
@@ -187,8 +187,8 @@ function search_namespaces(&$data,$base,$file,$type,$lvl,$opts){
 function search_media(&$data,$base,$file,$type,$lvl,$opts){
   //we do nothing with directories
   if($type == 'd') {
-  	return ($opts['recursive']);
-  } 
+    return ($opts['recursive']);
+  }
 
   $info         = array();
   $info['id']   = pathID($file,true);
diff --git a/inc/template.php b/inc/template.php
index 690f4ff41185c4b8b4d72b84b4277b41c60194c6..9a4132750a7f88c125dc3ff23fe7635e094ea543 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -6,8 +6,8 @@
  * @author     Andreas Gohr <andi@splitbrain.org>
  */
 
-  if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../').'/');
-  require_once(DOKU_CONF.'dokuwiki.php');
+if(!defined('DOKU_INC')) die('meh.');
+require_once(DOKU_CONF.'dokuwiki.php');
 
 /**
  * Returns the path to the given template, uses
diff --git a/inc/toolbar.php b/inc/toolbar.php
index 735567746fe527308a61250472bd93451fed562e..dee6db356b862b96818882fd096dc6189649f714 100644
--- a/inc/toolbar.php
+++ b/inc/toolbar.php
@@ -6,8 +6,7 @@
  * @author     Andreas Gohr <andi@splitbrain.org>
  */
 
-  if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../').'/');
-
+if(!defined('DOKU_INC')) die('meh.');
 require_once(DOKU_INC.'inc/JSON.php');