Revert "Move headers used by headers in include/ to include/private."

gyp/debugger.gyp

 # Copyright 2015 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 {
   'variables': {
     'skia_warnings_as_errors': 0,
     'conditions': [
       [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]', {
         # Use the systemwide Qt libs by default
@@ skipping 64 matching lines @@
   },
   'targets': [
     {
       'target_name': 'debugger',
       'type': 'executable',
       'mac_bundle': 1,
       'mac_framework_dirs': [
         '/Library/Frameworks',
       ],
       'include_dirs' : [
-        '../include/private',
         '../src/core',
         '../src/utils/debugger',
         '../debugger',      # To pull SkDebugger.h
         '../src/gpu',       # To pull gl/GrGLUtil.h
         '../src/ports',     # To pull SkFontDescriptor.h
         '../bench',
         '../tools',
         '../debugger/QT',   # For all the QT UI Goodies
         '<@(qt_includes)',
       ],
@@ skipping 70 matching lines @@
           'outputs': [ '<(moc_gen_dir)/moc_<(RULE_INPUT_ROOT).cpp' ],
           'action': [ '<(qt_moc)', '-DSK_SUPPORT_GPU=<(skia_gpu)',
                       '<(RULE_INPUT_PATH)',
                       '-o', '<(moc_gen_dir)/moc_<(RULE_INPUT_ROOT).cpp' ],
           'message': 'Generating <(RULE_INPUT_ROOT).cpp.',
         },
       ],
     },
   ],
 }