Rename include guards

57 files changed, 172 insertions, 171 deletions

diff --git a/include/user/appmgr.h b/include/user/appmgr.h
index 9547e9b..a3ee1fd 100644
--- a/include/user/appmgr.h
+++ b/include/user/appmgr.h
@@ -2,8 +2,8 @@
 	Vita Development Suite Libraries
 */
 
-#ifndef _PSP2_APPMGR_H_
-#define _PSP2_APPMGR_H_
+#ifndef _VDSUITE_USER_APPMGR_H
+#define _VDSUITE_USER_APPMGR_H
 
 #include_next <appmgr.h>
 
@@ -477,5 +477,5 @@ int sceSharedFbGetInfo(SceUID fbId, SceSharedFbInfo *fbInfo);
 }
 #endif
 
-#endif /* _PSP2_APPMGR_H_ */
+#endif /* _VDSUITE_USER_APPMGR_H */
 
diff --git a/include/user/audiocodec.h b/include/user/audiocodec.h
index ad3284f..4252d07 100644
--- a/include/user/audiocodec.h
+++ b/include/user/audiocodec.h
@@ -2,8 +2,8 @@
 	Vita Development Suite Libraries
 */
 
-#ifndef _DOLCESDK_PSP2_AUDIOCODEC_H_
-#define _DOLCESDK_PSP2_AUDIOCODEC_H_
+#ifndef _VDSUITE_USER_AUDIOCODEC_H
+#define _VDSUITE_USER_AUDIOCODEC_H
 
 #include <audiodec.h>
 
@@ -209,4 +209,4 @@ SceInt32 sceAudiocodecGetAt3Config(SceUInt32 cmode, SceUInt32 nbytes)
 }
 #endif
 
-#endif /* _DOLCESDK_PSP2_AUDIOCODEC_H_ */
+#endif /* _VDSUITE_USER_AUDIOCODEC_H */
diff --git a/include/user/audiodec.h b/include/user/audiodec.h
index b29ab98..a65ba01 100644
--- a/include/user/audiodec.h
+++ b/include/user/audiodec.h
@@ -2,12 +2,12 @@
 	Vita Development Suite Libraries
 */
 
-#ifndef _DOLCESDK_PSP2_AUDIODEC_H_
-#define _DOLCESDK_PSP2_AUDIODEC_H_
+#ifndef _VDSUITE_USER_AUDIODEC_H
+#define _VDSUITE_USER_AUDIODEC_H
 
 #include_next <audiodec.h>
 
 /* Audio decoder type */
 #define SCE_AUDIODEC_TYPE_SILK (0x1007U)
 
-#endif /* _DOLCESDK_PSP2_AUDIODEC_H_ */
+#endif /* _VDSUITE_USER_AUDIODEC_H */
diff --git a/include/user/audioenc.h b/include/user/audioenc.h
index 99ced89..7c130a0 100644
--- a/include/user/audioenc.h
+++ b/include/user/audioenc.h
@@ -2,12 +2,12 @@
 	Vita Development Suite Libraries
 */
 
-#ifndef _DOLCESDK_PSP2_AUDIOENC_H_
-#define _DOLCESDK_PSP2_AUDIOENC_H_
+#ifndef _VDSUITE_USER_AUDIOENC_H
+#define _VDSUITE_USER_AUDIOENC_H
 
 #include_next <audioenc.h>
 
 /* Audio encoder type */
 #define SCE_AUDIOENC_TYPE_SILK (0x2007U) /* Only use with sceAudioencCreateEncoderResident() */
 
-#endif /* _DOLCESDK_PSP2_AUDIOENC_H_ */
+#endif /* _VDSUITE_USER_AUDIOENC_H */
diff --git a/include/user/avcdec.h b/include/user/avcdec.h
index f3d067f..6028b7b 100644
--- a/include/user/avcdec.h
+++ b/include/user/avcdec.h
@@ -2,8 +2,8 @@
 	Vita Development Suite Libraries
 */
 
-#ifndef _DOLCESDK_PSP2_AVCDEC_H_
-#define _DOLCESDK_PSP2_AVCDEC_H_
+#ifndef _VDSUITE_USER_AVCDEC_H
+#define _VDSUITE_USER_AVCDEC_H
 
 #include <videodec.h>
 #include_next <avcdec.h>
@@ -60,5 +60,5 @@ extern SceInt32 sceAvcdecDecodeGetPictureNongameapp(SceAvcdecCtrl *pCtrl, SceAvc
 }
 #endif /* defined(_LANGUAGE_C_PLUS_PLUS)||defined(__cplusplus)||defined(c_plusplus) */
 
-#endif /* _DOLCESDK_PSP2_AVCDEC_H_ */
+#endif /* _VDSUITE_USER_AVCDEC_H */
 
diff --git a/include/user/avconfig.h b/include/user/avconfig.h
index 472cc0e..fdd1f1f 100644
--- a/include/user/avconfig.h
+++ b/include/user/avconfig.h
@@ -2,8 +2,8 @@
 	Vita Development Suite Libraries
 */
 
-#ifndef _PSP2_AVCONFIG_H_
-#define _PSP2_AVCONFIG_H_
+#ifndef _VDSUITE_USER_AVCONFIG_H
+#define _VDSUITE_USER_AVCONFIG_H
 
 #include <scetypes.h>
 
@@ -170,5 +170,5 @@ int sceAVConfigSetDisplayColorSpaceMode(SceUInt32 mode);
 }
 #endif
 
-#endif
+#endif /* _VDSUITE_USER_AVCONFIG_H */
 
diff --git a/include/user/bgapputil.h b/include/user/bgapputil.h
index a91070f..72050bf 100644
--- a/include/user/bgapputil.h
+++ b/include/user/bgapputil.h
@@ -2,8 +2,8 @@
 	Vita Development Suite Libraries
 */
 
-#ifndef _DOLCESDK_PSP2_BGAPPUTIL_H_
-#define _DOLCESDK_PSP2_BGAPPUTIL_H_
+#ifndef _VDSUITE_USER_BGAPPUTIL_H
+#define _VDSUITE_USER_BGAPPUTIL_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -27,4 +27,4 @@ int sceBgAppUtilStartBgApp(int mode);
 }
 #endif /* __cplusplus */
 
-#endif /* _DOLCESDK_PSP2_BGAPPUTIL_H_ */
+#endif /* _VDSUITE_USER_BGAPPUTIL_H */
diff --git a/include/user/compat.h b/include/user/compat.h
index 0f5832e..8b845ba 100644
--- a/include/user/compat.h
+++ b/include/user/compat.h
@@ -2,8 +2,8 @@
 	Vita Development Suite Libraries
 */
 
