[NaCL SDK] nacl_io: move fake pepper interfaces into seperate directory.

Also, honor the INCLUDES directive in example.dsc files.

Review URL: https://codereview.chromium.org/145153006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247016 0039d316-1c4b-4281-b951-d872f2087c98

27 files changed, 75 insertions, 73 deletions

diff --git a/native_client_sdk/src/resources/Makefile.example.template b/native_client_sdk/src/resources/Makefile.example.template
index 3c710d7..b313eca 100644
--- a/native_client_sdk/src/resources/Makefile.example.template
+++ b/native_client_sdk/src/resources/Makefile.example.template
@@ -30,6 +30,10 @@
 VALID_TOOLCHAINS := {{' '.join(tools)}}
 {{pre}}
 NACL_SDK_ROOT ?= $(abspath $(CURDIR)/{{rel_sdk}})
+[[if 'INCLUDES' in targets[0]:]]
+EXTRA_INC_PATHS={{' '.join(targets[0]['INCLUDES'])}}
+[[]]
+
 include $(NACL_SDK_ROOT)/tools/common.mk
 
 [[if desc.get('SOCKET_PERMISSIONS'):]]
diff --git a/native_client_sdk/src/tests/nacl_io_socket_test/example.dsc b/native_client_sdk/src/tests/nacl_io_socket_test/example.dsc
index 80f3f13..ec87c98 100644
--- a/native_client_sdk/src/tests/nacl_io_socket_test/example.dsc
+++ b/native_client_sdk/src/tests/nacl_io_socket_test/example.dsc
@@ -14,7 +14,6 @@
       # Order matters here: gtest has a "main" function that will be used if
       # referenced before ppapi.
       'LIBS': ['gmock', 'ppapi_cpp', 'ppapi', 'gtest', 'pthread'],
-      'INCLUDES': ['$(NACL_SDK_ROOT)/include/gtest/internal'],
       'CXXFLAGS': ['-Wno-sign-compare']
     }
   ],
diff --git a/native_client_sdk/src/tests/nacl_io_test/dev_fs_for_testing.h b/native_client_sdk/src/tests/nacl_io_test/dev_fs_for_testing.h
index d1cc2f9..86fc52b 100644
--- a/native_client_sdk/src/tests/nacl_io_test/dev_fs_for_testing.h
+++ b/native_client_sdk/src/tests/nacl_io_test/dev_fs_for_testing.h
@@ -5,7 +5,7 @@
 #ifndef TESTS_NACL_IO_TEST_DEV_FS_FOR_TESTING_H_
 #define TESTS_NACL_IO_TEST_DEV_FS_FOR_TESTING_H_
 
-#include "fake_pepper_interface.h"
+#include "fake_ppapi/fake_pepper_interface.h"
 #include "gmock/gmock.h"
 #include "nacl_io/devfs/dev_fs.h"
 #include "nacl_io/filesystem.h"
diff --git a/native_client_sdk/src/tests/nacl_io_test/example.dsc b/native_client_sdk/src/tests/nacl_io_test/example.dsc
index 98390c7..daed336 100644
--- a/native_client_sdk/src/tests/nacl_io_test/example.dsc
+++ b/native_client_sdk/src/tests/nacl_io_test/example.dsc
@@ -9,26 +9,26 @@
       'SOURCES' : [
         'dev_fs_for_testing.h',
         'event_test.cc',
-        'fake_core_interface.cc',
-        'fake_core_interface.h',
-        'fake_messaging_interface.cc',
-        'fake_messaging_interface.h',
-        'fake_pepper_interface.cc',
-        'fake_pepper_interface.h',
-        'fake_pepper_interface_html5_fs.cc',
-        'fake_pepper_interface_html5_fs.h',
-        'fake_pepper_interface_url_loader.cc',
-        'fake_pepper_interface_url_loader.h',
-        'fake_resource_manager.cc',
-        'fake_resource_manager.h',
-        'fake_var_array_buffer_interface.cc',
-        'fake_var_array_buffer_interface.h',
-        'fake_var_array_interface.cc',
-        'fake_var_array_interface.h',
-        'fake_var_interface.cc',
-        'fake_var_interface.h',
-        'fake_var_manager.cc',
-        'fake_var_manager.h',
+        'fake_ppapi/fake_core_interface.cc',
+        'fake_ppapi/fake_core_interface.h',
+        'fake_ppapi/fake_messaging_interface.cc',
+        'fake_ppapi/fake_messaging_interface.h',
+        'fake_ppapi/fake_pepper_interface.cc',
+        'fake_ppapi/fake_pepper_interface.h',
+        'fake_ppapi/fake_pepper_interface_html5_fs.cc',
+        'fake_ppapi/fake_pepper_interface_html5_fs.h',
+        'fake_ppapi/fake_pepper_interface_url_loader.cc',
+        'fake_ppapi/fake_pepper_interface_url_loader.h',
+        'fake_ppapi/fake_resource_manager.cc',
+        'fake_ppapi/fake_resource_manager.h',
+        'fake_ppapi/fake_var_array_buffer_interface.cc',
+        'fake_ppapi/fake_var_array_buffer_interface.h',
+        'fake_ppapi/fake_var_array_interface.cc',
+        'fake_ppapi/fake_var_array_interface.h',
+        'fake_ppapi/fake_var_interface.cc',
+        'fake_ppapi/fake_var_interface.h',
+        'fake_ppapi/fake_var_manager.cc',
+        'fake_ppapi/fake_var_manager.h',
         'fifo_test.cc',
         'filesystem_test.cc',
         'fuse_fs_test.cc',
@@ -56,7 +56,7 @@
       # Order matters here: gtest has a "main" function that will be used if
       # referenced before ppapi.
       'LIBS': ['gmock', 'ppapi_cpp', 'ppapi', 'gtest', 'pthread'],
-      'INCLUDES': ['$(NACL_SDK_ROOT)/include/gtest/internal'],
+      'INCLUDES': ["."],
       'CXXFLAGS': ['-Wno-sign-compare'],
     }
   ],
