diff --git a/anubis_dev/compiler/SConstruct b/anubis_dev/compiler/SConstruct
index 2d0e4d3..5145622 100644
--- a/anubis_dev/compiler/SConstruct
+++ b/anubis_dev/compiler/SConstruct
@@ -37,16 +37,6 @@ if platform.system() == 'Windows':
   #additionalLibs.append('shell32.lib')
   env.Append(LIBS=['ws2_32', 'shell32'])
   # env.Append(LINKFLAGS = ' /subsystem:console /incremental:no /machine:I386 ')
-  env['CXXCOM'] = env['CXXCOM'].replace('$SOURCES', '${SOURCES.abspath}')
-  env['CCCOM']  = env['CCCOM'].replace('$SOURCES', '${SOURCES.abspath}')
-  env.Append(CCFLAGS = ' -c -Wall -Wstrict-prototypes -m32')
-  env.Append(LINKFLAGS = ' -m32')
-  if debug:
-    env.Append(CCFLAGS = ' -g3 -O0')
-  else:
-    env.Append(CCFLAGS = ' -O2')
-  if static:
-    env.Append(LINKFLAGS = '-static')
 else:
   if platform.system() == 'Linux':
     env.Append(CPPDEFINES = {'_LINUX_': None})
@@ -56,17 +46,17 @@ else:
     #env['CXXCOM'] = '$CXX -o $TARGET -c $CXXFLAGS $CCFLAGS $_CCCOMCOM ${SOURCES.abspath}'
     env['CXXCOM'] = env['CXXCOM'].replace('$SOURCES', '${SOURCES.abspath}')
     env['CCCOM']  = env['CCCOM'].replace('$SOURCES', '${SOURCES.abspath}')
-
-  env.Append(CCFLAGS = ' -c -Wall -Wstrict-prototypes -m32')
-  env.Append(LINKFLAGS = ' -m32')
-  if debug:
-    env.Append(CCFLAGS = ' -g3 -O0')
-  else:
-    env.Append(CCFLAGS = ' -O2')
-  if static:
-    env.Append(LINKFLAGS = '-static')
   compiler_output_name = 'anubis_with_symbol'
 
+env.Append(CCFLAGS = ' -c -Wall -Wstrict-prototypes -m32')
+env.Append(LINKFLAGS = ' -m32')
+if debug:
+  env.Append(CCFLAGS = ' -g3 -O0')
+else:
+  env.Append(CCFLAGS = ' -O2')
+if static:
+  env.Append(LINKFLAGS = '-static')
+
 
 env['DEVDIR'] = os.path.normpath(os.path.join('..'))
 env['BASEDIR'] = os.path.normpath(os.path.join(env['DEVDIR'], '..'))
diff --git a/anubis_dev/compiler/src/compil.h b/anubis_dev/compiler/src/compil.h
index 52bb65a..a05f8c0 100644
--- a/anubis_dev/compiler/src/compil.h
+++ b/anubis_dev/compiler/src/compil.h
@@ -35,7 +35,7 @@ extern "C" {
 #define reallocz(p,n)    reallocz1(p,n)
 
    
-#define max_already_included (255)
+#define max_already_included (1024)
    
    
 /* general */ 
diff --git a/anubis_dev/vm/SConstruct b/anubis_dev/vm/SConstruct
index 0bd8c37..c107579 100644
--- a/anubis_dev/vm/SConstruct
+++ b/anubis_dev/vm/SConstruct
@@ -5,7 +5,7 @@ opts = Variables('DefaultOptions.py')
 opts.Add(BoolVariable('DEBUG', 'Set to 1 to build with debug symbols', 0))
 opts.Add(BoolVariable('GUI', 'Set to 1 to build with graphical interface support', 1))
 opts.Add(BoolVariable('SSL', 'Set to 1 to build with SSL support', 1))
-opts.Add(BoolVariable('SQLAPI', 'Set to 1 to build with SQLAPI support', 1))
+opts.Add(BoolVariable('SQLAPI', 'Set to 1 to build with SQLAPI support', 0))
 opts.Add(EnumVariable('SQLITE_THREADSAFE', 'Threading mode for Sqlite', '1', allowed_values=('0', '1', '2')))
 opts.Add('CC', 'The C compiler')
 opts.Add('CXX', 'The C++ compiler')
--
libgit2 0.21.4