-#ifndef _PSP2_COMPAT_H_
-#define _PSP2_COMPAT_H_
+#ifndef _VDSUITE_USER_COMPAT_H
+#define _VDSUITE_USER_COMPAT_H
 
 #include <kernel/iofilemgr.h>
 #include <rtc.h>
@@ -301,5 +301,5 @@ int sceCompatGetCurrentSecureTick(SceRtcTick *tick);
 }
 #endif
 
-#endif /* _PSP2_COMPAT_H_ */
+#endif /* _VDSUITE_USER_COMPAT_H */
 
diff --git a/include/user/ctrl.h b/include/user/ctrl.h
index 6d1f2e0..24f3263 100644
--- a/include/user/ctrl.h
+++ b/include/user/ctrl.h
@@ -2,8 +2,8 @@
 	Vita Development Suite Libraries
 */
 
-#ifndef _PSP2_CTRL_H_
-#define _PSP2_CTRL_H_
+#ifndef _VDSUITE_USER_CTRL_H
+#define _VDSUITE_USER_CTRL_H
 
 #include_next <ctrl.h>
 
@@ -82,4 +82,4 @@ int sceCtrlGetBatteryInfo(int port, SceUInt8 *batt);
 }
 #endif
 
-#endif /* _PSP2CTRL_H_ */
+#endif /* _VDSUITE_USER_CTRL_H */
diff --git a/include/user/display.h b/include/user/display.h
index 5a6235c..c13d5d5 100644
--- a/include/user/display.h
+++ b/include/user/display.h
@@ -2,8 +2,8 @@
 	Vita Development Suite Libraries
 */
 
-#ifndef _PSP2_DISPLAY_H_
-#define _PSP2_DISPLAY_H_
+#ifndef _VDSUITE_USER_DISPLAY_H
+#define _VDSUITE_USER_DISPLAY_H
 
 #include_next <display.h>
 
@@ -52,5 +52,5 @@ int sceDisplayGetVcountInternal(int display);
 }
 #endif
 
-#endif /* _PSP2_DISPLAY_H_ */
+#endif /* _VDSUITE_USER_DISPLAY_H */
 
diff --git a/include/user/gim.h b/include/user/gim.h
index ab91bb4..a3ed547 100644
--- a/include/user/gim.h
+++ b/include/user/gim.h
@@ -2,8 +2,8 @@
 	Vita Development Suite Libraries
 */
 
-#ifndef _DOLCESDK_PSP2_GIM_H_
-#define _DOLCESDK_PSP2_GIM_H_
+#ifndef _VDSUITE_USER_GIM_H
+#define _VDSUITE_USER_GIM_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -363,5 +363,5 @@ inline SceGimErrorCode sceGimCheckData(void *gim) {
 }
 #endif
 
-#endif /* _DOLCESDK_PSP2_GIM_H_ */
+#endif /* _VDSUITE_USER_GIM_H */
 
diff --git a/include/user/gxm/context.h b/include/user/gxm/context.h
index fe01b64..f225105 100644
--- a/include/user/gxm/context.h
+++ b/include/user/gxm/context.h
@@ -2,8 +2,8 @@
 	Vita Development Suite Libraries
 */
 
-#ifndef _DOLCESDK_PSP2_GXM_CONTEXT_INTERNAL_H_
-#define _DOLCESDK_PSP2_GXM_CONTEXT_INTERNAL_H_
+#ifndef _VDSUITE_USER_GXM_CONTEXT_H
+#define _VDSUITE_USER_GXM_CONTEXT_H
 
 /** @file
 */
@@ -102,4 +102,4 @@ SceGxmErrorCode sceGxmRazorReplayReserveVdm(
 }
 #endif	// def __cplusplus
 
-#endif /* _DOLCESDK_PSP2_GXM_CONTEXT_INTERNAL_H_ */
+#endif /* _VDSUITE_USER_GXM_CONTEXT_H */
diff --git a/include/user/gxm/init.h b/include/user/gxm/init.h
index a358ff7..961b7c2 100644
--- a/include/user/gxm/init.h
+++ b/include/user/gxm/init.h
@@ -2,8 +2,8 @@
 	Vita Development Suite Libraries
 */
 
-#ifndef _DOLCESDK_PSP2_GXM_INIT_INTERNAL_H_
-#define _DOLCESDK_PSP2_GXM_INIT_INTERNAL_H_
+#ifndef _VDSUITE_USER_GXM_INIT_H
+#define _VDSUITE_USER_GXM_INIT_H
 
 /** @file
 */
@@ -75,4 +75,4 @@ void *sceGxmGetDeviceData(void);
 }
 #endif	// def __cplusplus
 
-#endif /* _DOLCESDK_PSP2_GXM_INIT_INTERNAL_H_ */
+#endif /* _VDSUITE_USER_GXM_INIT_H */
diff --git a/include/user/gxm/memory.h b/include/user/gxm/memory.h
index cb1426e..1cc1de6 100644
--- a/include/user/gxm/memory.h
+++ b/include/user/gxm/memory.h
@@ -2,8 +2,8 @@
 	Vita Development Suite Libraries
 */
 
-#ifndef _DOLCESDK_PSP2_GXM_MEMORY_INTERNAL_H_
-#define _DOLCESDK_PSP2_GXM_MEMORY_INTERNAL_H_
+#ifndef _VDSUITE_USER_GXM_MEMORY_H
+#define _VDSUITE_USER_GXM_MEMORY_H
 
 /** @file
 
@@ -190,4 +190,4 @@ SceGxmErrorCode sceGxmFreeDeviceMemLinux(SceGxmDeviceMemInfo* memInfo);
 }
 #endif	// def __cplusplus
 
-#endif /* _DOLCESDK_PSP2_GXM_MEMORY_INTERNAL_H_ */
+#endif /* _VDSUITE_USER_GXM_MEMORY_H */
diff --git a/include/user/gxm/render_target.h b/include/user/gxm/render_target.h
index ea73ed7..16f2778 100644
--- a/include/user/gxm/render_target.h
+++ b/include/user/gxm/render_target.h
@@ -2,8 +2,8 @@
 	Vita Development Suite Libraries
 */
 
-#ifndef _DOLCESDK_PSP2_GXM_RENDER_TARGET_INTERNAL_H_
-#define _DOLCESDK_PSP2_GXM_RENDER_TARGET_INTERNAL_H_
+#ifndef _VDSUITE_USER_GXM_RENDER_TARGET_H
+#define _VDSUITE_USER_GXM_RENDER_TARGET_H
 
 /** @file
 */
