diff --git a/include/compat.inc.php b/include/compat.inc.php
index baa7a692..2c0a6ac1 100644
--- a/include/compat.inc.php
+++ b/include/compat.inc.php
@@ -6,11 +6,6 @@ if (IN_serendipity !== true) {
     die ("Don't hack!");
 }
 
-if (defined('S9Y_FRAMEWORK_COMPAT')) {
-    return;
-}
-@define('S9Y_FRAMEWORK_COMPAT', true);
-
 $serendipity = array();
 @ini_set('magic_quotes_runtime', 'off');
 
diff --git a/include/db/db.inc.php b/include/db/db.inc.php
index 9fab298a..b2b2c5bf 100644
--- a/include/db/db.inc.php
+++ b/include/db/db.inc.php
@@ -2,11 +2,6 @@
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 
-if (defined('S9Y_FRAMEWORK_DB')) {
-    return;
-}
-@define('S9Y_FRAMEWORK_DB', true);
-
 if (@include(S9Y_INCLUDE_PATH . "include/db/{$serendipity['dbType']}.inc.php")) {
     @define('S9Y_DB_INCLUDED', TRUE);
 }
diff --git a/include/functions_comments.inc.php b/include/functions_comments.inc.php
index 73980a0d..7fe77335 100644
--- a/include/functions_comments.inc.php
+++ b/include/functions_comments.inc.php
@@ -6,11 +6,6 @@ if (IN_serendipity !== true) {
     die ("Don't hack!");
 }
 
