diff --git a/src/OpenFOAM/db/dictionary/functionEntries/includeEntry/includeEntry.C b/src/OpenFOAM/db/dictionary/functionEntries/includeEntry/includeEntry.C
index 49679209db..81a8c0b23f 100644
--- a/src/OpenFOAM/db/dictionary/functionEntries/includeEntry/includeEntry.C
+++ b/src/OpenFOAM/db/dictionary/functionEntries/includeEntry/includeEntry.C
@@ -31,12 +31,19 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
+const Foam::word Foam::functionEntries::includeEntry::typeName
+(
+    Foam::functionEntries::includeEntry::typeName_()
+);
+
+// Don't lookup the debug switch here as the debug switch dictionary
+// might include includeEntry
+int Foam::functionEntries::includeEntry::debug(0);
+
 namespace Foam
 {
 namespace functionEntries
 {
-    defineTypeNameAndDebug(includeEntry, 0);
-
     addToMemberFunctionSelectionTable
     (
         functionEntry,
diff --git a/src/OpenFOAM/db/dictionary/functionEntries/inputModeEntry/inputModeEntry.C b/src/OpenFOAM/db/dictionary/functionEntries/inputModeEntry/inputModeEntry.C
index b75ffa1d32..27b1e78f5e 100644
--- a/src/OpenFOAM/db/dictionary/functionEntries/inputModeEntry/inputModeEntry.C
+++ b/src/OpenFOAM/db/dictionary/functionEntries/inputModeEntry/inputModeEntry.C
@@ -30,12 +30,19 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
+const Foam::word Foam::functionEntries::inputModeEntry::typeName
+(
+    Foam::functionEntries::inputModeEntry::typeName_()
+);
+
+// Don't lookup the debug switch here as the debug switch dictionary
+// might include inputModeEntries
+int Foam::functionEntries::inputModeEntry::debug(0);
+
 namespace Foam
 {
 namespace functionEntries
 {
-    defineTypeNameAndDebug(inputModeEntry, 0);
-
     addToMemberFunctionSelectionTable
     (
         functionEntry,