@@ -69,4 +69,4 @@ SceGxmErrorCode sceGxmCreateRenderTargetInternal(
 }
 #endif	// def __cplusplus
 
-#endif /* _DOLCESDK_PSP2_GXM_RENDER_TARGET_INTERNAL_H_ */
+#endif /* _VDSUITE_USER_GXM_RENDER_TARGET_H */
diff --git a/include/user/gxm/shader_patcher.h b/include/user/gxm/shader_patcher.h
index e63b557..0701e00 100644
--- a/include/user/gxm/shader_patcher.h
+++ b/include/user/gxm/shader_patcher.h
@@ -2,8 +2,8 @@
 	Vita Development Suite Libraries
 */
 
-#ifndef _DOLCESDK_PSP2_GXM_SHADER_PATCHER_INTERNAL_H_
-#define _DOLCESDK_PSP2_GXM_SHADER_PATCHER_INTERNAL_H_
+#ifndef _VDSUITE_USER_GXM_SHADER_PATCHER_H
+#define _VDSUITE_USER_GXM_SHADER_PATCHER_H
 
 /** @file
 */
@@ -82,4 +82,4 @@ SceGxmErrorCode sceGxmShaderPatcherCreateFragmentProgramInternal(
 }
 #endif	// def __cplusplus
 
-#endif /* _DOLCESDK_PSP2_GXM_SHADER_PATCHER_INTERNAL_H_ */
+#endif /* _VDSUITE_USER_GXM_SHADER_PATCHER_H */
diff --git a/include/user/gxm/sync_object.h b/include/user/gxm/sync_object.h
index f659894..f60e77d 100644
--- a/include/user/gxm/sync_object.h
+++ b/include/user/gxm/sync_object.h
@@ -2,8 +2,8 @@
 	Vita Development Suite Libraries
 */
 
-#ifndef _DOLCESDK_PSP2_GXM_SYNC_OBJECT_INTERNAL_H_
-#define _DOLCESDK_PSP2_GXM_SYNC_OBJECT_INTERNAL_H_
+#ifndef _VDSUITE_USER_GXM_SYNC_OBJECT_H
+#define _VDSUITE_USER_GXM_SYNC_OBJECT_H
 
 /** @file
 */
@@ -96,4 +96,4 @@ SceGxmErrorCode sceGxmSyncObjectCloseShared(uint32_t key, SceGxmSyncObject *sync
 }
 #endif	// def __cplusplus
 
-#endif /* _DOLCESDK_PSP2_GXM_SYNC_OBJECT_INTERNAL_H_ */
+#endif /* _VDSUITE_USER_GXM_SYNC_OBJECT_H */
diff --git a/include/user/hid.h b/include/user/hid.h
index 2245f2c..c8c4510 100644
--- a/include/user/hid.h
+++ b/include/user/hid.h
@@ -2,8 +2,8 @@
 	Vita Development Suite Libraries
 */
 
-#ifndef _PSP2_HID_H_
-#define _PSP2_HID_H_
+#ifndef _VDSUITE_USER_HID_H
+#define _VDSUITE_USER_HID_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -72,5 +72,5 @@ int sceHidMouseRead(SceUInt32 handle, SceHidMouseReport *reports[], int nReports
 }
 #endif
 
-#endif
+#endif /* _VDSUITE_USER_HID_H */
 
diff --git a/include/user/incoming_dialog.h b/include/user/incoming_dialog.h
index 45c55e9..d609e72 100644
--- a/include/user/incoming_dialog.h
+++ b/include/user/incoming_dialog.h
@@ -2,8 +2,8 @@
 	Vita Development Suite Libraries
 */
 
-#ifndef _DOLCESDK_PSP2_INCOMING_DIALOG_H_
-#define _DOLCESDK_PSP2_INCOMING_DIALOG_H_
+#ifndef _VDSUITE_USER_INCOMING_DIALOG_H
+#define _VDSUITE_USER_INCOMING_DIALOG_H
 
 #include <kernel/libkernel.h>
 #include <scetypes.h>
@@ -94,4 +94,4 @@ void sceIncomingDialogParamInit(SceIncomingDialogParam* dialogParam)
 }
 #endif /* __cplusplus */
 
-#endif /* _DOLCESDK_PSP2_INCOMING_DIALOG_H_ */
+#endif /* _VDSUITE_USER_INCOMING_DIALOG_H */
diff --git a/include/user/ini_file_processor.h b/include/user/ini_file_processor.h
index 4d15cb7..0cc1589 100644
--- a/include/user/ini_file_processor.h
+++ b/include/user/ini_file_processor.h
@@ -2,8 +2,8 @@
 	Vita Development Suite Libraries
 */
 
-#ifndef _DOLCESDK_PSP2_INI_FILE_PROCESSOR_H_
-#define _DOLCESDK_PSP2_INI_FILE_PROCESSOR_H_
+#ifndef _VDSUITE_USER_INI_FILE_PROCESSOR_H
+#define _VDSUITE_USER_INI_FILE_PROCESSOR_H
 
 #define SCE_INI_FILE_PROCESSOR_ERROR_MODE           ((int)0x80840002)
 #define SCE_INI_FILE_PROCESSOR_ERROR_EOF            ((int)0x80840005)
@@ -200,4 +200,4 @@ private:
 
 #endif // __cplusplus
 
-#endif // _DOLCESDK_PSP2_INI_FILE_PROCESSOR_H_
+#endif // _VDSUITE_USER_INI_FILE_PROCESSOR_H
diff --git a/include/user/jpegarm.h b/include/user/jpegarm.h
index 4ac3bfb..e58f3d1 100644
--- a/include/user/jpegarm.h
+++ b/include/user/jpegarm.h
@@ -2,8 +2,8 @@
 	Vita Development Suite Libraries
 */
 
-#ifndef _DOLCESDK_PSP2_JPEGARM_H_
-#define _DOLCESDK_PSP2_JPEGARM_H_
+#ifndef _VDSUITE_USER_JPEGARM_H
+#define _VDSUITE_USER_JPEGARM_H
 
 #include <scejpeg.h>
 
@@ -102,5 +102,5 @@ int sceJpegArmSplitDecodeMJpeg(void *pCtrl);
 }
 #endif
 
-#endif /* _DOLCESDK_PSP2_JPEGARM_H_ */
+#endif /* _VDSUITE_USER_JPEGARM_H */
 
diff --git a/include/user/kernel/iofilemgr.h b/include/user/kernel/iofilemgr.h
index 59f344d..291b9ae 100644
--- a/include/user/kernel/iofilemgr.h
+++ b/include/user/kernel/iofilemgr.h
@@ -2,8 +2,8 @@
 	Vita Development Suite Libraries
 */
 