diff --git a/native_client_sdk/src/tests/nacl_io_test/fake_core_interface.cc b/native_client_sdk/src/tests/nacl_io_test/fake_ppapi/fake_core_interface.cc
index 85759c4..4aa4d7e 100644
--- a/native_client_sdk/src/tests/nacl_io_test/fake_core_interface.cc
+++ b/native_client_sdk/src/tests/nacl_io_test/fake_ppapi/fake_core_interface.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "fake_core_interface.h"
+#include "fake_ppapi/fake_core_interface.h"
 
 FakeCoreInterface::FakeCoreInterface() {}
 
diff --git a/native_client_sdk/src/tests/nacl_io_test/fake_core_interface.h b/native_client_sdk/src/tests/nacl_io_test/fake_ppapi/fake_core_interface.h
index 19d53a2..fa6fe23 100644
--- a/native_client_sdk/src/tests/nacl_io_test/fake_core_interface.h
+++ b/native_client_sdk/src/tests/nacl_io_test/fake_ppapi/fake_core_interface.h
@@ -1,11 +1,11 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef TESTS_NACL_IO_TEST_FAKE_CORE_INTERFACE_H_
 #define TESTS_NACL_IO_TEST_FAKE_CORE_INTERFACE_H_
 
-#include "fake_resource_manager.h"
+#include "fake_ppapi/fake_resource_manager.h"
 #include "nacl_io/pepper_interface.h"
 #include "sdk_util/macros.h"
 
diff --git a/native_client_sdk/src/tests/nacl_io_test/fake_messaging_interface.cc b/native_client_sdk/src/tests/nacl_io_test/fake_ppapi/fake_messaging_interface.cc
index b949af8..e73fa73 100644
--- a/native_client_sdk/src/tests/nacl_io_test/fake_messaging_interface.cc
+++ b/native_client_sdk/src/tests/nacl_io_test/fake_ppapi/fake_messaging_interface.cc
@@ -1,10 +1,10 @@
-// Copyright (c) 2014 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "fake_messaging_interface.h"
+#include "fake_ppapi/fake_messaging_interface.h"
 
-#include "fake_var_manager.h"
+#include "fake_ppapi/fake_var_manager.h"
 
 FakeMessagingInterface::FakeMessagingInterface(
     FakeVarManager* manager, nacl_io::VarInterface* var_interface)
diff --git a/native_client_sdk/src/tests/nacl_io_test/fake_messaging_interface.h b/native_client_sdk/src/tests/nacl_io_test/fake_ppapi/fake_messaging_interface.h
index d056eea..3ea661c 100644
--- a/native_client_sdk/src/tests/nacl_io_test/fake_messaging_interface.h
+++ b/native_client_sdk/src/tests/nacl_io_test/fake_ppapi/fake_messaging_interface.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
diff --git a/native_client_sdk/src/tests/nacl_io_test/fake_pepper_interface.cc b/native_client_sdk/src/tests/nacl_io_test/fake_ppapi/fake_pepper_interface.cc
index 0fc3505..7b60a4b 100644
--- a/native_client_sdk/src/tests/nacl_io_test/fake_pepper_interface.cc
+++ b/native_client_sdk/src/tests/nacl_io_test/fake_ppapi/fake_pepper_interface.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2014 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "fake_pepper_interface.h"
+#include "fake_ppapi/fake_pepper_interface.h"
 
 using namespace nacl_io;
 
