diff --git a/Engine/source/platformX86UNIX/x86UNIXConsole.cpp b/Engine/source/platformX86UNIX/x86UNIXConsole.cpp
index 9dee9d263..88e17f38e 100644
--- a/Engine/source/platformX86UNIX/x86UNIXConsole.cpp
+++ b/Engine/source/platformX86UNIX/x86UNIXConsole.cpp
@@ -34,13 +34,14 @@
 #include <stdarg.h>
 #include <fcntl.h>
 
+#include "console/engineAPI.h"
+
 StdConsole *stdConsole = NULL;
 
-ConsoleFunction(enableWinConsole, void, 2, 2, "enableWinConsole(bool);")
+DefineEngineFunction(enableWinConsole, void, (bool _enable),, "enableWinConsole(bool);")
 {
-   argc;
    if (stdConsole)
-      stdConsole->enable(dAtob(argv[1]));
+      stdConsole->enable(_enable);
 }
 
 void StdConsole::create()
diff --git a/Engine/source/platformX86UNIX/x86UNIXFileio.cpp b/Engine/source/platformX86UNIX/x86UNIXFileio.cpp
index 40f5fedae..690bae1f0 100644
--- a/Engine/source/platformX86UNIX/x86UNIXFileio.cpp
+++ b/Engine/source/platformX86UNIX/x86UNIXFileio.cpp
@@ -55,7 +55,7 @@
  #include "console/console.h"
  #include "core/strings/stringFunctions.h"
  #include "util/tempAlloc.h"
- #include "cinterface/cinterface.h"
+ #include "cinterface/c_controlInterface.h"
  #include "core/volume.h"
 
  #if defined(__FreeBSD__)
diff --git a/Engine/source/platformX86UNIX/x86UNIXMath.cpp b/Engine/source/platformX86UNIX/x86UNIXMath.cpp
index 6d3d141c3..ada90c5f5 100644
--- a/Engine/source/platformX86UNIX/x86UNIXMath.cpp
+++ b/Engine/source/platformX86UNIX/x86UNIXMath.cpp
@@ -24,7 +24,7 @@
 #include "console/console.h"
 #include "math/mMath.h"
 #include "core/strings/stringFunctions.h"
-
+#include "console/engineAPI.h"
 
 extern void mInstallLibrary_C();
 extern void mInstallLibrary_ASM();
@@ -35,7 +35,13 @@ extern void mInstall_Library_SSE();
 
 
 //--------------------------------------
-ConsoleFunction( MathInit, void, 1, 10, "(detect|C|FPU|MMX|3DNOW|SSE|...)")
+DefineEngineStringlyVariadicFunction( mathInit, void, 1, 10, "( ... )"
+                                     "@brief Install the math library with specified extensions.\n\n"
+                                     "Possible parameters are:\n\n"
+                                     "    - 'DETECT' Autodetect math lib settings.\n\n"
+                                     "    - 'C' Enable the C math routines. C routines are always enabled.\n\n"
+                                     "    - 'SSE' Enable SSE math routines.\n\n"
+                                     "@ingroup Math")
 {
    U32 properties = CPU_PROP_C;  // C entensions are always used
 
diff --git a/Engine/source/platformX86UNIX/x86UNIXProcessControl.cpp b/Engine/source/platformX86UNIX/x86UNIXProcessControl.cpp
index bf246d132..09c59af4d 100644
--- a/Engine/source/platformX86UNIX/x86UNIXProcessControl.cpp
+++ b/Engine/source/platformX86UNIX/x86UNIXProcessControl.cpp
@@ -29,7 +29,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <signal.h>
-
+#include "console/engineAPI.h"
 #ifndef TORQUE_DEDICATED
 #include <SDL.h>
 #endif
@@ -203,10 +203,7 @@ void Platform::outputDebugString(const char *string, ...)
 
 //-----------------------------------------------------------------------------
 // testing function
-ConsoleFunction(debug_debugbreak, void, 1, 1, "debug_debugbreak()")
-{
-   Platform::debugBreak();
-}
+//DefineEngineFunction(debug_debugbreak, void, () , , "debug_debugbreak();");
 
 //-----------------------------------------------------------------------------
 void Platform::restartInstance()