-if (defined('S9Y_FRAMEWORK_COMMENTS')) {
-    return;
-}
-@define('S9Y_FRAMEWORK_COMMENTS', true);
-
 /**
  * Check if a comment token (from comment notification email) is valid for a given comment id.
  *
diff --git a/include/functions_config.inc.php b/include/functions_config.inc.php
index f4285754..f543cadf 100644
--- a/include/functions_config.inc.php
+++ b/include/functions_config.inc.php
@@ -6,11 +6,6 @@ if (IN_serendipity !== true) {
     die ("Don't hack!");
 }
 
-if (defined('S9Y_FRAMEWORK_CONFIG')) {
-    return;
-}
-@define('S9Y_FRAMEWORK_CONFIG', true);
-
 /**
  * Adds a new author account
  *
diff --git a/include/functions_entries.inc.php b/include/functions_entries.inc.php
index 0b82c9d3..19cf6b6c 100644
--- a/include/functions_entries.inc.php
+++ b/include/functions_entries.inc.php
@@ -6,11 +6,6 @@ if (IN_serendipity !== true) {
     die ("Don't hack!");
 }
 
-if (defined('S9Y_FRAMEWORK_ENTRIES')) {
-    return;
-}
-@define('S9Y_FRAMEWORK_ENTRIES', true);
-
 /**
  * Delete a category or range of categories
  *
diff --git a/include/functions_entries_admin.inc.php b/include/functions_entries_admin.inc.php
index c794bd26..ca26a4e1 100644
--- a/include/functions_entries_admin.inc.php
+++ b/include/functions_entries_admin.inc.php
@@ -6,12 +6,6 @@ if (IN_serendipity !== true) {
     die ("Don't hack!");
 }
 
-if (defined('S9Y_FRAMEWORK_ENTRIES_ADMIN')) {
-    return;
-}
-@define('S9Y_FRAMEWORK_ENTRIES_ADMIN', true);
-
-
 include_once(S9Y_INCLUDE_PATH . "include/functions_trackbacks.inc.php");
 
 
diff --git a/include/functions_images.inc.php b/include/functions_images.inc.php
index 630f6466..82009998 100644
--- a/include/functions_images.inc.php
+++ b/include/functions_images.inc.php
@@ -7,11 +7,6 @@ if (IN_serendipity !== true) {
     die ("Don't hack!");
 }
 
-if (defined('S9Y_FRAMEWORK_IMAGES')) {
-    return;
-}
-@define('S9Y_FRAMEWORK_IMAGES', true);
-
 /**
  * Check if an uploaded file is "evil"
  *
diff --git a/include/functions_installer.inc.php b/include/functions_installer.inc.php
index 894670f3..89dabe4a 100644
--- a/include/functions_installer.inc.php
+++ b/include/functions_installer.inc.php
@@ -6,11 +6,6 @@ if (IN_serendipity !== true) {
     die ("Don't hack!");
 }
 
-if (defined('S9Y_FRAMEWORK_INSTALLER')) {
-    return;
-}
-@define('S9Y_FRAMEWORK_INSTALLER', true);
-
 /**
  * Convert a PHP Ini setting to a boolean flag
  *
diff --git a/include/functions_permalinks.inc.php b/include/functions_permalinks.inc.php
index f5df8aa2..f2fac91c 100644
--- a/include/functions_permalinks.inc.php
+++ b/include/functions_permalinks.inc.php
@@ -6,11 +6,6 @@ if (IN_serendipity !== true) {
     die ("Don't hack!");
 }
 
-if (defined('S9Y_FRAMEWORK_PERMALINKS')) {
-    return;
-}
-@define('S9Y_FRAMEWORK_PERMALINKS', true);
-
 /**
  * Converts a string into a filename that can be used safely in HTTP URLs
  *
diff --git a/include/functions_smarty.inc.php b/include/functions_smarty.inc.php
index f6166041..0d857aec 100644
--- a/include/functions_smarty.inc.php
+++ b/include/functions_smarty.inc.php
@@ -6,11 +6,6 @@ if (IN_serendipity !== true) {
     die ("Don't hack!");
 }
 
-if (defined('S9Y_FRAMEWORK_SMARTY')) {
-    return;
-}
-@define('S9Y_FRAMEWORK_SMARTY', true);
-
 /**
  * Fetch a list of trackbacks for an entry
  *
diff --git a/include/plugin_api.inc.php b/include/plugin_api.inc.php
index 700c3f1e..dcab6404 100644
--- a/include/plugin_api.inc.php
+++ b/include/plugin_api.inc.php
@@ -6,12 +6,6 @@ if (IN_serendipity !== true) {
     die ('Don\'t hack!');
 }
 
-if (defined('S9Y_FRAMEWORK_PLUGIN_API')) {
-    return;
-}
-@define('S9Y_FRAMEWORK_PLUGIN_API', true);
-
-
 include_once S9Y_INCLUDE_PATH . 'include/functions.inc.php';
 
 
diff --git a/include/plugin_api_extension.inc.php b/include/plugin_api_extension.inc.php
index 9dd5e2d5..3ccf29e7 100644
--- a/include/plugin_api_extension.inc.php
+++ b/include/plugin_api_extension.inc.php
@@ -6,11 +6,6 @@ if (IN_serendipity !== true) {
     die ('Don\'t hack!');
 }
 
-if (defined('S9Y_FRAMEWORK_PLUGIN_API_EXTENSION')) {
-    return;
-}
-@define('S9Y_FRAMEWORK_PLUGIN_API_EXTENSION', true);
-
 class serendipity_plugin_api_extension extends serendipity_plugin_api
 {
     /**
diff --git a/rss.php b/rss.php
index 75b41cd9..401ece5a 100644
--- a/rss.php
+++ b/rss.php
@@ -138,9 +138,9 @@ $metadata = array(
     'version'           => $version
 );
 
-if (!defined('S9Y_FRAMEWORK_PLUGIN_API')) {
-    include(S9Y_INCLUDE_PATH . 'include/plugin_api.inc.php');
-}
+
+include_once(S9Y_INCLUDE_PATH . 'include/plugin_api.inc.php');
+
 $plugins = serendipity_plugin_api::enum_plugins();
 
 if (is_array($plugins)) {