-#ifndef _DOLCESDK_PSP2_KERNEL_IOFILEMGR_H_
-#define _DOLCESDK_PSP2_KERNEL_IOFILEMGR_H_
+#ifndef _VDSUITE_USER_KERNEL_IOFILEMGR_H
+#define _VDSUITE_USER_KERNEL_IOFILEMGR_H
 
 #include_next <kernel/iofilemgr.h>
 
@@ -70,4 +70,4 @@ int sceIoGetThreadDefaultPriority(void);
 }
 #endif
 
-#endif	/* _DOLCESDK_PSP2_KERNEL_IOFILEMGR_H_ */
+#endif	/* _VDSUITE_USER_KERNEL_IOFILEMGR_H */
diff --git a/include/user/kernel/iofilemgr_async.h b/include/user/kernel/iofilemgr_async.h
index 533fe35..c2a8446 100644
--- a/include/user/kernel/iofilemgr_async.h
+++ b/include/user/kernel/iofilemgr_async.h
@@ -2,8 +2,8 @@
 	Vita Development Suite Libraries
 */
 
-#ifndef _DOLCESDK_PSP2_KERNEL_IOFILEMGR_ASYNC_H_
-#define _DOLCESDK_PSP2_KERNEL_IOFILEMGR_ASYNC_H_
+#ifndef _VDSUITE_USER_KERNEL_IOFILEMGR_ASYNC_H
+#define _VDSUITE_USER_KERNEL_IOFILEMGR_ASYNC_H
 
 #include_next <kernel/iofilemgr_async.h>
 
@@ -35,4 +35,4 @@ int sceIoCompleteMultiple(SceIoAsyncParam* asyncParam, int numOfParam, int* numO
 }
 #endif
 
-#endif	/* _DOLCESDK_PSP2_KERNEL_IOFILEMGR_ASYNC_H_ */
+#endif	/* _VDSUITE_USER_KERNEL_IOFILEMGR_ASYNC_H */
diff --git a/include/user/kernel/iofilemgr_syscall.h b/include/user/kernel/iofilemgr_syscall.h
index 1826ec8..a1d4fb8 100644
--- a/include/user/kernel/iofilemgr_syscall.h
+++ b/include/user/kernel/iofilemgr_syscall.h
@@ -2,8 +2,8 @@
 	Vita Development Suite Libraries
 */
 
-#ifndef _DOLCESDK_PSP2_KERNEL_IOFILEMGR_SYSCALL_H_
-#define _DOLCESDK_PSP2_KERNEL_IOFILEMGR_SYSCALL_H_
+#ifndef _VDSUITE_USER_KERNEL_IOFILEMGR_SYSCALL_H
+#define _VDSUITE_USER_KERNEL_IOFILEMGR_SYSCALL_H
 
 #include <kernel/types.h>
 
@@ -80,4 +80,4 @@ SceSSize _sceIoPwrite(SceUID fd, const void *buf, SceSize nbyte, SceIoPwriteSysc
 }
 #endif
 
-#endif	/* _DOLCESDK_PSP2_KERNEL_IOFILEMGR_SYSCALL_H_ */
+#endif	/* _VDSUITE_USER_KERNEL_IOFILEMGR_SYSCALL_H */
diff --git a/include/user/kernel/libkernel.h b/include/user/kernel/libkernel.h
index 9a011bb..ac59394 100644
--- a/include/user/kernel/libkernel.h
+++ b/include/user/kernel/libkernel.h
@@ -2,8 +2,8 @@
 	Vita Development Suite Libraries
 */
 
-#ifndef _PSP2_KERNEL_CLIB_H_
-#define _PSP2_KERNEL_CLIB_H_
+#ifndef _VDSUITE_USER_KERNEL_LIBKERNEL_H
+#define _VDSUITE_USER_KERNEL_LIBKERNEL_H
 
 #include_next <kernel/libkernel.h>
 
@@ -82,5 +82,5 @@ SceInt32 sceClibMspaceIsHeapEmpty(SceClibMspace msp);
 
 SCE_CDECL_END
 
-#endif /* _PSP2_KERNEL_CLIB_H_ */
+#endif /* _VDSUITE_USER_KERNEL_LIBKERNEL_H */
 
diff --git a/include/user/kernel/modulemgr.h b/include/user/kernel/modulemgr.h
index 989750c..e798bca 100644
--- a/include/user/kernel/modulemgr.h
+++ b/include/user/kernel/modulemgr.h
@@ -2,8 +2,8 @@
 	Vita Development Suite Libraries
 */
 
-#ifndef _PSP2_KERNEL_MODULEMGR_H_
-#define _PSP2_KERNEL_MODULEMGR_H_
+#ifndef _VDSUITE_USER_KERNEL_MODULEMGR_H
+#define _VDSUITE_USER_KERNEL_MODULEMGR_H
 
 #include_next <kernel/modulemgr.h>
 
@@ -73,5 +73,5 @@ int sceKernelGetSystemSwVersion(SceKernelFwInfo *data);
 }
 #endif
 
-#endif /* _PSP2_KERNEL_MODULEMGR_H_ */
+#endif /* _VDSUITE_USER_KERNEL_MODULEMGR_H */
 
diff --git a/include/user/kernel/processmgr.h b/include/user/kernel/processmgr.h
index 8ae7530..dd8a677 100644
--- a/include/user/kernel/processmgr.h
+++ b/include/user/kernel/processmgr.h
@@ -2,8 +2,8 @@
 	Vita Development Suite Libraries
 */
 
-#ifndef _PSP2_KERNEL_PROCESSMGR_H_
-#define _PSP2_KERNEL_PROCESSMGR_H_
+#ifndef _VDSUITE_USER_KERNEL_PROCESSMGR_H
+#define _VDSUITE_USER_KERNEL_PROCESSMGR_H
 
 #include_next <kernel/processmgr.h>
 
@@ -29,5 +29,5 @@ int sceKernelPowerUnlock(SceInt32 type);
 
 SCE_CDECL_END
 
-#endif /* _PSP2_KERNEL_PROCESSMGR_H_ */
+#endif /* _VDSUITE_USER_KERNEL_PROCESSMGR_H */
 
diff --git a/include/user/kernel/rng.h b/include/user/kernel/rng.h
index ddb9d3f..3187aa4 100644
--- a/include/user/kernel/rng.h
+++ b/include/user/kernel/rng.h
@@ -2,8 +2,8 @@
 	Vita Development Suite Libraries
 */
 
