diff --git a/CMakeLists.txt b/CMakeLists.txt
index e27acc9a..065abf50 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,12 +1,12 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0 FATAL_ERROR)
 
 # Speed Dreams project
-PROJECT(speed-dreams)
+PROJECT(speed-dreams-2)
 
 INCLUDE(cmake/macros.cmake)
 INCLUDE(cmake/checks.cmake)
 
-# 3rd Party Dependency Stuff
+# Pre-built 3rd Party under Windows.
 IF(WIN32)
 	INCLUDE(Find3rdPartyDependencies)
 ENDIF(WIN32)
@@ -95,9 +95,6 @@ ENDIF(NEED_SVN_REV)
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake/config.h.cmake
                ${CMAKE_CURRENT_BINARY_DIR}/config.h)
 
-CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake/version.h.cmake
-               ${CMAKE_CURRENT_BINARY_DIR}/version.h)
-
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake/doxygen_config.cmake
 	       ${CMAKE_CURRENT_BINARY_DIR}/doxygen_config @ONLY)
 
diff --git a/cmake/config.h.cmake b/cmake/config.h.cmake
index 4d66e881..26528c41 100755
--- a/cmake/config.h.cmake
+++ b/cmake/config.h.cmake
@@ -124,11 +124,15 @@
 /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
 #cmakedefine TIME_WITH_SYS_TIME 1
 
-/* Version number of package */
+/* Version numbers for package */
 #ifndef VERSION
 #define VERSION "${VERSION}"
 #endif //VERSION
 
+#ifndef VERSION_LONG
+#define VERSION_LONG "${VERSION_LONG}"
+#endif //VERSION_LONG
+
 /* Define to 1 if your processor stores words with the most significant byte
    first (like Motorola and SPARC, unlike Intel and VAX). */
 #cmakedefine WORDS_BIGENDIAN 1
diff --git a/cmake/version.h.cmake b/cmake/version.h.cmake
deleted file mode 100755
index 541e2336..00000000
--- a/cmake/version.h.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef MK_VERSION_H
-#define MK_VERSION_H
-
-#ifndef VERSION
-#define VERSION "${VERSION}"
-#endif //VERSION
-
-#ifndef VERSION_LONG
-#define VERSION_LONG "${VERSION_LONG}"
-#endif //VERSION_LONG
-
-#endif //MK_VERSION_H
-
diff --git a/src/libs/tgf/application.cpp b/src/libs/tgf/application.cpp
index c83120a3..583bbb76 100644
--- a/src/libs/tgf/application.cpp
+++ b/src/libs/tgf/application.cpp
@@ -25,7 +25,16 @@
 #include <cerrno>
 #include <iostream>
 
+#ifdef WIN32
+#ifndef HAVE_CONFIG_H
+#define HAVE_CONFIG_H
+#endif
+#endif
+
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
+
 #include <portability.h>
 
 #include "tgf.hpp"
diff --git a/src/main/main.cpp b/src/main/main.cpp
index abb64827..741212be 100644
--- a/src/main/main.cpp
+++ b/src/main/main.cpp
@@ -31,96 +31,13 @@
 #endif
 
 #ifdef HAVE_CONFIG_H
-#include "version.h"
+#include "config.h"
 #endif
 
 #include <raceengine.h>
 #include <iuserinterface.h>
 
 
-//class NoGUIApplication : public GfApplication
-//{
-// public:
-//
-//	//! Constructor.
-//	NoGUIApplication(int argc, char **argv)
-//	: GfApplication("Speed Dreams", "an Open Motorsport Sim", argc, argv)
-//	{
-//	}
-//
-//	bool parseOptions()
-//	{
-//		// First the standard ones.
-//		if (!GfApplication::parseOptions())
-//			return false;
-//
-//		// Then the specific ones.
-//		std::list<std::string> lstNewOptionsLeft;
-//		std::list<std::string>::const_iterator itOpt;
-//		for (itOpt = _lstOptionsLeft.begin(); itOpt != _lstOptionsLeft.end(); itOpt++)
-//		{
-//			// Race to start.
-//			if (*itOpt == "-sr" || *itOpt == "--startrace")
-//			{
-//				itOpt++;
-//				if (itOpt != _lstOptionsLeft.end())
-//					strRaceToStart = *itOpt; ??????????????????
-//			}
-//			else
-//			{
-//				// Save this option : it is "left".
-//				lstNewOptionsLeft.push_back(*itOpt);
-//			}
-//		}
-//		
-//		// Store the new list of left options after parsing.
-//		_lstOptionsLeft = lstNewOptionsLeft;
-//		
-//		return true;
-//	}
-//};
-//
-//class GUIApplication : public GfuiApplication
-//{
-// public:
-//
-//	//! Constructor.
-//	Application(int argc, char **argv)
-//	: GfuiApplication("Speed Dreams", "an Open Motorsport Sim", argc, argv)
-//	{
-//	}
-//	
-//	bool parseOptions()
-//	{
-//		// // First the standard ones.
-//		// if (!GfApplication::parseOptions())
-//		// 	return false;
-//
-//		// // Then the specific ones.
-//		// std::list<std::string> lstNewOptionsLeft;
-//		// std::list<std::string>::const_iterator itOpt;
-//		// for (itOpt = _lstOptionsLeft.begin(); itOpt != _lstOptionsLeft.end(); itOpt++)
-//		// {
-//		// 	// Text-only
-//		// 	if (*itOpt == "-to" || *itOpt == "--textonly")
-//		// 	{
-//		// 		itOpt++;
-//		// 		_bTextOnly = true;
-//		// 	}
-//		// 	else
-//		// 	{
-//		// 		// Save this option : it is "left".
-//		// 		lstNewOptionsLeft.push_back(*itOpt);
-//		// 	}
-//		// }
-//		
-//		// // Store the new list of left options after parsing.
-//		// _lstOptionsLeft = lstNewOptionsLeft;
-//		
-//		return true;
-//	}
-//};
-
 /*
  * Function
  *    main
diff --git a/src/tools/trackgen/main.cpp b/src/tools/trackgen/main.cpp
index a24d47af..d5475128 100644
--- a/src/tools/trackgen/main.cpp
+++ b/src/tools/trackgen/main.cpp
@@ -46,7 +46,16 @@
 #include <plib/ssg.h>
 #include <SDL/SDL.h>
 
+#ifdef WIN32
+#ifndef HAVE_CONFIG_H
+#define HAVE_CONFIG_H
+#endif
+#endif
+
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
+
 #include <tgf.hpp>
 #include <portability.h>
 #include <itrackloader.h>