diff --git a/OpenRoadEd/Cephes/fresnl.cpp b/OpenRoadEd/Cephes/fresnl.cpp
index 2632c8575f49b7af0d9be3025d35614baebeb5e4..8a99ab1741a08c70657bf476b0a1c80594cf1b6e 100644
--- a/OpenRoadEd/Cephes/fresnl.cpp
+++ b/OpenRoadEd/Cephes/fresnl.cpp
@@ -455,7 +455,7 @@ extern "C" {double p1evl ( double, double *, int );}
 #else
 double fabs(), cos(), sin(), polevl(), p1evl();
 #endif
-extern "C" {double PI, PIO2, MACHEP;}
+extern "C" {extern double PI, PIO2, MACHEP;}
 
 //int fresnl( xxa, ssa, cca )
 //double xxa, *ssa, *cca;
diff --git a/OpenRoadEd/OpenDrive/Junction.h b/OpenRoadEd/OpenDrive/Junction.h
index 6e42539a59a340de7f88b12eb1064123fe89289e..45d5fc82ae28f36757903c5c359c6ecc373801da 100644
--- a/OpenRoadEd/OpenDrive/Junction.h
+++ b/OpenRoadEd/OpenDrive/Junction.h
@@ -129,13 +129,13 @@ public:
 	 * Return the pointer to the last junction connection
 	 * @return A pointer to JunctionConnection object
 	 */
-	JunctionConnection* Junction::GetLastJunctionConnection();
+    JunctionConnection* GetLastJunctionConnection();
 
 	/**
 	 * Return the pointer to the last added junction connection (which might not be the one from the end of the vector)
 	 * @return A pointer to JunctionConnection object
 	 */
-	JunctionConnection* Junction::GetLastAddedJunctionConnection();
+    JunctionConnection* GetLastAddedJunctionConnection();
 	
 	/**
 	 * Return the vector that stores junction priority records
@@ -160,14 +160,14 @@ public:
 	 * Return the pointer to the last junction priority record
 	 * @return A pointer to JunctionPriorityRoad object
 	 */
-	JunctionPriorityRoad* Junction::GetLastJunctionPriority();
+    JunctionPriorityRoad* GetLastJunctionPriority();
 
 	
 	/**
 	 * Return the pointer to the last added junction priority record (which might not be the one from the end of the vector)
 	 * @return A pointer to JunctionPriorityRoad object
 	 */
-	JunctionPriorityRoad* Junction::GetLastAddedJunctionPriority();
+    JunctionPriorityRoad* GetLastAddedJunctionPriority();
 
 	/**
 	 * Return the vector that stores junction controller records
@@ -192,13 +192,13 @@ public:
 	 * Return the pointer to the last junction controller record
 	 * @return A pointer to JunctionController object
 	 */
-	JunctionController* Junction::GetLastJunctionController();
+    JunctionController* GetLastJunctionController();
 
 	/**
 	 * Return the pointer to the last added junction controller record (which might not be the one from the end of the vector)
 	 * @return A pointer to JunctionController object
 	 */
-	JunctionController* Junction::GetLastAddedJunctionController();
+    JunctionController* GetLastAddedJunctionController();
 
 };
 
@@ -467,4 +467,4 @@ public:
 
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/OpenRoadEd/OpenDrive/Lane.h b/OpenRoadEd/OpenDrive/Lane.h
index ecf6eec9a9ca97950126a391fa5db1cf306a7bbe..652d4b53a26367cc0055f41a4cd1cd135686e099 100644
--- a/OpenRoadEd/OpenDrive/Lane.h
+++ b/OpenRoadEd/OpenDrive/Lane.h
@@ -3,8 +3,8 @@
 
 #include "Road.h"
 #include "OtherStructures.h"
-#include <Vector>
-#include <String>
+#include <vector>
+#include <string>
 
 
 //Prototypes
@@ -770,4 +770,4 @@ public:
 //----------------------------------------------------------------------------------
 
 
-#endif
\ No newline at end of file
+#endif
diff --git a/OpenRoadEd/OpenDrive/OpenDrive.h b/OpenRoadEd/OpenDrive/OpenDrive.h
index dffcec1b1aa2f2452a5479c9e84beb3bbef7634f..ff02a2360a5262cf30b4cb1ccfbb45e967b5e122 100644
--- a/OpenRoadEd/OpenDrive/OpenDrive.h
+++ b/OpenRoadEd/OpenDrive/OpenDrive.h
@@ -1,8 +1,8 @@
 #ifndef OPENDRIVE_H
 #define OPENDRIVE_H
 