diff --git a/native_client_sdk/src/tests/nacl_io_test/fake_pepper_interface.h b/native_client_sdk/src/tests/nacl_io_test/fake_ppapi/fake_pepper_interface.h
index 7b608a1..68f7864 100644
--- a/native_client_sdk/src/tests/nacl_io_test/fake_pepper_interface.h
+++ b/native_client_sdk/src/tests/nacl_io_test/fake_ppapi/fake_pepper_interface.h
@@ -1,16 +1,16 @@
-// Copyright (c) 2014 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef TESTS_NACL_IO_TEST_FAKE_PEPPER_INTERFACE_H_
 #define TESTS_NACL_IO_TEST_FAKE_PEPPER_INTERFACE_H_
 
-#include "fake_core_interface.h"
-#include "fake_messaging_interface.h"
-#include "fake_var_array_buffer_interface.h"
-#include "fake_var_array_interface.h"
-#include "fake_var_interface.h"
-#include "fake_var_manager.h"
+#include "fake_ppapi/fake_core_interface.h"
+#include "fake_ppapi/fake_messaging_interface.h"
+#include "fake_ppapi/fake_var_array_buffer_interface.h"
+#include "fake_ppapi/fake_var_array_interface.h"
+#include "fake_ppapi/fake_var_interface.h"
+#include "fake_ppapi/fake_var_manager.h"
 #include "nacl_io/pepper_interface_dummy.h"
 
 class FakePepperInterface : public nacl_io::PepperInterfaceDummy {
diff --git a/native_client_sdk/src/tests/nacl_io_test/fake_pepper_interface_html5_fs.cc b/native_client_sdk/src/tests/nacl_io_test/fake_ppapi/fake_pepper_interface_html5_fs.cc
index eddf42c..18776b9 100644
--- a/native_client_sdk/src/tests/nacl_io_test/fake_pepper_interface_html5_fs.cc
+++ b/native_client_sdk/src/tests/nacl_io_test/fake_ppapi/fake_pepper_interface_html5_fs.cc
@@ -1,8 +1,8 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "fake_pepper_interface_html5_fs.h"
+#include "fake_ppapi/fake_pepper_interface_html5_fs.h"
 
 #include <string.h>
 
diff --git a/native_client_sdk/src/tests/nacl_io_test/fake_pepper_interface_html5_fs.h b/native_client_sdk/src/tests/nacl_io_test/fake_ppapi/fake_pepper_interface_html5_fs.h
index ad6a221..000894e 100644
--- a/native_client_sdk/src/tests/nacl_io_test/fake_pepper_interface_html5_fs.h
+++ b/native_client_sdk/src/tests/nacl_io_test/fake_ppapi/fake_pepper_interface_html5_fs.h
@@ -1,4 +1,4 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -11,9 +11,9 @@
 
 #include <ppapi/c/pp_directory_entry.h>
 
-#include "fake_core_interface.h"
-#include "fake_var_interface.h"
-#include "fake_var_manager.h"
+#include "fake_ppapi/fake_core_interface.h"
+#include "fake_ppapi/fake_var_interface.h"
+#include "fake_ppapi/fake_var_manager.h"
 #include "nacl_io/pepper_interface_dummy.h"
 #include "sdk_util/macros.h"
 
diff --git a/native_client_sdk/src/tests/nacl_io_test/fake_pepper_interface_url_loader.cc b/native_client_sdk/src/tests/nacl_io_test/fake_ppapi/fake_pepper_interface_url_loader.cc
index 9451f64..988aac4 100644
--- a/native_client_sdk/src/tests/nacl_io_test/fake_pepper_interface_url_loader.cc
+++ b/native_client_sdk/src/tests/nacl_io_test/fake_ppapi/fake_pepper_interface_url_loader.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "fake_pepper_interface_url_loader.h"
+#include "fake_ppapi/fake_pepper_interface_url_loader.h"
 
 #include <string.h>
 #include <strings.h>
diff --git a/native_client_sdk/src/tests/nacl_io_test/fake_pepper_interface_url_loader.h b/native_client_sdk/src/tests/nacl_io_test/fake_ppapi/fake_pepper_interface_url_loader.h
index 1905e20..9a2b633 100644
--- a/native_client_sdk/src/tests/nacl_io_test/fake_pepper_interface_url_loader.h
+++ b/native_client_sdk/src/tests/nacl_io_test/fake_ppapi/fake_pepper_interface_url_loader.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -9,9 +9,9 @@
 #include <string>
 #include <vector>
 
-#include "fake_core_interface.h"
-#include "fake_var_interface.h"
-#include "fake_var_manager.h"
+#include "fake_ppapi/fake_core_interface.h"
+#include "fake_ppapi/fake_var_interface.h"
+#include "fake_ppapi/fake_var_manager.h"
 #include "nacl_io/pepper_interface_dummy.h"
 #include "sdk_util/macros.h"
 
diff --git a/native_client_sdk/src/tests/nacl_io_test/fake_resource_manager.cc b/native_client_sdk/src/tests/nacl_io_test/fake_ppapi/fake_resource_manager.cc
index ccb2993..aa40c3c 100644
--- a/native_client_sdk/src/tests/nacl_io_test/fake_resource_manager.cc
+++ b/native_client_sdk/src/tests/nacl_io_test/fake_ppapi/fake_resource_manager.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "fake_resource_manager.h"
+#include "fake_ppapi/fake_resource_manager.h"
 #include "gtest/gtest.h"
 #include "sdk_util/auto_lock.h"
 
diff --git a/native_client_sdk/src/tests/nacl_io_test/fake_resource_manager.h b/native_client_sdk/src/tests/nacl_io_test/fake_ppapi/fake_resource_manager.h
index 5a37df1..10e1d6e 100644
--- a/native_client_sdk/src/tests/nacl_io_test/fake_resource_manager.h
+++ b/native_client_sdk/src/tests/nacl_io_test/fake_ppapi/fake_resource_manager.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
diff --git a/native_client_sdk/src/tests/nacl_io_test/fake_var_array_buffer_interface.cc b/native_client_sdk/src/tests/nacl_io_test/fake_ppapi/fake_var_array_buffer_interface.cc
index f19da86..fd64606 100644
--- a/native_client_sdk/src/tests/nacl_io_test/fake_var_array_buffer_interface.cc
+++ b/native_client_sdk/src/tests/nacl_io_test/fake_ppapi/fake_var_array_buffer_interface.cc
@@ -1,10 +1,10 @@
-// Copyright (c) 2014 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "fake_var_array_buffer_interface.h"
+#include "fake_ppapi/fake_var_array_buffer_interface.h"
 
-#include "fake_var_manager.h"
+#include "fake_ppapi/fake_var_manager.h"
 #include "gtest/gtest.h"
 
 FakeVarArrayBufferInterface::FakeVarArrayBufferInterface(
diff --git a/native_client_sdk/src/tests/nacl_io_test/fake_var_array_buffer_interface.h b/native_client_sdk/src/tests/nacl_io_test/fake_ppapi/fake_var_array_buffer_interface.h
index a5ccc15..fb48371 100644
--- a/native_client_sdk/src/tests/nacl_io_test/fake_var_array_buffer_interface.h
+++ b/native_client_sdk/src/tests/nacl_io_test/fake_ppapi/fake_var_array_buffer_interface.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
diff --git a/native_client_sdk/src/tests/nacl_io_test/fake_var_array_interface.cc b/native_client_sdk/src/tests/nacl_io_test/fake_ppapi/fake_var_array_interface.cc
index fa9a827..9492805 100644
--- a/native_client_sdk/src/tests/nacl_io_test/fake_var_array_interface.cc
+++ b/native_client_sdk/src/tests/nacl_io_test/fake_ppapi/fake_var_array_interface.cc
@@ -1,10 +1,10 @@
-// Copyright (c) 2014 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "fake_var_array_interface.h"
+#include "fake_ppapi/fake_var_array_interface.h"
 
-#include "fake_var_manager.h"
+#include "fake_ppapi/fake_var_manager.h"
 #include "gtest/gtest.h"
 
 FakeVarArrayInterface::FakeVarArrayInterface(FakeVarManager* manager)
diff --git a/native_client_sdk/src/tests/nacl_io_test/fake_var_array_interface.h b/native_client_sdk/src/tests/nacl_io_test/fake_ppapi/fake_var_array_interface.h
index b08c752..8b70174 100644
--- a/native_client_sdk/src/tests/nacl_io_test/fake_var_array_interface.h
+++ b/native_client_sdk/src/tests/nacl_io_test/fake_ppapi/fake_var_array_interface.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
diff --git a/native_client_sdk/src/tests/nacl_io_test/fake_var_interface.cc b/native_client_sdk/src/tests/nacl_io_test/fake_ppapi/fake_var_interface.cc
index 104551d..a2e61b8 100644
--- a/native_client_sdk/src/tests/nacl_io_test/fake_var_interface.cc
+++ b/native_client_sdk/src/tests/nacl_io_test/fake_ppapi/fake_var_interface.cc
@@ -1,9 +1,9 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "fake_var_interface.h"
-#include "fake_var_manager.h"
+#include "fake_ppapi/fake_var_interface.h"
+#include "fake_ppapi/fake_var_manager.h"
 #include "gtest/gtest.h"
 
 FakeVarInterface::FakeVarInterface(FakeVarManager* manager)
diff --git a/native_client_sdk/src/tests/nacl_io_test/fake_var_interface.h b/native_client_sdk/src/tests/nacl_io_test/fake_ppapi/fake_var_interface.h
index 0306188..451553b 100644
--- a/native_client_sdk/src/tests/nacl_io_test/fake_var_interface.h
+++ b/native_client_sdk/src/tests/nacl_io_test/fake_ppapi/fake_var_interface.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
diff --git a/native_client_sdk/src/tests/nacl_io_test/fake_var_manager.cc b/native_client_sdk/src/tests/nacl_io_test/fake_ppapi/fake_var_manager.cc
index 9bc907c..eb1809e 100644
--- a/native_client_sdk/src/tests/nacl_io_test/fake_var_manager.cc
+++ b/native_client_sdk/src/tests/nacl_io_test/fake_ppapi/fake_var_manager.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2014 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "fake_var_manager.h"
+#include "fake_ppapi/fake_var_manager.h"
 
 #include "gtest/gtest.h"
 
diff --git a/native_client_sdk/src/tests/nacl_io_test/fake_var_manager.h b/native_client_sdk/src/tests/nacl_io_test/fake_ppapi/fake_var_manager.h
index 6da13a2..c8d1309 100644
--- a/native_client_sdk/src/tests/nacl_io_test/fake_var_manager.h
+++ b/native_client_sdk/src/tests/nacl_io_test/fake_ppapi/fake_var_manager.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
diff --git a/native_client_sdk/src/tests/nacl_io_test/html5_fs_test.cc b/native_client_sdk/src/tests/nacl_io_test/html5_fs_test.cc
index ef1068e..c91eeaf 100644
--- a/native_client_sdk/src/tests/nacl_io_test/html5_fs_test.cc
+++ b/native_client_sdk/src/tests/nacl_io_test/html5_fs_test.cc
@@ -17,13 +17,13 @@
 #include <windows.h>  // For Sleep()
 #endif
 
+#include "fake_ppapi/fake_pepper_interface_html5_fs.h"
 #include "nacl_io/kernel_handle.h"
 #include "nacl_io/html5fs/html5_fs.h"
 #include "nacl_io/osdirent.h"
 #include "nacl_io/osunistd.h"
 #include "nacl_io/pepper_interface_delegate.h"
 #include "sdk_util/scoped_ref.h"
-#include "fake_pepper_interface_html5_fs.h"
 #include "mock_util.h"
 #include "pepper_interface_mock.h"
 
diff --git a/native_client_sdk/src/tests/nacl_io_test/http_fs_test.cc b/native_client_sdk/src/tests/nacl_io_test/http_fs_test.cc
index 6e0a119..1168d68 100644
--- a/native_client_sdk/src/tests/nacl_io_test/http_fs_test.cc
+++ b/native_client_sdk/src/tests/nacl_io_test/http_fs_test.cc
@@ -10,7 +10,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
-#include "fake_pepper_interface_url_loader.h"
+#include "fake_ppapi/fake_pepper_interface_url_loader.h"
 
 #include "nacl_io/dir_node.h"
 #include "nacl_io/httpfs/http_fs.h"
diff --git a/native_client_sdk/src/tests/sdk_util_test/example.dsc b/native_client_sdk/src/tests/sdk_util_test/example.dsc
index 26fa010..937820b 100644
--- a/native_client_sdk/src/tests/sdk_util_test/example.dsc
+++ b/native_client_sdk/src/tests/sdk_util_test/example.dsc
@@ -14,7 +14,6 @@
       # Order matters here: gtest has a "main" function that will be used if
       # referenced before ppapi.
       'LIBS': ['gmock', 'ppapi_cpp', 'ppapi', 'gtest', 'pthread'],
-      'INCLUDES': ['$(NACL_SDK_ROOT)/include/gtest/internal'],
       'CXXFLAGS': ['-Wno-sign-compare']
     }
   ],