Update PoomSmart's YouTube tweak submodules

.gitmodules

@@ -26,10 +26,6 @@
 	path = Tweaks/YouTubeHeader
 	url = https://github.com/PoomSmart/YouTubeHeader.git
 	branch = main
-[submodule "Tweaks/PSHeader"]
-	path = Tweaks/PSHeader
-	url = https://github.com/PoomSmart/PSHeader.git
-	branch = master
 [submodule "Extensions"]
 	path = Extensions
 	url = https://github.com/CokePokes/YoutubeExtensions.git

Makefile

@@ -6,7 +6,7 @@ export libFLEX_ARCHS = arm64
 export Alderis_XCODEOPTS = LD_DYLIB_INSTALL_NAME=@rpath/Alderis.framework/Alderis
 export Alderis_XCODEFLAGS = DYLIB_INSTALL_NAME_BASE=/Library/Frameworks BUILD_LIBRARY_FOR_DISTRIBUTION=YES ARCHS="$(ARCHS)"
 export libcolorpicker_LDFLAGS = -F$(TARGET_PRIVATE_FRAMEWORK_PATH) -install_name @rpath/libcolorpicker.dylib
-export ADDITIONAL_CFLAGS = -I$(THEOS_PROJECT_DIR)/Tweaks/RemoteLog
+export ADDITIONAL_CFLAGS = -I$(THEOS_PROJECT_DIR)/Tweaks/RemoteLog -I$(THEOS_PROJECT_DIR)/Tweaks
 
 ifneq ($(JAILBROKEN),1)
 export DEBUGFLAG = -ggdb -Wno-unused-command-line-argument -L$(THEOS_OBJ_DIR) -F$(_THEOS_LOCAL_DATA_DIR)/$(THEOS_OBJ_DIR_NAME)/install/Library/Frameworks

Sources/YTCastConfirm.xm

@@ -1,4 +1,4 @@
-#import "../Tweaks/YouTubeHeader/YTAlertView.h"
+#import <YouTubeHeader/YTAlertView.h>
 #import "uYouPlus.h"
 
 extern NSBundle *uYouPlusBundle();

Sources/YTNoPaidPromo.x

@@ -1,5 +1,5 @@
-#import "../Tweaks/YouTubeHeader/YTPlayerOverlayProvider.h"
+#import <YouTubeHeader/YTPlayerOverlayProvider.h>
-#import "../Tweaks/YouTubeHeader/YTPlayerOverlay.h"
+#import <YouTubeHeader/YTPlayerOverlay.h>
 #import "uYouPlus.h"
 
 // YTNoPaidPromo: https://github.com/PoomSmart/YTNoPaidPromo

Sources/YTReExplore.x

@@ -1,7 +1,7 @@
-#import "../Tweaks/YouTubeHeader/YTIPivotBarRenderer.h"
+#import <YouTubeHeader/YTIPivotBarRenderer.h>
-#import "../Tweaks/YouTubeHeader/YTIGuideResponse.h"
+#import <YouTubeHeader/YTIGuideResponse.h>
-#import "../Tweaks/YouTubeHeader/YTIGuideResponseSupportedRenderers.h"
+#import <YouTubeHeader/YTIGuideResponseSupportedRenderers.h>
-#import "../Tweaks/YouTubeHeader/YTIBrowseRequest.h"
+#import <YouTubeHeader/YTIBrowseRequest.h>
 #import "uYouPlus.h"
 
 %group YTReExplore // https://github.com/PoomSmart/YTReExplore/

Sources/uYouPlus.h

@@ -7,10 +7,10 @@
 #import <rootless.h>
 
 #import "uYouPlusThemes.h" // Hide "Buy Super Thanks" banner (_ASDisplayView)
-#import "../Tweaks/YouTubeHeader/YTAppDelegate.h" // Activate FLEX
+#import <YouTubeHeader/YTAppDelegate.h> // Activate FLEX
-#import "../Tweaks/YouTubeHeader/YTIMenuConditionalServiceItemRenderer.h"
+#import <YouTubeHeader/YTIMenuConditionalServiceItemRenderer.h>
 
-// #import "../Tweaks/YouTubeHeader/YTISectionListRenderer.h" // Hide search ads by @PoomSmart - https://github.com/PoomSmart/YouTube-X
+// #import <YouTubeHeader/YTISectionListRenderer.h> // Hide search ads by @PoomSmart - https://github.com/PoomSmart/YouTube-X
 
 #define LOC(x) [tweakBundle localizedStringForKey:x value:nil table:nil]
 #define IS_ENABLED(k) [[NSUserDefaults standardUserDefaults] boolForKey:k]

Sources/uYouPlusPatches.h

@@ -1,4 +1,4 @@
-#import "../Tweaks/YouTubeHeader/YTCommonColorPalette.h"
+#import <YouTubeHeader/YTCommonColorPalette.h>
 #import "uYouPlus.h"
 
 @interface YTSingleVideoController : NSObject

Sources/uYouPlusSettings.h

@@ -1,9 +1,9 @@
-#import "../Tweaks/YouTubeHeader/YTSettingsViewController.h"
+#import <YouTubeHeader/YTSettingsViewController.h>
-#import "../Tweaks/YouTubeHeader/YTSearchableSettingsViewController.h"
+#import <YouTubeHeader/YTSearchableSettingsViewController.h>
-#import "../Tweaks/YouTubeHeader/YTSettingsSectionItem.h"
+#import <YouTubeHeader/YTSettingsSectionItem.h>
-#import "../Tweaks/YouTubeHeader/YTSettingsSectionItemManager.h"
+#import <YouTubeHeader/YTSettingsSectionItemManager.h>
-#import "../Tweaks/YouTubeHeader/YTUIUtils.h"
+#import <YouTubeHeader/YTUIUtils.h>
-#import "../Tweaks/YouTubeHeader/YTSettingsPickerViewController.h"
+#import <YouTubeHeader/YTSettingsPickerViewController.h>
 #import "uYouPlus.h"
 
 // For displaying snackbars

Sources/uYouPlusThemes.h

@@ -1,5 +1,5 @@
-#import "../Tweaks/YouTubeHeader/YTCommonColorPalette.h"
+#import <YouTubeHeader/YTCommonColorPalette.h>
-#import "../Tweaks/YouTubeHeader/ASCollectionView.h"
+#import <YouTubeHeader/ASCollectionView.h>
 #import "uYouPlus.h"
 
 @interface YCHLiveChatView : UIView