-#include <Vector>
-#include <String>
+#include <vector>
+#include <string>
 
 #include "Road.h"
 //--Prototypes--
@@ -164,4 +164,4 @@ public:
 };
 
 
-#endif
\ No newline at end of file
+#endif
diff --git a/OpenRoadEd/OpenDrive/OpenDriveXmlParser.cpp b/OpenRoadEd/OpenDrive/OpenDriveXmlParser.cpp
index dc2c8e60c70b2d09d2aa570bc9409962c7f12b4c..cd0dc29182c65440e14eda16ae014e4198d43a2a 100644
--- a/OpenRoadEd/OpenDrive/OpenDriveXmlParser.cpp
+++ b/OpenRoadEd/OpenDrive/OpenDriveXmlParser.cpp
@@ -1,7 +1,7 @@
 #include "OpenDriveXmlParser.h"
 #include <iostream>
 #include <algorithm>
-#include "windows.h"
+//#include "windows.h"
 
 using std::cout;
 using std::endl;
diff --git a/OpenRoadEd/OpenDrive/OpenDriveXmlParser.h b/OpenRoadEd/OpenDrive/OpenDriveXmlParser.h
index 448e1b24027f2397e08c0eb8a0dcacab71bd27f6..b451a58f2ac55023f6bd7cdc097a632c802ab669 100644
--- a/OpenRoadEd/OpenDrive/OpenDriveXmlParser.h
+++ b/OpenRoadEd/OpenDrive/OpenDriveXmlParser.h
@@ -1,8 +1,8 @@
 #ifndef OPENDRIVEXMLPARSER_H
 #define OPENDRIVEXMLPARSER_H
 
-#include <Vector>
-#include <String>
+#include <vector>
+#include <string>
 
 #include <iostream>
 #include <fstream>
@@ -83,4 +83,4 @@ public:
 };
 
 
-#endif
\ No newline at end of file
+#endif
diff --git a/OpenRoadEd/OpenDrive/OpenDriveXmlWriter.cpp b/OpenRoadEd/OpenDrive/OpenDriveXmlWriter.cpp
index d0099afa682ab62fd70bcc009f0509209d57db25..dad34f2121aa901bd84493e65c92b014fd313478 100644
--- a/OpenRoadEd/OpenDrive/OpenDriveXmlWriter.cpp
+++ b/OpenRoadEd/OpenDrive/OpenDriveXmlWriter.cpp
@@ -1,7 +1,7 @@
 #include "OpenDriveXmlWriter.h"
 #include <iostream>
 #include <algorithm>
-#include "windows.h"
+//#include "windows.h"
 
 using std::cout;
 using std::endl;
diff --git a/OpenRoadEd/OpenDrive/OpenDriveXmlWriter.h b/OpenRoadEd/OpenDrive/OpenDriveXmlWriter.h
index 1ca76d6f18da01f47619e5976801ba7134eae067..2b51002ed10b38128b3e2b601efdd36004d8fa66 100644
--- a/OpenRoadEd/OpenDrive/OpenDriveXmlWriter.h
+++ b/OpenRoadEd/OpenDrive/OpenDriveXmlWriter.h
@@ -1,8 +1,8 @@
 #ifndef OPENDRIVEXMLWRITER_H
 #define OPENDRIVEXMLWRITER_H
 
-#include <Vector>
-#include <String>
+#include <vector>
+#include <string>
 
 #include <iostream>
 #include <iomanip>
@@ -84,4 +84,4 @@ public:
 };
 
 
-#endif
\ No newline at end of file
+#endif
diff --git a/OpenRoadEd/OpenDrive/OtherStructures.h b/OpenRoadEd/OpenDrive/OtherStructures.h
index 493464f6fc665633543d2d252e3628526a402d33..ee37f277fc358946864a301a0213016b35b012de 100644
--- a/OpenRoadEd/OpenDrive/OtherStructures.h
+++ b/OpenRoadEd/OpenDrive/OtherStructures.h
@@ -1,6 +1,6 @@
 #ifndef OTHERSTRUCTURES_H
 #define OTHERSTRUCTURES_H