-#ifndef _PSP2_KERNEL_RNG_H_
-#define _PSP2_KERNEL_RNG_H_
+#ifndef _VDSUITE_USER_KERNEL_RNG_H
+#define _VDSUITE_USER_KERNEL_RNG_H
 
 #include <scetypes.h>
 
@@ -25,5 +25,5 @@ int sceKernelGetRandomNumber(void *output, SceSize size);
 }
 #endif
 
-#endif /* _PSP2_KERNEL_RNG_H_ */
+#endif /* _VDSUITE_USER_KERNEL_RNG_H */
 
diff --git a/include/user/kernel/sysmem.h b/include/user/kernel/sysmem.h
index ce5643e..fe278ea 100644
--- a/include/user/kernel/sysmem.h
+++ b/include/user/kernel/sysmem.h
@@ -2,8 +2,8 @@
 	Vita Development Suite Libraries
 */
 
-#ifndef _PSP2_KERNEL_SYSMEM_H_
-#define _PSP2_KERNEL_SYSMEM_H_
+#ifndef _VDSUITE_USER_KERNEL_SYSMEM_H
+#define _VDSUITE_USER_KERNEL_SYSMEM_H
 
 #include_next <kernel/sysmem.h>
 
@@ -40,5 +40,5 @@ int sceKernelIsPSVitaTV(void);
 
 SCE_CDECL_END
 
-#endif
+#endif /* _VDSUITE_USER_KERNEL_SYSMEM_H */
 
diff --git a/include/user/kernel/sysmem/memblock.h b/include/user/kernel/sysmem/memblock.h
index 6fe6d6e..96033da 100644
--- a/include/user/kernel/sysmem/memblock.h
+++ b/include/user/kernel/sysmem/memblock.h
@@ -2,8 +2,8 @@
 	Vita Development Suite Libraries
 */
 
-#ifndef _DOLCESDK_PSP2_KERNEL_SYSMEM_MEMBLOCK_H_
-#define _DOLCESDK_PSP2_KERNEL_SYSMEM_MEMBLOCK_H_
+#ifndef _VDSUITE_USER_KERNEL_SYSMEM_MEMBLOCK_H
+#define _VDSUITE_USER_KERNEL_SYSMEM_MEMBLOCK_H
 
 #include_next <kernel/sysmem/memblock.h>
 
@@ -43,4 +43,4 @@ typedef struct SceKernelAllocMemBlockOptInternal {
 
 SCE_CDECL_END
 
-#endif  /* _DOLCESDK_PSP2_KERNEL_SYSMEM_MEMBLOCK_H_ */
+#endif  /* _VDSUITE_USER_KERNEL_SYSMEM_MEMBLOCK_H */
diff --git a/include/user/kernel/threadmgr.h b/include/user/kernel/threadmgr.h
index 6dc062d..22e49e6 100644
--- a/include/user/kernel/threadmgr.h
+++ b/include/user/kernel/threadmgr.h
@@ -2,8 +2,8 @@
 	Vita Development Suite Libraries
 */
 
-#ifndef _PSP2_KERNEL_THREADMGR_H_
-#define _PSP2_KERNEL_THREADMGR_H_
+#ifndef _VDSUITE_USER_KERNEL_THREADMGR_H
+#define _VDSUITE_USER_KERNEL_THREADMGR_H
 
 #include_next <kernel/threadmgr.h>
 
@@ -150,5 +150,5 @@ int sceKernelSetThreadContextForMono(
 
 SCE_CDECL_END
 
-#endif /* _PSP2_KERNEL_THREADMGR_H_ */
+#endif /* _VDSUITE_USER_KERNEL_THREADMGR_H */
 
diff --git a/include/user/libsysmodule.h b/include/user/libsysmodule.h
index 1bf5d32..e7d7dc2 100644
--- a/include/user/libsysmodule.h
+++ b/include/user/libsysmodule.h
@@ -2,8 +2,8 @@
 	Vita Development Suite Libraries
 */
 
-#ifndef _PSP2_SYSMODULE_H_
-#define _PSP2_SYSMODULE_H_
+#ifndef _VDSUITE_USER_LIBSYSMODULE_H
+#define _VDSUITE_USER_LIBSYSMODULE_H
 
 #include_next <libsysmodule.h>
 
@@ -130,5 +130,5 @@ int sceSysmoduleUnloadModuleInternalWithArg(SceUInt32 id, SceSize args, void *ar
 }
 #endif
 
-#endif /* _PSP2_SYSMODULE_H_ */
+#endif /* _VDSUITE_USER_LIBSYSMODULE_H */
 
diff --git a/include/user/motion.h b/include/user/motion.h
index e12c9ea..decb7c8 100644
--- a/include/user/motion.h
+++ b/include/user/motion.h
@@ -2,8 +2,8 @@
 	Vita Development Suite Libraries
 */
 
-#ifndef _DOLCESDK_PSP2_MOTION_H_
-#define _DOLCESDK_PSP2_MOTION_H_
+#ifndef _VDSUITE_USER_MOTION_H
+#define _VDSUITE_USER_MOTION_H
 
 #include_next <motion.h>
 
@@ -108,6 +108,6 @@ int sceMotionGetStateInternal(SceMotionState *motionState);
 }
 #endif  /* defined(_LANGUAGE_C_PLUS_PLUS)||defined(__cplusplus)||defined(c_plusplus) */
 
-#endif /* _DOLCESDK_PSP2_MOTION_H_ */
+#endif /* _VDSUITE_USER_MOTION_H */
 
 
diff --git a/include/user/mtpif.h b/include/user/mtpif.h
index 3fda5d3..a174829 100644
--- a/include/user/mtpif.h
+++ b/include/user/mtpif.h
@@ -2,8 +2,8 @@
 	Vita Development Suite Libraries
 */
 
-#ifndef _PSP2_MTPIF_H_
-#define _PSP2_MTPIF_H_
+#ifndef _VDSUITE_USER_MTPIF_H
+#define _VDSUITE_USER_MTPIF_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -31,4 +31,4 @@ int sceMtpIfStopDriver(int flags);
 }
 #endif
 
-#endif /* _PSP2_MTPIF_H_ */
+#endif /* _VDSUITE_USER_MTPIF_H */
diff --git a/include/user/net/net_syscalls.h b/include/user/net/net_syscalls.h
index 9e9fc07..a1441cb 100644
--- a/include/user/net/net_syscalls.h
+++ b/include/user/net/net_syscalls.h
@@ -2,8 +2,8 @@
 	Vita Development Suite Libraries
 */
 
