diff --git a/src/common/angleutils.h b/src/common/angleutils.h
index f430741..24c766b 100644
--- a/src/common/angleutils.h
+++ b/src/common/angleutils.h
@@ -6,9 +6,13 @@
 
 // angleutils.h: Common ANGLE utilities.
 
+#ifndef COMMON_ANGLEUTILS_H_
+#define COMMON_ANGLEUTILS_H_
+
 // A macro to disallow the copy constructor and operator= functions
 // This must be used in the private: declarations for a class
 #define DISALLOW_COPY_AND_ASSIGN(TypeName) \
   TypeName(const TypeName&);               \
   void operator=(const TypeName&)
 
+#endif // COMMON_ANGLEUTILS_H_
diff --git a/src/common/debug.cpp b/src/common/debug.cpp
index 14c0d09..e8f8a20 100644
--- a/src/common/debug.cpp
+++ b/src/common/debug.cpp
@@ -6,7 +6,7 @@
 
 // debug.cpp: Debugging utilities.
 
-#include "debug.h"
+#include "common/debug.h"
 
 #include <stdio.h>
 #include <stdarg.h>
diff --git a/src/compiler/CodeGenGLSL.cpp b/src/compiler/CodeGenGLSL.cpp
index f47b615..1991cf8 100644
--- a/src/compiler/CodeGenGLSL.cpp
+++ b/src/compiler/CodeGenGLSL.cpp
@@ -4,7 +4,7 @@
 // found in the LICENSE file.
 //
 
-#include "TranslatorGLSL.h"
+#include "compiler/TranslatorGLSL.h"
 
 //
 // This function must be provided to create the actual
diff --git a/src/compiler/CodeGenHLSL.cpp b/src/compiler/CodeGenHLSL.cpp
index 2a2fd52..a180f49 100644
--- a/src/compiler/CodeGenHLSL.cpp
+++ b/src/compiler/CodeGenHLSL.cpp
@@ -4,7 +4,7 @@
 // found in the LICENSE file.
 //
 
-#include "TranslatorHLSL.h"
+#include "compiler/TranslatorHLSL.h"
 
 //
 // This function must be provided to create the actual
diff --git a/src/compiler/InfoSink.cpp b/src/compiler/InfoSink.cpp
index 8b70d23..6690d88 100644
--- a/src/compiler/InfoSink.cpp
+++ b/src/compiler/InfoSink.cpp
@@ -4,7 +4,7 @@
 // found in the LICENSE file.
 //
 
-#include "InfoSink.h"
+#include "compiler/InfoSink.h"
 
 #ifdef _WIN32
     #include <windows.h>
diff --git a/src/compiler/InfoSink.h b/src/compiler/InfoSink.h
index a2fb9c3..df826ab 100644
--- a/src/compiler/InfoSink.h
+++ b/src/compiler/InfoSink.h
@@ -7,9 +7,10 @@
 #ifndef _INFOSINK_INCLUDED_
 #define _INFOSINK_INCLUDED_
 
-#include "Common.h"
 #include <math.h>
 
+#include "compiler/Common.h"
+
 //
 // TPrefixType is used to centralize how info log messages start.
 // See below.
diff --git a/src/compiler/Initialize.cpp b/src/compiler/Initialize.cpp
index 2c3af79..2d0b556 100644
--- a/src/compiler/Initialize.cpp
+++ b/src/compiler/Initialize.cpp
@@ -10,8 +10,9 @@
 // built-in functions and operators.
 //
 