-#include <String>
+#include <string>
 using std::string;
 
 /**
@@ -63,4 +63,4 @@ public:
 
 
 
-#endif
\ No newline at end of file
+#endif
diff --git a/OpenRoadEd/OpenDrive/Road.h b/OpenRoadEd/OpenDrive/Road.h
index b56392db8892c67ac92618b06a6bde6e4fba5573..3e657532635b1ba0195a6d003549be82144ce40c 100644
--- a/OpenRoadEd/OpenDrive/Road.h
+++ b/OpenRoadEd/OpenDrive/Road.h
@@ -1,8 +1,8 @@
 #ifndef ROAD_H
 #define ROAD_H
 
-#include <Vector>
-#include <String>
+#include <vector>
+#include <string>
 
 #include "RoadGeometry.h"
 #include "Lane.h"
@@ -486,4 +486,4 @@ public:
 //----------------------------------------------------------------------------------
 
 
-#endif
\ No newline at end of file
+#endif
diff --git a/OpenRoadEd/OpenDrive/RoadGeometry.h b/OpenRoadEd/OpenDrive/RoadGeometry.h
index 2f2291db07eb7e8ceefa749648327418401f29e1..52983c75bb41eef3d5e30fa19532603130dd2ed5 100644
--- a/OpenRoadEd/OpenDrive/RoadGeometry.h
+++ b/OpenRoadEd/OpenDrive/RoadGeometry.h
@@ -1,8 +1,8 @@
 #ifndef ROADGEOMETRY_H
 #define ROADGEOMETRY_H
 
-#include <Vector>
-#include <String>
+#include <vector>
+#include <string>
 
 //Prototypes
 class RoadGeometry;
@@ -383,4 +383,4 @@ public:
 };
 
 
-#endif
\ No newline at end of file
+#endif
diff --git a/OpenRoadEd/Osg/OSGCameraControls2.h b/OpenRoadEd/Osg/OSGCameraControls2.h
index 42003a7944d53fbbce5142b0d4604dc78e0d1454..063098017ef6c70c0390397a202e764b94fb2604 100644
--- a/OpenRoadEd/Osg/OSGCameraControls2.h
+++ b/OpenRoadEd/Osg/OSGCameraControls2.h
@@ -3,7 +3,7 @@
 
 
 #include <osg/Matrixd>
-#include <osgGA/MatrixManipulator>
+#include <osgGA/CameraManipulator>
 
 /**
  * Free look camera that moves along the ground plane and along the vertical axis.
@@ -12,7 +12,7 @@
  * Movement along the ground plane: Space + Right mouse button
  * Movement along the vertical axis: Space + Middle mouse button
  */
