diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9c4ce5cd8..c944730ab 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -306,7 +306,7 @@ endif()
 
 # Compiler settings
 if (CMAKE_COMPILER_IS_GNUCC)
-    add_definitions (-Wall -Wextra -Wno-unused-parameter -Wno-reorder -std=c++0x -pedantic)
+    add_definitions (-Wall -Wextra -Wno-unused-parameter -Wno-reorder -std=c++03 -pedantic -Wno-long-long)
 
     # Silence warnings in OGRE headers. Remove once OGRE got fixed!
     add_definitions (-Wno-ignored-qualifiers)
@@ -506,7 +506,7 @@ if (WIN32)
         4738 # Storing 32-bit float result in memory, possible loss of performance
         4986 # Undocumented warning that occurs in the crtdbg.h file
         4996 # Function was declared deprecated
-		
+
 		# cause by ogre extensivly
 		4193 # #pragma warning(pop) : no matching '#pragma warning(push)'
 		4251 # class 'XXXX' needs to have dll-interface to be used by clients of class 'YYYY'
diff --git a/apps/openmw/mwworld/actionequip.cpp b/apps/openmw/mwworld/actionequip.cpp
index 60260a812..f3191e8bb 100644
--- a/apps/openmw/mwworld/actionequip.cpp
+++ b/apps/openmw/mwworld/actionequip.cpp
@@ -32,7 +32,7 @@ namespace MWWorld
         }
 
         assert(it != invStore.end());
-        
+
         std::string npcRace = actor.get<ESM::NPC>()->mBase->mRace;
 
         // equip the item in the first free slot
@@ -43,7 +43,7 @@ namespace MWWorld
             // Beast races cannot equip shoes / boots, or full helms (head part vs hair part)
             if(npcRace == "argonian" || npcRace == "khajiit")
             {
-                if(*slot == MWWorld::InventoryStore::Slot_Helmet){ 
+                if(*slot == MWWorld::InventoryStore::Slot_Helmet){
                     std::vector<ESM::PartReference> parts;
 
                     if(it.getType() == MWWorld::ContainerStore::Type_Clothing)
@@ -54,22 +54,22 @@ namespace MWWorld
                     bool allow = true;
                     for(std::vector<ESM::PartReference>::iterator itr = parts.begin(); itr != parts.end(); ++itr)
                     {
-                        if((*itr).mPart == ESM::PartReferenceType::PRT_Head)
+                        if((*itr).mPart == ESM::PRT_Head)
                         {
                             if(actor == MWBase::Environment::get().getWorld()->getPlayer().getPlayer() )
                                 MWBase::Environment::get().getWindowManager()->messageBox ("#{sNotifyMessage13}", std::vector<std::string>());
-                        
+
                             allow = false;
                             break;
                         }
                     }
-                    
+
                     if(!allow)
                         break;
                 }
 
                 if (*slot == MWWorld::InventoryStore::Slot_Boots)
-                {  
+                {
                     // Only notify the player, not npcs
                     if(actor == MWBase::Environment::get().getWorld()->getPlayer().getPlayer() )
                     {
diff --git a/components/bsa/bsa_archive.cpp b/components/bsa/bsa_archive.cpp
index 5274564a6..8117dbdfd 100644
--- a/components/bsa/bsa_archive.cpp
+++ b/components/bsa/bsa_archive.cpp
@@ -91,7 +91,7 @@ public:
 
             std::string searchable = normalize_path (proper.begin () + prefix, proper.end ());
 
-            mIndex.insert (std::make_pair (std::move (searchable), std::move (proper)));
+            mIndex.insert (std::make_pair (searchable, proper));
         }
     }
 
diff --git a/components/files/constrainedfiledatastream.cpp b/components/files/constrainedfiledatastream.cpp
index dd2985e56..321bcf7c8 100644
--- a/components/files/constrainedfiledatastream.cpp
+++ b/components/files/constrainedfiledatastream.cpp
@@ -3,11 +3,8 @@
 
 #include <stdexcept>
 #include <cassert>
-#ifndef __clang__
-#include <cstdint>
-#else
-#include <tr1/cstdint>
-#endif
+
+#include <libs/platform/stdint.h>
 
 namespace {
 
@@ -29,7 +26,7 @@ public:
 		mBufferOrigin = 0;
 		mBufferExtent = 0;
 	}
-		
+
 
 	size_t read(void* buf, size_t count)
 	{