Revert "Move headers with no dependencies."

This reverts commit 117842223b.

No good:
https://uberchromegw.corp.google.com/i/client.skia/builders/Mac%20Builder/builds/3465/steps/compile/logs/stdio

BUG=skia:4126

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

include/gpu/gl/SkGLContext.h

@@ -9,7 +9,7 @@
 #define SkGLContext_DEFINED
 
 #include "GrGLInterface.h"
-#include "../private/SkGpuFenceSync.h"
+#include "../../src/gpu/SkGpuFenceSync.h"
 
 /**
  * Create an offscreen opengl context with an RGBA8 / 8bit stencil FBO.
@@ -18,7 +18,7 @@
 
 class SK_API SkGLContext : public SkRefCnt {
 public:
-
+    
 
     ~SkGLContext() override;
 

include/views/SkOSWindow_Win.h

@@ -10,7 +10,7 @@
 #ifndef SkOSWindow_Win_DEFINED
 #define SkOSWindow_Win_DEFINED
 
-#include "../private/SkFunction.h"
+#include "../../src/core/SkFunction.h"
 #include "../private/SkTHash.h"
 #include "SkWindow.h"
 

src/core/SkRecords.h

@@ -8,10 +8,10 @@
 #ifndef SkRecords_DEFINED
 #define SkRecords_DEFINED
 
-#include "../private/SkPathPriv.h"
 #include "SkCanvas.h"
 #include "SkDrawable.h"
 #include "SkMatrix.h"
+#include "SkPathPriv.h"
 #include "SkPicture.h"
 #include "SkRSXform.h"
 #include "SkTextBlob.h"