-#ifndef _PSP2_NET_NET_SYSCALLS_H_
-#define _PSP2_NET_NET_SYSCALLS_H_
+#ifndef _VDSUITE_USER_NET_NET_SYSCALLS_H
+#define _VDSUITE_USER_NET_NET_SYSCALLS_H
 
 #include <net.h>
 
@@ -17,4 +17,4 @@ int sceNetSyscallConnect(int s, const SceNetSockaddr *name, unsigned int namelen
 }
 #endif
 
-#endif /* _PSP2_NET_NET_SYSCALLS_H_ */
+#endif /* _VDSUITE_USER_NET_NET_SYSCALLS_H */
diff --git a/include/user/notification_util.h b/include/user/notification_util.h
index 94d0540..065606b 100644
--- a/include/user/notification_util.h
+++ b/include/user/notification_util.h
@@ -2,8 +2,8 @@
 	Vita Development Suite Libraries
 */
 
-#ifndef _DOLCESDK_PSP2_NOTIFICATION_UTIL_H_
-#define _DOLCESDK_PSP2_NOTIFICATION_UTIL_H_
+#ifndef _VDSUITE_USER_NOTIFICATION_UTIL_H
+#define _VDSUITE_USER_NOTIFICATION_UTIL_H
 
 #include <scetypes.h>
 
@@ -93,4 +93,4 @@ SceInt32 sceNotificationUtilProgressFinish(const SceNotificationUtilProgressFini
 }
 #endif /* __cplusplus */
 
-#endif /* _DOLCESDK_PSP2_NOTIFICATION_UTIL_H_ */
+#endif /* _VDSUITE_USER_NOTIFICATION_UTIL_H */
diff --git a/include/user/npdrm.h b/include/user/npdrm.h
index 0827a12..f332997 100644
--- a/include/user/npdrm.h
+++ b/include/user/npdrm.h
@@ -2,8 +2,8 @@
 	Vita Development Suite Libraries
 */
 
-#ifndef _PSP2_NPDRM_H_
-#define _PSP2_NPDRM_H_
+#ifndef _VDSUITE_USER_NPDRM_H
+#define _VDSUITE_USER_NPDRM_H
 
 #include <stdint.h>
 
@@ -54,5 +54,5 @@ int _sceNpDrmGetRifNameForInstall(char *rif_name, const void *rif_data, int unk)
 }
 #endif
 
-#endif /* _PSP2_NPDRM_H_ */
+#endif /* _VDSUITE_USER_NPDRM_H */
 
diff --git a/include/user/npdrmpackage.h b/include/user/npdrmpackage.h
index bcf324d..25f11d5 100644
--- a/include/user/npdrmpackage.h
+++ b/include/user/npdrmpackage.h
@@ -2,8 +2,8 @@
 	Vita Development Suite Libraries
 */
 
-#ifndef _PSP2_NPDRMPACKAGE_H_
-#define _PSP2_NPDRMPACKAGE_H_
+#ifndef _VDSUITE_USER_NPDRMPACKAGE_H
+#define _VDSUITE_USER_NPDRMPACKAGE_H
 
 #include <scetypes.h>
 
@@ -52,4 +52,4 @@ int _sceNpDrmPackageDecrypt(void * __restrict__ buffer, SceSize size, _sceNpDrmP
 }
 #endif
 
-#endif /* _PSP2_NPDRMPACKAGE_H_ */
+#endif /* _VDSUITE_USER_NPDRMPACKAGE_H */
diff --git a/include/user/paf.h b/include/user/paf.h
index 1bcb90b..75b2c9d 100644
--- a/include/user/paf.h
+++ b/include/user/paf.h
@@ -2,8 +2,8 @@
 	Vita Development Suite Libraries
 */
 
-#ifndef _PSP2_PAF_H_
-#define _PSP2_PAF_H_
+#ifndef _VDSUITE_USER_PAF_H
+#define _VDSUITE_USER_PAF_H
 
 #include <stdarg.h>
 #include <wchar.h>
@@ -118,5 +118,5 @@ ScePafString *scePafCesUtf16CharToUtf8WithAlloc(const SceWChar16 *utf16, ScePafS
 }
 #endif
 
-#endif /* _PSP2_PAF_H_ */
+#endif /* _VDSUITE_USER_PAF_H */
 
diff --git a/include/user/power.h b/include/user/power.h
index 27b88af..bb5b068 100644
--- a/include/user/power.h
+++ b/include/user/power.h
@@ -2,8 +2,8 @@
 	Vita Development Suite Libraries
 */
 
-#ifndef _PSP2_POWER_H_
-#define _PSP2_POWER_H_
+#ifndef _VDSUITE_USER_POWER_H
+#define _VDSUITE_USER_POWER_H
 
 #include_next <power.h>
 
@@ -205,4 +205,4 @@ int scePowerGetUsingWireless(void);
 }
 #endif
 
-#endif /* _PSP2_POWER_H_ */
+#endif /* _VDSUITE_USER_POWER_H */
diff --git a/include/user/promoterutil.h b/include/user/promoterutil.h
index ba5a0ce..e5d1d68 100644
--- a/include/user/promoterutil.h
+++ b/include/user/promoterutil.h
@@ -2,8 +2,8 @@
 	Vita Development Suite Libraries
 */
 
-#ifndef _PSP2_PROMOTERUTIL_H_
-#define _PSP2_PROMOTERUTIL_H_
+#ifndef _VDSUITE_USER_PROMOTERUTIL_H
+#define _VDSUITE_USER_PROMOTERUTIL_H
 
 #include <stdint.h>
 
@@ -124,4 +124,4 @@ int scePromoterUtilityCheckExist(const char *titleid, int *res);
 }
 #endif
 
-#endif /* _PSP2_PROMOTERUTIL_H_ */
+#endif /* _VDSUITE_USER_PROMOTERUTIL_H */
diff --git a/include/user/pss.h b/include/user/pss.h
index 6158cff..3ad7d2c 100644
--- a/include/user/pss.h
+++ b/include/user/pss.h
@@ -2,8 +2,8 @@
 	Vita Development Suite Libraries
 */
 
-#ifndef _PSP2_PSS_H_
-#define _PSP2_PSS_H_
+#ifndef _VDSUITE_USER_PSS_H
+#define _VDSUITE_USER_PSS_H
 
 #include <stdint.h>
 #include <scetypes.h>
@@ -31,5 +31,5 @@ void pss_code_mem_unlock(void);
 }
 #endif
 
-#endif /* _PSP2_PSS_H_ */
+#endif /* _VDSUITE_USER_PSS_H */
 
diff --git a/include/user/registrymgr.h b/include/user/registrymgr.h
index 87672b6..847277b 100644
--- a/include/user/registrymgr.h
+++ b/include/user/registrymgr.h
@@ -2,8 +2,8 @@
 	Vita Development Suite Libraries
 */
 