-class OSGCameraControls2 : public osgGA::MatrixManipulator
+class OSGCameraControls2 : public osgGA::CameraManipulator
 {
 public:
 	/**
@@ -109,4 +109,4 @@ protected:
 
 
 
-#endif
\ No newline at end of file
+#endif
diff --git a/OpenRoadEd/Osg/OSGJunction.cpp b/OpenRoadEd/Osg/OSGJunction.cpp
index 031936e2d6c67ef1f52eb0bc34f243befb10bb49..7d6646e4638aab1a9a82bc5e746b7638e717f87e 100644
--- a/OpenRoadEd/Osg/OSGJunction.cpp
+++ b/OpenRoadEd/Osg/OSGJunction.cpp
@@ -4,7 +4,7 @@
 #include "OSGConstants.h"
 #include "OSGRoad.h"
 #include <sstream>		//debug (convert double to string)
-#include "windows.h"	//debug (OutputDebugString)
+//#include "windows.h"	//debug (OutputDebugString)
 
 #include <osg/Geometry>
 #include <osgUtil/DelaunayTriangulator>
diff --git a/OpenRoadEd/Osg/OSGMain.cpp b/OpenRoadEd/Osg/OSGMain.cpp
index 5500b4fa0f63c6abee95000fd01352bb0024e571..cef279cf84e7942a6fb36acc121169aa8f1d7a2d 100644
--- a/OpenRoadEd/Osg/OSGMain.cpp
+++ b/OpenRoadEd/Osg/OSGMain.cpp
@@ -1,5 +1,5 @@
 #include <sstream>		//debug (convert double to string)
-#include "windows.h"	//debug (OutputDebugString)
+//#include "windows.h"	//debug (OutputDebugString)
 
 
 #include <iostream>
@@ -12,9 +12,10 @@
 #include <osg/MatrixTransform>
 #include <osg/Notify>
 
-#include "osgMain.h"
+#include "OSGMain.h"
 #include "OSGCameraControls.h"
 #include "OSGCameraControls2.h"
+#include <osgGA/KeySwitchMatrixManipulator>
 
 #include "OSGConstants.h"
 
@@ -90,12 +91,12 @@ OSGMain::OSGMain(OpenDrive* openDrive)
 * @param width,height Dimensions of the viewer
 * @param window Window handler
 */
-void OSGMain::initViewer(int x, int y, int width, int height, HWND window)
+void OSGMain::initViewer(int x, int y, int width, int height/*, HWND window*/)
 {
 	mViewer = new osgViewer::Viewer;
 	mViewer->setKeyEventSetsDone(0);
 
-	createContext(x,y,width,height,window);
+    createContext(x,y,width,height/*,window*/);
 
 	//mViewer->setThreadingModel(osgViewer::Viewer::SingleThreaded);
 
@@ -180,7 +181,7 @@ void OSGMain::frame()
 /**
 * Creates the window context
 */
-void OSGMain::createContext(int x, int y, int width, int height, HWND window)
+void OSGMain::createContext(int x, int y, int width, int height/*, HWND window*/)
 {
 	// Sets the properties of the window and prepares it for renderin
 
@@ -205,7 +206,7 @@ void OSGMain::createContext(int x, int y, int width, int height, HWND window)
 	traits->sampleBuffers = ds->getMultiSamples();
 	traits->samples = ds->getNumMultiSamples();
 
-	traits->inheritedWindowData = new WindowData(window);
+    //traits->inheritedWindowData = new WindowData(window);
 
 	if (ds->getStereo())
 	{
@@ -295,9 +296,9 @@ void OSGMain::DrawRoadChordLine()
 	ss<<"Road ChordLine generation completed in "<<osg::Timer::instance()->delta_s(startTick,endTick)<<std::endl;
 	str.append(ss.str());
 	//Output to the debug window
-	OutputDebugString( "\n" ) ;
-	OutputDebugString( str.c_str() ) ;
-	OutputDebugString( "\n" ) ;
+    //OutputDebugString( "\n" ) ;
+    //OutputDebugString( str.c_str() ) ;
+    //OutputDebugString( "\n" ) ;
 }
 
 
@@ -369,9 +370,9 @@ void OSGMain::DrawRoads()
 	ss<<"Road generation completed in "<<osg::Timer::instance()->delta_s(startTick,endTick)<<std::endl;
 	str.append(ss.str());
 	//Output to the debug window
-	OutputDebugString( "\n" ) ;
-	OutputDebugString( str.c_str() ) ;
-	OutputDebugString( "\n" ) ;
+    //OutputDebugString( "\n" ) ;
+    //OutputDebugString( str.c_str() ) ;
+    //OutputDebugString( "\n" ) ;
 }
 
 
@@ -463,9 +464,9 @@ void OSGMain::DrawJunctions()
 	ss<<"Junction generation completed in "<<osg::Timer::instance()->delta_s(startTick,endTick)<<std::endl;
 	str.append(ss.str());
 	//Output to the debug window
-	OutputDebugString( "\n" ) ;
-	OutputDebugString( str.c_str() ) ;
-	OutputDebugString( "\n" ) ;
+    //OutputDebugString( "\n" ) ;
+    //OutputDebugString( str.c_str() ) ;
+    //OutputDebugString( "\n" ) ;
 }
 
 /**
@@ -525,9 +526,9 @@ void OSGMain::DrawScenery(std::string heightMapFile, std::string terrainFile, do
 	ss<<"HeightMap generation completed in "<<osg::Timer::instance()->delta_s(startTick,endTick)<<std::endl;
 	str.append(ss.str());
 	//Output to the debug window
-	OutputDebugString( "\n" ) ;
-	OutputDebugString( str.c_str() ) ;
-	OutputDebugString( "\n" ) ;
+    //OutputDebugString( "\n" ) ;
+    //OutputDebugString( str.c_str() ) ;
+    //OutputDebugString( "\n" ) ;
 
 	/////////////////////////////////////////////////////////////////////////////////////
 	//start Timer for statistics
@@ -549,9 +550,9 @@ void OSGMain::DrawScenery(std::string heightMapFile, std::string terrainFile, do
 	ss2<<"Scenery generation completed in "<<osg::Timer::instance()->delta_s(startTick,endTick)<<std::endl;
 	str2.append(ss2.str());
 	//Output to the debug window
-	OutputDebugString( "\n" ) ;
-	OutputDebugString( str2.c_str() ) ;
-	OutputDebugString( "\n" ) ;
+    //OutputDebugString( "\n" ) ;
+    //OutputDebugString( str2.c_str() ) ;
+    //OutputDebugString( "\n" ) ;
 }
 
 /**
@@ -796,7 +797,7 @@ OSGObjectNode* OSGMain::PickNode(float x, float y)
 		if (!hit->nodePath.empty())
 		{
 			//Get the path to the picked node
-			osg::NodePath* nodePath=&(hit->nodePath);
+            const osg::NodePath* nodePath=&(hit->nodePath);
 
 			//Get the selected object
 			osg::Node* node = nodePath->back();
@@ -916,9 +917,9 @@ OSGObjectNode* OSGMain::PickNode(float x, float y)
 					ss<<"Picked in "<<osg::Timer::instance()->delta_s(startTick,endTick)<<std::endl;
 					str.append(ss.str());
 					//Output to the debug window
-					OutputDebugString( "\n" ) ;
-					OutputDebugString( str.c_str() ) ;
-					OutputDebugString( "\n" ) ;
+                    //OutputDebugString( "\n" ) ;
+                    //OutputDebugString( str.c_str() ) ;
+                    //OutputDebugString( "\n" ) ;
 
 				}
 				///////////////////////////////////////////////
@@ -1587,4 +1588,4 @@ void OSGMain::Clear()
 	mOsgScenery=new OSGScenery;
 
 	mCurrentlySelected.ClearNodeInfoIndices();
-}
\ No newline at end of file
+}
diff --git a/OpenRoadEd/Osg/OSGMain.h b/OpenRoadEd/Osg/OSGMain.h
index 7797a0d90325df063fa48264424e5de429900d28..05d8d1ba6939c5142b736ecd591198ca61c9c066 100644
--- a/OpenRoadEd/Osg/OSGMain.h
+++ b/OpenRoadEd/Osg/OSGMain.h
@@ -9,18 +9,18 @@
 #include <osgViewer/Viewer>
 #include <osgViewer/GraphicsWindow>
 #include <osgViewer/ViewerEventHandlers>
-#include <osgViewer/api/Win32/GraphicsWindowWin32>
+//#include <osgViewer/api/Win32/GraphicsWindowWin32>
 
 #include <osgGA/TrackballManipulator>
 #include <osgGA/FlightManipulator>
 #include <osgGA/DriveManipulator>
-#include <osgGA/KeySwitchMatrixManipulator>
+//#include <osgGA/KeySwitchMatrixManipulator>
 #include <osgGA/StateSetManipulator>
 #include <osgGA/AnimationPathManipulator>
 #include <osgGA/TerrainManipulator>
 
 
-typedef osgViewer::GraphicsWindowWin32::WindowData WindowData;
+//typedef osgViewer::GraphicsWindowWin32::WindowData WindowData;
 
 
 #include "../OpenDrive/OpenDrive.h"
@@ -91,7 +91,7 @@ private:
 	/**
 	*
 	*/
-	void createContext(int x, int y, int widht, int height, HWND window);
+    void createContext(int x, int y, int widht, int height/*, HWND window*/);
 
 public:
 	//--------------
@@ -109,7 +109,7 @@ public:
 	* @param width,height Dimensions of the viewer
 	* @param window Window handler
 	*/
-	void initViewer(int x, int y, int width, int height, HWND window);
+    void initViewer(int x, int y, int width, int height/*, HWND window*/);
 
 	/**
 	* Load a mode
@@ -238,7 +238,7 @@ public:
 	* Pick a 3D object from the viewport
 	* @param x, y coordinates of the cursor at which to pick the objects 
 	*/
-	OSGObjectNode* OSGMain::PickNode(float x, float y);
+    OSGObjectNode* PickNode(float x, float y);
 
 	/**
 	* Depending on the node type and the hierarchycal index array, find it in the structure
diff --git a/OpenRoadEd/Osg/OSGObjectNode.h b/OpenRoadEd/Osg/OSGObjectNode.h
index 15d9932fcd397ad86e1cd2e569b2467e839d3f60..2a1457d263b005741908e8ab2f41595646a51207 100644
--- a/OpenRoadEd/Osg/OSGObjectNode.h
+++ b/OpenRoadEd/Osg/OSGObjectNode.h
@@ -4,7 +4,7 @@
 #include <osg/Node>
 #include <osg/Geode>
 #include <osg/Billboard>
-#include <Vector>
+#include <vector>
 
 /**
 * Enumeration type that contains all the OpenDRIVE available records
diff --git a/OpenRoadEd/Osg/OSGRoad.cpp b/OpenRoadEd/Osg/OSGRoad.cpp
index cfd2e6695ea37a9bc6e276bb2f6e58bbc6037b63..22dd98a652a2c877b1e5c3ca2fa99046fe0a7d17 100644
--- a/OpenRoadEd/Osg/OSGRoad.cpp
+++ b/OpenRoadEd/Osg/OSGRoad.cpp
@@ -2,7 +2,7 @@
 #include <fstream>
 #include <iostream>
 #include <sstream>		//debug (convert double to string)
-#include "windows.h"	//debug (OutputDebugString)
+//#include "windows.h"	//debug (OutputDebugString)
 #include <osg/Point>
 #include <osg/Material>
 #include <osg/Texture2D>
diff --git a/OpenRoadEd/Qt/ConfigDialogs/ReferencePlaneDialog.h b/OpenRoadEd/Qt/ConfigDialogs/ReferencePlaneDialog.h
index 8368915fb1e36ec3cc715a9805c54ec04e877792..d558a8819f622d642365e326eb2c4ec08a4cd3e2 100644
--- a/OpenRoadEd/Qt/ConfigDialogs/ReferencePlaneDialog.h
+++ b/OpenRoadEd/Qt/ConfigDialogs/ReferencePlaneDialog.h
@@ -93,4 +93,4 @@ private slots:
 };
 
 
-#endif
\ No newline at end of file
+#endif
diff --git a/OpenRoadEd/Qt/ConfigDialogs/SceneryDialog.h b/OpenRoadEd/Qt/ConfigDialogs/SceneryDialog.h
index 4d50a854d236e0b2d9d5f98486d6a1ad4ec81c6a..ce0bf56316fabc103939d0ecafa5e09a2db54035 100644
--- a/OpenRoadEd/Qt/ConfigDialogs/SceneryDialog.h
+++ b/OpenRoadEd/Qt/ConfigDialogs/SceneryDialog.h
@@ -81,4 +81,4 @@ private slots:
 };
 
 
-#endif
\ No newline at end of file
+#endif
diff --git a/OpenRoadEd/Qt/CreationWidgets/CreationAllRoad.h b/OpenRoadEd/Qt/CreationWidgets/CreationAllRoad.h
index c2a1b52d7fc02e0b04ab39bb363957096d35f489..a01d5f9dde6bc001c7264a264c2ccd1bf542224e 100644
--- a/OpenRoadEd/Qt/CreationWidgets/CreationAllRoad.h
+++ b/OpenRoadEd/Qt/CreationWidgets/CreationAllRoad.h
@@ -8,7 +8,7 @@
 #include "../../OpenDrive/OpenDrive.h"
 #include "../../OpenDrive/RoadGeometry.h"
 #include "../Tree/RoadTree.h"
-#include "../../Osg/OsgMain.h"
+#include "../../Osg/OSGMain.h"
 
 /**
  * Class that holds all the buttons used to create road related records
@@ -106,4 +106,4 @@ signals:
 	void RoadChanged(bool recalculateRoad);
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/OpenRoadEd/Qt/CreationWidgets/CreationPage.h b/OpenRoadEd/Qt/CreationWidgets/CreationPage.h
index 83ed0e4e2b844bda2a2ff3fce14c877b666bd33b..a25224e20b73d88afe2daf2b76a389bf55ba0f21 100644
--- a/OpenRoadEd/Qt/CreationWidgets/CreationPage.h
+++ b/OpenRoadEd/Qt/CreationWidgets/CreationPage.h
@@ -7,7 +7,7 @@
 
 #include "../../OpenDrive/OpenDrive.h"
 #include "../Tree/RoadTree.h"
-#include "../../Osg/OsgMain.h"
+#include "../../Osg/OSGMain.h"
 
 #include "CreationAllRoad.h"
 #include "CreationAllJunction.h"
@@ -67,4 +67,4 @@ signals:
 	
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/OpenRoadEd/Qt/CreationWidgets/DeleteAll.h b/OpenRoadEd/Qt/CreationWidgets/DeleteAll.h
index 98200535bb274c97b49e7fccfa47c690e88a1f46..b44a91eb4baa27e7dc3e630d21641379da2dcdd9 100644
--- a/OpenRoadEd/Qt/CreationWidgets/DeleteAll.h
+++ b/OpenRoadEd/Qt/CreationWidgets/DeleteAll.h
@@ -62,4 +62,4 @@ signals:
 	void RoadChanged(bool recalculateRoad);
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/OpenRoadEd/Qt/MainWindow.h b/OpenRoadEd/Qt/MainWindow.h
index 78f10def9b316a3205a34c606d46972ccf5392c6..02d4a68dd7400b4790b10ab2ca94d337915bbad9 100644
--- a/OpenRoadEd/Qt/MainWindow.h
+++ b/OpenRoadEd/Qt/MainWindow.h
@@ -213,4 +213,4 @@ private slots:
 };
 
 
-#endif
\ No newline at end of file
+#endif
diff --git a/OpenRoadEd/Qt/QOSGWidget.cpp b/OpenRoadEd/Qt/QOSGWidget.cpp
index 8790b918ebe1bc54ac342c2b870004eba677d1a7..f247748bae4f67007f7c4d2024e97691fc68e975 100644
--- a/OpenRoadEd/Qt/QOSGWidget.cpp
+++ b/OpenRoadEd/Qt/QOSGWidget.cpp
@@ -29,7 +29,7 @@ void QOSGWidget::Init(RoadTree *roadTree)
 	mRoadTree=roadTree;
 
 	// Updates the size of the 3D viewport
-	mOsgMain->initViewer(x(),y(),width(),height(),winId());
+    mOsgMain->initViewer(x(),y(),width(),height()/*,winId()*/);
 
 	setAttribute(Qt::WA_PaintOnScreen);
 	setAttribute(Qt::WA_NoSystemBackground);
