diff --git a/make.msvc.bat b/make.msvc.bat
index 4e9c488..7d98635 100755
--- a/make.msvc.bat
+++ b/make.msvc.bat
@@ -1,13 +1,17 @@
 @ECHO OFF
 
+if defined SMARTWINok_a (
+	goto STARTCOMPILING
+)
+
 :: Viual C++ 7.1
 if defined VS71COMNTOOLS  (
 	if exist "%VS71COMNTOOLS%\vsvars32.bat" (
 		echo -
 		echo - Visual C++ 7.1 found.
 		echo -
-		call "%VS71COMNTOOLS %\vsvars32.bat"
-		set TRY_THIS_SDK_PATH=%VS71COMNTOOLS%\..\..\..
+		call "%VS71COMNTOOLS%\vsvars32.bat"
+		set SMARTWINok_a=true
 		goto STARTCOMPILING
 	)
 )
@@ -19,7 +23,7 @@ if defined VS80COMNTOOLS (
 		echo - Visual C++ 8.0 found.
 		echo -
 		call "%VS80COMNTOOLS%\vsvars32.bat"
-		set TRY_THIS_SDK_PATH=%VS80COMNTOOLS%\..\..\..
+		set SMARTWINok_a=true
 		goto STARTCOMPILING
 	)
 )
@@ -31,7 +35,7 @@ if defined VCToolkitInstallDir (
 		echo - VC 7.1 Toolkit found.
 		echo -
 		call "%VCToolkitInstallDir%\vcvars32.bat"
-		set TRY_THIS_SDK_PATH=%VCToolkitInstallDir%\..
+		set SMARTWINok_a=true
 		goto STARTCOMPILING
 	)
 )
@@ -42,42 +46,36 @@ echo - No Visual C++ found, please set the enviroment variable
 echo - 
 echo - VCToolkitInstallDir  or  VS71COMNTOOLS or VS80COMNTOOLS 
 echo - 
-echo - to your Visual Strudio folder which contains vsvars32.bat.
+echo - to your Visual Studio folder which contains vsvars32.bat.
 echo - 
-echo - Or call the vcvars32.bat/vcvarsall.bat file.
+echo - Or call the vsvars32.bat.
 echo -
 
 goto ERROR
+		
 
 
 :STARTCOMPILING
 
+
+:: SmartWin buid process
+
+if defined SMARTWINok_a (
+
+
 @ECHO ON
 
-:: loki buid process
-
 cd src
 call make.msvc.bat
 cd ..
 
-cd examples
-call make.msvc.bat
-cd ..
-
 cd test
 call make.msvc.bat
 cd ..
 
-cd tools
-call make.msvc.bat
-cd ..
-
-
 goto LEAVE
 
-
-
-
+)
 
 :ERROR
 echo -
@@ -86,4 +84,6 @@ echo - An error occured. Compiling aborted.
 echo - 
 pause
 
-:LEAVE
\ No newline at end of file
+
+
+:LEAVE
diff --git a/test/RegressionTest/TypeTraitsTest2.h b/test/RegressionTest/TypeTraitsTest2.h
index 527b410..9d65776 100755
--- a/test/RegressionTest/TypeTraitsTest2.h
+++ b/test/RegressionTest/TypeTraitsTest2.h
@@ -109,7 +109,7 @@
 #define ENABLE_ADDITIONAL_TYPETRAITS
 
 
-#include <typetraits.h>
+#include <loki/TypeTraits.h>
 
 // Macros for testing isX variables
 
diff --git a/test/SafeFormat/main.cpp b/test/SafeFormat/main.cpp
index 8827920..bb11de3 100755
--- a/test/SafeFormat/main.cpp
+++ b/test/SafeFormat/main.cpp
@@ -9,7 +9,7 @@
 //     warranty.
 ////////////////////////////////////////////////////////////////////////////////
 
-#include "SafeFormat.h"
+#include "loki/SafeFormat.h"
 #include <iostream>
 #include <cassert>
 #include <utility>
diff --git a/test/flex_string/main.cpp b/test/flex_string/main.cpp
index 94e5905..a5294b3 100755
--- a/test/flex_string/main.cpp
+++ b/test/flex_string/main.cpp
@@ -24,7 +24,7 @@
 //#define NO_ITERATOR_TRAITS
 #endif
 
-#include "flex/flex_string.h"
+#include "loki/flex/flex_string.h"
 
 #include <iostream>
 #include <cstdio>