-#ifndef _PSP2_REGISTRYMGR_H_
-#define _PSP2_REGISTRYMGR_H_
+#ifndef _VDSUITE_USER_REGISTRYMGR_H
+#define _VDSUITE_USER_REGISTRYMGR_H
 
 #include <scetypes.h>
 
@@ -214,4 +214,4 @@ SceInt32 sceRegMgrUtilitySetStr(SceUInt32 id, const char *buf, SceSize size);
 }
 #endif
 
-#endif /* _PSP2_REGISTRYMGR_H_ */
+#endif /* _VDSUITE_USER_REGISTRYMGR_H */
diff --git a/include/user/sas.h b/include/user/sas.h
index 88ed7a9..a0b6969 100644
--- a/include/user/sas.h
+++ b/include/user/sas.h
@@ -2,8 +2,8 @@
 	Vita Development Suite Libraries
 */
 
-#ifndef _DOLCESDK_PSP2_SAS_H_
-#define _DOLCESDK_PSP2_SAS_H_
+#ifndef _VDSUITE_USER_SAS_H
+#define _VDSUITE_USER_SAS_H
 
 #include_next <sas.h>
 
@@ -54,4 +54,4 @@ SceSasResult sceSasSetEffectParamInternal(SceUID sasCoreId, SceUInt32 delayTime,
 }
 #endif
 
-#endif /* _DOLCESDK_PSP2_SAS_H_ */
+#endif /* _VDSUITE_USER_SAS_H */
diff --git a/include/user/sblacmgr.h b/include/user/sblacmgr.h
index a9d7944..19da6bd 100644
--- a/include/user/sblacmgr.h
+++ b/include/user/sblacmgr.h
@@ -2,8 +2,8 @@
 	Vita Development Suite Libraries
 */
 
-#ifndef _PSP2_SBLACMGR_H_
-#define _PSP2_SBLACMGR_H_
+#ifndef _VDSUITE_USER_SBLACMGR_H
+#define _VDSUITE_USER_SBLACMGR_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -15,4 +15,4 @@ int _sceSblACMgrIsGameProgram(void);
 }
 #endif
 
-#endif /* _PSP2_SBLACMGR_H_ */
+#endif /* _VDSUITE_USER_SBLACMGR_H */
diff --git a/include/user/shacccg.h b/include/user/shacccg.h
index 6de3606..94c3053 100644
--- a/include/user/shacccg.h
+++ b/include/user/shacccg.h
@@ -2,8 +2,8 @@
 	Vita Development Suite Libraries
 */
 
-#ifndef _DOLCESDK_PSP2_SHACCCG_H_
-#define _DOLCESDK_PSP2_SHACCCG_H_
+#ifndef _VDSUITE_USER_SHACCCG_H
+#define _VDSUITE_USER_SHACCCG_H
 
 #include <shacccg/types.h>
 #include <shacccg/paramquery.h>
@@ -127,4 +127,4 @@ int32_t sceShaccCgSetMemAllocator(
 }
 #endif	/* __cplusplus */
 
-#endif /* _DOLCESDK_PSP2_SHACCCG_H_ */
+#endif /* _VDSUITE_USER_SHACCCG_H */
diff --git a/include/user/shacccg/paramquery.h b/include/user/shacccg/paramquery.h
index add4fe1..4b3e2fc 100644
--- a/include/user/shacccg/paramquery.h
+++ b/include/user/shacccg/paramquery.h
@@ -2,8 +2,8 @@
 	Vita Development Suite Libraries
 */
 
-#ifndef _DOLCESDK_PSP2_SHACCCG_PARAMQUERY_H_
-#define _DOLCESDK_PSP2_SHACCCG_PARAMQUERY_H_
+#ifndef _VDSUITE_USER_SHACCCG_PARAMQUERY_H
+#define _VDSUITE_USER_SHACCCG_PARAMQUERY_H
 
 #include <stdint.h>
 
@@ -528,4 +528,4 @@ SceShaccCgParameterBaseType sceShaccCgGetSamplerQueryFormatPrecision(
 }
 #endif	/* __cplusplus */
 
-#endif /* _DOLCESDK_PSP2_SHACCCG_PARAMQUERY_H_ */
+#endif /* _VDSUITE_USER_SHACCCG_PARAMQUERY_H */
diff --git a/include/user/shacccg/types.h b/include/user/shacccg/types.h
index e3031e3..4d0520a 100644
--- a/include/user/shacccg/types.h
+++ b/include/user/shacccg/types.h
@@ -2,8 +2,8 @@
 	Vita Development Suite Libraries
 */
 
-#ifndef _DOLCESDK_PSP2_SHACCCG_TYPES_H_
-#define _DOLCESDK_PSP2_SHACCCG_TYPES_H_
+#ifndef _VDSUITE_USER_SHACCCG_TYPES_H
+#define _VDSUITE_USER_SHACCCG_TYPES_H
 
 #include <stddef.h>
 #include <stdint.h>
@@ -450,4 +450,4 @@ void sceShaccCgInitializeCallbackList(
 }
 #endif	/* __cplusplus */
 
-#endif /* _DOLCESDK_PSP2_SHACCCG_TYPES_H_ */
+#endif /* _VDSUITE_USER_SHACCCG_TYPES_H */
diff --git a/include/user/shellsvc.h b/include/user/shellsvc.h
index f07393b..b171b8a 100644
--- a/include/user/shellsvc.h
+++ b/include/user/shellsvc.h
@@ -2,8 +2,8 @@
 	Vita Development Suite Libraries
 */
 
-#ifndef _DOLCESDK_PSP2_SHELLSVC_H_
-#define _DOLCESDK_PSP2_SHELLSVC_H_
+#ifndef _VDSUITE_USER_SHELLSVC_H
+#define _VDSUITE_USER_SHELLSVC_H
 
 #include <scetypes.h>
 
@@ -179,5 +179,5 @@ SceShellSvcSvcObj *sceShellSvcGetSvcObj(void);
 }
 #endif
 
-#endif /* _DOLCESDK_PSP2_SHELLSVC_H_ */
+#endif /* _VDSUITE_USER_SHELLSVC_H */
 
diff --git a/include/user/trigger_util.h b/include/user/trigger_util.h
index af6f56b..3b6f582 100644
--- a/include/user/trigger_util.h
+++ b/include/user/trigger_util.h
@@ -2,8 +2,8 @@
 	Vita Development Suite Libraries
 */
 