-#include "intermediate.h"
-#include "Initialize.h"
+#include "compiler/Initialize.h"
+
+#include "compiler/intermediate.h"
 
 void TBuiltIns::initialize()
 {
diff --git a/src/compiler/Initialize.h b/src/compiler/Initialize.h
index 1878cf3..777742e 100644
--- a/src/compiler/Initialize.h
+++ b/src/compiler/Initialize.h
@@ -8,9 +8,10 @@
 #define _INITIALIZE_INCLUDED_
 
 #include "GLSLANG/ResourceLimits.h"
-#include "Common.h"
-#include "ShHandle.h"
-#include "SymbolTable.h"
+
+#include "compiler/Common.h"
+#include "compiler/ShHandle.h"
+#include "compiler/SymbolTable.h"
 
 typedef TVector<TString> TBuiltInStrings;
 
diff --git a/src/compiler/InitializeDll.cpp b/src/compiler/InitializeDll.cpp
index 35a9829..06f8384 100644
--- a/src/compiler/InitializeDll.cpp
+++ b/src/compiler/InitializeDll.cpp
@@ -4,12 +4,13 @@
 // found in the LICENSE file.
 //
 
-#include "InitializeDll.h"
-#include "InitializeGlobals.h"
-#include "InitializeParseContext.h"
+#include "compiler/InitializeDll.h"
 
 #include "GLSLANG/ShaderLang.h"
 
+#include "compiler/InitializeGlobals.h"
+#include "compiler/InitializeParseContext.h"
+
 OS_TLSIndex ThreadInitializeIndex = OS_INVALID_TLS_INDEX;
 
 bool InitProcess()
diff --git a/src/compiler/InitializeDll.h b/src/compiler/InitializeDll.h
index ec7b303..bb17540 100644
--- a/src/compiler/InitializeDll.h
+++ b/src/compiler/InitializeDll.h
@@ -7,7 +7,7 @@
 #define __INITIALIZEDLL_H
 
 
-#include "osinclude.h"
+#include "compiler/osinclude.h"
 
 
 bool InitProcess();
diff --git a/src/compiler/InitializeParseContext.h b/src/compiler/InitializeParseContext.h
index 45fc3f3..68295d0 100644
--- a/src/compiler/InitializeParseContext.h
+++ b/src/compiler/InitializeParseContext.h
@@ -6,7 +6,7 @@
 
 #ifndef __INITIALIZE_PARSE_CONTEXT_INCLUDED_
 #define __INITIALIZE_PARSE_CONTEXT_INCLUDED_
-#include "osinclude.h"
+#include "compiler/osinclude.h"
 
 bool InitializeParseContextIndex();
 bool InitializeGlobalParseContext();
diff --git a/src/compiler/IntermTraverse.cpp b/src/compiler/IntermTraverse.cpp
index 6a61884..34a6f3c 100644
--- a/src/compiler/IntermTraverse.cpp
+++ b/src/compiler/IntermTraverse.cpp
@@ -4,7 +4,7 @@
 // found in the LICENSE file.
 //
 
-#include "intermediate.h"
+#include "compiler/intermediate.h"
 
 //
 // Traverse the intermediate representation tree, and
diff --git a/src/compiler/Intermediate.cpp b/src/compiler/Intermediate.cpp
index c85aaaf..5b42233 100644
--- a/src/compiler/Intermediate.cpp
+++ b/src/compiler/Intermediate.cpp
@@ -8,11 +8,12 @@
 // Build the intermediate representation.
 //
 
-#include "localintermediate.h"
-#include "QualifierAlive.h"
-#include "RemoveTree.h"
 #include <float.h>
 
+#include "compiler/localintermediate.h"
+#include "compiler/QualifierAlive.h"
+#include "compiler/RemoveTree.h"
+
 bool CompareStructure(const TType& leftNodeType, constUnion* rightUnionArray, constUnion* leftUnionArray);
 
 ////////////////////////////////////////////////////////////////////////////
diff --git a/src/compiler/Link.cpp b/src/compiler/Link.cpp
index 80f22ac..3bc1d45 100644
--- a/src/compiler/Link.cpp
+++ b/src/compiler/Link.cpp
@@ -8,8 +8,8 @@
 // The top level algorithms for linking multiple
 // shaders together.
 //
-#include "Common.h"
-#include "ShHandle.h"
+#include "compiler/Common.h"
+#include "compiler/ShHandle.h"
 
 //
 // Actual link object, derived from the shader handle base classes.
diff --git a/src/compiler/OutputGLSL.cpp b/src/compiler/OutputGLSL.cpp
index 925c5be..a4a766f 100644
--- a/src/compiler/OutputGLSL.cpp
+++ b/src/compiler/OutputGLSL.cpp
@@ -4,7 +4,8 @@
 // found in the LICENSE file.
 //
 
-#include "OutputGLSL.h"
+#include "compiler/OutputGLSL.h"
+
 #include "common/debug.h"
 
 namespace
diff --git a/src/compiler/OutputGLSL.h b/src/compiler/OutputGLSL.h
index 82e1a66..4dde653 100644
--- a/src/compiler/OutputGLSL.h
+++ b/src/compiler/OutputGLSL.h
@@ -7,8 +7,8 @@
 #ifndef CROSSCOMPILERGLSL_OUTPUTGLSL_H_
 #define CROSSCOMPILERGLSL_OUTPUTGLSL_H_
 
-#include "intermediate.h"
-#include "ParseHelper.h"
+#include "compiler/intermediate.h"
+#include "compiler/ParseHelper.h"
 
 class TOutputGLSL : public TIntermTraverser
 {
diff --git a/src/compiler/OutputHLSL.cpp b/src/compiler/OutputHLSL.cpp
index 05da22a..7ba66e2 100644
--- a/src/compiler/OutputHLSL.cpp
+++ b/src/compiler/OutputHLSL.cpp
@@ -4,11 +4,12 @@
 // found in the LICENSE file.
 //
 
-#include "OutputHLSL.h"
+#include "compiler/OutputHLSL.h"
 
-#include "UnfoldSelect.h"
 #include "common/debug.h"
-#include "InfoSink.h"
+
+#include "compiler/InfoSink.h"
+#include "compiler/UnfoldSelect.h"
 
 namespace sh
 {
diff --git a/src/compiler/OutputHLSL.h b/src/compiler/OutputHLSL.h
index 9ac0426..7fbdeb5 100644
--- a/src/compiler/OutputHLSL.h
+++ b/src/compiler/OutputHLSL.h
@@ -7,8 +7,8 @@
 #ifndef COMPILER_OUTPUTHLSL_H_
 #define COMPILER_OUTPUTHLSL_H_
 
-#include "intermediate.h"
-#include "ParseHelper.h"
+#include "compiler/intermediate.h"
+#include "compiler/ParseHelper.h"
 
 namespace sh
 {
diff --git a/src/compiler/ParseHelper.cpp b/src/compiler/ParseHelper.cpp
index 4062a56..3509e3c 100644
--- a/src/compiler/ParseHelper.cpp
+++ b/src/compiler/ParseHelper.cpp
@@ -4,10 +4,13 @@
 // found in the LICENSE file.
 //
 
-#include "ParseHelper.h"
-#include "InitializeParseContext.h"
-#include "osinclude.h"
+#include "compiler/ParseHelper.h"
+
 #include <stdarg.h>
+
+#include "compiler/osinclude.h"
+#include "compiler/InitializeParseContext.h"
+
 ///////////////////////////////////////////////////////////////////////
 //
 // Sub- vector and matrix fields
diff --git a/src/compiler/ParseHelper.h b/src/compiler/ParseHelper.h
index bb61220..e1af790 100644
--- a/src/compiler/ParseHelper.h
+++ b/src/compiler/ParseHelper.h
@@ -6,9 +6,9 @@
 #ifndef _PARSER_HELPER_INCLUDED_
 #define _PARSER_HELPER_INCLUDED_
 
-#include "ShHandle.h"
-#include "SymbolTable.h"
-#include "localintermediate.h"
+#include "compiler/ShHandle.h"
+#include "compiler/SymbolTable.h"
+#include "compiler/localintermediate.h"
 
 struct TMatrixFields {
 	bool wholeRow;
diff --git a/src/compiler/PoolAlloc.cpp b/src/compiler/PoolAlloc.cpp
index 013e752..9355a12 100644
--- a/src/compiler/PoolAlloc.cpp
+++ b/src/compiler/PoolAlloc.cpp
@@ -4,11 +4,11 @@
 // found in the LICENSE file.
 //
 
-#include "PoolAlloc.h"
-#include "Common.h"
+#include "compiler/PoolAlloc.h"
 
-#include "InitializeGlobals.h"
-#include "osinclude.h"
+#include "compiler/osinclude.h"
+#include "compiler/Common.h"
+#include "compiler/InitializeGlobals.h"
 
 OS_TLSIndex PoolIndex = TLS_OUT_OF_INDEXES;
 
diff --git a/src/compiler/QualifierAlive.cpp b/src/compiler/QualifierAlive.cpp
index e47fd6f..92a6874 100644
--- a/src/compiler/QualifierAlive.cpp
+++ b/src/compiler/QualifierAlive.cpp
@@ -4,7 +4,7 @@
 // found in the LICENSE file.
 //
 
-#include "intermediate.h"
+#include "compiler/intermediate.h"
 
 class TAliveTraverser : public TIntermTraverser {
 public:
diff --git a/src/compiler/RemoveTree.cpp b/src/compiler/RemoveTree.cpp
index 9c4162e..a4b8c1e 100644
--- a/src/compiler/RemoveTree.cpp
+++ b/src/compiler/RemoveTree.cpp
@@ -4,8 +4,9 @@
 // found in the LICENSE file.
 //
 
-#include "intermediate.h"
-#include "RemoveTree.h"
+#include "compiler/intermediate.h"
+#include "compiler/RemoveTree.h"
+
 //
 // Code to recursively delete the intermediate tree.
 //
diff --git a/src/compiler/ShHandle.h b/src/compiler/ShHandle.h
index dfd80e2..47b9785 100644
--- a/src/compiler/ShHandle.h
+++ b/src/compiler/ShHandle.h
@@ -16,7 +16,7 @@
 
 #include "GLSLANG/ShaderLang.h"
 
-#include "InfoSink.h"
+#include "compiler/InfoSink.h"
 
 class TCompiler;
 class TLinker;
diff --git a/src/compiler/ShaderLang.cpp b/src/compiler/ShaderLang.cpp
index 7f4137d..2e0f15d 100644
--- a/src/compiler/ShaderLang.cpp
+++ b/src/compiler/ShaderLang.cpp
@@ -11,11 +11,11 @@
 
 #include "GLSLANG/ShaderLang.h"
 
-#include "Initialize.h"
-#include "InitializeDll.h"
-#include "ParseHelper.h"
-#include "ShHandle.h"
-#include "SymbolTable.h"
+#include "compiler/Initialize.h"
+#include "compiler/InitializeDll.h"
+#include "compiler/ParseHelper.h"
+#include "compiler/ShHandle.h"
+#include "compiler/SymbolTable.h"
 
 //
 // A symbol table for each language.  Each has a different
diff --git a/src/compiler/SymbolTable.cpp b/src/compiler/SymbolTable.cpp
index f1752dd..d44537a 100644
--- a/src/compiler/SymbolTable.cpp
+++ b/src/compiler/SymbolTable.cpp
@@ -9,7 +9,7 @@
 // are documented in the header file.
 //
 
-#include "SymbolTable.h"
+#include "compiler/SymbolTable.h"
 
 //
 // TType helper function needs a place to live.
diff --git a/src/compiler/SymbolTable.h b/src/compiler/SymbolTable.h
index 2afde93..0340d19 100644
--- a/src/compiler/SymbolTable.h
+++ b/src/compiler/SymbolTable.h
@@ -30,9 +30,9 @@
 //   are tracked in the intermediate representation, not the symbol table.
 //
 
-#include "Common.h"
-#include "intermediate.h"
-#include "InfoSink.h"
+#include "compiler/Common.h"
+#include "compiler/intermediate.h"
+#include "compiler/InfoSink.h"
 
 //
 // Symbol base class.  (Can build functions or variables out of these...)
diff --git a/src/compiler/TranslatorGLSL.cpp b/src/compiler/TranslatorGLSL.cpp
index ff6deab..061543d 100644
--- a/src/compiler/TranslatorGLSL.cpp
+++ b/src/compiler/TranslatorGLSL.cpp
@@ -4,8 +4,9 @@
 // found in the LICENSE file.
 //
 
-#include "TranslatorGLSL.h"
-#include "OutputGLSL.h"
+#include "compiler/TranslatorGLSL.h"
+
+#include "compiler/OutputGLSL.h"
 
 TranslatorGLSL::TranslatorGLSL(EShLanguage l, int dOptions)
         : TCompiler(l),
diff --git a/src/compiler/TranslatorGLSL.h b/src/compiler/TranslatorGLSL.h
index 480996a..1ccd3fb 100644
--- a/src/compiler/TranslatorGLSL.h
+++ b/src/compiler/TranslatorGLSL.h
@@ -7,7 +7,7 @@
 #ifndef COMPILER_TRANSLATORGLSL_H_
 #define COMPILER_TRANSLATORGLSL_H_
 
-#include "ShHandle.h"
+#include "compiler/ShHandle.h"
 
 class TranslatorGLSL : public TCompiler {
 public:
diff --git a/src/compiler/TranslatorHLSL.cpp b/src/compiler/TranslatorHLSL.cpp
index 1d18c68..d8dc800 100644
--- a/src/compiler/TranslatorHLSL.cpp
+++ b/src/compiler/TranslatorHLSL.cpp
@@ -4,8 +4,9 @@
 // found in the LICENSE file.
 //
 
-#include "TranslatorHLSL.h"
-#include "OutputHLSL.h"
+#include "compiler/TranslatorHLSL.h"
+
+#include "compiler/OutputHLSL.h"
 
 TranslatorHLSL::TranslatorHLSL(EShLanguage language, int debugOptions)
     : TCompiler(language), debugOptions(debugOptions)
diff --git a/src/compiler/TranslatorHLSL.h b/src/compiler/TranslatorHLSL.h
index 8ea859a..029479f 100644
--- a/src/compiler/TranslatorHLSL.h
+++ b/src/compiler/TranslatorHLSL.h
@@ -7,7 +7,7 @@
 #ifndef COMPILER_TRANSLATORHLSL_H_
 #define COMPILER_TRANSLATORHLSL_H_
 
-#include "ShHandle.h"
+#include "compiler/ShHandle.h"
 
 class TranslatorHLSL : public TCompiler {
 public:
diff --git a/src/compiler/Types.h b/src/compiler/Types.h
index e06d83f..0fe1f83 100644
--- a/src/compiler/Types.h
+++ b/src/compiler/Types.h
@@ -7,8 +7,8 @@
 #ifndef _TYPES_INCLUDED
 #define _TYPES_INCLUDED
 
-#include "Common.h"
-#include "BaseTypes.h"
+#include "compiler/Common.h"
+#include "compiler/BaseTypes.h"
 
 //
 // Need to have association of line numbers to types in a list for building structs.
diff --git a/src/compiler/UnfoldSelect.cpp b/src/compiler/UnfoldSelect.cpp
index 65ccfa6..00e8a94 100644
--- a/src/compiler/UnfoldSelect.cpp
+++ b/src/compiler/UnfoldSelect.cpp
@@ -4,11 +4,12 @@
 // found in the LICENSE file.
 //
 
-#include "UnfoldSelect.h"
+#include "compiler/UnfoldSelect.h"
 
-#include "OutputHLSL.h"
 #include "common/debug.h"
-#include "InfoSink.h"
+
+#include "compiler/InfoSink.h"
+#include "compiler/OutputHLSL.h"
 
 namespace sh
 {
diff --git a/src/compiler/UnfoldSelect.h b/src/compiler/UnfoldSelect.h
index 44a706c..68b2e8a 100644
--- a/src/compiler/UnfoldSelect.h
+++ b/src/compiler/UnfoldSelect.h
@@ -7,8 +7,8 @@
 #ifndef COMPILER_UNFOLDSELECT_H_
 #define COMPILER_UNFOLDSELECT_H_
 
-#include "intermediate.h"
-#include "ParseHelper.h"
+#include "compiler/intermediate.h"
+#include "compiler/ParseHelper.h"
 
 namespace sh
 {
diff --git a/src/compiler/intermOut.cpp b/src/compiler/intermOut.cpp
index 360f1ce..a5bd069 100644
--- a/src/compiler/intermOut.cpp
+++ b/src/compiler/intermOut.cpp
@@ -4,7 +4,7 @@
 // found in the LICENSE file.
 //
 
-#include "localintermediate.h"
+#include "compiler/localintermediate.h"
 
 //
 // Two purposes:
diff --git a/src/compiler/intermediate.h b/src/compiler/intermediate.h
index 525f92a..1208b07 100644
--- a/src/compiler/intermediate.h
+++ b/src/compiler/intermediate.h
@@ -16,9 +16,9 @@
 #ifndef __INTERMEDIATE_H
 #define __INTERMEDIATE_H
 
-#include "Common.h"
-#include "Types.h"
-#include "ConstantUnion.h"
+#include "compiler/Common.h"
+#include "compiler/Types.h"
+#include "compiler/ConstantUnion.h"
 
 //
 // Operators used by the high-level (parse tree) representation.
diff --git a/src/compiler/localintermediate.h b/src/compiler/localintermediate.h
index d234508..a4b5416 100644
--- a/src/compiler/localintermediate.h
+++ b/src/compiler/localintermediate.h
@@ -8,8 +8,8 @@
 #define _LOCAL_INTERMEDIATE_INCLUDED_
 
 #include "GLSLANG/ShaderLang.h"
-#include "intermediate.h"
-#include "SymbolTable.h"
+#include "compiler/intermediate.h"
+#include "compiler/SymbolTable.h"
 
 struct TVectorFields {
     int offsets[4];
diff --git a/src/compiler/ossource.cpp b/src/compiler/ossource.cpp
index ed93efe..1d61baa 100644
--- a/src/compiler/ossource.cpp
+++ b/src/compiler/ossource.cpp
@@ -4,7 +4,7 @@
 // found in the LICENSE file.
 //
 
-#include "osinclude.h"
+#include "compiler/osinclude.h"
 //
 // This file contains contains the window's specific functions
 //
diff --git a/src/compiler/parseConst.cpp b/src/compiler/parseConst.cpp
index 31773d2..f2fd4a5 100644
--- a/src/compiler/parseConst.cpp
+++ b/src/compiler/parseConst.cpp
@@ -4,7 +4,7 @@
 // found in the LICENSE file.
 //
 
-#include "ParseHelper.h"
+#include "compiler/ParseHelper.h"
 
 //
 // Use this class to carry along data from node to node in 
diff --git a/src/libEGL/Config.cpp b/src/libEGL/Config.cpp
index 6c1f244..c0f744d 100644
--- a/src/libEGL/Config.cpp
+++ b/src/libEGL/Config.cpp
@@ -8,7 +8,7 @@
 // and size for an egl::Surface. Implements EGLConfig and related functionality.
 // [EGL 1.4] section 3.4 page 15.
 
-#include "Config.h"
+#include "libEGL/Config.h"
 
 #include <algorithm>
 #include <vector>
diff --git a/src/libEGL/Display.cpp b/src/libEGL/Display.cpp
index 3fdd940..89eb585 100644
--- a/src/libEGL/Display.cpp
+++ b/src/libEGL/Display.cpp
@@ -8,14 +8,15 @@
 // display on which graphics are drawn. Implements EGLDisplay.
 // [EGL 1.4] section 2.1.2 page 3.
 
-#include "Display.h"
+#include "libEGL/Display.h"
 
 #include <algorithm>
 #include <vector>
 
-#include "main.h"
 #include "common/debug.h"
 
+#include "libEGL/main.h"
+
 namespace egl
 {
 Display::Display(HDC deviceContext) : mDc(deviceContext)
diff --git a/src/libEGL/Surface.cpp b/src/libEGL/Surface.cpp
index cddbc11..9ad5ec4 100644
--- a/src/libEGL/Surface.cpp
+++ b/src/libEGL/Surface.cpp
@@ -8,11 +8,12 @@
 // such as the client area of a window, including any back buffers.
 // Implements EGLSurface and related functionality. [EGL 1.4] section 2.2 page 3.
 
-#include "Surface.h"
+#include "libEGL/Surface.h"
 
-#include "main.h"
 #include "common/debug.h"
 
+#include "libEGL/main.h"
+
 namespace egl
 {
 Surface::Surface(IDirect3DDevice9 *device, IDirect3DSwapChain9 *swapChain, IDirect3DSurface9 *depthStencil, EGLint configID) 
diff --git a/src/libEGL/libEGL.cpp b/src/libEGL/libEGL.cpp
index 924b2ad..f9a7311 100644
--- a/src/libEGL/libEGL.cpp
+++ b/src/libEGL/libEGL.cpp
@@ -6,13 +6,15 @@
 
 // libEGL.cpp: Implements the exported EGL functions.
 
-#include "main.h"
-#include "Display.h"
-#include "libGLESv2/Context.h"
-#include "common/debug.h"
-
 #include <exception>
 
+#include "common/debug.h"
+#include "libGLESv2/Context.h"
+
+#include "libEGL/main.h"
+#include "libEGL/Display.h"
+
+
 bool validate(egl::Display *display)
 {
     if (display == EGL_NO_DISPLAY)
diff --git a/src/libEGL/main.cpp b/src/libEGL/main.cpp
index 887fd15..92cbdde 100644
--- a/src/libEGL/main.cpp
+++ b/src/libEGL/main.cpp
@@ -6,7 +6,7 @@
 
 // main.cpp: DLL entry point and management of thread-local data.
 
-#include "main.h"
+#include "libEGL/main.h"
 
 #include "common/debug.h"
 
diff --git a/src/libGLESv2/Blit.cpp b/src/libGLESv2/Blit.cpp
index 136cb35..f056d2b 100644
--- a/src/libGLESv2/Blit.cpp
+++ b/src/libGLESv2/Blit.cpp
@@ -6,13 +6,14 @@
 
 // Blit.cpp: Surface copy utility class.
 
-#include "Blit.h"
+#include "libGLESv2/Blit.h"
 
 #include <d3dx9.h>
 
-#include "main.h"
 #include "common/debug.h"
 
+#include "libGLESv2/main.h"
+
 namespace
 {
 // Standard Vertex Shader
diff --git a/src/libGLESv2/Buffer.cpp b/src/libGLESv2/Buffer.cpp
index 7e5e199..f3cdf5f 100644
--- a/src/libGLESv2/Buffer.cpp
+++ b/src/libGLESv2/Buffer.cpp
@@ -8,14 +8,15 @@
 // index data. Implements GL buffer objects and related functionality.
 // [OpenGL ES 2.0.24] section 2.9 page 21.
 
-#include "Buffer.h"
+#include "libGLESv2/Buffer.h"
 
 #include <cstdlib>
 #include <limits>
 #include <utility>
 
 #include "common/debug.h"
-#include "geometry/backend.h"
+
+#include "libGLESv2/geometry/backend.h"
 
 namespace gl
 {
diff --git a/src/libGLESv2/Context.cpp b/src/libGLESv2/Context.cpp
index fed65d4..2c8ef1d 100644
--- a/src/libGLESv2/Context.cpp
+++ b/src/libGLESv2/Context.cpp
@@ -7,25 +7,26 @@
 // Context.cpp: Implements the gl::Context class, managing all GL state and performing
 // rendering operations. It is the GLES2 specific implementation of EGLContext.
 
-#include "Context.h"
+#include "libGLESv2/Context.h"
 
 #include <algorithm>
 
-#include "main.h"
 #include "libEGL/Display.h"
-#include "Buffer.h"
-#include "Shader.h"
-#include "Program.h"
-#include "Texture.h"
-#include "FrameBuffer.h"
-#include "RenderBuffer.h"
-#include "mathutil.h"
-#include "utilities.h"
-#include "geometry/backend.h"
-#include "geometry/VertexDataManager.h"
-#include "geometry/IndexDataManager.h"
-#include "geometry/dx9.h"
-#include "Blit.h"
+
+#include "libGLESv2/main.h"
+#include "libGLESv2/mathutil.h"
+#include "libGLESv2/utilities.h"
+#include "libGLESv2/Blit.h"
+#include "libGLESv2/Buffer.h"
+#include "libGLESv2/FrameBuffer.h"
+#include "libGLESv2/Program.h"
+#include "libGLESv2/RenderBuffer.h"
+#include "libGLESv2/Shader.h"
+#include "libGLESv2/Texture.h"
+#include "libGLESv2/geometry/backend.h"
+#include "libGLESv2/geometry/VertexDataManager.h"
+#include "libGLESv2/geometry/IndexDataManager.h"
+#include "libGLESv2/geometry/dx9.h"
 
 #undef near
 #undef far
diff --git a/src/libGLESv2/Framebuffer.cpp b/src/libGLESv2/Framebuffer.cpp
index ae1ae94..8c5114a 100644
--- a/src/libGLESv2/Framebuffer.cpp
+++ b/src/libGLESv2/Framebuffer.cpp
@@ -7,11 +7,11 @@
 // Framebuffer.cpp: Implements the gl::Framebuffer class. Implements GL framebuffer
 // objects and related functionality. [OpenGL ES 2.0.24] section 4.4 page 105.
 
-#include "Framebuffer.h"
+#include "libGLESv2/Framebuffer.h"
 
-#include "Renderbuffer.h"
-#include "Texture.h"
-#include "main.h"
+#include "libGLESv2/main.h"
+#include "libGLESv2/Renderbuffer.h"
+#include "libGLESv2/Texture.h"
 
 namespace gl
 {
diff --git a/src/libGLESv2/Program.cpp b/src/libGLESv2/Program.cpp
index 9683956..f8d14b1 100644
--- a/src/libGLESv2/Program.cpp
+++ b/src/libGLESv2/Program.cpp
@@ -7,12 +7,13 @@
 // Program.cpp: Implements the gl::Program class. Implements GL program objects
 // and related functionality. [OpenGL ES 2.0.24] section 2.10.3 page 28.
 
-#include "Program.h"
+#include "libGLESv2/Program.h"
 
-#include "main.h"
-#include "Shader.h"
 #include "common/debug.h"
 
+#include "libGLESv2/main.h"
+#include "libGLESv2/Shader.h"
+
 namespace gl
 {
 Uniform::Uniform(GLenum type, const std::string &name, unsigned int bytes) : type(type), name(name), bytes(bytes)
diff --git a/src/libGLESv2/Renderbuffer.cpp b/src/libGLESv2/Renderbuffer.cpp
index fa74e40..29eb6e8 100644
--- a/src/libGLESv2/Renderbuffer.cpp
+++ b/src/libGLESv2/Renderbuffer.cpp
@@ -8,10 +8,10 @@
 // Colorbuffer, Depthbuffer and Stencilbuffer. Implements GL renderbuffer
 // objects and related functionality. [OpenGL ES 2.0.24] section 4.4.3 page 108.
 
-#include "Renderbuffer.h"
+#include "libGLESv2/Renderbuffer.h"
 
-#include "main.h"
-#include "utilities.h"
+#include "libGLESv2/main.h"
+#include "libGLESv2/utilities.h"
 
 namespace gl
 {
diff --git a/src/libGLESv2/Shader.cpp b/src/libGLESv2/Shader.cpp
index 7deef0c..1fae330 100644
--- a/src/libGLESv2/Shader.cpp
+++ b/src/libGLESv2/Shader.cpp
@@ -8,13 +8,14 @@
 // VertexShader and FragmentShader. Implements GL shader objects and related
 // functionality. [OpenGL ES 2.0.24] section 2.10 page 24 and section 3.8 page 84.
 
-#include "Shader.h"
+#include "libGLESv2/Shader.h"
 
-#include "main.h"
 #include "GLSLANG/Shaderlang.h"
 #include "compiler/OutputHLSL.h"
 #include "common/debug.h"
 
+#include "libGLESv2/main.h"
+
 namespace gl
 {
 void *Shader::mFragmentCompiler = NULL;
diff --git a/src/libGLESv2/Texture.cpp b/src/libGLESv2/Texture.cpp
index f530307..37edd5a 100644
--- a/src/libGLESv2/Texture.cpp
+++ b/src/libGLESv2/Texture.cpp
@@ -8,15 +8,16 @@
 // Texture2D and TextureCubeMap. Implements GL texture objects and related
 // functionality. [OpenGL ES 2.0.24] section 3.7 page 63.
 
-#include "Texture.h"
+#include "libGLESv2/Texture.h"
 
 #include <algorithm>
 
-#include "main.h"
-#include "mathutil.h"
 #include "common/debug.h"
-#include "utilities.h"
-#include "Blit.h"
+
+#include "libGLESv2/main.h"
+#include "libGLESv2/mathutil.h"
+#include "libGLESv2/utilities.h"
+#include "libGLESv2/Blit.h"
 
 namespace gl
 {
diff --git a/src/libGLESv2/geometry/IndexDataManager.cpp b/src/libGLESv2/geometry/IndexDataManager.cpp
index b0e864c..8e5ea88 100644
--- a/src/libGLESv2/geometry/IndexDataManager.cpp
+++ b/src/libGLESv2/geometry/IndexDataManager.cpp
@@ -7,11 +7,12 @@
 // geometry/IndexDataManager.cpp: Defines the IndexDataManager, a class that
 // runs the Buffer translation process for index buffers.
 
-#include "geometry/IndexDataManager.h"
+#include "libGLESv2/geometry/IndexDataManager.h"
 
 #include "common/debug.h"
-#include "Buffer.h"
-#include "geometry/backend.h"
+
+#include "libGLESv2/Buffer.h"
+#include "libGLESv2/geometry/backend.h"
 
 namespace
 {
diff --git a/src/libGLESv2/geometry/IndexDataManager.h b/src/libGLESv2/geometry/IndexDataManager.h
index d590a9b..9e27c86 100644
--- a/src/libGLESv2/geometry/IndexDataManager.h
+++ b/src/libGLESv2/geometry/IndexDataManager.h
@@ -16,7 +16,7 @@
 #define GL_APICALL
 #include <GLES2/gl2.h>
 
-#include "Context.h"
+#include "libGLESv2/Context.h"
 
 namespace gl
 {
diff --git a/src/libGLESv2/geometry/VertexDataManager.cpp b/src/libGLESv2/geometry/VertexDataManager.cpp
index acb60ae..d6b08e7 100644
--- a/src/libGLESv2/geometry/VertexDataManager.cpp
+++ b/src/libGLESv2/geometry/VertexDataManager.cpp
@@ -7,14 +7,15 @@
 // geometry/VertexDataManager.h: Defines the VertexDataManager, a class that
 // runs the Buffer translation process.
 
-#include "geometry/VertexDataManager.h"
+#include "libGLESv2/geometry/VertexDataManager.h"
 
 #include "common/debug.h"
-#include "Program.h"
 
-#include "Buffer.h"
-#include "geometry/backend.h"
-#include "geometry/IndexDataManager.h"
+#include "libGLESv2/Buffer.h"
+#include "libGLESv2/Program.h"
+
+#include "libGLESv2/geometry/backend.h"
+#include "libGLESv2/geometry/IndexDataManager.h"
 
 namespace
 {
diff --git a/src/libGLESv2/geometry/VertexDataManager.h b/src/libGLESv2/geometry/VertexDataManager.h
index 0d19261..26b81e9 100644
--- a/src/libGLESv2/geometry/VertexDataManager.h
+++ b/src/libGLESv2/geometry/VertexDataManager.h
@@ -16,7 +16,7 @@
 #define GL_APICALL
 #include <GLES2/gl2.h>
 
-#include "Context.h"
+#include "libGLESv2/Context.h"
 
 namespace gl
 {
diff --git a/src/libGLESv2/geometry/backend.cpp b/src/libGLESv2/geometry/backend.cpp
index 2076e04..3f5e283 100644
--- a/src/libGLESv2/geometry/backend.cpp
+++ b/src/libGLESv2/geometry/backend.cpp
@@ -7,7 +7,7 @@
 // geometry/backend.h: Abstract classes BufferBackEnd, TranslatedVertexBuffer and TranslatedIndexBuffer
 // that must be implemented by any API-specific implementation of ANGLE.
 
-#include "geometry/backend.h"
+#include "libGLESv2/geometry/backend.h"
 
 #include "common/debug.h"
 
diff --git a/src/libGLESv2/geometry/backend.h b/src/libGLESv2/geometry/backend.h
index 16afbdc..07e2c16 100644
--- a/src/libGLESv2/geometry/backend.h
+++ b/src/libGLESv2/geometry/backend.h
@@ -15,7 +15,7 @@
 #define GL_APICALL
 #include <GLES2/gl2.h>
 
-#include "Context.h"
+#include "libGLESv2/Context.h"
 
 namespace gl
 {
diff --git a/src/libGLESv2/geometry/dx9.cpp b/src/libGLESv2/geometry/dx9.cpp
index 0e90a7d..f6ed703 100644
--- a/src/libGLESv2/geometry/dx9.cpp
+++ b/src/libGLESv2/geometry/dx9.cpp
@@ -6,18 +6,18 @@
 
 // geometry/dx9.h: Direct3D 9-based implementation of BufferBackEnd, TranslatedVertexBuffer and TranslatedIndexBuffer.
 
-#include "dx9.h"
+#include "libGLESv2/geometry/dx9.h"
 
 #include <cstddef>
 
 #define GL_APICALL
 #include <GLES2/gl2.h>
 
-#include "Context.h"
 #include "common/debug.h"
 
-#include "geometry/vertexconversion.h"
-#include "geometry/IndexDataManager.h"
+#include "libGLESv2/Context.h"
+#include "libGLESv2/geometry/vertexconversion.h"
+#include "libGLESv2/geometry/IndexDataManager.h"
 
 namespace
 {
diff --git a/src/libGLESv2/geometry/dx9.h b/src/libGLESv2/geometry/dx9.h
index 27afd68..cb18381 100644
--- a/src/libGLESv2/geometry/dx9.h
+++ b/src/libGLESv2/geometry/dx9.h
@@ -11,8 +11,8 @@
 
 #include <d3d9.h>
 
-#include "Buffer.h"
-#include "geometry/backend.h"
+#include "libGLESv2/Buffer.h"
+#include "libGLESv2/geometry/backend.h"
 
 namespace gl
 {
diff --git a/src/libGLESv2/geometry/vertexconversion.h b/src/libGLESv2/geometry/vertexconversion.h
index 2260085..29f17c0 100644
--- a/src/libGLESv2/geometry/vertexconversion.h
+++ b/src/libGLESv2/geometry/vertexconversion.h
@@ -13,7 +13,7 @@
 #include <cstddef>
 #include <limits>
 
-#include "Context.h" // Defines Index
+#include "libGLESv2/Context.h" // Defines Index
 
 namespace gl
 {
diff --git a/src/libGLESv2/libGLESv2.cpp b/src/libGLESv2/libGLESv2.cpp
index 78e2667..1dcfd0d 100644
--- a/src/libGLESv2/libGLESv2.cpp
+++ b/src/libGLESv2/libGLESv2.cpp
@@ -13,17 +13,18 @@
 #include <exception>
 #include <limits>
 
-#include "Context.h"
-#include "main.h"
-#include "Program.h"
-#include "Shader.h"
-#include "Buffer.h"
-#include "Texture.h"
-#include "Renderbuffer.h"
-#include "Framebuffer.h"
-#include "mathutil.h"
 #include "common/debug.h"
-#include "utilities.h"
+
+#include "libGLESv2/main.h"
+#include "libGLESv2/mathutil.h"
+#include "libGLESv2/utilities.h"
+#include "libGLESv2/Buffer.h"
+#include "libGLESv2/Context.h"
+#include "libGLESv2/Framebuffer.h"
+#include "libGLESv2/Program.h"
+#include "libGLESv2/Renderbuffer.h"
+#include "libGLESv2/Shader.h"
+#include "libGLESv2/Texture.h"
 
 extern "C"
 {
diff --git a/src/libGLESv2/main.cpp b/src/libGLESv2/main.cpp
index 168155d..69b8051 100644
--- a/src/libGLESv2/main.cpp
+++ b/src/libGLESv2/main.cpp
@@ -6,11 +6,12 @@
 
 // main.cpp: DLL entry point and management of thread-local data.
 
-#include "main.h"
+#include "libGLESv2/main.h"
 
-#include "Framebuffer.h"
-#include "libEGL/Surface.h"
 #include "common/debug.h"
+#include "libEGL/Surface.h"
+
+#include "libGLESv2/Framebuffer.h"
 
 static DWORD currentTLS = TLS_OUT_OF_INDEXES;
 
diff --git a/src/libGLESv2/utilities.cpp b/src/libGLESv2/utilities.cpp
index 0550700..d461ca4 100644
--- a/src/libGLESv2/utilities.cpp
+++ b/src/libGLESv2/utilities.cpp
@@ -6,11 +6,12 @@
 
 // utilities.cpp: Conversion functions and other utility routines.
 
-#include "utilities.h"
+#include "libGLESv2/utilities.h"
 
 #include "common/debug.h"
-#include "mathutil.h"
-#include "Context.h"
+
+#include "libGLESv2/mathutil.h"
+#include "libGLESv2/Context.h"
 
 namespace es2dx
 {