@@ -354,4 +354,4 @@ void QOSGWidget::OnRoadRecalculated(unsigned int index)
 	// Redraw the recalculated road and it's chord line
 	mOsgMain->RedrawRoad(index);
 	mOsgMain->RedrawRoadChordLine(index);
-}
\ No newline at end of file
+}
diff --git a/OpenRoadEd/Qt/QOSGWidget.h b/OpenRoadEd/Qt/QOSGWidget.h
index 7d1e4e5b3dca5de1df74ef45e5275ffcd9dfae81..6172a4f378028f4b14741980dc419ca851833b1a 100644
--- a/OpenRoadEd/Qt/QOSGWidget.h
+++ b/OpenRoadEd/Qt/QOSGWidget.h
@@ -9,7 +9,6 @@ using Qt::WindowFlags;
 #include "Tree/RoadTree.h"
 #include "../Osg/OSGMain.h"
 
-
 /**
  * OSG widget class used as a 3D viewport
  *
@@ -111,4 +110,4 @@ private slots:
 };
 
 
-#endif
\ No newline at end of file
+#endif
diff --git a/OpenRoadEd/Qt/ToolsDialogs/LoadingDialog.h b/OpenRoadEd/Qt/ToolsDialogs/LoadingDialog.h
index 5c488f776aeaed8fc597eb706d899e217dfb11b2..af1d6f2a9e8a187788e30e66b8abb45e3754e592 100644
--- a/OpenRoadEd/Qt/ToolsDialogs/LoadingDialog.h
+++ b/OpenRoadEd/Qt/ToolsDialogs/LoadingDialog.h
@@ -6,7 +6,6 @@
 #include <QtCore/QSettings>
 #include "../../Osg/OSGMain.h"
 
-
 /**
  * "Loading" dialog
  *
@@ -23,4 +22,4 @@ public:
 };
 
 
-#endif
\ No newline at end of file
+#endif
diff --git a/OpenRoadEd/main.cpp b/OpenRoadEd/main.cpp
index 569c7911c05946d0fdb3eaa220f1c5b7da4e15e3..3a760507ab825a4b32365bf377aabc751c171437 100644
--- a/OpenRoadEd/main.cpp
+++ b/OpenRoadEd/main.cpp
@@ -33,4 +33,4 @@ int main(int argc, char *argv[])
 
     // Runs the application
     return app.exec();
-}
\ No newline at end of file
+}