-#ifndef _DOLCESDK_PSP2_TRIGGER_UTIL_H_
-#define _DOLCESDK_PSP2_TRIGGER_UTIL_H_
+#ifndef _VDSUITE_USER_TRIGGER_UTIL_H
+#define _VDSUITE_USER_TRIGGER_UTIL_H
 
 #include <rtc.h>
 #include <scetypes.h>
@@ -232,4 +232,4 @@ int sceTriggerUtilGetRegisteredSystemTitleIdList(char* buffer, int *numOfIds);
 }
 #endif /* __cplusplus */
 
-#endif /* _DOLCESDK_PSP2_TRIGGER_UTIL_H_ */
+#endif /* _VDSUITE_USER_TRIGGER_UTIL_H */
diff --git a/include/user/udcd.h b/include/user/udcd.h
index efb4b94..2371056 100644
--- a/include/user/udcd.h
+++ b/include/user/udcd.h
@@ -2,8 +2,8 @@
 	Vita Development Suite Libraries
 */
 
-#ifndef _PSP2_UDCD_H_
-#define _PSP2_UDCD_H_
+#ifndef _VDSUITE_USER_UDCD_H
+#define _VDSUITE_USER_UDCD_H
 
 #include <stdint.h>
 #include <scetypes.h>
@@ -116,4 +116,4 @@ int sceUdcdWaitState(SceUdcdWaitParam *waitParam, unsigned int timeout);
 }
 #endif
 
-#endif /* _PSP2_UDCD_H_ */
+#endif /* _VDSUITE_USER_UDCD_H */
diff --git a/include/user/usbd.h b/include/user/usbd.h
index 4c3f680..e066230 100644
--- a/include/user/usbd.h
+++ b/include/user/usbd.h
@@ -2,8 +2,8 @@
 	Vita Development Suite Libraries
 */
 
-#ifndef _PSP2_USBD_H_
-#define _PSP2_USBD_H_
+#ifndef _VDSUITE_USER_USBD_H
+#define _VDSUITE_USER_USBD_H
 
 #include <scetypes.h>
 
@@ -90,4 +90,4 @@ int sceUsbdAttachCompositeLdd(SceUID, unsigned char unk[0x14]);
 }
 #endif
 
-#endif /* _PSP2_USBD_H_ */
+#endif /* _VDSUITE_USER_USBD_H */
diff --git a/include/user/usbserial.h b/include/user/usbserial.h
index 25a07e3..53bb04d 100644
--- a/include/user/usbserial.h
+++ b/include/user/usbserial.h
@@ -2,8 +2,8 @@
 	Vita Development Suite Libraries
 */
 
-#ifndef _PSP2_USBSERIAL_H_
-#define _PSP2_USBSERIAL_H_
+#ifndef _VDSUITE_USER_USBSERIAL_H
+#define _VDSUITE_USER_USBSERIAL_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -82,4 +82,5 @@ unsigned int sceUsbSerialRecv(void *buffer, unsigned int max_len, int unk1, int
 #ifdef __cplusplus
 }
 #endif
-#endif
+
+#endif /* _VDSUITE_USER_USBSERIAL_H */
diff --git a/include/user/usbstorvstor.h b/include/user/usbstorvstor.h
index 84b0389..44713df 100644
--- a/include/user/usbstorvstor.h
+++ b/include/user/usbstorvstor.h
@@ -2,8 +2,8 @@
 	Vita Development Suite Libraries
 */
 
-#ifndef _PSP2_USBSTORVSTOR_H_
-#define _PSP2_USBSTORVSTOR_H_
+#ifndef _VDSUITE_USER_USBSTORVSTOR_H
+#define _VDSUITE_USER_USBSTORVSTOR_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -53,4 +53,4 @@ int sceUsbstorVStorStop(void);
 }
 #endif
 
-#endif /* _PSP2_USBSTORVSTOR_H_ */
+#endif /* _VDSUITE_USER_USBSTORVSTOR_H */
diff --git a/include/user/videodec.h b/include/user/videodec.h
index 51d44a3..9af6bde 100644
--- a/include/user/videodec.h
+++ b/include/user/videodec.h
@@ -2,8 +2,8 @@
 	Vita Development Suite Libraries
 */
 
-#ifndef _DOLCESDK_PSP2_VIDEODEC_H_
-#define _DOLCESDK_PSP2_VIDEODEC_H_
+#ifndef _VDSUITE_USER_VIDEODEC_H
+#define _VDSUITE_USER_VIDEODEC_H
 
 #include_next <videodec.h>
 
@@ -34,5 +34,5 @@ extern SceInt32 sceVideodecInitLibraryWithUnmapMemNongameapp(SceUInt32 codecType
 }
 #endif /* defined(_LANGUAGE_C_PLUS_PLUS)||defined(__cplusplus)||defined(c_plusplus) */
 
-#endif /* _DOLCESDK_PSP2_VIDEODEC_H_ */
+#endif /* _VDSUITE_USER_VIDEODEC_H */
 
diff --git a/include/user/videoexport.h b/include/user/videoexport.h
index 4b95850..1522b37 100644
--- a/include/user/videoexport.h
+++ b/include/user/videoexport.h
@@ -2,8 +2,8 @@
 	Vita Development Suite Libraries
 */
 
-#ifndef _PSP2_VIDEO_EXPORT_H_
-#define _PSP2_VIDEO_EXPORT_H_
+#ifndef _VDSUITE_USER_VIDEOEXPORT_H
+#define _VDSUITE_USER_VIDEOEXPORT_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -39,4 +39,4 @@ int sceVideoExportFromFile(const VideoExportInputParam* in_param, int unk, void*
 }
 #endif
 
-#endif /* _PSP2_VIDEO_EXPORT_H_ */
+#endif /* _VDSUITE_USER_VIDEOEXPORT_H */
diff --git a/include/user/vshbridge.h b/include/user/vshbridge.h
index a31c748..c3a5b9a 100644
--- a/include/user/vshbridge.h
+++ b/include/user/vshbridge.h
@@ -2,8 +2,8 @@
 	Vita Development Suite Libraries
 */
 
-#ifndef _PSP2_VSHBRIDGE_H_
-#define _PSP2_VSHBRIDGE_H_
+#ifndef _VDSUITE_USER_VSHBRIDGE_H
+#define _VDSUITE_USER_VSHBRIDGE_H
 
 #include <kernel/modulemgr.h>
 
@@ -106,4 +106,4 @@ int vshRemovableMemoryGetCardInsertState(void);
 }
 #endif
 
-#endif /* _PSP2_VSHBRIDGE_H_ */
+#endif /* _VDSUITE_USER_VSHBRIDGE_H */