469 files changed, 340 insertions, 2779 deletions
diff --git a/plugins/CryptoPP/GPGw/GnuPGw.dep b/plugins/CryptoPP/GPGw/GnuPGw.dep
deleted file mode 100644
index 4c922be73c..0000000000
--- a/plugins/CryptoPP/GPGw/GnuPGw.dep
+++ /dev/null
@@ -1,141 +0,0 @@
-# Microsoft Developer Studio Generated Dependency File, included by GnuPGw.mak
-
-.\commonheaders.c : \
-	"..\version.h"\
-	".\commonheaders.h"\
-	".\gpg.h"\
-	".\keys.h"\
-	".\language.h"\
-	".\passdialog.h"\
-	".\passphrases.h"\
-	".\pipeexec.h"\
-	".\size.h"\
-	".\tools.h"\
-	".\userdialog.h"\
-	
-
-.\gpg.c : \
-	"..\version.h"\
-	".\commonheaders.h"\
-	".\gpg.h"\
-	".\keys.h"\
-	".\language.h"\
-	".\passdialog.h"\
-	".\passphrases.h"\
-	".\pipeexec.h"\
-	".\size.h"\
-	".\tools.h"\
-	".\userdialog.h"\
-	
-
-.\keys.c : \
-	"..\version.h"\
-	".\commonheaders.h"\
-	".\gpg.h"\
-	".\keys.h"\
-	".\language.h"\
-	".\passdialog.h"\
-	".\passphrases.h"\
-	".\pipeexec.h"\
-	".\size.h"\
-	".\tools.h"\
-	".\userdialog.h"\
-	
-
-.\language.c : \
-	"..\version.h"\
-	".\commonheaders.h"\
-	".\gpg.h"\
-	".\keys.h"\
-	".\language.h"\
-	".\passdialog.h"\
-	".\passphrases.h"\
-	".\pipeexec.h"\
-	".\size.h"\
-	".\tools.h"\
-	".\userdialog.h"\
-	
-
-.\main.c : \
-	"..\version.h"\
-	".\commonheaders.h"\
-	".\gpg.h"\
-	".\keys.h"\
-	".\language.h"\
-	".\passdialog.h"\
-	".\passphrases.h"\
-	".\pipeexec.h"\
-	".\size.h"\
-	".\tools.h"\
-	".\userdialog.h"\
-	
-
-.\passdialog.c : \
-	"..\version.h"\
-	".\commonheaders.h"\
-	".\gpg.h"\
-	".\keys.h"\
-	".\language.h"\
-	".\passdialog.h"\
-	".\passphrases.h"\
-	".\pipeexec.h"\
-	".\size.h"\
-	".\tools.h"\
-	".\userdialog.h"\
-	
-
-.\passphrases.c : \
-	"..\version.h"\
-	".\commonheaders.h"\
-	".\gpg.h"\
-	".\keys.h"\
-	".\language.h"\
-	".\passdialog.h"\
-	".\passphrases.h"\
-	".\pipeexec.h"\
-	".\size.h"\
-	".\tools.h"\
-	".\userdialog.h"\
-	
-
-.\pipeexec.c : \
-	"..\version.h"\
-	".\commonheaders.h"\
-	".\gpg.h"\
-	".\keys.h"\
-	".\language.h"\
-	".\passdialog.h"\
-	".\passphrases.h"\
-	".\pipeexec.h"\
-	".\size.h"\
-	".\tools.h"\
-	".\userdialog.h"\
-	
-
-.\tools.c : \
-	"..\version.h"\
-	".\commonheaders.h"\
-	".\gpg.h"\
-	".\keys.h"\
-	".\language.h"\
-	".\passdialog.h"\
-	".\passphrases.h"\
-	".\pipeexec.h"\
-	".\size.h"\
-	".\tools.h"\
-	".\userdialog.h"\
-	
-
-.\userdialog.c : \
-	"..\version.h"\
-	".\commonheaders.h"\
-	".\gpg.h"\
-	".\keys.h"\
-	".\language.h"\
-	".\passdialog.h"\
-	".\passphrases.h"\
-	".\pipeexec.h"\
-	".\size.h"\
-	".\tools.h"\
-	".\userdialog.h"\
-	
diff --git a/plugins/CryptoPP/GPGw/GnuPGw.dsp b/plugins/CryptoPP/GPGw/GnuPGw.dsp
deleted file mode 100644
index 1ce65c2572..0000000000
--- a/plugins/CryptoPP/GPGw/GnuPGw.dsp
+++ /dev/null
@@ -1,158 +0,0 @@
-# Microsoft Developer Studio Project File - Name="GnuPGw" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=GnuPGw - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "GnuPGw.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "GnuPGw.mak" CFG="GnuPGw - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "GnuPGw - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "GnuPGw___Win32_Release"
-# PROP BASE Intermediate_Dir "GnuPGw___Win32_Release"
-# PROP BASE Ignore_Export_Lib 1
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 1
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /Gi /GX /O2 /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /Yu"commonheaders.h" /FD /c
-# SUBTRACT CPP /Fr
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x417 /d "NDEBUG"
-# ADD RSC /l 0x419 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib shell32.lib gdi32.lib msimg32.lib comdlg32.lib advapi32.lib msvcrt.lib /nologo /base:"0x46100000" /dll /map /machine:I386 /filealign:0x200
-# SUBTRACT BASE LINK32 /pdb:none
-# ADD LINK32 kernel32.lib user32.lib shell32.lib gdi32.lib msimg32.lib comdlg32.lib advapi32.lib msvcrt.lib /nologo /base:"0x46100000" /dll /map /machine:I386 /filealign:0x200
-# SUBTRACT LINK32 /pdb:none /debug
-# Begin Target
-
-# Name "GnuPGw - Win32 Release"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\commonheaders.c
-# ADD CPP /Yc"commonheaders.h"
-# End Source File
-# Begin Source File
-
-SOURCE=.\gpg.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\keys.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\language.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\main.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\passdialog.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\passphrases.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\pipeexec.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\tools.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\userdialog.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=.\commonheaders.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\gpg.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\keys.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\language.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\passdialog.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\passphrases.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\pipeexec.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\resource.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\size.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\userdialog.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# Begin Source File
-
-SOURCE=.\resource.rc
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/plugins/CryptoPP/GPGw/GnuPGw.mak b/plugins/CryptoPP/GPGw/GnuPGw.mak
deleted file mode 100644
index 225c4fc5d3..0000000000
--- a/plugins/CryptoPP/GPGw/GnuPGw.mak
+++ /dev/null
@@ -1,191 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on GnuPGw.dsp
-!IF "$(CFG)" == ""
-CFG=GnuPGw - Win32 Release
-!MESSAGE No configuration specified. Defaulting to GnuPGw - Win32 Release.
-!ENDIF 
-
-!IF "$(CFG)" != "GnuPGw - Win32 Release"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "GnuPGw.mak" CFG="GnuPGw - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "GnuPGw - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-OUTDIR=.\Release
-INTDIR=.\Release
-# Begin Custom Macros
-OutDir=.\Release
-# End Custom Macros
-
-ALL : "$(OUTDIR)\GnuPGw.dll"
-
-
-CLEAN :
-	-@erase "$(INTDIR)\commonheaders.obj"
-	-@erase "$(INTDIR)\GnuPGw.pch"
-	-@erase "$(INTDIR)\gpg.obj"
-	-@erase "$(INTDIR)\keys.obj"
-	-@erase "$(INTDIR)\language.obj"
-	-@erase "$(INTDIR)\main.obj"
-	-@erase "$(INTDIR)\passdialog.obj"
-	-@erase "$(INTDIR)\passphrases.obj"
-	-@erase "$(INTDIR)\pipeexec.obj"
-	-@erase "$(INTDIR)\resource.res"
-	-@erase "$(INTDIR)\tools.obj"
-	-@erase "$(INTDIR)\userdialog.obj"
-	-@erase "$(INTDIR)\vc60.idb"
-	-@erase "$(OUTDIR)\GnuPGw.dll"
-	-@erase "$(OUTDIR)\GnuPGw.exp"
-	-@erase "$(OUTDIR)\GnuPGw.map"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /GX /O1 /Ob2 /Fp"$(INTDIR)\GnuPGw.pch" /Yu"commonheaders.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
-RSC=rc.exe
-RSC_PROJ=/l 0x419 /fo"$(INTDIR)\resource.res" /d "NDEBUG" 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\GnuPGw.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib shell32.lib gdi32.lib msimg32.lib comdlg32.lib advapi32.lib msvcrt.lib /nologo /base:"0x46100000" /dll /incremental:no /pdb:"$(OUTDIR)\GnuPGw.pdb" /map:"$(INTDIR)\GnuPGw.map" /machine:I386 /out:"$(OUTDIR)\GnuPGw.dll" /implib:"$(OUTDIR)\GnuPGw.lib" /filealign:0x200 
-LINK32_OBJS= \
-	"$(INTDIR)\commonheaders.obj" \
-	"$(INTDIR)\gpg.obj" \
-	"$(INTDIR)\keys.obj" \
-	"$(INTDIR)\language.obj" \
-	"$(INTDIR)\main.obj" \
-	"$(INTDIR)\passdialog.obj" \
-	"$(INTDIR)\passphrases.obj" \
-	"$(INTDIR)\pipeexec.obj" \
-	"$(INTDIR)\tools.obj" \
-	"$(INTDIR)\userdialog.obj" \
-	"$(INTDIR)\resource.res"
-
-"$(OUTDIR)\GnuPGw.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-
-!IF "$(NO_EXTERNAL_DEPS)" != "1"
-!IF EXISTS("GnuPGw.dep")
-!INCLUDE "GnuPGw.dep"
-!ELSE 
-!MESSAGE Warning: cannot find "GnuPGw.dep"
-!ENDIF 
-!ENDIF 
-
-
-!IF "$(CFG)" == "GnuPGw - Win32 Release"
-SOURCE=.\commonheaders.c
-CPP_SWITCHES=/nologo /MD /W3 /GX /O1 /Ob2 /Fp"$(INTDIR)\GnuPGw.pch" /Yc"commonheaders.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\commonheaders.obj"	"$(INTDIR)\GnuPGw.pch" : $(SOURCE) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-SOURCE=.\gpg.c
-
-"$(INTDIR)\gpg.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\GnuPGw.pch"
-
-
-SOURCE=.\keys.c
-
-"$(INTDIR)\keys.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\GnuPGw.pch"
-
-
-SOURCE=.\language.c
-
-"$(INTDIR)\language.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\GnuPGw.pch"
-
-
-SOURCE=.\main.c
-
-"$(INTDIR)\main.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\GnuPGw.pch"
-
-
-SOURCE=.\passdialog.c
-
-"$(INTDIR)\passdialog.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\GnuPGw.pch"
-
-
-SOURCE=.\passphrases.c
-
-"$(INTDIR)\passphrases.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\GnuPGw.pch"
-
-
-SOURCE=.\pipeexec.c
-
-"$(INTDIR)\pipeexec.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\GnuPGw.pch"
-
-
-SOURCE=.\tools.c
-
-"$(INTDIR)\tools.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\GnuPGw.pch"
-
-
-SOURCE=.\userdialog.c
-
-"$(INTDIR)\userdialog.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\GnuPGw.pch"
-
-
-SOURCE=.\resource.rc
-
-"$(INTDIR)\resource.res" : $(SOURCE) "$(INTDIR)"
-	$(RSC) $(RSC_PROJ) $(SOURCE)
-
-
-
-!ENDIF 
-
diff --git a/plugins/CryptoPP/GPGw/gnupgw.dsw b/plugins/CryptoPP/GPGw/gnupgw.dsw
deleted file mode 100644
index 1c2166cbc1..0000000000
--- a/plugins/CryptoPP/GPGw/gnupgw.dsw
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "GnuPGw"=.\GnuPGw.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/plugins/CryptoPP/GPGw/gpgw.msp b/plugins/CryptoPP/GPGw/gpgw.msp
deleted file mode 100644
index 36a8ceedc8..0000000000
--- a/plugins/CryptoPP/GPGw/gpgw.msp
+++ /dev/null
@@ -1,110 +0,0 @@
-[Project]
-name=gpgw
-type=2
-defaultConfig=1
-
-
-[Debug]
-// compiler 
-workingDirectory=
-arguments=
-intermediateFilesDirectory=Debug
-outputFilesDirectory=Debug
-compilerPreprocessor=
-extraCompilerOptions=
-compilerIncludeDirectory=
-noWarning=0
-defaultWarning=0
-allWarning=1
-extraWarning=0
-isoWarning=0
-warningsAsErrors=0
-debugType=1
-debugLevel=2
-exceptionEnabled=1
-runtimeTypeEnabled=1
-optimizeLevel=0
-
-// linker
-libraryPath=
-outputFilename=Debug\gpgw.dll
-libraries=comdlg32
-extraLinkerOptions=
-ignoreStartupFile=0
-ignoreDefaultLibs=0
-stripExecutableFile=0
-
-// archive
-extraArchiveOptions=
-
-//resource
-resourcePreprocessor=
-resourceIncludeDirectory=
-extraResourceOptions=
-
-[Release]
-// compiler 
-workingDirectory=
-arguments=
-intermediateFilesDirectory=Release
-outputFilesDirectory=Release
-compilerPreprocessor=
-extraCompilerOptions=
-compilerIncludeDirectory=
-noWarning=0
-defaultWarning=0
-allWarning=1
-extraWarning=0
-isoWarning=0
-warningAsErrors=0
-debugType=0
-debugLevel=1
-exceptionEnabled=0
-runtimeTypeEnabled=0
-optimizeLevel=4
-
-// linker
-libraryPath=
-outputFilename=Release\gpgw.dll
-libraries=comdlg32
-extraLinkerOptions=
-ignoreStartupFile=0
-ignoreDefaultLibs=0
-stripExecutableFile=1
-
-// archive
-extraArchiveOptions=
-
-//resource
-resourcePreprocessor=
-resourceIncludeDirectory=
-extraResourceOptions=
-
-[Source]
-1=commonheaders.c
-2=gpg.c
-3=keys.c
-4=language.c
-5=main.c
-6=passdialog.c
-7=passphrases.c
-8=pipeexec.c
-9=tools.c
-10=userdialog.c
-[Header]
-1=commonheaders.h
-2=gpg.h
-3=keys.h
-4=language.h
-5=passdialog.h
-6=passphrases.h
-7=pipeexec.h
-8=resource.h
-9=size.h
-10=tools.h
-11=userdialog.h
-[Resource]
-1=resource.rc
-[Other]
-[History]
-pipeexec.c,1120
diff --git a/plugins/CryptoPP/PGPw/PGPsdkW.dep b/plugins/CryptoPP/PGPw/PGPsdkW.dep
deleted file mode 100644
index a0663216fc..0000000000
--- a/plugins/CryptoPP/PGPw/PGPsdkW.dep
+++ /dev/null
@@ -1,43 +0,0 @@
-# Microsoft Developer Studio Generated Dependency File, included by PGPsdkW.mak
-
-.\commonheaders.cpp : \
-	"..\version.h"\
-	".\commonheaders.h"\
-	".\sdk6\include\pgpBase.h"\
-	".\sdk6\include\pgpConfig.h"\
-	".\sdk6\include\pgpEncode.h"\
-	".\sdk6\include\pgpErrors.h"\
-	".\sdk6\include\pgpFeatures.h"\
-	".\sdk6\include\pgpGroups.h"\
-	".\sdk6\include\pgpHash.h"\
-	".\sdk6\include\pgpKeys.h"\
-	".\sdk6\include\pgpMemoryMgr.h"\
-	".\sdk6\include\pgpOptionList.h"\
-	".\sdk6\include\pgpPFLConfig.h"\
-	".\sdk6\include\pgpPFLErrors.h"\
-	".\sdk6\include\pgpPubTypes.h"\
-	".\sdk6\include\pgpTLS.h"\
-	".\sdk6\include\pgpUserInterface.h"\
-	".\sdk6\include\pgpUtilities.h"\
-	
-
-.\main.cpp : \
-	"..\version.h"\
-	".\commonheaders.h"\
-	".\sdk6\include\pgpBase.h"\
-	".\sdk6\include\pgpConfig.h"\
-	".\sdk6\include\pgpEncode.h"\
-	".\sdk6\include\pgpErrors.h"\
-	".\sdk6\include\pgpFeatures.h"\
-	".\sdk6\include\pgpGroups.h"\
-	".\sdk6\include\pgpHash.h"\
-	".\sdk6\include\pgpKeys.h"\
-	".\sdk6\include\pgpMemoryMgr.h"\
-	".\sdk6\include\pgpOptionList.h"\
-	".\sdk6\include\pgpPFLConfig.h"\
-	".\sdk6\include\pgpPFLErrors.h"\
-	".\sdk6\include\pgpPubTypes.h"\
-	".\sdk6\include\pgpTLS.h"\
-	".\sdk6\include\pgpUserInterface.h"\
-	".\sdk6\include\pgpUtilities.h"\
-	
diff --git a/plugins/CryptoPP/PGPw/PGPsdkW.dsp b/plugins/CryptoPP/PGPw/PGPsdkW.dsp
deleted file mode 100644
index 630865db79..0000000000
--- a/plugins/CryptoPP/PGPw/PGPsdkW.dsp
+++ /dev/null
@@ -1,122 +0,0 @@
-# Microsoft Developer Studio Project File - Name="PGPsdkW" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=PGPsdkW - Win32 Release6
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "PGPsdkW.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "PGPsdkW.mak" CFG="PGPsdkW - Win32 Release6"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "PGPsdkW - Win32 Release6" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "PGPsdkW - Win32 Release8" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "PGPsdkW - Win32 Release6"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "PGPsdkW___Win32_Release6"
-# PROP BASE Intermediate_Dir "PGPsdkW___Win32_Release6"
-# PROP BASE Ignore_Export_Lib 1
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release6"
-# PROP Intermediate_Dir "Release6"
-# PROP Ignore_Export_Lib 1
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /Gi /O1 /I "sdk6/include" /D PGP_WIN32=0x658 /YX"commonheaders.h" /FD /c
-# ADD CPP /nologo /MD /W3 /Gi /GX /O1 /I "sdk6/include" /D PGP_WIN32=0x658 /Yu"commonheaders.h" /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x417 /d "NDEBUG"
-# ADD RSC /l 0x417 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 delayimp.lib pgp_sdk.lib pgpsdknl.lib pgpsdkui.lib kernel32.lib user32.lib shell32.lib gdi32.lib msimg32.lib comdlg32.lib msvcrt.lib /nologo /base:"0x46600000" /dll /map /machine:I386 /pdb:"Release6/PGPsdkW6.pdb" /out:"Release6/PGPsdkW6.dll" /libpath:"sdk6/lib" /filealign:0x200 /delayload:pgp_sdk.dll /delayload:pgpsdkui.dll
-# SUBTRACT BASE LINK32 /pdb:none
-# ADD LINK32 delayimp.lib pgp_sdk.lib pgpsdknl.lib pgpsdkui.lib kernel32.lib user32.lib shell32.lib gdi32.lib msimg32.lib comdlg32.lib msvcrt.lib /nologo /base:"0x46600000" /dll /map /machine:I386 /pdb:"Release6/PGPsdkW6.pdb" /out:"Release6/PGPsdkW6.dll" /libpath:"sdk6/lib" /filealign:0x200 /delayload:pgp_sdk.dll /delayload:pgpsdkui.dll
-# SUBTRACT LINK32 /pdb:none
-
-!ELSEIF  "$(CFG)" == "PGPsdkW - Win32 Release8"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "PGPsdkW___Win32_Release8"
-# PROP BASE Intermediate_Dir "PGPsdkW___Win32_Release8"
-# PROP BASE Ignore_Export_Lib 1
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release8"
-# PROP Intermediate_Dir "Release8"
-# PROP Ignore_Export_Lib 1
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /Gi /O1 /I "sdk8/include" /D PGP_WIN32=0x800 /YX"commonheaders.h" /FD /c
-# ADD CPP /nologo /MD /W3 /Gi /GX /O1 /I "sdk8/include" /D PGP_WIN32=0x800 /Yu"commonheaders.h" /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x417 /d "NDEBUG"
-# ADD RSC /l 0x417 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 delayimp.lib pgpsdk.lib pgpsdknl.lib pgpsdkui.lib kernel32.lib user32.lib shell32.lib gdi32.lib msimg32.lib comdlg32.lib msvcrt.lib /nologo /base:"0x46800000" /dll /map /machine:I386 /pdb:"Release8/PGPsdkW8.pdb" /out:"Release8/PGPsdkW8.dll" /libpath:"sdk8/lib" /filealign:0x200 /delayload:pgp_sdk.dll /delayload:pgpsdkui.dll
-# SUBTRACT BASE LINK32 /pdb:none
-# ADD LINK32 delayimp.lib pgpsdk.lib pgpsdknl.lib pgpsdkui.lib kernel32.lib user32.lib shell32.lib gdi32.lib msimg32.lib comdlg32.lib msvcrt.lib /nologo /base:"0x46800000" /dll /map /machine:I386 /pdb:"Release8/PGPsdkW8.pdb" /out:"Release8/PGPsdkW8.dll" /libpath:"sdk8/lib" /filealign:0x200 /delayload:pgpsdk.dll /delayload:pgpsdkui.dll
-# SUBTRACT LINK32 /pdb:none
-
-!ENDIF 
-
-# Begin Target
-
-# Name "PGPsdkW - Win32 Release6"
-# Name "PGPsdkW - Win32 Release8"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\commonheaders.cpp
-# ADD CPP /Yc"commonheaders.h"
-# End Source File
-# Begin Source File
-
-SOURCE=.\main.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=.\commonheaders.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/plugins/CryptoPP/PGPw/PGPsdkW.dsw b/plugins/CryptoPP/PGPw/PGPsdkW.dsw
deleted file mode 100644
index 443b854d9a..0000000000
--- a/plugins/CryptoPP/PGPw/PGPsdkW.dsw
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "PGPsdkW"=.\PGPsdkW.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/plugins/CryptoPP/PGPw/PGPsdkW.mak b/plugins/CryptoPP/PGPw/PGPsdkW.mak
deleted file mode 100644
index 86459e7075..0000000000
--- a/plugins/CryptoPP/PGPw/PGPsdkW.mak
+++ /dev/null
@@ -1,220 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on PGPsdkW.dsp
-!IF "$(CFG)" == ""
-CFG=PGPsdkW - Win32 Release6
-!MESSAGE No configuration specified. Defaulting to PGPsdkW - Win32 Release6.
-!ENDIF 
-
-!IF "$(CFG)" != "PGPsdkW - Win32 Release6" && "$(CFG)" != "PGPsdkW - Win32 Release8"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "PGPsdkW.mak" CFG="PGPsdkW - Win32 Release6"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "PGPsdkW - Win32 Release6" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "PGPsdkW - Win32 Release8" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-!IF  "$(CFG)" == "PGPsdkW - Win32 Release6"
-
-OUTDIR=.\Release6
-INTDIR=.\Release6
-# Begin Custom Macros
-OutDir=.\Release6
-# End Custom Macros
-
-ALL : "$(OUTDIR)\PGPsdkW6.dll"
-
-
-CLEAN :
-	-@erase "$(INTDIR)\commonheaders.obj"
-	-@erase "$(INTDIR)\main.obj"
-	-@erase "$(INTDIR)\PGPsdkW.pch"
-	-@erase "$(INTDIR)\vc60.idb"
-	-@erase "$(OUTDIR)\PGPsdkW6.dll"
-	-@erase "$(OUTDIR)\PGPsdkW6.exp"
-	-@erase "$(OUTDIR)\PGPsdkW6.map"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /Gi /GX /O1 /I "sdk6/include" /D PGP_WIN32=0x658 /Fp"$(INTDIR)\PGPsdkW.pch" /Yu"commonheaders.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\PGPsdkW.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=delayimp.lib pgp_sdk.lib pgpsdknl.lib pgpsdkui.lib kernel32.lib user32.lib shell32.lib gdi32.lib msimg32.lib comdlg32.lib msvcrt.lib /nologo /base:"0x46600000" /dll /incremental:no /pdb:"$(OUTDIR)\PGPsdkW6.pdb" /map:"$(INTDIR)\PGPsdkW6.map" /machine:I386 /out:"$(OUTDIR)\PGPsdkW6.dll" /implib:"$(OUTDIR)\PGPsdkW6.lib" /libpath:"sdk6/lib" /filealign:0x200 /delayload:pgp_sdk.dll /delayload:pgpsdkui.dll 
-LINK32_OBJS= \
-	"$(INTDIR)\commonheaders.obj" \
-	"$(INTDIR)\main.obj"
-
-"$(OUTDIR)\PGPsdkW6.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "PGPsdkW - Win32 Release8"
-
-OUTDIR=.\Release8
-INTDIR=.\Release8
-# Begin Custom Macros
-OutDir=.\Release8
-# End Custom Macros
-
-ALL : "$(OUTDIR)\PGPsdkW8.dll"
-
-
-CLEAN :
-	-@erase "$(INTDIR)\commonheaders.obj"
-	-@erase "$(INTDIR)\main.obj"
-	-@erase "$(INTDIR)\PGPsdkW.pch"
-	-@erase "$(INTDIR)\vc60.idb"
-	-@erase "$(OUTDIR)\PGPsdkW8.dll"
-	-@erase "$(OUTDIR)\PGPsdkW8.exp"
-	-@erase "$(OUTDIR)\PGPsdkW8.map"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /Gi /GX /O1 /I "sdk8/include" /D PGP_WIN32=0x800 /Fp"$(INTDIR)\PGPsdkW.pch" /Yu"commonheaders.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\PGPsdkW.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=delayimp.lib pgpsdk.lib pgpsdknl.lib pgpsdkui.lib kernel32.lib user32.lib shell32.lib gdi32.lib msimg32.lib comdlg32.lib msvcrt.lib /nologo /base:"0x46800000" /dll /incremental:no /pdb:"$(OUTDIR)\PGPsdkW8.pdb" /map:"$(INTDIR)\PGPsdkW8.map" /machine:I386 /out:"$(OUTDIR)\PGPsdkW8.dll" /implib:"$(OUTDIR)\PGPsdkW8.lib" /libpath:"sdk8/lib" /filealign:0x200 /delayload:pgpsdk.dll /delayload:pgpsdkui.dll 
-LINK32_OBJS= \
-	"$(INTDIR)\commonheaders.obj" \
-	"$(INTDIR)\main.obj"
-
-"$(OUTDIR)\PGPsdkW8.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
-
-!IF "$(NO_EXTERNAL_DEPS)" != "1"
-!IF EXISTS("PGPsdkW.dep")
-!INCLUDE "PGPsdkW.dep"
-!ELSE 
-!MESSAGE Warning: cannot find "PGPsdkW.dep"
-!ENDIF 
-!ENDIF 
-
-
-!IF "$(CFG)" == "PGPsdkW - Win32 Release6" || "$(CFG)" == "PGPsdkW - Win32 Release8"
-SOURCE=.\commonheaders.cpp
-
-!IF  "$(CFG)" == "PGPsdkW - Win32 Release6"
-
-CPP_SWITCHES=/nologo /MD /W3 /Gi /GX /O1 /I "sdk6/include" /D PGP_WIN32=0x658 /Fp"$(INTDIR)\PGPsdkW.pch" /Yc"commonheaders.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\commonheaders.obj"	"$(INTDIR)\PGPsdkW.pch" : $(SOURCE) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "PGPsdkW - Win32 Release8"
-
-CPP_SWITCHES=/nologo /MD /W3 /Gi /GX /O1 /I "sdk8/include" /D PGP_WIN32=0x800 /Fp"$(INTDIR)\PGPsdkW.pch" /Yc"commonheaders.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\commonheaders.obj"	"$(INTDIR)\PGPsdkW.pch" : $(SOURCE) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE=.\main.cpp
-
-"$(INTDIR)\main.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\PGPsdkW.pch"
-
-
-
-!ENDIF 
-
diff --git a/plugins/CryptoPP/crypto/Doxyfile b/plugins/CryptoPP/crypto/Doxyfile
deleted file mode 100644
index 2b7398edce..0000000000
--- a/plugins/CryptoPP/crypto/Doxyfile
+++ /dev/null
@@ -1,1147 +0,0 @@
-# Doxyfile 1.3.7
-
-# This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project
-#
-# All text after a hash (#) is considered a comment and will be ignored
-# The format is:
-#       TAG = value [value, ...]
-# For lists items can also be appended using:
-#       TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (" ")
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
-# by quotes) that should identify the project.
-
-PROJECT_NAME           = Crypto++
-
-# The PROJECT_NUMBER tag can be used to enter a project or revision number. 
-# This could be handy for archiving the generated documentation or 
-# if some version control system is used.
-
-PROJECT_NUMBER         = 
-
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
-# base path where the generated documentation will be put. 
-# If a relative path is entered, it will be relative to the location 
-# where doxygen was started. If left blank the current directory will be used.
-
-OUTPUT_DIRECTORY       = doc
-
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 
-# 2 levels of 10 sub-directories under the output directory of each output 
-# format and will distribute the generated files over these directories. 
-# Enabling this option can be useful when feeding doxygen a huge amount of source 
-# files, where putting all generated files in the same directory would otherwise 
-# cause performance problems for the file system.
-
-CREATE_SUBDIRS         = NO
-
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all 
-# documentation generated by doxygen is written. Doxygen will use this 
-# information to generate all constant output in the proper language. 
-# The default language is English, other supported languages are: 
-# Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, 
-# Finnish, French, German, Greek, Hungarian, Italian, Japanese, Japanese-en 
-# (Japanese with English messages), Korean, Korean-en, Norwegian, Polish, Portuguese, 
-# Romanian, Russian, Serbian, Slovak, Slovene, Spanish, Swedish, and Ukrainian.
-
-OUTPUT_LANGUAGE        = English
-
-# This tag can be used to specify the encoding used in the generated output. 
-# The encoding is not always determined by the language that is chosen, 
-# but also whether or not the output is meant for Windows or non-Windows users. 
-# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES 
-# forces the Windows encoding (this is the default for the Windows binary), 
-# whereas setting the tag to NO uses a Unix-style encoding (the default for 
-# all platforms other than Windows).
-
-USE_WINDOWS_ENCODING   = YES
-
-# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will 
-# include brief member descriptions after the members that are listed in 
-# the file and class documentation (similar to JavaDoc). 
-# Set to NO to disable this.
-
-BRIEF_MEMBER_DESC      = YES
-
-# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend 
-# the brief description of a member or function before the detailed description. 
-# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the 
-# brief descriptions will be completely suppressed.
-
-REPEAT_BRIEF           = YES
-
-# This tag implements a quasi-intelligent brief description abbreviator 
-# that is used to form the text in various listings. Each string 
-# in this list, if found as the leading text of the brief description, will be 
-# stripped from the text and the result after processing the whole list, is used 
-# as the annotated text. Otherwise, the brief description is used as-is. If left 
-# blank, the following values are used ("$name" is automatically replaced with the 
-# name of the entity): "The $name class" "The $name widget" "The $name file" 
-# "is" "provides" "specifies" "contains" "represents" "a" "an" "the"
-
-ABBREVIATE_BRIEF       = 
-
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then 
-# Doxygen will generate a detailed section even if there is only a brief 
-# description.
-
-ALWAYS_DETAILED_SEC    = NO
-
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all inherited 
-# members of a class in the documentation of that class as if those members were 
-# ordinary class members. Constructors, destructors and assignment operators of 
-# the base classes will not be shown.
-
-INLINE_INHERITED_MEMB  = YES
-
-# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full 
-# path before files name in the file list and in the header files. If set 
-# to NO the shortest path that makes the file name unique will be used.
-
-FULL_PATH_NAMES        = NO
-
-# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag 
-# can be used to strip a user-defined part of the path. Stripping is 
-# only done if one of the specified strings matches the left-hand part of 
-# the path. The tag can be used to show relative paths in the file list. 
-# If left blank the directory from which doxygen is run is used as the 
-# path to strip.
-
-STRIP_FROM_PATH        = 
-
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of 
-# the path mentioned in the documentation of a class, which tells 
-# the reader which header file to include in order to use a class. 
-# If left blank only the name of the header file containing the class 
-# definition is used. Otherwise one should specify the include paths that 
-# are normally passed to the compiler using the -I flag.
-
-STRIP_FROM_INC_PATH    = 
-
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter 
-# (but less readable) file names. This can be useful is your file systems 
-# doesn't support long names like on DOS, Mac, or CD-ROM.
-
-SHORT_NAMES            = NO
-
-# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen 
-# will interpret the first line (until the first dot) of a JavaDoc-style 
-# comment as the brief description. If set to NO, the JavaDoc 
-# comments will behave just like the Qt-style comments (thus requiring an 
-# explicit @brief command for a brief description.
-
-JAVADOC_AUTOBRIEF      = YES
-
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen 
-# treat a multi-line C++ special comment block (i.e. a block of //! or /// 
-# comments) as a brief description. This used to be the default behaviour. 
-# The new default is to treat a multi-line C++ comment block as a detailed 
-# description. Set this tag to YES if you prefer the old behaviour instead.
-
-MULTILINE_CPP_IS_BRIEF = NO
-
-# If the DETAILS_AT_TOP tag is set to YES then Doxygen 
-# will output the detailed description near the top, like JavaDoc.
-# If set to NO, the detailed description appears after the member 
-# documentation.
-
-DETAILS_AT_TOP         = Yes
-
-# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented 
-# member inherits the documentation from any documented member that it 
-# re-implements.
-
-INHERIT_DOCS           = YES
-
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC 
-# tag is set to YES, then doxygen will reuse the documentation of the first 
-# member in the group (if any) for the other members of the group. By default 
-# all members of a group must be documented explicitly.
-
-DISTRIBUTE_GROUP_DOC   = NO
-
-# The TAB_SIZE tag can be used to set the number of spaces in a tab. 
-# Doxygen uses this value to replace tabs by spaces in code fragments.
-
-TAB_SIZE               = 8
-
-# This tag can be used to specify a number of aliases that acts 
-# as commands in the documentation. An alias has the form "name=value". 
-# For example adding "sideeffect=\par Side Effects:\n" will allow you to 
-# put the command \sideeffect (or @sideeffect) in the documentation, which 
-# will result in a user-defined paragraph with heading "Side Effects:". 
-# You can put \n's in the value part of an alias to insert newlines.
-
-ALIASES                = 
-
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources 
-# only. Doxygen will then generate output that is more tailored for C. 
-# For instance, some of the names that are used will be different. The list 
-# of all members will be omitted, etc.
-
-OPTIMIZE_OUTPUT_FOR_C  = NO
-
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java sources 
-# only. Doxygen will then generate output that is more tailored for Java. 
-# For instance, namespaces will be presented as packages, qualified scopes 
-# will look different, etc.
-
-OPTIMIZE_OUTPUT_JAVA   = NO
-
-# Set the SUBGROUPING tag to YES (the default) to allow class member groups of 
-# the same type (for instance a group of public functions) to be put as a 
-# subgroup of that type (e.g. under the Public Functions section). Set it to 
-# NO to prevent subgrouping. Alternatively, this can be done per class using 
-# the \nosubgrouping command.
-
-SUBGROUPING            = YES
-
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-
-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in 
-# documentation are documented, even if no documentation was available. 
-# Private class members and static file members will be hidden unless 
-# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
-
-EXTRACT_ALL            = NO
-
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class 
-# will be included in the documentation.
-
-EXTRACT_PRIVATE        = NO
-
-# If the EXTRACT_STATIC tag is set to YES all static members of a file 
-# will be included in the documentation.
-
-EXTRACT_STATIC         = NO
-
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) 
-# defined locally in source files will be included in the documentation. 
-# If set to NO only classes defined in header files are included.
-
-EXTRACT_LOCAL_CLASSES  = YES
-
-# This flag is only useful for Objective-C code. When set to YES local 
-# methods, which are defined in the implementation section but not in 
-# the interface are included in the documentation. 
-# If set to NO (the default) only methods in the interface are included.
-
-EXTRACT_LOCAL_METHODS  = NO
-
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all 
-# undocumented members of documented classes, files or namespaces. 
-# If set to NO (the default) these members will be included in the 
-# various overviews, but no documentation section is generated. 
-# This option has no effect if EXTRACT_ALL is enabled.
-
-HIDE_UNDOC_MEMBERS     = NO
-
-# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all 
-# undocumented classes that are normally visible in the class hierarchy. 
-# If set to NO (the default) these classes will be included in the various 
-# overviews. This option has no effect if EXTRACT_ALL is enabled.
-
-HIDE_UNDOC_CLASSES     = NO
-
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all 
-# friend (class|struct|union) declarations. 
-# If set to NO (the default) these declarations will be included in the 
-# documentation.
-
-HIDE_FRIEND_COMPOUNDS  = NO
-
-# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any 
-# documentation blocks found inside the body of a function. 
-# If set to NO (the default) these blocks will be appended to the 
-# function's detailed documentation block.
-
-HIDE_IN_BODY_DOCS      = NO
-
-# The INTERNAL_DOCS tag determines if documentation 
-# that is typed after a \internal command is included. If the tag is set 
-# to NO (the default) then the documentation will be excluded. 
-# Set it to YES to include the internal documentation.
-
-INTERNAL_DOCS          = NO
-
-# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate 
-# file names in lower-case letters. If set to YES upper-case letters are also 
-# allowed. This is useful if you have classes or files whose names only differ 
-# in case and if your file system supports case sensitive file names. Windows 
-# users are advised to set this option to NO.
-
-CASE_SENSE_NAMES       = NO
-
-# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen 
-# will show members with their full class and namespace scopes in the 
-# documentation. If set to YES the scope will be hidden.
-
-HIDE_SCOPE_NAMES       = NO
-
-# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen 
-# will put a list of the files that are included by a file in the documentation 
-# of that file.
-
-SHOW_INCLUDE_FILES     = YES
-
-# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] 
-# is inserted in the documentation for inline members.
-
-INLINE_INFO            = YES
-
-# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen 
-# will sort the (detailed) documentation of file and class members 
-# alphabetically by member name. If set to NO the members will appear in 
-# declaration order.
-
-SORT_MEMBER_DOCS       = NO
-
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the 
-# brief documentation of file, namespace and class members alphabetically 
-# by member name. If set to NO (the default) the members will appear in 
-# declaration order.
-
-SORT_BRIEF_DOCS        = NO
-
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be 
-# sorted by fully-qualified names, including namespaces. If set to 
-# NO (the default), the class list will be sorted only by class name, 
-# not including the namespace part. 
-# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
-# Note: This option applies only to the class list, not to the 
-# alphabetical list.
-
-SORT_BY_SCOPE_NAME     = NO
-
-# The GENERATE_TODOLIST tag can be used to enable (YES) or 
-# disable (NO) the todo list. This list is created by putting \todo 
-# commands in the documentation.
-
-GENERATE_TODOLIST      = YES
-
-# The GENERATE_TESTLIST tag can be used to enable (YES) or 
-# disable (NO) the test list. This list is created by putting \test 
-# commands in the documentation.
-
-GENERATE_TESTLIST      = YES
-
-# The GENERATE_BUGLIST tag can be used to enable (YES) or 
-# disable (NO) the bug list. This list is created by putting \bug 
-# commands in the documentation.
-
-GENERATE_BUGLIST       = YES
-
-# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or 
-# disable (NO) the deprecated list. This list is created by putting 
-# \deprecated commands in the documentation.
-
-GENERATE_DEPRECATEDLIST= YES
-
-# The ENABLED_SECTIONS tag can be used to enable conditional 
-# documentation sections, marked by \if sectionname ... \endif.
-
-ENABLED_SECTIONS       = 
-
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines 
-# the initial value of a variable or define consists of for it to appear in 
-# the documentation. If the initializer consists of more lines than specified 
-# here it will be hidden. Use a value of 0 to hide initializers completely. 
-# The appearance of the initializer of individual variables and defines in the 
-# documentation can be controlled using \showinitializer or \hideinitializer 
-# command in the documentation regardless of this setting.
-
-MAX_INITIALIZER_LINES  = 30
-
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated 
-# at the bottom of the documentation of classes and structs. If set to YES the 
-# list will mention the files that were used to generate the documentation.
-
-SHOW_USED_FILES        = YES
-
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-
-# The QUIET tag can be used to turn on/off the messages that are generated 
-# by doxygen. Possible values are YES and NO. If left blank NO is used.
-
-QUIET                  = NO
-
-# The WARNINGS tag can be used to turn on/off the warning messages that are 
-# generated by doxygen. Possible values are YES and NO. If left blank 
-# NO is used.
-
-WARNINGS               = No
-
-# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings 
-# for undocumented members. If EXTRACT_ALL is set to YES then this flag will 
-# automatically be disabled.
-
-WARN_IF_UNDOCUMENTED   = No
-
-# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for 
-# potential errors in the documentation, such as not documenting some 
-# parameters in a documented function, or documenting parameters that 
-# don't exist or using markup commands wrongly.
-
-WARN_IF_DOC_ERROR      = YES
-
-# The WARN_FORMAT tag determines the format of the warning messages that 
-# doxygen can produce. The string should contain the $file, $line, and $text 
-# tags, which will be replaced by the file and line number from which the 
-# warning originated and the warning text.
-
-WARN_FORMAT            = "$file:$line: $text"
-
-# The WARN_LOGFILE tag can be used to specify a file to which warning 
-# and error messages should be written. If left blank the output is written 
-# to stderr.
-
-WARN_LOGFILE           = 
-
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-
-# The INPUT tag can be used to specify the files and/or directories that contain 
-# documented source files. You may enter file names like "myfile.cpp" or 
-# directories like "/usr/src/myproject". Separate the files or directories 
-# with spaces.
-
-INPUT                  = .
-
-# If the value of the INPUT tag contains directories, you can use the 
-# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
-# and *.h) to filter out the source-files in the directories. If left 
-# blank the following patterns are tested: 
-# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx *.hpp 
-# *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm
-
-FILE_PATTERNS          = *.h \
-                         *.cpp
-
-# The RECURSIVE tag can be used to turn specify whether or not subdirectories 
-# should be searched for input files as well. Possible values are YES and NO. 
-# If left blank NO is used.
-
-RECURSIVE              = NO
-
-# The EXCLUDE tag can be used to specify files and/or directories that should 
-# excluded from the INPUT source files. This way you can easily exclude a 
-# subdirectory from a directory tree whose root is specified with the INPUT tag.
-
-EXCLUDE                = adhoc.cpp
-
-# The EXCLUDE_SYMLINKS tag can be used select whether or not files or directories 
-# that are symbolic links (a Unix filesystem feature) are excluded from the input.
-
-EXCLUDE_SYMLINKS       = NO
-
-# If the value of the INPUT tag contains directories, you can use the 
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude 
-# certain files from those directories.
-
-EXCLUDE_PATTERNS       = 
-
-# The EXAMPLE_PATH tag can be used to specify one or more files or 
-# directories that contain example code fragments that are included (see 
-# the \include command).
-
-EXAMPLE_PATH           = .
-
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the 
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
-# and *.h) to filter out the source-files in the directories. If left 
-# blank all files are included.
-
-EXAMPLE_PATTERNS       = 
-
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be 
-# searched for input files to be used with the \include or \dontinclude 
-# commands irrespective of the value of the RECURSIVE tag. 
-# Possible values are YES and NO. If left blank NO is used.
-
-EXAMPLE_RECURSIVE      = NO
-
-# The IMAGE_PATH tag can be used to specify one or more files or 
-# directories that contain image that are included in the documentation (see 
-# the \image command).
-
-IMAGE_PATH             = 
-
-# The INPUT_FILTER tag can be used to specify a program that doxygen should 
-# invoke to filter for each input file. Doxygen will invoke the filter program 
-# by executing (via popen()) the command <filter> <input-file>, where <filter> 
-# is the value of the INPUT_FILTER tag, and <input-file> is the name of an 
-# input file. Doxygen will then use the output that the filter program writes 
-# to standard output.
-
-INPUT_FILTER           = 
-
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using 
-# INPUT_FILTER) will be used to filter the input files when producing source 
-# files to browse (i.e. when SOURCE_BROWSER is set to YES).
-
-FILTER_SOURCE_FILES    = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to source browsing
-#---------------------------------------------------------------------------
-
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will 
-# be generated. Documented entities will be cross-referenced with these sources. 
-# Note: To get rid of all source code in the generated output, make sure also 
-# VERBATIM_HEADERS is set to NO.
-
-SOURCE_BROWSER         = YES
-
-# Setting the INLINE_SOURCES tag to YES will include the body 
-# of functions and classes directly in the documentation.
-
-INLINE_SOURCES         = NO
-
-# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct 
-# doxygen to hide any special comment blocks from generated source code 
-# fragments. Normal C and C++ comments will always remain visible.
-
-STRIP_CODE_COMMENTS    = NO
-
-# If the REFERENCED_BY_RELATION tag is set to YES (the default) 
-# then for each documented function all documented 
-# functions referencing it will be listed.
-
-REFERENCED_BY_RELATION = YES
-
-# If the REFERENCES_RELATION tag is set to YES (the default) 
-# then for each documented function all documented entities 
-# called/used by that function will be listed.
-
-REFERENCES_RELATION    = YES
-
-# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen 
-# will generate a verbatim copy of the header file for each class for 
-# which an include is specified. Set to NO to disable this.
-
-VERBATIM_HEADERS       = YES
-
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index 
-# of all compounds will be generated. Enable this if the project 
-# contains a lot of classes, structs, unions or interfaces.
-
-ALPHABETICAL_INDEX     = YES
-
-# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then 
-# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns 
-# in which this list will be split (can be a number in the range [1..20])
-
-COLS_IN_ALPHA_INDEX    = 3
-
-# In case all classes in a project start with a common prefix, all 
-# classes will be put under the same header in the alphabetical index. 
-# The IGNORE_PREFIX tag can be used to specify one or more prefixes that 
-# should be ignored while generating the index headers.
-
-IGNORE_PREFIX          = 
-
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_HTML tag is set to YES (the default) Doxygen will 
-# generate HTML output.
-
-GENERATE_HTML          = YES
-
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `html' will be used as the default path.
-
-HTML_OUTPUT            = 
-
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for 
-# each generated HTML page (for example: .htm,.php,.asp). If it is left blank 
-# doxygen will generate files with .html extension.
-
-HTML_FILE_EXTENSION    = .html
-
-# The HTML_HEADER tag can be used to specify a personal HTML header for 
-# each generated HTML page. If it is left blank doxygen will generate a 
-# standard header.
-
-HTML_HEADER            = 
-
-# The HTML_FOOTER tag can be used to specify a personal HTML footer for 
-# each generated HTML page. If it is left blank doxygen will generate a 
-# standard footer.
-
-HTML_FOOTER            = 
-
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
-# style sheet that is used by each HTML page. It can be used to 
-# fine-tune the look of the HTML output. If the tag is left blank doxygen 
-# will generate a default style sheet. Note that doxygen will try to copy 
-# the style sheet file to the HTML output directory, so don't put your own 
-# stylesheet in the HTML output directory as well, or it will be erased!
-
-HTML_STYLESHEET        = 
-
-# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, 
-# files or namespaces will be aligned in HTML using tables. If set to 
-# NO a bullet list will be used.
-
-HTML_ALIGN_MEMBERS     = YES
-
-# If the GENERATE_HTMLHELP tag is set to YES, additional index files 
-# will be generated that can be used as input for tools like the 
-# Microsoft HTML help workshop to generate a compressed HTML help file (.chm) 
-# of the generated HTML documentation.
-
-GENERATE_HTMLHELP      = YES
-
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can 
-# be used to specify the file name of the resulting .chm file. You 
-# can add a path in front of the file if the result should not be 
-# written to the html output directory.
-
-CHM_FILE               = 
-
-# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can 
-# be used to specify the location (absolute path including file name) of 
-# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run 
-# the HTML help compiler on the generated index.hhp.
-
-HHC_LOCATION           = 
-
-# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag 
-# controls if a separate .chi index file is generated (YES) or that 
-# it should be included in the master .chm file (NO).
-
-GENERATE_CHI           = NO
-
-# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag 
-# controls whether a binary table of contents is generated (YES) or a 
-# normal table of contents (NO) in the .chm file.
-
-BINARY_TOC             = NO
-
-# The TOC_EXPAND flag can be set to YES to add extra items for group members 
-# to the contents of the HTML help documentation and to the tree view.
-
-TOC_EXPAND             = NO
-
-# The DISABLE_INDEX tag can be used to turn on/off the condensed index at 
-# top of each HTML page. The value NO (the default) enables the index and 
-# the value YES disables it.
-
-DISABLE_INDEX          = NO
-
-# This tag can be used to set the number of enum values (range [1..20]) 
-# that doxygen will group on one line in the generated HTML documentation.
-
-ENUM_VALUES_PER_LINE   = 4
-
-# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be
-# generated containing a tree-like index structure (just like the one that 
-# is generated for HTML Help). For this to work a browser that supports 
-# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, 
-# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are 
-# probably better off using the HTML help feature.
-
-GENERATE_TREEVIEW      = NO
-
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be 
-# used to set the initial width (in pixels) of the frame in which the tree 
-# is shown.
-
-TREEVIEW_WIDTH         = 250
-
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will 
-# generate Latex output.
-
-GENERATE_LATEX         = NO
-
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `latex' will be used as the default path.
-
-LATEX_OUTPUT           = 
-
-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be 
-# invoked. If left blank `latex' will be used as the default command name.
-
-LATEX_CMD_NAME         = latex
-
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to 
-# generate index for LaTeX. If left blank `makeindex' will be used as the 
-# default command name.
-
-MAKEINDEX_CMD_NAME     = makeindex
-
-# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact 
-# LaTeX documents. This may be useful for small projects and may help to 
-# save some trees in general.
-
-COMPACT_LATEX          = NO
-
-# The PAPER_TYPE tag can be used to set the paper type that is used 
-# by the printer. Possible values are: a4, a4wide, letter, legal and 
-# executive. If left blank a4wide will be used.
-
-PAPER_TYPE             = a4
-
-# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX 
-# packages that should be included in the LaTeX output.
-
-EXTRA_PACKAGES         = 
-
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for 
-# the generated latex document. The header should contain everything until 
-# the first chapter. If it is left blank doxygen will generate a 
-# standard header. Notice: only use this tag if you know what you are doing!
-
-LATEX_HEADER           = 
-
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated 
-# is prepared for conversion to pdf (using ps2pdf). The pdf file will 
-# contain links (just like the HTML output) instead of page references 
-# This makes the output suitable for online browsing using a pdf viewer.
-
-PDF_HYPERLINKS         = NO
-
-# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of 
-# plain latex in the generated Makefile. Set this option to YES to get a 
-# higher quality PDF documentation.
-
-USE_PDFLATEX           = NO
-
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. 
-# command to the generated LaTeX files. This will instruct LaTeX to keep 
-# running if errors occur, instead of asking the user for help. 
-# This option is also used when generating formulas in HTML.
-
-LATEX_BATCHMODE        = NO
-
-# If LATEX_HIDE_INDICES is set to YES then doxygen will not 
-# include the index chapters (such as File Index, Compound Index, etc.) 
-# in the output.
-
-LATEX_HIDE_INDICES     = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output 
-# The RTF output is optimized for Word 97 and may not look very pretty with 
-# other RTF readers or editors.
-
-GENERATE_RTF           = NO
-
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `rtf' will be used as the default path.
-
-RTF_OUTPUT             = rtf
-
-# If the COMPACT_RTF tag is set to YES Doxygen generates more compact 
-# RTF documents. This may be useful for small projects and may help to 
-# save some trees in general.
-
-COMPACT_RTF            = NO
-
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated 
-# will contain hyperlink fields. The RTF file will 
-# contain links (just like the HTML output) instead of page references. 
-# This makes the output suitable for online browsing using WORD or other 
-# programs which support those fields. 
-# Note: wordpad (write) and others do not support links.
-
-RTF_HYPERLINKS         = NO
-
-# Load stylesheet definitions from file. Syntax is similar to doxygen's 
-# config file, i.e. a series of assignments. You only have to provide 
-# replacements, missing definitions are set to their default value.
-
-RTF_STYLESHEET_FILE    = 
-
-# Set optional variables used in the generation of an rtf document. 
-# Syntax is similar to doxygen's config file.
-
-RTF_EXTENSIONS_FILE    = 
-
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_MAN tag is set to YES (the default) Doxygen will 
-# generate man pages
-
-GENERATE_MAN           = NO
-
-# The MAN_OUTPUT tag is used to specify where the man pages will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `man' will be used as the default path.
-
-MAN_OUTPUT             = 
-
-# The MAN_EXTENSION tag determines the extension that is added to 
-# the generated man pages (default is the subroutine's section .3)
-
-MAN_EXTENSION          = .3
-
-# If the MAN_LINKS tag is set to YES and Doxygen generates man output, 
-# then it will generate one additional man file for each entity 
-# documented in the real man page(s). These additional files 
-# only source the real man page, but without them the man command 
-# would be unable to find the correct page. The default is NO.
-
-MAN_LINKS              = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the XML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_XML tag is set to YES Doxygen will 
-# generate an XML file that captures the structure of 
-# the code including all documentation.
-
-GENERATE_XML           = NO
-
-# The XML_OUTPUT tag is used to specify where the XML pages will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `xml' will be used as the default path.
-
-XML_OUTPUT             = xml
-
-# The XML_SCHEMA tag can be used to specify an XML schema, 
-# which can be used by a validating XML parser to check the 
-# syntax of the XML files.
-
-XML_SCHEMA             = 
-
-# The XML_DTD tag can be used to specify an XML DTD, 
-# which can be used by a validating XML parser to check the 
-# syntax of the XML files.
-
-XML_DTD                = 
-
-# If the XML_PROGRAMLISTING tag is set to YES Doxygen will 
-# dump the program listings (including syntax highlighting 
-# and cross-referencing information) to the XML output. Note that 
-# enabling this will significantly increase the size of the XML output.
-
-XML_PROGRAMLISTING     = YES
-
-#---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will 
-# generate an AutoGen Definitions (see autogen.sf.net) file 
-# that captures the structure of the code including all 
-# documentation. Note that this feature is still experimental 
-# and incomplete at the moment.
-
-GENERATE_AUTOGEN_DEF   = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_PERLMOD tag is set to YES Doxygen will 
-# generate a Perl module file that captures the structure of 
-# the code including all documentation. Note that this 
-# feature is still experimental and incomplete at the 
-# moment.
-
-GENERATE_PERLMOD       = NO
-
-# If the PERLMOD_LATEX tag is set to YES Doxygen will generate 
-# the necessary Makefile rules, Perl scripts and LaTeX code to be able 
-# to generate PDF and DVI output from the Perl module output.
-
-PERLMOD_LATEX          = NO
-
-# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be 
-# nicely formatted so it can be parsed by a human reader.  This is useful 
-# if you want to understand what is going on.  On the other hand, if this 
-# tag is set to NO the size of the Perl module output will be much smaller 
-# and Perl will parse it just the same.
-
-PERLMOD_PRETTY         = YES
-
-# The names of the make variables in the generated doxyrules.make file 
-# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. 
-# This is useful so different doxyrules.make files included by the same 
-# Makefile don't overwrite each other's variables.
-
-PERLMOD_MAKEVAR_PREFIX = 
-
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor   
-#---------------------------------------------------------------------------
-
-# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will 
-# evaluate all C-preprocessor directives found in the sources and include 
-# files.
-
-ENABLE_PREPROCESSING   = YES
-
-# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro 
-# names in the source code. If set to NO (the default) only conditional 
-# compilation will be performed. Macro expansion can be done in a controlled 
-# way by setting EXPAND_ONLY_PREDEF to YES.
-
-MACRO_EXPANSION        = YES
-
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES 
-# then the macro expansion is limited to the macros specified with the 
-# PREDEFINED and EXPAND_AS_PREDEFINED tags.
-
-EXPAND_ONLY_PREDEF     = NO
-
-# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files 
-# in the INCLUDE_PATH (see below) will be search if a #include is found.
-
-SEARCH_INCLUDES        = YES
-
-# The INCLUDE_PATH tag can be used to specify one or more directories that 
-# contain include files that are not input files but should be processed by 
-# the preprocessor.
-
-INCLUDE_PATH           = .
-
-# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard 
-# patterns (like *.h and *.hpp) to filter out the header-files in the 
-# directories. If left blank, the patterns specified with FILE_PATTERNS will 
-# be used.
-
-INCLUDE_FILE_PATTERNS  = 
-
-# The PREDEFINED tag can be used to specify one or more macro names that 
-# are defined before the preprocessor is started (similar to the -D option of 
-# gcc). The argument of the tag is a list of macros of the form: name 
-# or name=definition (no spaces). If the definition and the = are 
-# omitted =1 is assumed.
-
-PREDEFINED             = _WIN32 \
-                         _WINDOWS \
-                         WORD64_AVAILABLE \
-                         __FreeBSD__ \
-                         CRYPTOPP_DOXYGEN_PROCESSING
-
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
-# this tag can be used to specify a list of macro names that should be expanded. 
-# The macro definition that is found in the sources will be used. 
-# Use the PREDEFINED tag if you want to use a different macro definition.
-
-EXPAND_AS_DEFINED      = 
-
-# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then 
-# doxygen's preprocessor will remove all function-like macros that are alone 
-# on a line, have an all uppercase name, and do not end with a semicolon. Such 
-# function macros are typically used for boiler-plate code, and will confuse the 
-# parser if not removed.
-
-SKIP_FUNCTION_MACROS   = YES
-
-#---------------------------------------------------------------------------
-# Configuration::additions related to external references   
-#---------------------------------------------------------------------------
-
-# The TAGFILES option can be used to specify one or more tagfiles. 
-# Optionally an initial location of the external documentation 
-# can be added for each tagfile. The format of a tag file without 
-# this location is as follows: 
-#   TAGFILES = file1 file2 ... 
-# Adding location for the tag files is done as follows: 
-#   TAGFILES = file1=loc1 "file2 = loc2" ... 
-# where "loc1" and "loc2" can be relative or absolute paths or 
-# URLs. If a location is present for each tag, the installdox tool 
-# does not have to be run to correct the links.
-# Note that each tag file must have a unique name
-# (where the name does NOT include the path)
-# If a tag file is not located in the directory in which doxygen 
-# is run, you must also specify the path to the tagfile here.
-
-TAGFILES               = 
-
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create 
-# a tag file that is based on the input files it reads.
-
-GENERATE_TAGFILE       = 
-
-# If the ALLEXTERNALS tag is set to YES all external classes will be listed 
-# in the class index. If set to NO only the inherited external classes 
-# will be listed.
-
-ALLEXTERNALS           = NO
-
-# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed 
-# in the modules index. If set to NO, only the current project's groups will 
-# be listed.
-
-EXTERNAL_GROUPS        = YES
-
-# The PERL_PATH should be the absolute path and name of the perl script 
-# interpreter (i.e. the result of `which perl').
-
-PERL_PATH              = /usr/bin/perl
-
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool   
-#---------------------------------------------------------------------------
-
-# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will 
-# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base or 
-# super classes. Setting the tag to NO turns the diagrams off. Note that this 
-# option is superseded by the HAVE_DOT option below. This is only a fallback. It is 
-# recommended to install and use dot, since it yields more powerful graphs.
-
-CLASS_DIAGRAMS         = YES
-
-# If set to YES, the inheritance and collaboration graphs will hide 
-# inheritance and usage relations if the target is undocumented 
-# or is not a class.
-
-HIDE_UNDOC_RELATIONS   = YES
-
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is 
-# available from the path. This tool is part of Graphviz, a graph visualization 
-# toolkit from AT&T and Lucent Bell Labs. The other options in this section 
-# have no effect if this option is set to NO (the default)
-
-HAVE_DOT               = NO
-
-# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen 
-# will generate a graph for each documented class showing the direct and 
-# indirect inheritance relations. Setting this tag to YES will force the 
-# the CLASS_DIAGRAMS tag to NO.
-
-CLASS_GRAPH            = YES
-
-# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen 
-# will generate a graph for each documented class showing the direct and 
-# indirect implementation dependencies (inheritance, containment, and 
-# class references variables) of the class with other documented classes.
-
-COLLABORATION_GRAPH    = YES
-
-# If the UML_LOOK tag is set to YES doxygen will generate inheritance and 
-# collaboration diagrams in a style similar to the OMG's Unified Modeling 
-# Language.
-
-UML_LOOK               = NO
-
-# If set to YES, the inheritance and collaboration graphs will show the 
-# relations between templates and their instances.
-
-TEMPLATE_RELATIONS     = YES
-
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT 
-# tags are set to YES then doxygen will generate a graph for each documented 
-# file showing the direct and indirect include dependencies of the file with 
-# other documented files.
-
-INCLUDE_GRAPH          = YES
-
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and 
-# HAVE_DOT tags are set to YES then doxygen will generate a graph for each 
-# documented header file showing the documented files that directly or 
-# indirectly include this file.
-
-INCLUDED_BY_GRAPH      = YES
-
-# If the CALL_GRAPH and HAVE_DOT tags are set to YES then doxygen will 
-# generate a call dependency graph for every global function or class method. 
-# Note that enabling this option will significantly increase the time of a run. 
-# So in most cases it will be better to enable call graphs for selected 
-# functions only using the \callgraph command.
-
-CALL_GRAPH             = NO
-
-# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen 
-# will graphical hierarchy of all classes instead of a textual one.
-
-GRAPHICAL_HIERARCHY    = YES
-
-# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images 
-# generated by dot. Possible values are png, jpg, or gif
-# If left blank png will be used.
-
-DOT_IMAGE_FORMAT       = png
-
-# The tag DOT_PATH can be used to specify the path where the dot tool can be 
-# found. If left blank, it is assumed the dot tool can be found on the path.
-
-DOT_PATH               = 
-
-# The DOTFILE_DIRS tag can be used to specify one or more directories that 
-# contain dot files that are included in the documentation (see the 
-# \dotfile command).
-
-DOTFILE_DIRS           = 
-
-# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width 
-# (in pixels) of the graphs generated by dot. If a graph becomes larger than 
-# this value, doxygen will try to truncate the graph, so that it fits within 
-# the specified constraint. Beware that most browsers cannot cope with very 
-# large images.
-
-MAX_DOT_GRAPH_WIDTH    = 1024
-
-# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height 
-# (in pixels) of the graphs generated by dot. If a graph becomes larger than 
-# this value, doxygen will try to truncate the graph, so that it fits within 
-# the specified constraint. Beware that most browsers cannot cope with very 
-# large images.
-
-MAX_DOT_GRAPH_HEIGHT   = 1024
-
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the 
-# graphs generated by dot. A depth value of 3 means that only nodes reachable 
-# from the root by following a path via at most 3 edges will be shown. Nodes that 
-# lay further from the root node will be omitted. Note that setting this option to 
-# 1 or 2 may greatly reduce the computation time needed for large code bases. Also 
-# note that a graph may be further truncated if the graph's image dimensions are 
-# not sufficient to fit the graph (see MAX_DOT_GRAPH_WIDTH and MAX_DOT_GRAPH_HEIGHT). 
-# If 0 is used for the depth value (the default), the graph is not depth-constrained.
-
-MAX_DOT_GRAPH_DEPTH    = 0
-
-# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will 
-# generate a legend page explaining the meaning of the various boxes and 
-# arrows in the dot generated graphs.
-
-GENERATE_LEGEND        = YES
-
-# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will 
-# remove the intermediate dot files that are used to generate 
-# the various graphs.
-
-DOT_CLEANUP            = YES
-
-#---------------------------------------------------------------------------
-# Configuration::additions related to the search engine   
-#---------------------------------------------------------------------------
-
-# The SEARCHENGINE tag specifies whether or not a search engine should be 
-# used. If set to NO the values of all tags below this one will be ignored.
-
-SEARCHENGINE           = NO
diff --git a/plugins/CryptoPP/crypto/adhoc.cpp.proto b/plugins/CryptoPP/crypto/adhoc.cpp.proto
deleted file mode 100644
index dc7f697596..0000000000
--- a/plugins/CryptoPP/crypto/adhoc.cpp.proto
+++ /dev/null
@@ -1,17 +0,0 @@
-#include "filters.h"
-#include "files.h"
-#include "base64.h"
-#include "hex.h"
-#include <iostream>
-
-USING_NAMESPACE(CryptoPP)
-USING_NAMESPACE(std)
-
-extern int (*AdhocTest)(int argc, char *argv[]);
-
-int MyAdhocTest(int argc, char *argv[])
-{
-	return 0;
-}
-
-static int s_i = (AdhocTest = &MyAdhocTest, 0);
diff --git a/plugins/CryptoPP/crypto/cryptlib_10.vcxproj b/plugins/CryptoPP/crypto/cryptlib_10.vcxproj
index d45fe25291..fbd5682ade 100644
--- a/plugins/CryptoPP/crypto/cryptlib_10.vcxproj
+++ b/plugins/CryptoPP/crypto/cryptlib_10.vcxproj
@@ -79,6 +79,10 @@
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <WarningLevel>Level3</WarningLevel>
     </ClCompile>
+    <Lib>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
@@ -91,6 +95,10 @@
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <WarningLevel>Level3</WarningLevel>
     </ClCompile>
+    <Lib>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -101,6 +109,10 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
     </ClCompile>
+    <Lib>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
@@ -111,255 +123,260 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
     </ClCompile>
+    <Lib>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="3way.cpp" />
-    <ClCompile Include="adler32.cpp" />
-    <ClCompile Include="algebra.cpp" />
-    <ClCompile Include="algparam.cpp" />
-    <ClCompile Include="arc4.cpp" />
-    <ClCompile Include="asn.cpp" />
-    <ClCompile Include="base32.cpp" />
-    <ClCompile Include="base64.cpp" />
-    <ClCompile Include="basecode.cpp" />
-    <ClCompile Include="bfinit.cpp" />
-    <ClCompile Include="blowfish.cpp" />
-    <ClCompile Include="blumshub.cpp" />
-    <ClCompile Include="camellia.cpp" />
-    <ClCompile Include="cast.cpp" />
-    <ClCompile Include="casts.cpp" />
-    <ClCompile Include="cbcmac.cpp" />
-    <ClCompile Include="channels.cpp" />
-    <ClCompile Include="cpu.cpp" />
-    <ClCompile Include="crc.cpp" />
-    <ClCompile Include="cryptlib.cpp" />
-    <ClCompile Include="default.cpp" />
-    <ClCompile Include="des.cpp" />
-    <ClCompile Include="dessp.cpp" />
-    <ClCompile Include="dh.cpp" />
-    <ClCompile Include="dh2.cpp" />
-    <ClCompile Include="dll.cpp">
+    <ClCompile Include="src\3way.cpp" />
+    <ClCompile Include="src\adler32.cpp" />
+    <ClCompile Include="src\algebra.cpp" />
+    <ClCompile Include="src\algparam.cpp" />
+    <ClCompile Include="src\arc4.cpp" />
+    <ClCompile Include="src\asn.cpp" />
+    <ClCompile Include="src\base32.cpp" />
+    <ClCompile Include="src\base64.cpp" />
+    <ClCompile Include="src\basecode.cpp" />
+    <ClCompile Include="src\bfinit.cpp" />
+    <ClCompile Include="src\blowfish.cpp" />
+    <ClCompile Include="src\blumshub.cpp" />
+    <ClCompile Include="src\camellia.cpp" />
+    <ClCompile Include="src\cast.cpp" />
+    <ClCompile Include="src\casts.cpp" />
+    <ClCompile Include="src\cbcmac.cpp" />
+    <ClCompile Include="src\channels.cpp" />
+    <ClCompile Include="src\cpu.cpp" />
+    <ClCompile Include="src\crc.cpp" />
+    <ClCompile Include="src\cryptlib.cpp" />
+    <ClCompile Include="src\default.cpp" />
+    <ClCompile Include="src\des.cpp" />
+    <ClCompile Include="src\dessp.cpp" />
+    <ClCompile Include="src\dh.cpp" />
+    <ClCompile Include="src\dh2.cpp" />
+    <ClCompile Include="src\dll.cpp">
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="dsa.cpp" />
-    <ClCompile Include="ec2n.cpp" />
-    <ClCompile Include="eccrypto.cpp" />
-    <ClCompile Include="ecp.cpp" />
-    <ClCompile Include="elgamal.cpp" />
-    <ClCompile Include="emsa2.cpp" />
-    <ClCompile Include="eprecomp.cpp" />
-    <ClCompile Include="esign.cpp" />
-    <ClCompile Include="files.cpp" />
-    <ClCompile Include="filters.cpp" />
-    <ClCompile Include="fips140.cpp" />
-    <ClCompile Include="fipstest.cpp" />
-    <ClCompile Include="gf256.cpp" />
-    <ClCompile Include="gf2_32.cpp" />
-    <ClCompile Include="gf2n.cpp" />
-    <ClCompile Include="gfpcrypt.cpp" />
-    <ClCompile Include="gost.cpp" />
-    <ClCompile Include="gzip.cpp" />
-    <ClCompile Include="hex.cpp" />
-    <ClCompile Include="hmac.cpp" />
-    <ClCompile Include="hrtimer.cpp" />
-    <ClCompile Include="ida.cpp" />
-    <ClCompile Include="idea.cpp" />
-    <ClCompile Include="integer.cpp" />
-    <ClCompile Include="iterhash.cpp" />
-    <ClCompile Include="luc.cpp" />
-    <ClCompile Include="mars.cpp" />
-    <ClCompile Include="marss.cpp" />
-    <ClCompile Include="md2.cpp" />
-    <ClCompile Include="md4.cpp" />
-    <ClCompile Include="md5.cpp" />
-    <ClCompile Include="misc.cpp" />
-    <ClCompile Include="modes.cpp" />
-    <ClCompile Include="mqueue.cpp" />
-    <ClCompile Include="mqv.cpp" />
-    <ClCompile Include="nbtheory.cpp" />
-    <ClCompile Include="network.cpp" />
-    <ClCompile Include="oaep.cpp" />
-    <ClCompile Include="osrng.cpp" />
-    <ClCompile Include="panama.cpp" />
-    <ClCompile Include="pch.cpp">
+    <ClCompile Include="src\dsa.cpp" />
+    <ClCompile Include="src\ec2n.cpp" />
+    <ClCompile Include="src\eccrypto.cpp" />
+    <ClCompile Include="src\ecp.cpp" />
+    <ClCompile Include="src\elgamal.cpp" />
+    <ClCompile Include="src\emsa2.cpp" />
+    <ClCompile Include="src\eprecomp.cpp" />
+    <ClCompile Include="src\esign.cpp" />
+    <ClCompile Include="src\files.cpp" />
+    <ClCompile Include="src\filters.cpp" />
+    <ClCompile Include="src\fips140.cpp" />
+    <ClCompile Include="src\fipstest.cpp" />
+    <ClCompile Include="src\gf256.cpp" />
+    <ClCompile Include="src\gf2_32.cpp" />
+    <ClCompile Include="src\gf2n.cpp" />
+    <ClCompile Include="src\gfpcrypt.cpp" />
+    <ClCompile Include="src\gost.cpp" />
+    <ClCompile Include="src\gzip.cpp" />
+    <ClCompile Include="src\hex.cpp" />
+    <ClCompile Include="src\hmac.cpp" />
+    <ClCompile Include="src\hrtimer.cpp" />
+    <ClCompile Include="src\ida.cpp" />
+    <ClCompile Include="src\idea.cpp" />
+    <ClCompile Include="src\integer.cpp" />
+    <ClCompile Include="src\iterhash.cpp" />
+    <ClCompile Include="src\luc.cpp" />
+    <ClCompile Include="src\mars.cpp" />
+    <ClCompile Include="src\marss.cpp" />
+    <ClCompile Include="src\md2.cpp" />
+    <ClCompile Include="src\md4.cpp" />
+    <ClCompile Include="src\md5.cpp" />
+    <ClCompile Include="src\misc.cpp" />
+    <ClCompile Include="src\modes.cpp" />
+    <ClCompile Include="src\mqueue.cpp" />
+    <ClCompile Include="src\mqv.cpp" />
+    <ClCompile Include="src\nbtheory.cpp" />
+    <ClCompile Include="src\network.cpp" />
+    <ClCompile Include="src\oaep.cpp" />
+    <ClCompile Include="src\osrng.cpp" />
+    <ClCompile Include="src\panama.cpp" />
+    <ClCompile Include="src\pch.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="pkcspad.cpp" />
-    <ClCompile Include="polynomi.cpp" />
-    <ClCompile Include="pssr.cpp" />
-    <ClCompile Include="pubkey.cpp" />
-    <ClCompile Include="queue.cpp" />
-    <ClCompile Include="rabin.cpp" />
-    <ClCompile Include="randpool.cpp" />
-    <ClCompile Include="rc2.cpp" />
-    <ClCompile Include="rc5.cpp" />
-    <ClCompile Include="rc6.cpp" />
-    <ClCompile Include="rdtables.cpp" />
-    <ClCompile Include="rijndael.cpp" />
-    <ClCompile Include="ripemd.cpp" />
-    <ClCompile Include="rng.cpp" />
-    <ClCompile Include="rsa.cpp" />
-    <ClCompile Include="rw.cpp" />
-    <ClCompile Include="safer.cpp" />
-    <ClCompile Include="salsa.cpp" />
-    <ClCompile Include="seal.cpp" />
-    <ClCompile Include="serpent.cpp" />
-    <ClCompile Include="sha.cpp" />
-    <ClCompile Include="shacal2.cpp" />
-    <ClCompile Include="shark.cpp" />
-    <ClCompile Include="sharkbox.cpp" />
-    <ClCompile Include="simple.cpp" />
-    <ClCompile Include="skipjack.cpp" />
-    <ClCompile Include="socketft.cpp" />
-    <ClCompile Include="sosemanuk.cpp" />
-    <ClCompile Include="square.cpp" />
-    <ClCompile Include="squaretb.cpp" />
-    <ClCompile Include="strciphr.cpp" />
-    <ClCompile Include="tea.cpp" />
-    <ClCompile Include="tftables.cpp" />
-    <ClCompile Include="tiger.cpp" />
-    <ClCompile Include="tigertab.cpp" />
-    <ClCompile Include="trdlocal.cpp" />
-    <ClCompile Include="ttmac.cpp" />
-    <ClCompile Include="twofish.cpp" />
-    <ClCompile Include="vmac.cpp" />
-    <ClCompile Include="wait.cpp" />
-    <ClCompile Include="wake.cpp" />
-    <ClCompile Include="whrlpool.cpp" />
-    <ClCompile Include="winpipes.cpp" />
-    <ClCompile Include="xtr.cpp" />
-    <ClCompile Include="xtrcrypt.cpp" />
-    <ClCompile Include="zdeflate.cpp" />
-    <ClCompile Include="zinflate.cpp" />
-    <ClCompile Include="zlib.cpp" />
+    <ClCompile Include="src\pkcspad.cpp" />
+    <ClCompile Include="src\polynomi.cpp" />
+    <ClCompile Include="src\pssr.cpp" />
+    <ClCompile Include="src\pubkey.cpp" />
+    <ClCompile Include="src\queue.cpp" />
+    <ClCompile Include="src\rabin.cpp" />
+    <ClCompile Include="src\randpool.cpp" />
+    <ClCompile Include="src\rc2.cpp" />
+    <ClCompile Include="src\rc5.cpp" />
+    <ClCompile Include="src\rc6.cpp" />
+    <ClCompile Include="src\rdtables.cpp" />
+    <ClCompile Include="src\rijndael.cpp" />
+    <ClCompile Include="src\ripemd.cpp" />
+    <ClCompile Include="src\rng.cpp" />
+    <ClCompile Include="src\rsa.cpp" />
+    <ClCompile Include="src\rw.cpp" />
+    <ClCompile Include="src\safer.cpp" />
+    <ClCompile Include="src\salsa.cpp" />
+    <ClCompile Include="src\seal.cpp" />
+    <ClCompile Include="src\serpent.cpp" />
+    <ClCompile Include="src\sha.cpp" />
+    <ClCompile Include="src\shacal2.cpp" />
+    <ClCompile Include="src\shark.cpp" />
+    <ClCompile Include="src\sharkbox.cpp" />
+    <ClCompile Include="src\simple.cpp" />
+    <ClCompile Include="src\skipjack.cpp" />
+    <ClCompile Include="src\socketft.cpp" />
+    <ClCompile Include="src\sosemanuk.cpp" />
+    <ClCompile Include="src\square.cpp" />
+    <ClCompile Include="src\squaretb.cpp" />
+    <ClCompile Include="src\strciphr.cpp" />
+    <ClCompile Include="src\tea.cpp" />
+    <ClCompile Include="src\tftables.cpp" />
+    <ClCompile Include="src\tiger.cpp" />
+    <ClCompile Include="src\tigertab.cpp" />
+    <ClCompile Include="src\trdlocal.cpp" />
+    <ClCompile Include="src\ttmac.cpp" />
+    <ClCompile Include="src\twofish.cpp" />
+    <ClCompile Include="src\vmac.cpp" />
+    <ClCompile Include="src\wait.cpp" />
+    <ClCompile Include="src\wake.cpp" />
+    <ClCompile Include="src\whrlpool.cpp" />
+    <ClCompile Include="src\winpipes.cpp" />
+    <ClCompile Include="src\xtr.cpp" />
+    <ClCompile Include="src\xtrcrypt.cpp" />
+    <ClCompile Include="src\zdeflate.cpp" />
+    <ClCompile Include="src\zinflate.cpp" />
+    <ClCompile Include="src\zlib.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Doxyfile" />
-    <None Include="GNUmakefile" />
-    <None Include="license.txt" />
-    <None Include="readme.txt" />
+    <None Include="docs\license.txt" />
+    <None Include="docs\readme.txt" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="3way.h" />
-    <ClInclude Include="adler32.h" />
-    <ClInclude Include="aes.h" />
-    <ClInclude Include="algebra.h" />
-    <ClInclude Include="algparam.h" />
-    <ClInclude Include="arc4.h" />
-    <ClInclude Include="argnames.h" />
-    <ClInclude Include="asn.h" />
-    <ClInclude Include="base32.h" />
-    <ClInclude Include="base64.h" />
-    <ClInclude Include="basecode.h" />
-    <ClInclude Include="blowfish.h" />
-    <ClInclude Include="blumshub.h" />
-    <ClInclude Include="camellia.h" />
-    <ClInclude Include="cast.h" />
-    <ClInclude Include="cbcmac.h" />
-    <ClInclude Include="channels.h" />
-    <ClInclude Include="config.h" />
-    <ClInclude Include="crc.h" />
-    <ClInclude Include="cryptlib.h" />
-    <ClInclude Include="default.h" />
-    <ClInclude Include="des.h" />
-    <ClInclude Include="dh.h" />
-    <ClInclude Include="dh2.h" />
-    <ClInclude Include="dmac.h" />
-    <ClInclude Include="dsa.h" />
-    <ClInclude Include="dword.h" />
-    <ClInclude Include="ec2n.h" />
-    <ClInclude Include="eccrypto.h" />
-    <ClInclude Include="ecp.h" />
-    <ClInclude Include="elgamal.h" />
-    <ClInclude Include="emsa2.h" />
-    <ClInclude Include="eprecomp.h" />
-    <ClInclude Include="esign.h" />
-    <ClInclude Include="factory.h" />
-    <ClInclude Include="files.h" />
-    <ClInclude Include="filters.h" />
-    <ClInclude Include="fips140.h" />
-    <ClInclude Include="fltrimpl.h" />
-    <ClInclude Include="gf256.h" />
-    <ClInclude Include="gf2_32.h" />
-    <ClInclude Include="gf2n.h" />
-    <ClInclude Include="gfpcrypt.h" />
-    <ClInclude Include="gost.h" />
-    <ClInclude Include="gzip.h" />
-    <ClInclude Include="hex.h" />
-    <ClInclude Include="hmac.h" />
-    <ClInclude Include="hrtimer.h" />
-    <ClInclude Include="ida.h" />
-    <ClInclude Include="idea.h" />
-    <ClInclude Include="integer.h" />
-    <ClInclude Include="iterhash.h" />
-    <ClInclude Include="lubyrack.h" />
-    <ClInclude Include="luc.h" />
-    <ClInclude Include="mars.h" />
-    <ClInclude Include="md2.h" />
-    <ClInclude Include="md4.h" />
-    <ClInclude Include="md5.h" />
-    <ClInclude Include="mdc.h" />
-    <ClInclude Include="misc.h" />
-    <ClInclude Include="modarith.h" />
-    <ClInclude Include="modes.h" />
-    <ClInclude Include="modexppc.h" />
-    <ClInclude Include="mqueue.h" />
-    <ClInclude Include="mqv.h" />
-    <ClInclude Include="nbtheory.h" />
-    <ClInclude Include="network.h" />
-    <ClInclude Include="nr.h" />
-    <ClInclude Include="oaep.h" />
-    <ClInclude Include="oids.h" />
-    <ClInclude Include="osrng.h" />
-    <ClInclude Include="panama.h" />
-    <ClInclude Include="pch.h" />
-    <ClInclude Include="pkcspad.h" />
-    <ClInclude Include="polynomi.h" />
-    <ClInclude Include="pssr.h" />
-    <ClInclude Include="pubkey.h" />
-    <ClInclude Include="pwdbased.h" />
-    <ClInclude Include="queue.h" />
-    <ClInclude Include="rabin.h" />
-    <ClInclude Include="randpool.h" />
-    <ClInclude Include="rc2.h" />
-    <ClInclude Include="rc5.h" />
-    <ClInclude Include="rc6.h" />
-    <ClInclude Include="rijndael.h" />
-    <ClInclude Include="ripemd.h" />
-    <ClInclude Include="rng.h" />
-    <ClInclude Include="rsa.h" />
-    <ClInclude Include="rw.h" />
-    <ClInclude Include="safer.h" />
-    <ClInclude Include="salsa.h" />
-    <ClInclude Include="seal.h" />
-    <ClInclude Include="secblock.h" />
-    <ClInclude Include="seckey.h" />
-    <ClInclude Include="serpent.h" />
-    <ClInclude Include="sha.h" />
-    <ClInclude Include="shacal2.h" />
-    <ClInclude Include="shark.h" />
-    <ClInclude Include="simple.h" />
-    <ClInclude Include="skipjack.h" />
-    <ClInclude Include="smartptr.h" />
-    <ClInclude Include="socketft.h" />
-    <ClInclude Include="square.h" />
-    <ClInclude Include="strciphr.h" />
-    <ClInclude Include="tea.h" />
-    <ClInclude Include="tiger.h" />
-    <ClInclude Include="trdlocal.h" />
-    <ClInclude Include="trunhash.h" />
-    <ClInclude Include="ttmac.h" />
-    <ClInclude Include="twofish.h" />
-    <ClInclude Include="wait.h" />
-    <ClInclude Include="wake.h" />
-    <ClInclude Include="whrlpool.h" />
-    <ClInclude Include="winpipes.h" />
-    <ClInclude Include="words.h" />
-    <ClInclude Include="xtr.h" />
-    <ClInclude Include="xtrcrypt.h" />
-    <ClInclude Include="zdeflate.h" />
-    <ClInclude Include="zinflate.h" />
-    <ClInclude Include="zlib.h" />
+    <ClInclude Include="src\3way.h" />
+    <ClInclude Include="src\adler32.h" />
+    <ClInclude Include="src\aes.h" />
+    <ClInclude Include="src\algebra.h" />
+    <ClInclude Include="src\algparam.h" />
+    <ClInclude Include="src\arc4.h" />
+    <ClInclude Include="src\argnames.h" />
+    <ClInclude Include="src\asn.h" />
+    <ClInclude Include="src\base32.h" />
+    <ClInclude Include="src\base64.h" />
+    <ClInclude Include="src\basecode.h" />
+    <ClInclude Include="src\blowfish.h" />
+    <ClInclude Include="src\blumshub.h" />
+    <ClInclude Include="src\camellia.h" />
+    <ClInclude Include="src\cast.h" />
+    <ClInclude Include="src\cbcmac.h" />
+    <ClInclude Include="src\channels.h" />
+    <ClInclude Include="src\config.h" />
+    <ClInclude Include="src\crc.h" />
+    <ClInclude Include="src\cryptlib.h" />
+    <ClInclude Include="src\default.h" />
+    <ClInclude Include="src\des.h" />
+    <ClInclude Include="src\dh.h" />
+    <ClInclude Include="src\dh2.h" />
+    <ClInclude Include="src\dmac.h" />
+    <ClInclude Include="src\dsa.h" />
+    <ClInclude Include="src\dword.h" />
+    <ClInclude Include="src\ec2n.h" />
+    <ClInclude Include="src\eccrypto.h" />
+    <ClInclude Include="src\ecp.h" />
+    <ClInclude Include="src\elgamal.h" />
+    <ClInclude Include="src\emsa2.h" />
+    <ClInclude Include="src\eprecomp.h" />
+    <ClInclude Include="src\esign.h" />
+    <ClInclude Include="src\factory.h" />
+    <ClInclude Include="src\files.h" />
+    <ClInclude Include="src\filters.h" />
+    <ClInclude Include="src\fips140.h" />
+    <ClInclude Include="src\fltrimpl.h" />
+    <ClInclude Include="src\gf256.h" />
+    <ClInclude Include="src\gf2_32.h" />
+    <ClInclude Include="src\gf2n.h" />
+    <ClInclude Include="src\gfpcrypt.h" />
+    <ClInclude Include="src\gost.h" />
+    <ClInclude Include="src\gzip.h" />
+    <ClInclude Include="src\hex.h" />
+    <ClInclude Include="src\hmac.h" />
+    <ClInclude Include="src\hrtimer.h" />
+    <ClInclude Include="src\ida.h" />
+    <ClInclude Include="src\idea.h" />
+    <ClInclude Include="src\integer.h" />
+    <ClInclude Include="src\iterhash.h" />
+    <ClInclude Include="src\lubyrack.h" />
+    <ClInclude Include="src\luc.h" />
+    <ClInclude Include="src\mars.h" />
+    <ClInclude Include="src\md2.h" />
+    <ClInclude Include="src\md4.h" />
+    <ClInclude Include="src\md5.h" />
+    <ClInclude Include="src\mdc.h" />
+    <ClInclude Include="src\misc.h" />
+    <ClInclude Include="src\modarith.h" />
+    <ClInclude Include="src\modes.h" />
+    <ClInclude Include="src\modexppc.h" />
+    <ClInclude Include="src\mqueue.h" />
+    <ClInclude Include="src\mqv.h" />
+    <ClInclude Include="src\nbtheory.h" />
+    <ClInclude Include="src\network.h" />
+    <ClInclude Include="src\nr.h" />
+    <ClInclude Include="src\oaep.h" />
+    <ClInclude Include="src\oids.h" />
+    <ClInclude Include="src\osrng.h" />
+    <ClInclude Include="src\panama.h" />
+    <ClInclude Include="src\pch.h" />
+    <ClInclude Include="src\pkcspad.h" />
+    <ClInclude Include="src\polynomi.h" />
+    <ClInclude Include="src\pssr.h" />
+    <ClInclude Include="src\pubkey.h" />
+    <ClInclude Include="src\pwdbased.h" />
+    <ClInclude Include="src\queue.h" />
+    <ClInclude Include="src\rabin.h" />
+    <ClInclude Include="src\randpool.h" />
+    <ClInclude Include="src\rc2.h" />
+    <ClInclude Include="src\rc5.h" />
+    <ClInclude Include="src\rc6.h" />
+    <ClInclude Include="src\rijndael.h" />
+    <ClInclude Include="src\ripemd.h" />
+    <ClInclude Include="src\rng.h" />
+    <ClInclude Include="src\rsa.h" />
+    <ClInclude Include="src\rw.h" />
+    <ClInclude Include="src\safer.h" />
+    <ClInclude Include="src\salsa.h" />
+    <ClInclude Include="src\seal.h" />
+    <ClInclude Include="src\secblock.h" />
+    <ClInclude Include="src\seckey.h" />
+    <ClInclude Include="src\serpent.h" />
+    <ClInclude Include="src\sha.h" />
+    <ClInclude Include="src\shacal2.h" />
+    <ClInclude Include="src\shark.h" />
+    <ClInclude Include="src\simple.h" />
+    <ClInclude Include="src\skipjack.h" />
+    <ClInclude Include="src\smartptr.h" />
+    <ClInclude Include="src\socketft.h" />
+    <ClInclude Include="src\square.h" />
+    <ClInclude Include="src\strciphr.h" />
+    <ClInclude Include="src\tea.h" />
+    <ClInclude Include="src\tiger.h" />
+    <ClInclude Include="src\trdlocal.h" />
+    <ClInclude Include="src\trunhash.h" />
+    <ClInclude Include="src\ttmac.h" />
+    <ClInclude Include="src\twofish.h" />
+    <ClInclude Include="src\wait.h" />
+    <ClInclude Include="src\wake.h" />
+    <ClInclude Include="src\whrlpool.h" />
+    <ClInclude Include="src\winpipes.h" />
+    <ClInclude Include="src\words.h" />
+    <ClInclude Include="src\xtr.h" />
+    <ClInclude Include="src\xtrcrypt.h" />
+    <ClInclude Include="src\zdeflate.h" />
+    <ClInclude Include="src\zinflate.h" />
+    <ClInclude Include="src\zlib.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="res\cryptopp.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/plugins/CryptoPP/crypto/crypto54msvc6.patch b/plugins/CryptoPP/crypto/crypto54msvc6.patch
deleted file mode 100644
index 5a5b57b856..0000000000
--- a/plugins/CryptoPP/crypto/crypto54msvc6.patch
+++ /dev/null
@@ -1,241 +0,0 @@
-Index: config.h
-===================================================================
-RCS file: /cvsroot/cryptopp/c5/config.h,v
-retrieving revision 1.28
-diff -c -r1.28 config.h
-*** config.h	20 Dec 2006 15:20:00 -0000	1.28
---- config.h	25 Dec 2006 08:07:27 -0000
-***************
-*** 154,159 ****
---- 154,161 ----
-  const unsigned int WORD_SIZE = sizeof(word);
-  const unsigned int WORD_BITS = WORD_SIZE * 8;
-  
-+ NAMESPACE_END
-+ 
-  #if defined(_MSC_VER) // || defined(__BORLANDC__) intrinsics don't work on BCB 2006
-  	#define INTEL_INTRINSICS
-  	#define FAST_ROTATE
-***************
-*** 171,188 ****
-  	#define CRYPTOPP_L1_CACHE_LINE_SIZE 32
-  #endif
-  
-  #ifndef CRYPTOPP_L1_CACHE_ALIGN
-! 	#if defined(_MSC_VER)
-  		#define CRYPTOPP_L1_CACHE_ALIGN(x) __declspec(align(CRYPTOPP_L1_CACHE_LINE_SIZE)) x
-  	#elif defined(__GNUC__)
-  		#define CRYPTOPP_L1_CACHE_ALIGN(x) x __attribute__((aligned(CRYPTOPP_L1_CACHE_LINE_SIZE)))
-  	#else
-  		#define CRYPTOPP_L1_CACHE_ALIGN(x) x
-  	#endif
-  #endif
-  
-- NAMESPACE_END
-- 
-  // VC60 workaround: it doesn't allow typename in some places
-  #if defined(_MSC_VER) && (_MSC_VER < 1300)
-  #define CPP_TYPENAME
---- 173,198 ----
-  	#define CRYPTOPP_L1_CACHE_LINE_SIZE 32
-  #endif
-  
-+ #if defined(_MSC_VER)
-+ 	#if _MSC_VER == 1200
-+ 		#include <malloc.h>
-+ 	#endif
-+ 	#if _MSC_VER > 1200 || defined(_mm_free)
-+ 		#define CRYPTOPP_MSVC6PP_OR_LATER		// VC 6 processor pack or later
-+ 	#endif
-+ #endif
-+ 
-  #ifndef CRYPTOPP_L1_CACHE_ALIGN
-! 	#if defined(CRYPTOPP_MSVC6PP_OR_LATER)
-  		#define CRYPTOPP_L1_CACHE_ALIGN(x) __declspec(align(CRYPTOPP_L1_CACHE_LINE_SIZE)) x
-  	#elif defined(__GNUC__)
-  		#define CRYPTOPP_L1_CACHE_ALIGN(x) x __attribute__((aligned(CRYPTOPP_L1_CACHE_LINE_SIZE)))
-  	#else
-+ 		#define CRYPTOPP_L1_CACHE_ALIGN_NOT_AVAILABLE
-  		#define CRYPTOPP_L1_CACHE_ALIGN(x) x
-  	#endif
-  #endif
-  
-  // VC60 workaround: it doesn't allow typename in some places
-  #if defined(_MSC_VER) && (_MSC_VER < 1300)
-  #define CPP_TYPENAME
-***************
-*** 190,195 ****
---- 200,212 ----
-  #define CPP_TYPENAME typename
-  #endif
-  
-+ // VC60 workaround: can't cast unsigned __int64 to float or double
-+ #if defined(_MSC_VER) && !defined(CRYPTOPP_MSVC6PP_OR_LATER)
-+ #define CRYPTOPP_VC6_INT64 (__int64)
-+ #else
-+ #define CRYPTOPP_VC6_INT64
-+ #endif
-+ 
-  #ifdef _MSC_VER
-  #define CRYPTOPP_NO_VTABLE __declspec(novtable)
-  #else
-***************
-*** 239,255 ****
-  #endif
-  
-  // how to declare class constants
-! #if defined(_MSC_VER) && _MSC_VER < 1300
-  #	define CRYPTOPP_CONSTANT(x) enum {x};
-  #else
-  #	define CRYPTOPP_CONSTANT(x) static const int x;
-  #endif
-  
-! // how to allocate 16-byte aligned memory (for SSE2)
-! #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-! #	define CRYPTOPP_MALLOC_ALIGNMENT_IS_16
-! #elif defined(__linux__) || defined(__sun__) || defined(__CYGWIN__)
-! #	define CRYPTOPP_MEMALIGN_AVAILABLE
-  #endif
-  
-  // ***************** determine availability of OS features ********************
---- 256,282 ----
-  #endif
-  
-  // how to declare class constants
-! #if defined(_MSC_VER) && _MSC_VER <= 1300
-  #	define CRYPTOPP_CONSTANT(x) enum {x};
-  #else
-  #	define CRYPTOPP_CONSTANT(x) static const int x;
-  #endif
-  
-! #ifdef CRYPTOPP_X86ASM_AVAILABLE
-! 	#if defined(CRYPTOPP_MSVC6PP_OR_LATER) || (defined(__INTEL_COMPILER) && (__INTEL_COMPILER >= 500)) || (defined(__ICL) && (__ICL >= 500))
-! 		#define SSE2_INTRINSICS_AVAILABLE
-! 		#define CRYPTOPP_MM_MALLOC_AVAILABLE
-! 	#endif
-! 	// SSE2 intrinsics work in GCC 3.3 or later
-! 	#if defined(__SSE2__) && (__GNUC__ > 3 || __GNUC_MINOR__ > 2)
-! 		#define SSE2_INTRINSICS_AVAILABLE
-! 		// how to allocate 16-byte aligned memory (for SSE2)
-! 		#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-! 			#define CRYPTOPP_MALLOC_ALIGNMENT_IS_16
-! 		#elif defined(__linux__) || defined(__sun__) || defined(__CYGWIN__)
-! 			#define CRYPTOPP_MEMALIGN_AVAILABLE
-! 		#endif
-! 	#endif
-  #endif
-  
-  // ***************** determine availability of OS features ********************
-Index: hrtimer.cpp
-===================================================================
-RCS file: /cvsroot/cryptopp/c5/hrtimer.cpp,v
-retrieving revision 1.11
-diff -c -r1.11 hrtimer.cpp
-*** hrtimer.cpp	18 Dec 2006 02:34:32 -0000	1.11
---- hrtimer.cpp	25 Dec 2006 08:07:27 -0000
-***************
-*** 23,35 ****
-  	static unsigned long unitsPerSecondTable[] = {1, 1000, 1000*1000, 1000*1000*1000};
-  
-  	assert(unit < sizeof(unitsPerSecondTable) / sizeof(unitsPerSecondTable[0]));
-! #if defined(_MSC_VER) && (_MSC_VER < 1300)
-! 	// MSVC 6 workaround
-! 	return (double)(__int64)t * unitsPerSecondTable[unit] / (__int64)TicksPerSecond();
-! #else
-! 	return (double)t * unitsPerSecondTable[unit] / TicksPerSecond();
-! #endif
-! 		
-  }
-  
-  void TimerBase::StartTimer()
---- 23,29 ----
-  	static unsigned long unitsPerSecondTable[] = {1, 1000, 1000*1000, 1000*1000*1000};
-  
-  	assert(unit < sizeof(unitsPerSecondTable) / sizeof(unitsPerSecondTable[0]));
-! 	return (double)CRYPTOPP_VC6_INT64 t * unitsPerSecondTable[unit] / CRYPTOPP_VC6_INT64 TicksPerSecond();
-  }
-  
-  void TimerBase::StartTimer()
-Index: integer.h
-===================================================================
-RCS file: /cvsroot/cryptopp/c5/integer.h,v
-retrieving revision 1.13
-diff -c -r1.13 integer.h
-*** integer.h	9 Jun 2006 06:28:22 -0000	1.13
---- integer.h	25 Dec 2006 08:07:27 -0000
-***************
-*** 9,37 ****
-  #include <iosfwd>
-  #include <algorithm>
-  
-- #ifdef CRYPTOPP_X86ASM_AVAILABLE
-- 
-- #ifdef _M_IX86
-- 	#if (defined(__INTEL_COMPILER) && (__INTEL_COMPILER >= 500)) || (defined(__ICL) && (__ICL >= 500))
-- 		#define SSE2_INTRINSICS_AVAILABLE
-- 		#define CRYPTOPP_MM_MALLOC_AVAILABLE
-- 	#elif defined(_MSC_VER)
-- 		// _mm_free seems to be the only way to tell if the Processor Pack is installed or not
-- 		#include <malloc.h>
-- 		#if defined(_mm_free)
-- 			#define SSE2_INTRINSICS_AVAILABLE
-- 			#define CRYPTOPP_MM_MALLOC_AVAILABLE
-- 		#endif
-- 	#endif
-- #endif
-- 
-- // SSE2 intrinsics work in GCC 3.3 or later
-- #if defined(__SSE2__) && (__GNUC__ > 3 || __GNUC_MINOR__ > 2)
-- 	#define SSE2_INTRINSICS_AVAILABLE
-- #endif
-- 
-- #endif
-- 
-  NAMESPACE_BEGIN(CryptoPP)
-  
-  #if defined(SSE2_INTRINSICS_AVAILABLE)
---- 9,14 ----
-Index: network.cpp
-===================================================================
-RCS file: /cvsroot/cryptopp/c5/network.cpp,v
-retrieving revision 1.8
-diff -c -r1.8 network.cpp
-*** network.cpp	18 Dec 2006 02:34:32 -0000	1.8
---- network.cpp	25 Dec 2006 08:07:27 -0000
-***************
-*** 395,401 ****
-  float NetworkSink::GetMaxObservedSpeed() const
-  {
-  	lword m = GetMaxBytesPerSecond();
-! 	return m ? STDMIN(m_maxObservedSpeed, float(m)) : m_maxObservedSpeed;
-  }
-  
-  unsigned int NetworkSink::GetMaxWaitObjectCount() const
---- 395,401 ----
-  float NetworkSink::GetMaxObservedSpeed() const
-  {
-  	lword m = GetMaxBytesPerSecond();
-! 	return m ? STDMIN(m_maxObservedSpeed, float(CRYPTOPP_VC6_INT64 m)) : m_maxObservedSpeed;
-  }
-  
-  unsigned int NetworkSink::GetMaxWaitObjectCount() const
-Index: rijndael.cpp
-===================================================================
-RCS file: /cvsroot/cryptopp/c5/rijndael.cpp,v
-retrieving revision 1.5
-diff -c -r1.5 rijndael.cpp
-*** rijndael.cpp	14 Dec 2006 11:41:31 -0000	1.5
---- rijndael.cpp	25 Dec 2006 08:07:27 -0000
-***************
-*** 52,57 ****
---- 52,61 ----
-  #include "rijndael.h"
-  #include "misc.h"
-  
-+ #ifdef CRYPTOPP_L1_CACHE_ALIGN_NOT_AVAILABLE
-+ #pragma message("Don't know how to align data on L1 cache boundary. Defense against AES timing attack may be affected.")
-+ #endif
-+ 
-  NAMESPACE_BEGIN(CryptoPP)
-  
-  void Rijndael::Base::UncheckedSetKey(const byte *userKey, unsigned int keylen, const NameValuePairs &)
diff --git a/plugins/CryptoPP/crypto/License.txt b/plugins/CryptoPP/crypto/docs/License.txt
index 8ec0a405b7..8ec0a405b7 100644
--- a/plugins/CryptoPP/crypto/License.txt
+++ b/plugins/CryptoPP/crypto/docs/License.txt
diff --git a/plugins/CryptoPP/crypto/Readme.txt b/plugins/CryptoPP/crypto/docs/Readme.txt
index d4d3acd475..d4d3acd475 100644
--- a/plugins/CryptoPP/crypto/Readme.txt
+++ b/plugins/CryptoPP/crypto/docs/Readme.txt
diff --git a/plugins/CryptoPP/crypto/cryptopp.rc b/plugins/CryptoPP/crypto/res/cryptopp.rc
index 8ebf9259e6..f56f52c03b 100644
--- a/plugins/CryptoPP/crypto/cryptopp.rc
+++ b/plugins/CryptoPP/crypto/res/cryptopp.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.
 //
-#include "resource.h"
+#include "..\src\resource.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
@@ -70,7 +70,7 @@ END
 
 1 TEXTINCLUDE 
 BEGIN
-    "resource.h\0"
+    "..\\src\\resource.h\0"
 END
 
 2 TEXTINCLUDE 
diff --git a/plugins/CryptoPP/crypto/3desval.dat b/plugins/CryptoPP/crypto/src/3desval.dat
index d43e84993c..d43e84993c 100644
--- a/plugins/CryptoPP/crypto/3desval.dat
+++ b/plugins/CryptoPP/crypto/src/3desval.dat
diff --git a/plugins/CryptoPP/crypto/3way.cpp b/plugins/CryptoPP/crypto/src/3way.cpp
index f1265ce8d0..f1265ce8d0 100644
--- a/plugins/CryptoPP/crypto/3way.cpp
+++ b/plugins/CryptoPP/crypto/src/3way.cpp
diff --git a/plugins/CryptoPP/crypto/3way.h b/plugins/CryptoPP/crypto/src/3way.h
index ccbf9038b7..ccbf9038b7 100644
--- a/plugins/CryptoPP/crypto/3way.h
+++ b/plugins/CryptoPP/crypto/src/3way.h
diff --git a/plugins/CryptoPP/crypto/3wayval.dat b/plugins/CryptoPP/crypto/src/3wayval.dat
index 79e6ebd25a..79e6ebd25a 100644
--- a/plugins/CryptoPP/crypto/3wayval.dat
+++ b/plugins/CryptoPP/crypto/src/3wayval.dat
diff --git a/plugins/CryptoPP/crypto/adhoc.cpp b/plugins/CryptoPP/crypto/src/adhoc.cpp
index dc7f697596..dc7f697596 100644
--- a/plugins/CryptoPP/crypto/adhoc.cpp
+++ b/plugins/CryptoPP/crypto/src/adhoc.cpp
diff --git a/plugins/CryptoPP/crypto/adler32.cpp b/plugins/CryptoPP/crypto/src/adler32.cpp
index 227020275f..227020275f 100644
--- a/plugins/CryptoPP/crypto/adler32.cpp
+++ b/plugins/CryptoPP/crypto/src/adler32.cpp
diff --git a/plugins/CryptoPP/crypto/adler32.h b/plugins/CryptoPP/crypto/src/adler32.h
index 672b3edd18..672b3edd18 100644
--- a/plugins/CryptoPP/crypto/adler32.h
+++ b/plugins/CryptoPP/crypto/src/adler32.h
diff --git a/plugins/CryptoPP/crypto/aes.h b/plugins/CryptoPP/crypto/src/aes.h
index 03b6bf12b9..03b6bf12b9 100644
--- a/plugins/CryptoPP/crypto/aes.h
+++ b/plugins/CryptoPP/crypto/src/aes.h
diff --git a/plugins/CryptoPP/crypto/algebra.cpp b/plugins/CryptoPP/crypto/src/algebra.cpp
index 5d7e2134fc..5d7e2134fc 100644
--- a/plugins/CryptoPP/crypto/algebra.cpp
+++ b/plugins/CryptoPP/crypto/src/algebra.cpp
diff --git a/plugins/CryptoPP/crypto/algebra.h b/plugins/CryptoPP/crypto/src/algebra.h
index e7f379394f..e7f379394f 100644
--- a/plugins/CryptoPP/crypto/algebra.h
+++ b/plugins/CryptoPP/crypto/src/algebra.h
diff --git a/plugins/CryptoPP/crypto/algparam.cpp b/plugins/CryptoPP/crypto/src/algparam.cpp
index 6e765c2768..6e765c2768 100644
--- a/plugins/CryptoPP/crypto/algparam.cpp
+++ b/plugins/CryptoPP/crypto/src/algparam.cpp
diff --git a/plugins/CryptoPP/crypto/algparam.h b/plugins/CryptoPP/crypto/src/algparam.h
index 27555d4e8f..27555d4e8f 100644
--- a/plugins/CryptoPP/crypto/algparam.h
+++ b/plugins/CryptoPP/crypto/src/algparam.h
diff --git a/plugins/CryptoPP/crypto/arc4.cpp b/plugins/CryptoPP/crypto/src/arc4.cpp
index ff9d587712..ff9d587712 100644
--- a/plugins/CryptoPP/crypto/arc4.cpp
+++ b/plugins/CryptoPP/crypto/src/arc4.cpp
diff --git a/plugins/CryptoPP/crypto/arc4.h b/plugins/CryptoPP/crypto/src/arc4.h
index 7846d5adbe..7846d5adbe 100644
--- a/plugins/CryptoPP/crypto/arc4.h
+++ b/plugins/CryptoPP/crypto/src/arc4.h
diff --git a/plugins/CryptoPP/crypto/argnames.h b/plugins/CryptoPP/crypto/src/argnames.h
index f888d42dae..f888d42dae 100644
--- a/plugins/CryptoPP/crypto/argnames.h
+++ b/plugins/CryptoPP/crypto/src/argnames.h
diff --git a/plugins/CryptoPP/crypto/asn.cpp b/plugins/CryptoPP/crypto/src/asn.cpp
index 41740900ca..41740900ca 100644
--- a/plugins/CryptoPP/crypto/asn.cpp
+++ b/plugins/CryptoPP/crypto/src/asn.cpp
diff --git a/plugins/CryptoPP/crypto/asn.h b/plugins/CryptoPP/crypto/src/asn.h
index d74af5a76a..d74af5a76a 100644
--- a/plugins/CryptoPP/crypto/asn.h
+++ b/plugins/CryptoPP/crypto/src/asn.h
diff --git a/plugins/CryptoPP/crypto/base32.cpp b/plugins/CryptoPP/crypto/src/base32.cpp
index 5eee3aa130..5eee3aa130 100644
--- a/plugins/CryptoPP/crypto/base32.cpp
+++ b/plugins/CryptoPP/crypto/src/base32.cpp
diff --git a/plugins/CryptoPP/crypto/base32.h b/plugins/CryptoPP/crypto/src/base32.h
index 6b7937ac78..6b7937ac78 100644
--- a/plugins/CryptoPP/crypto/base32.h
+++ b/plugins/CryptoPP/crypto/src/base32.h
diff --git a/plugins/CryptoPP/crypto/base64.cpp b/plugins/CryptoPP/crypto/src/base64.cpp
index 1e233496a4..1e233496a4 100644
--- a/plugins/CryptoPP/crypto/base64.cpp
+++ b/plugins/CryptoPP/crypto/src/base64.cpp
diff --git a/plugins/CryptoPP/crypto/base64.h b/plugins/CryptoPP/crypto/src/base64.h
index c405ecaf36..c405ecaf36 100644
--- a/plugins/CryptoPP/crypto/base64.h
+++ b/plugins/CryptoPP/crypto/src/base64.h
diff --git a/plugins/CryptoPP/crypto/basecode.cpp b/plugins/CryptoPP/crypto/src/basecode.cpp
index ab94f81550..ab94f81550 100644
--- a/plugins/CryptoPP/crypto/basecode.cpp
+++ b/plugins/CryptoPP/crypto/src/basecode.cpp
diff --git a/plugins/CryptoPP/crypto/basecode.h b/plugins/CryptoPP/crypto/src/basecode.h
index a20623ae0b..a20623ae0b 100644
--- a/plugins/CryptoPP/crypto/basecode.h
+++ b/plugins/CryptoPP/crypto/src/basecode.h
diff --git a/plugins/CryptoPP/crypto/bench.cpp b/plugins/CryptoPP/crypto/src/bench.cpp
index bbaa1e5c5c..bbaa1e5c5c 100644
--- a/plugins/CryptoPP/crypto/bench.cpp
+++ b/plugins/CryptoPP/crypto/src/bench.cpp
diff --git a/plugins/CryptoPP/crypto/bench.h b/plugins/CryptoPP/crypto/src/bench.h
index c5da2cf693..c5da2cf693 100644
--- a/plugins/CryptoPP/crypto/bench.h
+++ b/plugins/CryptoPP/crypto/src/bench.h
diff --git a/plugins/CryptoPP/crypto/bench2.cpp b/plugins/CryptoPP/crypto/src/bench2.cpp
index 144c1b172b..144c1b172b 100644
--- a/plugins/CryptoPP/crypto/bench2.cpp
+++ b/plugins/CryptoPP/crypto/src/bench2.cpp
diff --git a/plugins/CryptoPP/crypto/bfinit.cpp b/plugins/CryptoPP/crypto/src/bfinit.cpp
index 06db2096f6..06db2096f6 100644
--- a/plugins/CryptoPP/crypto/bfinit.cpp
+++ b/plugins/CryptoPP/crypto/src/bfinit.cpp
diff --git a/plugins/CryptoPP/crypto/blowfish.cpp b/plugins/CryptoPP/crypto/src/blowfish.cpp
index 7fe9a56fef..7fe9a56fef 100644
--- a/plugins/CryptoPP/crypto/blowfish.cpp
+++ b/plugins/CryptoPP/crypto/src/blowfish.cpp
diff --git a/plugins/CryptoPP/crypto/blowfish.h b/plugins/CryptoPP/crypto/src/blowfish.h
index d36af881dd..d36af881dd 100644
--- a/plugins/CryptoPP/crypto/blowfish.h
+++ b/plugins/CryptoPP/crypto/src/blowfish.h
diff --git a/plugins/CryptoPP/crypto/blumshub.cpp b/plugins/CryptoPP/crypto/src/blumshub.cpp
index 6ab2209925..6ab2209925 100644
--- a/plugins/CryptoPP/crypto/blumshub.cpp
+++ b/plugins/CryptoPP/crypto/src/blumshub.cpp
diff --git a/plugins/CryptoPP/crypto/blumshub.h b/plugins/CryptoPP/crypto/src/blumshub.h
index 538c1520d5..538c1520d5 100644
--- a/plugins/CryptoPP/crypto/blumshub.h
+++ b/plugins/CryptoPP/crypto/src/blumshub.h
diff --git a/plugins/CryptoPP/crypto/camellia.cpp b/plugins/CryptoPP/crypto/src/camellia.cpp
index b9f1db808a..b9f1db808a 100644
--- a/plugins/CryptoPP/crypto/camellia.cpp
+++ b/plugins/CryptoPP/crypto/src/camellia.cpp
diff --git a/plugins/CryptoPP/crypto/camellia.dat b/plugins/CryptoPP/crypto/src/camellia.dat
index 833ffc05c7..833ffc05c7 100644
--- a/plugins/CryptoPP/crypto/camellia.dat
+++ b/plugins/CryptoPP/crypto/src/camellia.dat
diff --git a/plugins/CryptoPP/crypto/camellia.h b/plugins/CryptoPP/crypto/src/camellia.h
index 0426e45426..0426e45426 100644
--- a/plugins/CryptoPP/crypto/camellia.h
+++ b/plugins/CryptoPP/crypto/src/camellia.h
diff --git a/plugins/CryptoPP/crypto/cast.cpp b/plugins/CryptoPP/crypto/src/cast.cpp
index c6787ea22c..c6787ea22c 100644
--- a/plugins/CryptoPP/crypto/cast.cpp
+++ b/plugins/CryptoPP/crypto/src/cast.cpp
diff --git a/plugins/CryptoPP/crypto/cast.h b/plugins/CryptoPP/crypto/src/cast.h
index f527be8aa1..f527be8aa1 100644
--- a/plugins/CryptoPP/crypto/cast.h
+++ b/plugins/CryptoPP/crypto/src/cast.h
diff --git a/plugins/CryptoPP/crypto/cast128v.dat b/plugins/CryptoPP/crypto/src/cast128v.dat
index b46518cb8c..b46518cb8c 100644
--- a/plugins/CryptoPP/crypto/cast128v.dat
+++ b/plugins/CryptoPP/crypto/src/cast128v.dat
diff --git a/plugins/CryptoPP/crypto/cast256v.dat b/plugins/CryptoPP/crypto/src/cast256v.dat
index 40264eb746..40264eb746 100644
--- a/plugins/CryptoPP/crypto/cast256v.dat
+++ b/plugins/CryptoPP/crypto/src/cast256v.dat
diff --git a/plugins/CryptoPP/crypto/casts.cpp b/plugins/CryptoPP/crypto/src/casts.cpp
index d823d725ce..d823d725ce 100644
--- a/plugins/CryptoPP/crypto/casts.cpp
+++ b/plugins/CryptoPP/crypto/src/casts.cpp
diff --git a/plugins/CryptoPP/crypto/cbcmac.cpp b/plugins/CryptoPP/crypto/src/cbcmac.cpp
index 322a4c3845..322a4c3845 100644
--- a/plugins/CryptoPP/crypto/cbcmac.cpp
+++ b/plugins/CryptoPP/crypto/src/cbcmac.cpp
diff --git a/plugins/CryptoPP/crypto/cbcmac.h b/plugins/CryptoPP/crypto/src/cbcmac.h
index 9e944c685c..9e944c685c 100644
--- a/plugins/CryptoPP/crypto/cbcmac.h
+++ b/plugins/CryptoPP/crypto/src/cbcmac.h
diff --git a/plugins/CryptoPP/crypto/channels.cpp b/plugins/CryptoPP/crypto/src/channels.cpp
index e0c5c4fb74..e0c5c4fb74 100644
--- a/plugins/CryptoPP/crypto/channels.cpp
+++ b/plugins/CryptoPP/crypto/src/channels.cpp
diff --git a/plugins/CryptoPP/crypto/channels.h b/plugins/CryptoPP/crypto/src/channels.h
index 499a246b6b..499a246b6b 100644
--- a/plugins/CryptoPP/crypto/channels.h
+++ b/plugins/CryptoPP/crypto/src/channels.h
diff --git a/plugins/CryptoPP/crypto/config.h b/plugins/CryptoPP/crypto/src/config.h
index a33577577e..a33577577e 100644
--- a/plugins/CryptoPP/crypto/config.h
+++ b/plugins/CryptoPP/crypto/src/config.h
diff --git a/plugins/CryptoPP/crypto/cpu.cpp b/plugins/CryptoPP/crypto/src/cpu.cpp
index ab6905231a..ab6905231a 100644
--- a/plugins/CryptoPP/crypto/cpu.cpp
+++ b/plugins/CryptoPP/crypto/src/cpu.cpp
diff --git a/plugins/CryptoPP/crypto/cpu.h b/plugins/CryptoPP/crypto/src/cpu.h
index 518e92f166..518e92f166 100644
--- a/plugins/CryptoPP/crypto/cpu.h
+++ b/plugins/CryptoPP/crypto/src/cpu.h
diff --git a/plugins/CryptoPP/crypto/crc.cpp b/plugins/CryptoPP/crypto/src/crc.cpp
index a27f891ba4..a27f891ba4 100644
--- a/plugins/CryptoPP/crypto/crc.cpp
+++ b/plugins/CryptoPP/crypto/src/crc.cpp
diff --git a/plugins/CryptoPP/crypto/crc.h b/plugins/CryptoPP/crypto/src/crc.h
index ffe90f4c46..ffe90f4c46 100644
--- a/plugins/CryptoPP/crypto/crc.h
+++ b/plugins/CryptoPP/crypto/src/crc.h
diff --git a/plugins/CryptoPP/crypto/cryptlib.cpp b/plugins/CryptoPP/crypto/src/cryptlib.cpp
index c91d4e3de3..c91d4e3de3 100644
--- a/plugins/CryptoPP/crypto/cryptlib.cpp
+++ b/plugins/CryptoPP/crypto/src/cryptlib.cpp
diff --git a/plugins/CryptoPP/crypto/cryptlib.h b/plugins/CryptoPP/crypto/src/cryptlib.h
index 8949e03ae8..8949e03ae8 100644
--- a/plugins/CryptoPP/crypto/cryptlib.h
+++ b/plugins/CryptoPP/crypto/src/cryptlib.h
diff --git a/plugins/CryptoPP/crypto/cryptlib_10.vcxproj.filters b/plugins/CryptoPP/crypto/src/cryptlib_10.vcxproj.filters
index e41c439cb6..e41c439cb6 100644
--- a/plugins/CryptoPP/crypto/cryptlib_10.vcxproj.filters
+++ b/plugins/CryptoPP/crypto/src/cryptlib_10.vcxproj.filters
diff --git a/plugins/CryptoPP/crypto/cryptlib_bds.cpp b/plugins/CryptoPP/crypto/src/cryptlib_bds.cpp
index 40fc2474ac..40fc2474ac 100644
--- a/plugins/CryptoPP/crypto/cryptlib_bds.cpp
+++ b/plugins/CryptoPP/crypto/src/cryptlib_bds.cpp
diff --git a/plugins/CryptoPP/crypto/datatest.cpp b/plugins/CryptoPP/crypto/src/datatest.cpp
index 4a6fb04f43..4a6fb04f43 100644
--- a/plugins/CryptoPP/crypto/datatest.cpp
+++ b/plugins/CryptoPP/crypto/src/datatest.cpp
diff --git a/plugins/CryptoPP/crypto/default.cpp b/plugins/CryptoPP/crypto/src/default.cpp
index c7f9b2c68b..c7f9b2c68b 100644
--- a/plugins/CryptoPP/crypto/default.cpp
+++ b/plugins/CryptoPP/crypto/src/default.cpp
diff --git a/plugins/CryptoPP/crypto/default.h b/plugins/CryptoPP/crypto/src/default.h
index fd3eb48c2d..fd3eb48c2d 100644
--- a/plugins/CryptoPP/crypto/default.h
+++ b/plugins/CryptoPP/crypto/src/default.h
diff --git a/plugins/CryptoPP/crypto/des.cpp b/plugins/CryptoPP/crypto/src/des.cpp
index 69c4ba066d..69c4ba066d 100644
--- a/plugins/CryptoPP/crypto/des.cpp
+++ b/plugins/CryptoPP/crypto/src/des.cpp
diff --git a/plugins/CryptoPP/crypto/des.h b/plugins/CryptoPP/crypto/src/des.h
index a6aaa79d94..a6aaa79d94 100644
--- a/plugins/CryptoPP/crypto/des.h
+++ b/plugins/CryptoPP/crypto/src/des.h
diff --git a/plugins/CryptoPP/crypto/descert.dat b/plugins/CryptoPP/crypto/src/descert.dat
index 7fea9542a5..7fea9542a5 100644
--- a/plugins/CryptoPP/crypto/descert.dat
+++ b/plugins/CryptoPP/crypto/src/descert.dat
diff --git a/plugins/CryptoPP/crypto/dessp.cpp b/plugins/CryptoPP/crypto/src/dessp.cpp
index 938272106c..938272106c 100644
--- a/plugins/CryptoPP/crypto/dessp.cpp
+++ b/plugins/CryptoPP/crypto/src/dessp.cpp
diff --git a/plugins/CryptoPP/crypto/dh.cpp b/plugins/CryptoPP/crypto/src/dh.cpp
index b0b2e7c861..b0b2e7c861 100644
--- a/plugins/CryptoPP/crypto/dh.cpp
+++ b/plugins/CryptoPP/crypto/src/dh.cpp
diff --git a/plugins/CryptoPP/crypto/dh.h b/plugins/CryptoPP/crypto/src/dh.h
index 590b9bbc93..590b9bbc93 100644
--- a/plugins/CryptoPP/crypto/dh.h
+++ b/plugins/CryptoPP/crypto/src/dh.h
diff --git a/plugins/CryptoPP/crypto/dh1024.dat b/plugins/CryptoPP/crypto/src/dh1024.dat
index 86a9551827..86a9551827 100644
--- a/plugins/CryptoPP/crypto/dh1024.dat
+++ b/plugins/CryptoPP/crypto/src/dh1024.dat
diff --git a/plugins/CryptoPP/crypto/dh2.cpp b/plugins/CryptoPP/crypto/src/dh2.cpp
index 4a292af3b1..4a292af3b1 100644
--- a/plugins/CryptoPP/crypto/dh2.cpp
+++ b/plugins/CryptoPP/crypto/src/dh2.cpp
diff --git a/plugins/CryptoPP/crypto/dh2.h b/plugins/CryptoPP/crypto/src/dh2.h
index 1dfd5e2f86..1dfd5e2f86 100644
--- a/plugins/CryptoPP/crypto/dh2.h
+++ b/plugins/CryptoPP/crypto/src/dh2.h
diff --git a/plugins/CryptoPP/crypto/dh2048.dat b/plugins/CryptoPP/crypto/src/dh2048.dat
index bd5255fa05..bd5255fa05 100644
--- a/plugins/CryptoPP/crypto/dh2048.dat
+++ b/plugins/CryptoPP/crypto/src/dh2048.dat
diff --git a/plugins/CryptoPP/crypto/dlie1024.dat b/plugins/CryptoPP/crypto/src/dlie1024.dat
index 2b2c85c518..2b2c85c518 100644
--- a/plugins/CryptoPP/crypto/dlie1024.dat
+++ b/plugins/CryptoPP/crypto/src/dlie1024.dat
diff --git a/plugins/CryptoPP/crypto/dlie2048.dat b/plugins/CryptoPP/crypto/src/dlie2048.dat
index e2289c7a20..e2289c7a20 100644
--- a/plugins/CryptoPP/crypto/dlie2048.dat
+++ b/plugins/CryptoPP/crypto/src/dlie2048.dat
diff --git a/plugins/CryptoPP/crypto/dll.cpp b/plugins/CryptoPP/crypto/src/dll.cpp
index 5f644577cb..5f644577cb 100644
--- a/plugins/CryptoPP/crypto/dll.cpp
+++ b/plugins/CryptoPP/crypto/src/dll.cpp
diff --git a/plugins/CryptoPP/crypto/dll.h b/plugins/CryptoPP/crypto/src/dll.h
index 274e8b6234..274e8b6234 100644
--- a/plugins/CryptoPP/crypto/dll.h
+++ b/plugins/CryptoPP/crypto/src/dll.h
diff --git a/plugins/CryptoPP/crypto/dlltest.cpp b/plugins/CryptoPP/crypto/src/dlltest.cpp
index 0b3287dc7f..0b3287dc7f 100644
--- a/plugins/CryptoPP/crypto/dlltest.cpp
+++ b/plugins/CryptoPP/crypto/src/dlltest.cpp
diff --git a/plugins/CryptoPP/crypto/dmac.h b/plugins/CryptoPP/crypto/src/dmac.h
index 054e6cbf18..054e6cbf18 100644
--- a/plugins/CryptoPP/crypto/dmac.h
+++ b/plugins/CryptoPP/crypto/src/dmac.h
diff --git a/plugins/CryptoPP/crypto/dsa.cpp b/plugins/CryptoPP/crypto/src/dsa.cpp
index 4b130d723f..4b130d723f 100644
--- a/plugins/CryptoPP/crypto/dsa.cpp
+++ b/plugins/CryptoPP/crypto/src/dsa.cpp
diff --git a/plugins/CryptoPP/crypto/dsa.h b/plugins/CryptoPP/crypto/src/dsa.h
index 96ba3c1b24..96ba3c1b24 100644
--- a/plugins/CryptoPP/crypto/dsa.h
+++ b/plugins/CryptoPP/crypto/src/dsa.h
diff --git a/plugins/CryptoPP/crypto/dsa1024.dat b/plugins/CryptoPP/crypto/src/dsa1024.dat
index 8e59120277..8e59120277 100644
--- a/plugins/CryptoPP/crypto/dsa1024.dat
+++ b/plugins/CryptoPP/crypto/src/dsa1024.dat
diff --git a/plugins/CryptoPP/crypto/dsa1024b.dat b/plugins/CryptoPP/crypto/src/dsa1024b.dat
index edfb808a02..edfb808a02 100644
--- a/plugins/CryptoPP/crypto/dsa1024b.dat
+++ b/plugins/CryptoPP/crypto/src/dsa1024b.dat
diff --git a/plugins/CryptoPP/crypto/dsa512.dat b/plugins/CryptoPP/crypto/src/dsa512.dat
index 0d63cfdb62..0d63cfdb62 100644
--- a/plugins/CryptoPP/crypto/dsa512.dat
+++ b/plugins/CryptoPP/crypto/src/dsa512.dat
diff --git a/plugins/CryptoPP/crypto/ec2n.cpp b/plugins/CryptoPP/crypto/src/ec2n.cpp
index e2cf4ad0ed..e2cf4ad0ed 100644
--- a/plugins/CryptoPP/crypto/ec2n.cpp
+++ b/plugins/CryptoPP/crypto/src/ec2n.cpp
diff --git a/plugins/CryptoPP/crypto/ec2n.h b/plugins/CryptoPP/crypto/src/ec2n.h
index ebcaf4d26c..ebcaf4d26c 100644
--- a/plugins/CryptoPP/crypto/ec2n.h
+++ b/plugins/CryptoPP/crypto/src/ec2n.h
diff --git a/plugins/CryptoPP/crypto/eccrypto.cpp b/plugins/CryptoPP/crypto/src/eccrypto.cpp
index c08df9e4a6..c08df9e4a6 100644
--- a/plugins/CryptoPP/crypto/eccrypto.cpp
+++ b/plugins/CryptoPP/crypto/src/eccrypto.cpp
diff --git a/plugins/CryptoPP/crypto/eccrypto.h b/plugins/CryptoPP/crypto/src/eccrypto.h
index e97b906465..e97b906465 100644
--- a/plugins/CryptoPP/crypto/eccrypto.h
+++ b/plugins/CryptoPP/crypto/src/eccrypto.h
diff --git a/plugins/CryptoPP/crypto/ecp.cpp b/plugins/CryptoPP/crypto/src/ecp.cpp
index 35e264b62a..35e264b62a 100644
--- a/plugins/CryptoPP/crypto/ecp.cpp
+++ b/plugins/CryptoPP/crypto/src/ecp.cpp
diff --git a/plugins/CryptoPP/crypto/ecp.h b/plugins/CryptoPP/crypto/src/ecp.h
index 07f906c9aa..07f906c9aa 100644
--- a/plugins/CryptoPP/crypto/ecp.h
+++ b/plugins/CryptoPP/crypto/src/ecp.h
diff --git a/plugins/CryptoPP/crypto/elgamal.cpp b/plugins/CryptoPP/crypto/src/elgamal.cpp
index ff0a1dcc90..ff0a1dcc90 100644
--- a/plugins/CryptoPP/crypto/elgamal.cpp
+++ b/plugins/CryptoPP/crypto/src/elgamal.cpp
diff --git a/plugins/CryptoPP/crypto/elgamal.h b/plugins/CryptoPP/crypto/src/elgamal.h
index 1c5d53ba22..1c5d53ba22 100644
--- a/plugins/CryptoPP/crypto/elgamal.h
+++ b/plugins/CryptoPP/crypto/src/elgamal.h
diff --git a/plugins/CryptoPP/crypto/elgc1024.dat b/plugins/CryptoPP/crypto/src/elgc1024.dat
index 37518b6fbe..37518b6fbe 100644
--- a/plugins/CryptoPP/crypto/elgc1024.dat
+++ b/plugins/CryptoPP/crypto/src/elgc1024.dat
diff --git a/plugins/CryptoPP/crypto/emsa2.cpp b/plugins/CryptoPP/crypto/src/emsa2.cpp
index 43974358f6..43974358f6 100644
--- a/plugins/CryptoPP/crypto/emsa2.cpp
+++ b/plugins/CryptoPP/crypto/src/emsa2.cpp
diff --git a/plugins/CryptoPP/crypto/emsa2.h b/plugins/CryptoPP/crypto/src/emsa2.h
index 911bd9707d..911bd9707d 100644
--- a/plugins/CryptoPP/crypto/emsa2.h
+++ b/plugins/CryptoPP/crypto/src/emsa2.h
diff --git a/plugins/CryptoPP/crypto/eprecomp.cpp b/plugins/CryptoPP/crypto/src/eprecomp.cpp
index 67a4ab6105..67a4ab6105 100644
--- a/plugins/CryptoPP/crypto/eprecomp.cpp
+++ b/plugins/CryptoPP/crypto/src/eprecomp.cpp
diff --git a/plugins/CryptoPP/crypto/eprecomp.h b/plugins/CryptoPP/crypto/src/eprecomp.h
index ade6c3400a..ade6c3400a 100644
--- a/plugins/CryptoPP/crypto/eprecomp.h
+++ b/plugins/CryptoPP/crypto/src/eprecomp.h
diff --git a/plugins/CryptoPP/crypto/esig1023.dat b/plugins/CryptoPP/crypto/src/esig1023.dat
index 4e43ad4629..4e43ad4629 100644
--- a/plugins/CryptoPP/crypto/esig1023.dat
+++ b/plugins/CryptoPP/crypto/src/esig1023.dat
diff --git a/plugins/CryptoPP/crypto/esig1536.dat b/plugins/CryptoPP/crypto/src/esig1536.dat
index 8e10d134cd..8e10d134cd 100644
--- a/plugins/CryptoPP/crypto/esig1536.dat
+++ b/plugins/CryptoPP/crypto/src/esig1536.dat
diff --git a/plugins/CryptoPP/crypto/esig2046.dat b/plugins/CryptoPP/crypto/src/esig2046.dat
index 1c318540a4..1c318540a4 100644
--- a/plugins/CryptoPP/crypto/esig2046.dat
+++ b/plugins/CryptoPP/crypto/src/esig2046.dat
diff --git a/plugins/CryptoPP/crypto/esign.cpp b/plugins/CryptoPP/crypto/src/esign.cpp
index 39d80a61fc..39d80a61fc 100644
--- a/plugins/CryptoPP/crypto/esign.cpp
+++ b/plugins/CryptoPP/crypto/src/esign.cpp
diff --git a/plugins/CryptoPP/crypto/esign.h b/plugins/CryptoPP/crypto/src/esign.h
index 058e414cc3..058e414cc3 100644
--- a/plugins/CryptoPP/crypto/esign.h
+++ b/plugins/CryptoPP/crypto/src/esign.h
diff --git a/plugins/CryptoPP/crypto/factory.h b/plugins/CryptoPP/crypto/src/factory.h
index 3c22c1b8f2..3c22c1b8f2 100644
--- a/plugins/CryptoPP/crypto/factory.h
+++ b/plugins/CryptoPP/crypto/src/factory.h
diff --git a/plugins/CryptoPP/crypto/files.cpp b/plugins/CryptoPP/crypto/src/files.cpp
index 61915d777a..61915d777a 100644
--- a/plugins/CryptoPP/crypto/files.cpp
+++ b/plugins/CryptoPP/crypto/src/files.cpp
diff --git a/plugins/CryptoPP/crypto/files.h b/plugins/CryptoPP/crypto/src/files.h
index 2e6fa87cc2..2e6fa87cc2 100644
--- a/plugins/CryptoPP/crypto/files.h
+++ b/plugins/CryptoPP/crypto/src/files.h
diff --git a/plugins/CryptoPP/crypto/filters.cpp b/plugins/CryptoPP/crypto/src/filters.cpp
index b3fbacfaa3..b3fbacfaa3 100644
--- a/plugins/CryptoPP/crypto/filters.cpp
+++ b/plugins/CryptoPP/crypto/src/filters.cpp
diff --git a/plugins/CryptoPP/crypto/filters.h b/plugins/CryptoPP/crypto/src/filters.h
index a49fb8df8b..a49fb8df8b 100644
--- a/plugins/CryptoPP/crypto/filters.h
+++ b/plugins/CryptoPP/crypto/src/filters.h
diff --git a/plugins/CryptoPP/crypto/fips140.cpp b/plugins/CryptoPP/crypto/src/fips140.cpp
index 87b49118a5..87b49118a5 100644
--- a/plugins/CryptoPP/crypto/fips140.cpp
+++ b/plugins/CryptoPP/crypto/src/fips140.cpp
diff --git a/plugins/CryptoPP/crypto/fips140.h b/plugins/CryptoPP/crypto/src/fips140.h
index b580fe4657..b580fe4657 100644
--- a/plugins/CryptoPP/crypto/fips140.h
+++ b/plugins/CryptoPP/crypto/src/fips140.h
diff --git a/plugins/CryptoPP/crypto/fipsalgt.cpp b/plugins/CryptoPP/crypto/src/fipsalgt.cpp
index 5f33537516..5f33537516 100644
--- a/plugins/CryptoPP/crypto/fipsalgt.cpp
+++ b/plugins/CryptoPP/crypto/src/fipsalgt.cpp
diff --git a/plugins/CryptoPP/crypto/fipstest.cpp b/plugins/CryptoPP/crypto/src/fipstest.cpp
index f1a8b8e1f0..f1a8b8e1f0 100644
--- a/plugins/CryptoPP/crypto/fipstest.cpp
+++ b/plugins/CryptoPP/crypto/src/fipstest.cpp
diff --git a/plugins/CryptoPP/crypto/fltrimpl.h b/plugins/CryptoPP/crypto/src/fltrimpl.h
index 62f7604ab0..62f7604ab0 100644
--- a/plugins/CryptoPP/crypto/fltrimpl.h
+++ b/plugins/CryptoPP/crypto/src/fltrimpl.h
diff --git a/plugins/CryptoPP/crypto/gf256.cpp b/plugins/CryptoPP/crypto/src/gf256.cpp
index 3649f75592..3649f75592 100644
--- a/plugins/CryptoPP/crypto/gf256.cpp
+++ b/plugins/CryptoPP/crypto/src/gf256.cpp
diff --git a/plugins/CryptoPP/crypto/gf256.h b/plugins/CryptoPP/crypto/src/gf256.h
index 24a86f5cd2..24a86f5cd2 100644
--- a/plugins/CryptoPP/crypto/gf256.h
+++ b/plugins/CryptoPP/crypto/src/gf256.h
diff --git a/plugins/CryptoPP/crypto/gf2_32.cpp b/plugins/CryptoPP/crypto/src/gf2_32.cpp
index 929dac0deb..929dac0deb 100644
--- a/plugins/CryptoPP/crypto/gf2_32.cpp
+++ b/plugins/CryptoPP/crypto/src/gf2_32.cpp
diff --git a/plugins/CryptoPP/crypto/gf2_32.h b/plugins/CryptoPP/crypto/src/gf2_32.h
index d2eecf1a9f..d2eecf1a9f 100644
--- a/plugins/CryptoPP/crypto/gf2_32.h
+++ b/plugins/CryptoPP/crypto/src/gf2_32.h
diff --git a/plugins/CryptoPP/crypto/gf2n.cpp b/plugins/CryptoPP/crypto/src/gf2n.cpp
index 463db0fa3b..463db0fa3b 100644
--- a/plugins/CryptoPP/crypto/gf2n.cpp
+++ b/plugins/CryptoPP/crypto/src/gf2n.cpp
diff --git a/plugins/CryptoPP/crypto/gf2n.h b/plugins/CryptoPP/crypto/src/gf2n.h
index c4500502ca..c4500502ca 100644
--- a/plugins/CryptoPP/crypto/gf2n.h
+++ b/plugins/CryptoPP/crypto/src/gf2n.h
diff --git a/plugins/CryptoPP/crypto/gfpcrypt.cpp b/plugins/CryptoPP/crypto/src/gfpcrypt.cpp
index 0a0ffe96b3..0a0ffe96b3 100644
--- a/plugins/CryptoPP/crypto/gfpcrypt.cpp
+++ b/plugins/CryptoPP/crypto/src/gfpcrypt.cpp
diff --git a/plugins/CryptoPP/crypto/gfpcrypt.h b/plugins/CryptoPP/crypto/src/gfpcrypt.h
index 6e73d47db7..6e73d47db7 100644
--- a/plugins/CryptoPP/crypto/gfpcrypt.h
+++ b/plugins/CryptoPP/crypto/src/gfpcrypt.h
diff --git a/plugins/CryptoPP/crypto/gost.cpp b/plugins/CryptoPP/crypto/src/gost.cpp
index 4318b3df8f..4318b3df8f 100644
--- a/plugins/CryptoPP/crypto/gost.cpp
+++ b/plugins/CryptoPP/crypto/src/gost.cpp
diff --git a/plugins/CryptoPP/crypto/gost.h b/plugins/CryptoPP/crypto/src/gost.h
index a919120b62..a919120b62 100644
--- a/plugins/CryptoPP/crypto/gost.h
+++ b/plugins/CryptoPP/crypto/src/gost.h
diff --git a/plugins/CryptoPP/crypto/gostval.dat b/plugins/CryptoPP/crypto/src/gostval.dat
index d81d03b89b..d81d03b89b 100644
--- a/plugins/CryptoPP/crypto/gostval.dat
+++ b/plugins/CryptoPP/crypto/src/gostval.dat
diff --git a/plugins/CryptoPP/crypto/gzip.cpp b/plugins/CryptoPP/crypto/src/gzip.cpp
index 3a52529dc6..3a52529dc6 100644
--- a/plugins/CryptoPP/crypto/gzip.cpp
+++ b/plugins/CryptoPP/crypto/src/gzip.cpp
diff --git a/plugins/CryptoPP/crypto/gzip.h b/plugins/CryptoPP/crypto/src/gzip.h
index b96fc1ecb5..b96fc1ecb5 100644
--- a/plugins/CryptoPP/crypto/gzip.h
+++ b/plugins/CryptoPP/crypto/src/gzip.h
diff --git a/plugins/CryptoPP/crypto/haval.cpp b/plugins/CryptoPP/crypto/src/haval.cpp
index d98d38e0c6..d98d38e0c6 100644
--- a/plugins/CryptoPP/crypto/haval.cpp
+++ b/plugins/CryptoPP/crypto/src/haval.cpp
diff --git a/plugins/CryptoPP/crypto/haval.h b/plugins/CryptoPP/crypto/src/haval.h
index 4cd6db382a..4cd6db382a 100644
--- a/plugins/CryptoPP/crypto/haval.h
+++ b/plugins/CryptoPP/crypto/src/haval.h
diff --git a/plugins/CryptoPP/crypto/havalcer.dat b/plugins/CryptoPP/crypto/src/havalcer.dat
index e0ab4039f4..e0ab4039f4 100644
--- a/plugins/CryptoPP/crypto/havalcer.dat
+++ b/plugins/CryptoPP/crypto/src/havalcer.dat
diff --git a/plugins/CryptoPP/crypto/hex.cpp b/plugins/CryptoPP/crypto/src/hex.cpp
index df4fc2ed2d..df4fc2ed2d 100644
--- a/plugins/CryptoPP/crypto/hex.cpp
+++ b/plugins/CryptoPP/crypto/src/hex.cpp
diff --git a/plugins/CryptoPP/crypto/hex.h b/plugins/CryptoPP/crypto/src/hex.h
index b19592cdba..b19592cdba 100644
--- a/plugins/CryptoPP/crypto/hex.h
+++ b/plugins/CryptoPP/crypto/src/hex.h
diff --git a/plugins/CryptoPP/crypto/hmac.cpp b/plugins/CryptoPP/crypto/src/hmac.cpp
index a25eb74990..a25eb74990 100644
--- a/plugins/CryptoPP/crypto/hmac.cpp
+++ b/plugins/CryptoPP/crypto/src/hmac.cpp
diff --git a/plugins/CryptoPP/crypto/hmac.h b/plugins/CryptoPP/crypto/src/hmac.h
index 8dfebe186f..8dfebe186f 100644
--- a/plugins/CryptoPP/crypto/hmac.h
+++ b/plugins/CryptoPP/crypto/src/hmac.h
diff --git a/plugins/CryptoPP/crypto/hrtimer.cpp b/plugins/CryptoPP/crypto/src/hrtimer.cpp
index 4a1cc79ec5..4a1cc79ec5 100644
--- a/plugins/CryptoPP/crypto/hrtimer.cpp
+++ b/plugins/CryptoPP/crypto/src/hrtimer.cpp
diff --git a/plugins/CryptoPP/crypto/hrtimer.h b/plugins/CryptoPP/crypto/src/hrtimer.h
index de8835fef7..de8835fef7 100644
--- a/plugins/CryptoPP/crypto/hrtimer.h
+++ b/plugins/CryptoPP/crypto/src/hrtimer.h
diff --git a/plugins/CryptoPP/crypto/ida.cpp b/plugins/CryptoPP/crypto/src/ida.cpp
index aae18f22bb..aae18f22bb 100644
--- a/plugins/CryptoPP/crypto/ida.cpp
+++ b/plugins/CryptoPP/crypto/src/ida.cpp
diff --git a/plugins/CryptoPP/crypto/ida.h b/plugins/CryptoPP/crypto/src/ida.h
index 8171637a20..8171637a20 100644
--- a/plugins/CryptoPP/crypto/ida.h
+++ b/plugins/CryptoPP/crypto/src/ida.h
diff --git a/plugins/CryptoPP/crypto/idea.cpp b/plugins/CryptoPP/crypto/src/idea.cpp
index 19e9330579..19e9330579 100644
--- a/plugins/CryptoPP/crypto/idea.cpp
+++ b/plugins/CryptoPP/crypto/src/idea.cpp
diff --git a/plugins/CryptoPP/crypto/idea.h b/plugins/CryptoPP/crypto/src/idea.h
index 2b97ee5ce0..2b97ee5ce0 100644
--- a/plugins/CryptoPP/crypto/idea.h
+++ b/plugins/CryptoPP/crypto/src/idea.h
diff --git a/plugins/CryptoPP/crypto/ideaval.dat b/plugins/CryptoPP/crypto/src/ideaval.dat
index 4c96d338de..4c96d338de 100644
--- a/plugins/CryptoPP/crypto/ideaval.dat
+++ b/plugins/CryptoPP/crypto/src/ideaval.dat
diff --git a/plugins/CryptoPP/crypto/integer.cpp b/plugins/CryptoPP/crypto/src/integer.cpp
index fe87a957e8..fe87a957e8 100644
--- a/plugins/CryptoPP/crypto/integer.cpp
+++ b/plugins/CryptoPP/crypto/src/integer.cpp
diff --git a/plugins/CryptoPP/crypto/integer.h b/plugins/CryptoPP/crypto/src/integer.h
index aca1db08f2..aca1db08f2 100644
--- a/plugins/CryptoPP/crypto/integer.h
+++ b/plugins/CryptoPP/crypto/src/integer.h
diff --git a/plugins/CryptoPP/crypto/iterhash.cpp b/plugins/CryptoPP/crypto/src/iterhash.cpp
index 53c133e65e..53c133e65e 100644
--- a/plugins/CryptoPP/crypto/iterhash.cpp
+++ b/plugins/CryptoPP/crypto/src/iterhash.cpp
diff --git a/plugins/CryptoPP/crypto/iterhash.h b/plugins/CryptoPP/crypto/src/iterhash.h
index de3cae85cc..de3cae85cc 100644
--- a/plugins/CryptoPP/crypto/iterhash.h
+++ b/plugins/CryptoPP/crypto/src/iterhash.h
diff --git a/plugins/CryptoPP/crypto/lubyrack.h b/plugins/CryptoPP/crypto/src/lubyrack.h
index e2b30eacfd..e2b30eacfd 100644
--- a/plugins/CryptoPP/crypto/lubyrack.h
+++ b/plugins/CryptoPP/crypto/src/lubyrack.h
diff --git a/plugins/CryptoPP/crypto/luc.cpp b/plugins/CryptoPP/crypto/src/luc.cpp
index 51af79fec2..51af79fec2 100644
--- a/plugins/CryptoPP/crypto/luc.cpp
+++ b/plugins/CryptoPP/crypto/src/luc.cpp
diff --git a/plugins/CryptoPP/crypto/luc.h b/plugins/CryptoPP/crypto/src/luc.h
index f220e73781..f220e73781 100644
--- a/plugins/CryptoPP/crypto/luc.h
+++ b/plugins/CryptoPP/crypto/src/luc.h
diff --git a/plugins/CryptoPP/crypto/luc1024.dat b/plugins/CryptoPP/crypto/src/luc1024.dat
index f81dea0c6e..f81dea0c6e 100644
--- a/plugins/CryptoPP/crypto/luc1024.dat
+++ b/plugins/CryptoPP/crypto/src/luc1024.dat
diff --git a/plugins/CryptoPP/crypto/luc2048.dat b/plugins/CryptoPP/crypto/src/luc2048.dat
index a4b3cefb8c..a4b3cefb8c 100644
--- a/plugins/CryptoPP/crypto/luc2048.dat
+++ b/plugins/CryptoPP/crypto/src/luc2048.dat
diff --git a/plugins/CryptoPP/crypto/lucc1024.dat b/plugins/CryptoPP/crypto/src/lucc1024.dat
index 4366892c1d..4366892c1d 100644
--- a/plugins/CryptoPP/crypto/lucc1024.dat
+++ b/plugins/CryptoPP/crypto/src/lucc1024.dat
diff --git a/plugins/CryptoPP/crypto/lucc512.dat b/plugins/CryptoPP/crypto/src/lucc512.dat
index 9c2cf1abaf..9c2cf1abaf 100644
--- a/plugins/CryptoPP/crypto/lucc512.dat
+++ b/plugins/CryptoPP/crypto/src/lucc512.dat
diff --git a/plugins/CryptoPP/crypto/lucd1024.dat b/plugins/CryptoPP/crypto/src/lucd1024.dat
index 8554fa8bab..8554fa8bab 100644
--- a/plugins/CryptoPP/crypto/lucd1024.dat
+++ b/plugins/CryptoPP/crypto/src/lucd1024.dat
diff --git a/plugins/CryptoPP/crypto/lucd512.dat b/plugins/CryptoPP/crypto/src/lucd512.dat
index a782f445b7..a782f445b7 100644
--- a/plugins/CryptoPP/crypto/lucd512.dat
+++ b/plugins/CryptoPP/crypto/src/lucd512.dat
diff --git a/plugins/CryptoPP/crypto/lucs1024.dat b/plugins/CryptoPP/crypto/src/lucs1024.dat
index 13931998c7..13931998c7 100644
--- a/plugins/CryptoPP/crypto/lucs1024.dat
+++ b/plugins/CryptoPP/crypto/src/lucs1024.dat
diff --git a/plugins/CryptoPP/crypto/lucs512.dat b/plugins/CryptoPP/crypto/src/lucs512.dat
index f8fd288b0e..f8fd288b0e 100644
--- a/plugins/CryptoPP/crypto/lucs512.dat
+++ b/plugins/CryptoPP/crypto/src/lucs512.dat
diff --git a/plugins/CryptoPP/crypto/mars.cpp b/plugins/CryptoPP/crypto/src/mars.cpp
index 6e2fe9d94f..6e2fe9d94f 100644
--- a/plugins/CryptoPP/crypto/mars.cpp
+++ b/plugins/CryptoPP/crypto/src/mars.cpp
diff --git a/plugins/CryptoPP/crypto/mars.h b/plugins/CryptoPP/crypto/src/mars.h
index 9c681021d2..9c681021d2 100644
--- a/plugins/CryptoPP/crypto/mars.h
+++ b/plugins/CryptoPP/crypto/src/mars.h
diff --git a/plugins/CryptoPP/crypto/marss.cpp b/plugins/CryptoPP/crypto/src/marss.cpp
index d7eff4f849..d7eff4f849 100644
--- a/plugins/CryptoPP/crypto/marss.cpp
+++ b/plugins/CryptoPP/crypto/src/marss.cpp
diff --git a/plugins/CryptoPP/crypto/marsval.dat b/plugins/CryptoPP/crypto/src/marsval.dat
index 16a43b42e3..16a43b42e3 100644
--- a/plugins/CryptoPP/crypto/marsval.dat
+++ b/plugins/CryptoPP/crypto/src/marsval.dat
diff --git a/plugins/CryptoPP/crypto/md2.cpp b/plugins/CryptoPP/crypto/src/md2.cpp
index f4331dad86..f4331dad86 100644
--- a/plugins/CryptoPP/crypto/md2.cpp
+++ b/plugins/CryptoPP/crypto/src/md2.cpp
diff --git a/plugins/CryptoPP/crypto/md2.h b/plugins/CryptoPP/crypto/src/md2.h
index 760edec051..760edec051 100644
--- a/plugins/CryptoPP/crypto/md2.h
+++ b/plugins/CryptoPP/crypto/src/md2.h
diff --git a/plugins/CryptoPP/crypto/md4.cpp b/plugins/CryptoPP/crypto/src/md4.cpp
index 84fe4cca32..84fe4cca32 100644
--- a/plugins/CryptoPP/crypto/md4.cpp
+++ b/plugins/CryptoPP/crypto/src/md4.cpp
diff --git a/plugins/CryptoPP/crypto/md4.h b/plugins/CryptoPP/crypto/src/md4.h
index ac98f94654..ac98f94654 100644
--- a/plugins/CryptoPP/crypto/md4.h
+++ b/plugins/CryptoPP/crypto/src/md4.h
diff --git a/plugins/CryptoPP/crypto/md5.cpp b/plugins/CryptoPP/crypto/src/md5.cpp
index 11035b77ca..11035b77ca 100644
--- a/plugins/CryptoPP/crypto/md5.cpp
+++ b/plugins/CryptoPP/crypto/src/md5.cpp
diff --git a/plugins/CryptoPP/crypto/md5.h b/plugins/CryptoPP/crypto/src/md5.h
index 2b35003b7a..2b35003b7a 100644
--- a/plugins/CryptoPP/crypto/md5.h
+++ b/plugins/CryptoPP/crypto/src/md5.h
diff --git a/plugins/CryptoPP/crypto/md5mac.cpp b/plugins/CryptoPP/crypto/src/md5mac.cpp
index f5c90c3f11..f5c90c3f11 100644
--- a/plugins/CryptoPP/crypto/md5mac.cpp
+++ b/plugins/CryptoPP/crypto/src/md5mac.cpp
diff --git a/plugins/CryptoPP/crypto/md5mac.h b/plugins/CryptoPP/crypto/src/md5mac.h
index bd17e70ba2..bd17e70ba2 100644
--- a/plugins/CryptoPP/crypto/md5mac.h
+++ b/plugins/CryptoPP/crypto/src/md5mac.h
diff --git a/plugins/CryptoPP/crypto/mdc.h b/plugins/CryptoPP/crypto/src/mdc.h
index 50c368be74..50c368be74 100644
--- a/plugins/CryptoPP/crypto/mdc.h
+++ b/plugins/CryptoPP/crypto/src/mdc.h
diff --git a/plugins/CryptoPP/crypto/misc.cpp b/plugins/CryptoPP/crypto/src/misc.cpp
index 92aa7d2fd9..92aa7d2fd9 100644
--- a/plugins/CryptoPP/crypto/misc.cpp
+++ b/plugins/CryptoPP/crypto/src/misc.cpp
diff --git a/plugins/CryptoPP/crypto/misc.h b/plugins/CryptoPP/crypto/src/misc.h
index 7927a29684..7927a29684 100644
--- a/plugins/CryptoPP/crypto/misc.h
+++ b/plugins/CryptoPP/crypto/src/misc.h
diff --git a/plugins/CryptoPP/crypto/modarith.h b/plugins/CryptoPP/crypto/src/modarith.h
index 7decb621dd..7decb621dd 100644
--- a/plugins/CryptoPP/crypto/modarith.h
+++ b/plugins/CryptoPP/crypto/src/modarith.h
diff --git a/plugins/CryptoPP/crypto/modes.cpp b/plugins/CryptoPP/crypto/src/modes.cpp
index 21bcc4c39d..21bcc4c39d 100644
--- a/plugins/CryptoPP/crypto/modes.cpp
+++ b/plugins/CryptoPP/crypto/src/modes.cpp
diff --git a/plugins/CryptoPP/crypto/modes.h b/plugins/CryptoPP/crypto/src/modes.h
index 1a5f5ec305..1a5f5ec305 100644
--- a/plugins/CryptoPP/crypto/modes.h
+++ b/plugins/CryptoPP/crypto/src/modes.h
diff --git a/plugins/CryptoPP/crypto/modexppc.h b/plugins/CryptoPP/crypto/src/modexppc.h
index a9df756497..a9df756497 100644
--- a/plugins/CryptoPP/crypto/modexppc.h
+++ b/plugins/CryptoPP/crypto/src/modexppc.h
diff --git a/plugins/CryptoPP/crypto/mqueue.cpp b/plugins/CryptoPP/crypto/src/mqueue.cpp
index 8c071e27c5..8c071e27c5 100644
--- a/plugins/CryptoPP/crypto/mqueue.cpp
+++ b/plugins/CryptoPP/crypto/src/mqueue.cpp
diff --git a/plugins/CryptoPP/crypto/mqueue.h b/plugins/CryptoPP/crypto/src/mqueue.h
index a05cafbf4c..a05cafbf4c 100644
--- a/plugins/CryptoPP/crypto/mqueue.h
+++ b/plugins/CryptoPP/crypto/src/mqueue.h
diff --git a/plugins/CryptoPP/crypto/mqv.cpp b/plugins/CryptoPP/crypto/src/mqv.cpp
index a290945a2e..a290945a2e 100644
--- a/plugins/CryptoPP/crypto/mqv.cpp
+++ b/plugins/CryptoPP/crypto/src/mqv.cpp
diff --git a/plugins/CryptoPP/crypto/mqv.h b/plugins/CryptoPP/crypto/src/mqv.h
index 8692010a18..8692010a18 100644
--- a/plugins/CryptoPP/crypto/mqv.h
+++ b/plugins/CryptoPP/crypto/src/mqv.h
diff --git a/plugins/CryptoPP/crypto/mqv1024.dat b/plugins/CryptoPP/crypto/src/mqv1024.dat
index 415377ac69..415377ac69 100644
--- a/plugins/CryptoPP/crypto/mqv1024.dat
+++ b/plugins/CryptoPP/crypto/src/mqv1024.dat
diff --git a/plugins/CryptoPP/crypto/mqv2048.dat b/plugins/CryptoPP/crypto/src/mqv2048.dat
index ef32456696..ef32456696 100644
--- a/plugins/CryptoPP/crypto/mqv2048.dat
+++ b/plugins/CryptoPP/crypto/src/mqv2048.dat
diff --git a/plugins/CryptoPP/crypto/nbtheory.cpp b/plugins/CryptoPP/crypto/src/nbtheory.cpp
index 3de1fa5e3d..3de1fa5e3d 100644
--- a/plugins/CryptoPP/crypto/nbtheory.cpp
+++ b/plugins/CryptoPP/crypto/src/nbtheory.cpp
diff --git a/plugins/CryptoPP/crypto/nbtheory.h b/plugins/CryptoPP/crypto/src/nbtheory.h
index 0a1ac37619..0a1ac37619 100644
--- a/plugins/CryptoPP/crypto/nbtheory.h
+++ b/plugins/CryptoPP/crypto/src/nbtheory.h
diff --git a/plugins/CryptoPP/crypto/network.cpp b/plugins/CryptoPP/crypto/src/network.cpp
index b47c236207..b47c236207 100644
--- a/plugins/CryptoPP/crypto/network.cpp
+++ b/plugins/CryptoPP/crypto/src/network.cpp
diff --git a/plugins/CryptoPP/crypto/network.h b/plugins/CryptoPP/crypto/src/network.h
index d9b3c66ef0..d9b3c66ef0 100644
--- a/plugins/CryptoPP/crypto/network.h
+++ b/plugins/CryptoPP/crypto/src/network.h
diff --git a/plugins/CryptoPP/crypto/nr.h b/plugins/CryptoPP/crypto/src/nr.h
index f13acebe4c..f13acebe4c 100644
--- a/plugins/CryptoPP/crypto/nr.h
+++ b/plugins/CryptoPP/crypto/src/nr.h
diff --git a/plugins/CryptoPP/crypto/nr1024.dat b/plugins/CryptoPP/crypto/src/nr1024.dat
index 6778ccfb2a..6778ccfb2a 100644
--- a/plugins/CryptoPP/crypto/nr1024.dat
+++ b/plugins/CryptoPP/crypto/src/nr1024.dat
diff --git a/plugins/CryptoPP/crypto/nr2048.dat b/plugins/CryptoPP/crypto/src/nr2048.dat
index d9f11f1696..d9f11f1696 100644
--- a/plugins/CryptoPP/crypto/nr2048.dat
+++ b/plugins/CryptoPP/crypto/src/nr2048.dat
diff --git a/plugins/CryptoPP/crypto/oaep.cpp b/plugins/CryptoPP/crypto/src/oaep.cpp
index cbdef84d74..cbdef84d74 100644
--- a/plugins/CryptoPP/crypto/oaep.cpp
+++ b/plugins/CryptoPP/crypto/src/oaep.cpp
diff --git a/plugins/CryptoPP/crypto/oaep.h b/plugins/CryptoPP/crypto/src/oaep.h
index b40c30b9b5..b40c30b9b5 100644
--- a/plugins/CryptoPP/crypto/oaep.h
+++ b/plugins/CryptoPP/crypto/src/oaep.h
diff --git a/plugins/CryptoPP/crypto/oids.h b/plugins/CryptoPP/crypto/src/oids.h
index 56e15be8b3..56e15be8b3 100644
--- a/plugins/CryptoPP/crypto/oids.h
+++ b/plugins/CryptoPP/crypto/src/oids.h
diff --git a/plugins/CryptoPP/crypto/osrng.cpp b/plugins/CryptoPP/crypto/src/osrng.cpp
index ff7f034de7..ff7f034de7 100644
--- a/plugins/CryptoPP/crypto/osrng.cpp
+++ b/plugins/CryptoPP/crypto/src/osrng.cpp
diff --git a/plugins/CryptoPP/crypto/osrng.h b/plugins/CryptoPP/crypto/src/osrng.h
index 839e768607..839e768607 100644
--- a/plugins/CryptoPP/crypto/osrng.h
+++ b/plugins/CryptoPP/crypto/src/osrng.h
diff --git a/plugins/CryptoPP/crypto/panama.cpp b/plugins/CryptoPP/crypto/src/panama.cpp
index 06f023576c..06f023576c 100644
--- a/plugins/CryptoPP/crypto/panama.cpp
+++ b/plugins/CryptoPP/crypto/src/panama.cpp
diff --git a/plugins/CryptoPP/crypto/panama.h b/plugins/CryptoPP/crypto/src/panama.h
index 18a19bbaba..18a19bbaba 100644
--- a/plugins/CryptoPP/crypto/panama.h
+++ b/plugins/CryptoPP/crypto/src/panama.h
diff --git a/plugins/CryptoPP/crypto/pch.cpp b/plugins/CryptoPP/crypto/src/pch.cpp
index 9e6b2e073e..9e6b2e073e 100644
--- a/plugins/CryptoPP/crypto/pch.cpp
+++ b/plugins/CryptoPP/crypto/src/pch.cpp
diff --git a/plugins/CryptoPP/crypto/pch.h b/plugins/CryptoPP/crypto/src/pch.h
index 765ebde9b3..765ebde9b3 100644
--- a/plugins/CryptoPP/crypto/pch.h
+++ b/plugins/CryptoPP/crypto/src/pch.h
diff --git a/plugins/CryptoPP/crypto/pkcspad.cpp b/plugins/CryptoPP/crypto/src/pkcspad.cpp
index 5a8b6cad48..5a8b6cad48 100644
--- a/plugins/CryptoPP/crypto/pkcspad.cpp
+++ b/plugins/CryptoPP/crypto/src/pkcspad.cpp
diff --git a/plugins/CryptoPP/crypto/pkcspad.h b/plugins/CryptoPP/crypto/src/pkcspad.h
index 096a923779..096a923779 100644
--- a/plugins/CryptoPP/crypto/pkcspad.h
+++ b/plugins/CryptoPP/crypto/src/pkcspad.h
diff --git a/plugins/CryptoPP/crypto/polynomi.cpp b/plugins/CryptoPP/crypto/src/polynomi.cpp
index 40258ad94a..40258ad94a 100644
--- a/plugins/CryptoPP/crypto/polynomi.cpp
+++ b/plugins/CryptoPP/crypto/src/polynomi.cpp
diff --git a/plugins/CryptoPP/crypto/polynomi.h b/plugins/CryptoPP/crypto/src/polynomi.h
index 60221659e8..60221659e8 100644
--- a/plugins/CryptoPP/crypto/polynomi.h
+++ b/plugins/CryptoPP/crypto/src/polynomi.h
diff --git a/plugins/CryptoPP/crypto/pssr.cpp b/plugins/CryptoPP/crypto/src/pssr.cpp
index 34ce71aed6..34ce71aed6 100644
--- a/plugins/CryptoPP/crypto/pssr.cpp
+++ b/plugins/CryptoPP/crypto/src/pssr.cpp
diff --git a/plugins/CryptoPP/crypto/pssr.h b/plugins/CryptoPP/crypto/src/pssr.h
index e1ee5fec4f..e1ee5fec4f 100644
--- a/plugins/CryptoPP/crypto/pssr.h
+++ b/plugins/CryptoPP/crypto/src/pssr.h
diff --git a/plugins/CryptoPP/crypto/pubkey.cpp b/plugins/CryptoPP/crypto/src/pubkey.cpp
index 3b53ee5e6a..3b53ee5e6a 100644
--- a/plugins/CryptoPP/crypto/pubkey.cpp
+++ b/plugins/CryptoPP/crypto/src/pubkey.cpp
diff --git a/plugins/CryptoPP/crypto/pubkey.h b/plugins/CryptoPP/crypto/src/pubkey.h
index 51743ef797..51743ef797 100644
--- a/plugins/CryptoPP/crypto/pubkey.h
+++ b/plugins/CryptoPP/crypto/src/pubkey.h
diff --git a/plugins/CryptoPP/crypto/pwdbased.h b/plugins/CryptoPP/crypto/src/pwdbased.h
index 0751030136..0751030136 100644
--- a/plugins/CryptoPP/crypto/pwdbased.h
+++ b/plugins/CryptoPP/crypto/src/pwdbased.h
diff --git a/plugins/CryptoPP/crypto/queue.cpp b/plugins/CryptoPP/crypto/src/queue.cpp
index 38218a6c91..38218a6c91 100644
--- a/plugins/CryptoPP/crypto/queue.cpp
+++ b/plugins/CryptoPP/crypto/src/queue.cpp
diff --git a/plugins/CryptoPP/crypto/queue.h b/plugins/CryptoPP/crypto/src/queue.h
index a7c4f4c71f..a7c4f4c71f 100644
--- a/plugins/CryptoPP/crypto/queue.h
+++ b/plugins/CryptoPP/crypto/src/queue.h
diff --git a/plugins/CryptoPP/crypto/rabi1024.dat b/plugins/CryptoPP/crypto/src/rabi1024.dat
index ef84137507..ef84137507 100644
--- a/plugins/CryptoPP/crypto/rabi1024.dat
+++ b/plugins/CryptoPP/crypto/src/rabi1024.dat
diff --git a/plugins/CryptoPP/crypto/rabi2048.dat b/plugins/CryptoPP/crypto/src/rabi2048.dat
index cb638ef7f2..cb638ef7f2 100644
--- a/plugins/CryptoPP/crypto/rabi2048.dat
+++ b/plugins/CryptoPP/crypto/src/rabi2048.dat
diff --git a/plugins/CryptoPP/crypto/rabin.cpp b/plugins/CryptoPP/crypto/src/rabin.cpp
index 51d6c8ccc4..51d6c8ccc4 100644
--- a/plugins/CryptoPP/crypto/rabin.cpp
+++ b/plugins/CryptoPP/crypto/src/rabin.cpp
diff --git a/plugins/CryptoPP/crypto/rabin.h b/plugins/CryptoPP/crypto/src/rabin.h
index 60deabb49a..60deabb49a 100644
--- a/plugins/CryptoPP/crypto/rabin.h
+++ b/plugins/CryptoPP/crypto/src/rabin.h
diff --git a/plugins/CryptoPP/crypto/randpool.cpp b/plugins/CryptoPP/crypto/src/randpool.cpp
index 2a38f5d50d..2a38f5d50d 100644
--- a/plugins/CryptoPP/crypto/randpool.cpp
+++ b/plugins/CryptoPP/crypto/src/randpool.cpp
diff --git a/plugins/CryptoPP/crypto/randpool.h b/plugins/CryptoPP/crypto/src/randpool.h
index 4c444be0f2..4c444be0f2 100644
--- a/plugins/CryptoPP/crypto/randpool.h
+++ b/plugins/CryptoPP/crypto/src/randpool.h
diff --git a/plugins/CryptoPP/crypto/rc2.cpp b/plugins/CryptoPP/crypto/src/rc2.cpp
index 2cc8cf1061..2cc8cf1061 100644
--- a/plugins/CryptoPP/crypto/rc2.cpp
+++ b/plugins/CryptoPP/crypto/src/rc2.cpp
diff --git a/plugins/CryptoPP/crypto/rc2.h b/plugins/CryptoPP/crypto/src/rc2.h
index 25c10f3c74..25c10f3c74 100644
--- a/plugins/CryptoPP/crypto/rc2.h
+++ b/plugins/CryptoPP/crypto/src/rc2.h
diff --git a/plugins/CryptoPP/crypto/rc2val.dat b/plugins/CryptoPP/crypto/src/rc2val.dat
index f28d48ccf4..f28d48ccf4 100644
--- a/plugins/CryptoPP/crypto/rc2val.dat
+++ b/plugins/CryptoPP/crypto/src/rc2val.dat
diff --git a/plugins/CryptoPP/crypto/rc5.cpp b/plugins/CryptoPP/crypto/src/rc5.cpp
index 7fd623991a..7fd623991a 100644
--- a/plugins/CryptoPP/crypto/rc5.cpp
+++ b/plugins/CryptoPP/crypto/src/rc5.cpp
diff --git a/plugins/CryptoPP/crypto/rc5.h b/plugins/CryptoPP/crypto/src/rc5.h
index 36be4b71c5..36be4b71c5 100644
--- a/plugins/CryptoPP/crypto/rc5.h
+++ b/plugins/CryptoPP/crypto/src/rc5.h
diff --git a/plugins/CryptoPP/crypto/rc5val.dat b/plugins/CryptoPP/crypto/src/rc5val.dat
index 4f4de59185..4f4de59185 100644
--- a/plugins/CryptoPP/crypto/rc5val.dat
+++ b/plugins/CryptoPP/crypto/src/rc5val.dat
diff --git a/plugins/CryptoPP/crypto/rc6.cpp b/plugins/CryptoPP/crypto/src/rc6.cpp
index f2cf808698..f2cf808698 100644
--- a/plugins/CryptoPP/crypto/rc6.cpp
+++ b/plugins/CryptoPP/crypto/src/rc6.cpp
diff --git a/plugins/CryptoPP/crypto/rc6.h b/plugins/CryptoPP/crypto/src/rc6.h
index 0499d3338a..0499d3338a 100644
--- a/plugins/CryptoPP/crypto/rc6.h
+++ b/plugins/CryptoPP/crypto/src/rc6.h
diff --git a/plugins/CryptoPP/crypto/rc6val.dat b/plugins/CryptoPP/crypto/src/rc6val.dat
index d9401b2a3c..d9401b2a3c 100644
--- a/plugins/CryptoPP/crypto/rc6val.dat
+++ b/plugins/CryptoPP/crypto/src/rc6val.dat
diff --git a/plugins/CryptoPP/crypto/rdtables.cpp b/plugins/CryptoPP/crypto/src/rdtables.cpp
index 8dd8b80985..8dd8b80985 100644
--- a/plugins/CryptoPP/crypto/rdtables.cpp
+++ b/plugins/CryptoPP/crypto/src/rdtables.cpp
diff --git a/plugins/CryptoPP/crypto/regtest.cpp b/plugins/CryptoPP/crypto/src/regtest.cpp
index 0cfb9ce797..0cfb9ce797 100644
--- a/plugins/CryptoPP/crypto/regtest.cpp
+++ b/plugins/CryptoPP/crypto/src/regtest.cpp
diff --git a/plugins/CryptoPP/crypto/resource.h b/plugins/CryptoPP/crypto/src/resource.h
index a2e492cb43..a2e492cb43 100644
--- a/plugins/CryptoPP/crypto/resource.h
+++ b/plugins/CryptoPP/crypto/src/resource.h
diff --git a/plugins/CryptoPP/crypto/rijndael.cpp b/plugins/CryptoPP/crypto/src/rijndael.cpp
index c1682d8399..c1682d8399 100644
--- a/plugins/CryptoPP/crypto/rijndael.cpp
+++ b/plugins/CryptoPP/crypto/src/rijndael.cpp
diff --git a/plugins/CryptoPP/crypto/rijndael.dat b/plugins/CryptoPP/crypto/src/rijndael.dat
index cf97819ad6..cf97819ad6 100644
--- a/plugins/CryptoPP/crypto/rijndael.dat
+++ b/plugins/CryptoPP/crypto/src/rijndael.dat
diff --git a/plugins/CryptoPP/crypto/rijndael.h b/plugins/CryptoPP/crypto/src/rijndael.h
index 8a2fa77d2d..8a2fa77d2d 100644
--- a/plugins/CryptoPP/crypto/rijndael.h
+++ b/plugins/CryptoPP/crypto/src/rijndael.h
diff --git a/plugins/CryptoPP/crypto/ripemd.cpp b/plugins/CryptoPP/crypto/src/ripemd.cpp
index 16d977894d..16d977894d 100644
--- a/plugins/CryptoPP/crypto/ripemd.cpp
+++ b/plugins/CryptoPP/crypto/src/ripemd.cpp
diff --git a/plugins/CryptoPP/crypto/ripemd.h b/plugins/CryptoPP/crypto/src/ripemd.h
index fc7b54d3cc..fc7b54d3cc 100644
--- a/plugins/CryptoPP/crypto/ripemd.h
+++ b/plugins/CryptoPP/crypto/src/ripemd.h
diff --git a/plugins/CryptoPP/crypto/rng.cpp b/plugins/CryptoPP/crypto/src/rng.cpp
index a27974e956..a27974e956 100644
--- a/plugins/CryptoPP/crypto/rng.cpp
+++ b/plugins/CryptoPP/crypto/src/rng.cpp
diff --git a/plugins/CryptoPP/crypto/rng.h b/plugins/CryptoPP/crypto/src/rng.h
index ff4d6267ba..ff4d6267ba 100644
--- a/plugins/CryptoPP/crypto/rng.h
+++ b/plugins/CryptoPP/crypto/src/rng.h
diff --git a/plugins/CryptoPP/crypto/rsa.cpp b/plugins/CryptoPP/crypto/src/rsa.cpp
index 9793de56c8..9793de56c8 100644
--- a/plugins/CryptoPP/crypto/rsa.cpp
+++ b/plugins/CryptoPP/crypto/src/rsa.cpp
diff --git a/plugins/CryptoPP/crypto/rsa.h b/plugins/CryptoPP/crypto/src/rsa.h
index cc8a1bb2c7..cc8a1bb2c7 100644
--- a/plugins/CryptoPP/crypto/rsa.h
+++ b/plugins/CryptoPP/crypto/src/rsa.h
diff --git a/plugins/CryptoPP/crypto/rsa1024.dat b/plugins/CryptoPP/crypto/src/rsa1024.dat
index 92b99f4b81..92b99f4b81 100644
--- a/plugins/CryptoPP/crypto/rsa1024.dat
+++ b/plugins/CryptoPP/crypto/src/rsa1024.dat
diff --git a/plugins/CryptoPP/crypto/rsa2048.dat b/plugins/CryptoPP/crypto/src/rsa2048.dat
index 9b39ea3cdb..9b39ea3cdb 100644
--- a/plugins/CryptoPP/crypto/rsa2048.dat
+++ b/plugins/CryptoPP/crypto/src/rsa2048.dat
diff --git a/plugins/CryptoPP/crypto/rsa400pb.dat b/plugins/CryptoPP/crypto/src/rsa400pb.dat
index 08c69eb3e2..08c69eb3e2 100644
--- a/plugins/CryptoPP/crypto/rsa400pb.dat
+++ b/plugins/CryptoPP/crypto/src/rsa400pb.dat
diff --git a/plugins/CryptoPP/crypto/rsa400pv.dat b/plugins/CryptoPP/crypto/src/rsa400pv.dat
index f49cf37289..f49cf37289 100644
--- a/plugins/CryptoPP/crypto/rsa400pv.dat
+++ b/plugins/CryptoPP/crypto/src/rsa400pv.dat
diff --git a/plugins/CryptoPP/crypto/rsa512a.dat b/plugins/CryptoPP/crypto/src/rsa512a.dat
index 2cbc1e6a07..2cbc1e6a07 100644
--- a/plugins/CryptoPP/crypto/rsa512a.dat
+++ b/plugins/CryptoPP/crypto/src/rsa512a.dat
diff --git a/plugins/CryptoPP/crypto/rw.cpp b/plugins/CryptoPP/crypto/src/rw.cpp
index b8d135972f..b8d135972f 100644
--- a/plugins/CryptoPP/crypto/rw.cpp
+++ b/plugins/CryptoPP/crypto/src/rw.cpp
diff --git a/plugins/CryptoPP/crypto/rw.h b/plugins/CryptoPP/crypto/src/rw.h
index e999f58fa9..e999f58fa9 100644
--- a/plugins/CryptoPP/crypto/rw.h
+++ b/plugins/CryptoPP/crypto/src/rw.h
diff --git a/plugins/CryptoPP/crypto/rw1024.dat b/plugins/CryptoPP/crypto/src/rw1024.dat
index dcd0209bd0..dcd0209bd0 100644
--- a/plugins/CryptoPP/crypto/rw1024.dat
+++ b/plugins/CryptoPP/crypto/src/rw1024.dat
diff --git a/plugins/CryptoPP/crypto/rw2048.dat b/plugins/CryptoPP/crypto/src/rw2048.dat
index 5547c88b1d..5547c88b1d 100644
--- a/plugins/CryptoPP/crypto/rw2048.dat
+++ b/plugins/CryptoPP/crypto/src/rw2048.dat
diff --git a/plugins/CryptoPP/crypto/safer.cpp b/plugins/CryptoPP/crypto/src/safer.cpp
index 1e66357046..1e66357046 100644
--- a/plugins/CryptoPP/crypto/safer.cpp
+++ b/plugins/CryptoPP/crypto/src/safer.cpp
diff --git a/plugins/CryptoPP/crypto/safer.h b/plugins/CryptoPP/crypto/src/safer.h
index 60676c507b..60676c507b 100644
--- a/plugins/CryptoPP/crypto/safer.h
+++ b/plugins/CryptoPP/crypto/src/safer.h
diff --git a/plugins/CryptoPP/crypto/saferval.dat b/plugins/CryptoPP/crypto/src/saferval.dat
index 52ba4a2c97..52ba4a2c97 100644
--- a/plugins/CryptoPP/crypto/saferval.dat
+++ b/plugins/CryptoPP/crypto/src/saferval.dat
diff --git a/plugins/CryptoPP/crypto/salsa.cpp b/plugins/CryptoPP/crypto/src/salsa.cpp
index ae10d4a81a..ae10d4a81a 100644
--- a/plugins/CryptoPP/crypto/salsa.cpp
+++ b/plugins/CryptoPP/crypto/src/salsa.cpp
diff --git a/plugins/CryptoPP/crypto/salsa.h b/plugins/CryptoPP/crypto/src/salsa.h
index ea3ed248a6..ea3ed248a6 100644
--- a/plugins/CryptoPP/crypto/salsa.h
+++ b/plugins/CryptoPP/crypto/src/salsa.h
diff --git a/plugins/CryptoPP/crypto/seal.cpp b/plugins/CryptoPP/crypto/src/seal.cpp
index 0af337544d..0af337544d 100644
--- a/plugins/CryptoPP/crypto/seal.cpp
+++ b/plugins/CryptoPP/crypto/src/seal.cpp
diff --git a/plugins/CryptoPP/crypto/seal.h b/plugins/CryptoPP/crypto/src/seal.h
index c8b7ff4e95..c8b7ff4e95 100644
--- a/plugins/CryptoPP/crypto/seal.h
+++ b/plugins/CryptoPP/crypto/src/seal.h
diff --git a/plugins/CryptoPP/crypto/secblock.h b/plugins/CryptoPP/crypto/src/secblock.h
index 4c2b27bb8b..4c2b27bb8b 100644
--- a/plugins/CryptoPP/crypto/secblock.h
+++ b/plugins/CryptoPP/crypto/src/secblock.h
diff --git a/plugins/CryptoPP/crypto/seckey.h b/plugins/CryptoPP/crypto/src/seckey.h
index 5bd8f9a0ce..5bd8f9a0ce 100644
--- a/plugins/CryptoPP/crypto/seckey.h
+++ b/plugins/CryptoPP/crypto/src/seckey.h
diff --git a/plugins/CryptoPP/crypto/serpent.cpp b/plugins/CryptoPP/crypto/src/serpent.cpp
index 068e64281f..068e64281f 100644
--- a/plugins/CryptoPP/crypto/serpent.cpp
+++ b/plugins/CryptoPP/crypto/src/serpent.cpp
diff --git a/plugins/CryptoPP/crypto/serpent.h b/plugins/CryptoPP/crypto/src/serpent.h
index 900ea7662e..900ea7662e 100644
--- a/plugins/CryptoPP/crypto/serpent.h
+++ b/plugins/CryptoPP/crypto/src/serpent.h
diff --git a/plugins/CryptoPP/crypto/serpentp.h b/plugins/CryptoPP/crypto/src/serpentp.h
index 4416b5de90..4416b5de90 100644
--- a/plugins/CryptoPP/crypto/serpentp.h
+++ b/plugins/CryptoPP/crypto/src/serpentp.h
diff --git a/plugins/CryptoPP/crypto/serpentv.dat b/plugins/CryptoPP/crypto/src/serpentv.dat
index 38ee88b43c..38ee88b43c 100644
--- a/plugins/CryptoPP/crypto/serpentv.dat
+++ b/plugins/CryptoPP/crypto/src/serpentv.dat
diff --git a/plugins/CryptoPP/crypto/sha.cpp b/plugins/CryptoPP/crypto/src/sha.cpp
index ba20fc0715..ba20fc0715 100644
--- a/plugins/CryptoPP/crypto/sha.cpp
+++ b/plugins/CryptoPP/crypto/src/sha.cpp
diff --git a/plugins/CryptoPP/crypto/sha.h b/plugins/CryptoPP/crypto/src/sha.h
index ff05827c7a..ff05827c7a 100644
--- a/plugins/CryptoPP/crypto/sha.h
+++ b/plugins/CryptoPP/crypto/src/sha.h
diff --git a/plugins/CryptoPP/crypto/shacal2.cpp b/plugins/CryptoPP/crypto/src/shacal2.cpp
index 7ddc94dad4..7ddc94dad4 100644
--- a/plugins/CryptoPP/crypto/shacal2.cpp
+++ b/plugins/CryptoPP/crypto/src/shacal2.cpp
diff --git a/plugins/CryptoPP/crypto/shacal2.h b/plugins/CryptoPP/crypto/src/shacal2.h
index 5a95f8be6a..5a95f8be6a 100644
--- a/plugins/CryptoPP/crypto/shacal2.h
+++ b/plugins/CryptoPP/crypto/src/shacal2.h
diff --git a/plugins/CryptoPP/crypto/shacal2v.dat b/plugins/CryptoPP/crypto/src/shacal2v.dat
index 325d606b07..325d606b07 100644
--- a/plugins/CryptoPP/crypto/shacal2v.dat
+++ b/plugins/CryptoPP/crypto/src/shacal2v.dat
diff --git a/plugins/CryptoPP/crypto/shark.cpp b/plugins/CryptoPP/crypto/src/shark.cpp
index 1692a88005..1692a88005 100644
--- a/plugins/CryptoPP/crypto/shark.cpp
+++ b/plugins/CryptoPP/crypto/src/shark.cpp
diff --git a/plugins/CryptoPP/crypto/shark.h b/plugins/CryptoPP/crypto/src/shark.h
index a4acd21a13..a4acd21a13 100644
--- a/plugins/CryptoPP/crypto/shark.h
+++ b/plugins/CryptoPP/crypto/src/shark.h
diff --git a/plugins/CryptoPP/crypto/sharkbox.cpp b/plugins/CryptoPP/crypto/src/sharkbox.cpp
index bbe65b5ec7..bbe65b5ec7 100644
--- a/plugins/CryptoPP/crypto/sharkbox.cpp
+++ b/plugins/CryptoPP/crypto/src/sharkbox.cpp
diff --git a/plugins/CryptoPP/crypto/sharkval.dat b/plugins/CryptoPP/crypto/src/sharkval.dat
index 59106c4e28..59106c4e28 100644
--- a/plugins/CryptoPP/crypto/sharkval.dat
+++ b/plugins/CryptoPP/crypto/src/sharkval.dat
diff --git a/plugins/CryptoPP/crypto/simple.cpp b/plugins/CryptoPP/crypto/src/simple.cpp
index d0a120d112..d0a120d112 100644
--- a/plugins/CryptoPP/crypto/simple.cpp
+++ b/plugins/CryptoPP/crypto/src/simple.cpp
diff --git a/plugins/CryptoPP/crypto/simple.h b/plugins/CryptoPP/crypto/src/simple.h
index 268690758f..268690758f 100644
--- a/plugins/CryptoPP/crypto/simple.h
+++ b/plugins/CryptoPP/crypto/src/simple.h
diff --git a/plugins/CryptoPP/crypto/skipjack.cpp b/plugins/CryptoPP/crypto/src/skipjack.cpp
index e0a0e0143a..e0a0e0143a 100644
--- a/plugins/CryptoPP/crypto/skipjack.cpp
+++ b/plugins/CryptoPP/crypto/src/skipjack.cpp
diff --git a/plugins/CryptoPP/crypto/skipjack.dat b/plugins/CryptoPP/crypto/src/skipjack.dat
index 3f2f67ad33..3f2f67ad33 100644
--- a/plugins/CryptoPP/crypto/skipjack.dat
+++ b/plugins/CryptoPP/crypto/src/skipjack.dat
diff --git a/plugins/CryptoPP/crypto/skipjack.h b/plugins/CryptoPP/crypto/src/skipjack.h
index 9e8a33ba10..9e8a33ba10 100644
--- a/plugins/CryptoPP/crypto/skipjack.h
+++ b/plugins/CryptoPP/crypto/src/skipjack.h
diff --git a/plugins/CryptoPP/crypto/smartptr.h b/plugins/CryptoPP/crypto/src/smartptr.h
index 5259aa8e49..5259aa8e49 100644
--- a/plugins/CryptoPP/crypto/smartptr.h
+++ b/plugins/CryptoPP/crypto/src/smartptr.h
diff --git a/plugins/CryptoPP/crypto/socketft.cpp b/plugins/CryptoPP/crypto/src/socketft.cpp
index bcb6e0a080..bcb6e0a080 100644
--- a/plugins/CryptoPP/crypto/socketft.cpp
+++ b/plugins/CryptoPP/crypto/src/socketft.cpp
diff --git a/plugins/CryptoPP/crypto/socketft.h b/plugins/CryptoPP/crypto/src/socketft.h
index 211c8dbb9e..211c8dbb9e 100644
--- a/plugins/CryptoPP/crypto/socketft.h
+++ b/plugins/CryptoPP/crypto/src/socketft.h
diff --git a/plugins/CryptoPP/crypto/sosemanuk.cpp b/plugins/CryptoPP/crypto/src/sosemanuk.cpp
index d33c8db50f..d33c8db50f 100644
--- a/plugins/CryptoPP/crypto/sosemanuk.cpp
+++ b/plugins/CryptoPP/crypto/src/sosemanuk.cpp
diff --git a/plugins/CryptoPP/crypto/sosemanuk.h b/plugins/CryptoPP/crypto/src/sosemanuk.h
index f101e2c6c9..f101e2c6c9 100644
--- a/plugins/CryptoPP/crypto/sosemanuk.h
+++ b/plugins/CryptoPP/crypto/src/sosemanuk.h
diff --git a/plugins/CryptoPP/crypto/square.cpp b/plugins/CryptoPP/crypto/src/square.cpp
index 4bd7b9a969..4bd7b9a969 100644
--- a/plugins/CryptoPP/crypto/square.cpp
+++ b/plugins/CryptoPP/crypto/src/square.cpp
diff --git a/plugins/CryptoPP/crypto/square.h b/plugins/CryptoPP/crypto/src/square.h
index 939b7acc1d..939b7acc1d 100644
--- a/plugins/CryptoPP/crypto/square.h
+++ b/plugins/CryptoPP/crypto/src/square.h
diff --git a/plugins/CryptoPP/crypto/squaretb.cpp b/plugins/CryptoPP/crypto/src/squaretb.cpp
index a54465aee1..a54465aee1 100644
--- a/plugins/CryptoPP/crypto/squaretb.cpp
+++ b/plugins/CryptoPP/crypto/src/squaretb.cpp
diff --git a/plugins/CryptoPP/crypto/squareva.dat b/plugins/CryptoPP/crypto/src/squareva.dat
index c09013afbe..c09013afbe 100644
--- a/plugins/CryptoPP/crypto/squareva.dat
+++ b/plugins/CryptoPP/crypto/src/squareva.dat
diff --git a/plugins/CryptoPP/crypto/stdcpp.h b/plugins/CryptoPP/crypto/src/stdcpp.h
index e535310efa..e535310efa 100644
--- a/plugins/CryptoPP/crypto/stdcpp.h
+++ b/plugins/CryptoPP/crypto/src/stdcpp.h
diff --git a/plugins/CryptoPP/crypto/strciphr.cpp b/plugins/CryptoPP/crypto/src/strciphr.cpp
index fcc1e907b1..fcc1e907b1 100644
--- a/plugins/CryptoPP/crypto/strciphr.cpp
+++ b/plugins/CryptoPP/crypto/src/strciphr.cpp
diff --git a/plugins/CryptoPP/crypto/strciphr.h b/plugins/CryptoPP/crypto/src/strciphr.h
index d257af748b..d257af748b 100644
--- a/plugins/CryptoPP/crypto/strciphr.h
+++ b/plugins/CryptoPP/crypto/src/strciphr.h
diff --git a/plugins/CryptoPP/crypto/tea.cpp b/plugins/CryptoPP/crypto/src/tea.cpp
index 1c2e2e15d2..1c2e2e15d2 100644
--- a/plugins/CryptoPP/crypto/tea.cpp
+++ b/plugins/CryptoPP/crypto/src/tea.cpp
diff --git a/plugins/CryptoPP/crypto/tea.h b/plugins/CryptoPP/crypto/src/tea.h
index 4cc1e928cd..4cc1e928cd 100644
--- a/plugins/CryptoPP/crypto/tea.h
+++ b/plugins/CryptoPP/crypto/src/tea.h
diff --git a/plugins/CryptoPP/crypto/test.cpp b/plugins/CryptoPP/crypto/src/test.cpp
index c49a222c6e..c49a222c6e 100644
--- a/plugins/CryptoPP/crypto/test.cpp
+++ b/plugins/CryptoPP/crypto/src/test.cpp
diff --git a/plugins/CryptoPP/crypto/tftables.cpp b/plugins/CryptoPP/crypto/src/tftables.cpp
index ad55aa7ed1..ad55aa7ed1 100644
--- a/plugins/CryptoPP/crypto/tftables.cpp
+++ b/plugins/CryptoPP/crypto/src/tftables.cpp
diff --git a/plugins/CryptoPP/crypto/tiger.cpp b/plugins/CryptoPP/crypto/src/tiger.cpp
index a4ecfd17a7..a4ecfd17a7 100644
--- a/plugins/CryptoPP/crypto/tiger.cpp
+++ b/plugins/CryptoPP/crypto/src/tiger.cpp
diff --git a/plugins/CryptoPP/crypto/tiger.h b/plugins/CryptoPP/crypto/src/tiger.h
index 05b49d4a1d..05b49d4a1d 100644
--- a/plugins/CryptoPP/crypto/tiger.h
+++ b/plugins/CryptoPP/crypto/src/tiger.h
diff --git a/plugins/CryptoPP/crypto/tigertab.cpp b/plugins/CryptoPP/crypto/src/tigertab.cpp
index 0a7243256e..0a7243256e 100644
--- a/plugins/CryptoPP/crypto/tigertab.cpp
+++ b/plugins/CryptoPP/crypto/src/tigertab.cpp
diff --git a/plugins/CryptoPP/crypto/trdlocal.cpp b/plugins/CryptoPP/crypto/src/trdlocal.cpp
index 6cf1799d06..6cf1799d06 100644
--- a/plugins/CryptoPP/crypto/trdlocal.cpp
+++ b/plugins/CryptoPP/crypto/src/trdlocal.cpp
diff --git a/plugins/CryptoPP/crypto/trdlocal.h b/plugins/CryptoPP/crypto/src/trdlocal.h
index 10f14a47fb..10f14a47fb 100644
--- a/plugins/CryptoPP/crypto/trdlocal.h
+++ b/plugins/CryptoPP/crypto/src/trdlocal.h
diff --git a/plugins/CryptoPP/crypto/trunhash.h b/plugins/CryptoPP/crypto/src/trunhash.h
index 16fd8c09f8..16fd8c09f8 100644
--- a/plugins/CryptoPP/crypto/trunhash.h
+++ b/plugins/CryptoPP/crypto/src/trunhash.h
diff --git a/plugins/CryptoPP/crypto/ttmac.cpp b/plugins/CryptoPP/crypto/src/ttmac.cpp
index 6b4e8bfe56..6b4e8bfe56 100644
--- a/plugins/CryptoPP/crypto/ttmac.cpp
+++ b/plugins/CryptoPP/crypto/src/ttmac.cpp
diff --git a/plugins/CryptoPP/crypto/ttmac.h b/plugins/CryptoPP/crypto/src/ttmac.h
index ce8d968135..ce8d968135 100644
--- a/plugins/CryptoPP/crypto/ttmac.h
+++ b/plugins/CryptoPP/crypto/src/ttmac.h
diff --git a/plugins/CryptoPP/crypto/twofish.cpp b/plugins/CryptoPP/crypto/src/twofish.cpp
index e34bde5cce..e34bde5cce 100644
--- a/plugins/CryptoPP/crypto/twofish.cpp
+++ b/plugins/CryptoPP/crypto/src/twofish.cpp
diff --git a/plugins/CryptoPP/crypto/twofish.h b/plugins/CryptoPP/crypto/src/twofish.h
index d3143ad957..d3143ad957 100644
--- a/plugins/CryptoPP/crypto/twofish.h
+++ b/plugins/CryptoPP/crypto/src/twofish.h
diff --git a/plugins/CryptoPP/crypto/twofishv.dat b/plugins/CryptoPP/crypto/src/twofishv.dat
index 8b23740ccf..8b23740ccf 100644
--- a/plugins/CryptoPP/crypto/twofishv.dat
+++ b/plugins/CryptoPP/crypto/src/twofishv.dat
diff --git a/plugins/CryptoPP/crypto/usage.dat b/plugins/CryptoPP/crypto/src/usage.dat
index 103d98e80f..103d98e80f 100644
--- a/plugins/CryptoPP/crypto/usage.dat
+++ b/plugins/CryptoPP/crypto/src/usage.dat
diff --git a/plugins/CryptoPP/crypto/validat1.cpp b/plugins/CryptoPP/crypto/src/validat1.cpp
index fceb62196b..fceb62196b 100644
--- a/plugins/CryptoPP/crypto/validat1.cpp
+++ b/plugins/CryptoPP/crypto/src/validat1.cpp
diff --git a/plugins/CryptoPP/crypto/validat2.cpp b/plugins/CryptoPP/crypto/src/validat2.cpp
index 76b58ea7d9..76b58ea7d9 100644
--- a/plugins/CryptoPP/crypto/validat2.cpp
+++ b/plugins/CryptoPP/crypto/src/validat2.cpp
diff --git a/plugins/CryptoPP/crypto/validat3.cpp b/plugins/CryptoPP/crypto/src/validat3.cpp
index 698aa5b511..698aa5b511 100644
--- a/plugins/CryptoPP/crypto/validat3.cpp
+++ b/plugins/CryptoPP/crypto/src/validat3.cpp
diff --git a/plugins/CryptoPP/crypto/validate.h b/plugins/CryptoPP/crypto/src/validate.h
index 6e2cdaf174..6e2cdaf174 100644
--- a/plugins/CryptoPP/crypto/validate.h
+++ b/plugins/CryptoPP/crypto/src/validate.h
diff --git a/plugins/CryptoPP/crypto/vmac.cpp b/plugins/CryptoPP/crypto/src/vmac.cpp
index a24491792c..a24491792c 100644
--- a/plugins/CryptoPP/crypto/vmac.cpp
+++ b/plugins/CryptoPP/crypto/src/vmac.cpp
diff --git a/plugins/CryptoPP/crypto/vmac.h b/plugins/CryptoPP/crypto/src/vmac.h
index a2c85ace03..a2c85ace03 100644
--- a/plugins/CryptoPP/crypto/vmac.h
+++ b/plugins/CryptoPP/crypto/src/vmac.h
diff --git a/plugins/CryptoPP/crypto/wait.cpp b/plugins/CryptoPP/crypto/src/wait.cpp
index e4bae04faa..e4bae04faa 100644
--- a/plugins/CryptoPP/crypto/wait.cpp
+++ b/plugins/CryptoPP/crypto/src/wait.cpp
diff --git a/plugins/CryptoPP/crypto/wait.h b/plugins/CryptoPP/crypto/src/wait.h
index c01b745e32..c01b745e32 100644
--- a/plugins/CryptoPP/crypto/wait.h
+++ b/plugins/CryptoPP/crypto/src/wait.h
diff --git a/plugins/CryptoPP/crypto/wake.cpp b/plugins/CryptoPP/crypto/src/wake.cpp
index 41d06753ba..41d06753ba 100644
--- a/plugins/CryptoPP/crypto/wake.cpp
+++ b/plugins/CryptoPP/crypto/src/wake.cpp
diff --git a/plugins/CryptoPP/crypto/wake.h b/plugins/CryptoPP/crypto/src/wake.h
index 6c6c05c5e0..6c6c05c5e0 100644
--- a/plugins/CryptoPP/crypto/wake.h
+++ b/plugins/CryptoPP/crypto/src/wake.h
diff --git a/plugins/CryptoPP/crypto/whrlpool.cpp b/plugins/CryptoPP/crypto/src/whrlpool.cpp
index 33a32e2d3e..33a32e2d3e 100644
--- a/plugins/CryptoPP/crypto/whrlpool.cpp
+++ b/plugins/CryptoPP/crypto/src/whrlpool.cpp
diff --git a/plugins/CryptoPP/crypto/whrlpool.h b/plugins/CryptoPP/crypto/src/whrlpool.h
index 32f3a2de83..32f3a2de83 100644
--- a/plugins/CryptoPP/crypto/whrlpool.h
+++ b/plugins/CryptoPP/crypto/src/whrlpool.h
diff --git a/plugins/CryptoPP/crypto/winpipes.cpp b/plugins/CryptoPP/crypto/src/winpipes.cpp
index ea9843973b..ea9843973b 100644
--- a/plugins/CryptoPP/crypto/winpipes.cpp
+++ b/plugins/CryptoPP/crypto/src/winpipes.cpp
diff --git a/plugins/CryptoPP/crypto/winpipes.h b/plugins/CryptoPP/crypto/src/winpipes.h
index 75ac3a8c66..75ac3a8c66 100644
--- a/plugins/CryptoPP/crypto/winpipes.h
+++ b/plugins/CryptoPP/crypto/src/winpipes.h
diff --git a/plugins/CryptoPP/crypto/words.h b/plugins/CryptoPP/crypto/src/words.h
index f76e8499f4..f76e8499f4 100644
--- a/plugins/CryptoPP/crypto/words.h
+++ b/plugins/CryptoPP/crypto/src/words.h
diff --git a/plugins/CryptoPP/crypto/x64masm.asm b/plugins/CryptoPP/crypto/src/x64masm.asm
index f619f94ec8..f619f94ec8 100644
--- a/plugins/CryptoPP/crypto/x64masm.asm
+++ b/plugins/CryptoPP/crypto/src/x64masm.asm
diff --git a/plugins/CryptoPP/crypto/xormac.h b/plugins/CryptoPP/crypto/src/xormac.h
index 977b2cd6f7..977b2cd6f7 100644
--- a/plugins/CryptoPP/crypto/xormac.h
+++ b/plugins/CryptoPP/crypto/src/xormac.h
diff --git a/plugins/CryptoPP/crypto/xtr.cpp b/plugins/CryptoPP/crypto/src/xtr.cpp
index d2f3fb0708..d2f3fb0708 100644
--- a/plugins/CryptoPP/crypto/xtr.cpp
+++ b/plugins/CryptoPP/crypto/src/xtr.cpp
diff --git a/plugins/CryptoPP/crypto/xtr.h b/plugins/CryptoPP/crypto/src/xtr.h
index 40ca8a14ab..40ca8a14ab 100644
--- a/plugins/CryptoPP/crypto/xtr.h
+++ b/plugins/CryptoPP/crypto/src/xtr.h
diff --git a/plugins/CryptoPP/crypto/xtrcrypt.cpp b/plugins/CryptoPP/crypto/src/xtrcrypt.cpp
index ce3ed76154..ce3ed76154 100644
--- a/plugins/CryptoPP/crypto/xtrcrypt.cpp
+++ b/plugins/CryptoPP/crypto/src/xtrcrypt.cpp
diff --git a/plugins/CryptoPP/crypto/xtrcrypt.h b/plugins/CryptoPP/crypto/src/xtrcrypt.h
index 2f51b116a3..2f51b116a3 100644
--- a/plugins/CryptoPP/crypto/xtrcrypt.h
+++ b/plugins/CryptoPP/crypto/src/xtrcrypt.h
diff --git a/plugins/CryptoPP/crypto/xtrdh171.dat b/plugins/CryptoPP/crypto/src/xtrdh171.dat
index ba784ca105..ba784ca105 100644
--- a/plugins/CryptoPP/crypto/xtrdh171.dat
+++ b/plugins/CryptoPP/crypto/src/xtrdh171.dat
diff --git a/plugins/CryptoPP/crypto/xtrdh342.dat b/plugins/CryptoPP/crypto/src/xtrdh342.dat
index 5f7eecd1a2..5f7eecd1a2 100644
--- a/plugins/CryptoPP/crypto/xtrdh342.dat
+++ b/plugins/CryptoPP/crypto/src/xtrdh342.dat
diff --git a/plugins/CryptoPP/crypto/zdeflate.cpp b/plugins/CryptoPP/crypto/src/zdeflate.cpp
index 099226bab8..099226bab8 100644
--- a/plugins/CryptoPP/crypto/zdeflate.cpp
+++ b/plugins/CryptoPP/crypto/src/zdeflate.cpp
diff --git a/plugins/CryptoPP/crypto/zdeflate.h b/plugins/CryptoPP/crypto/src/zdeflate.h
index 60b8533112..60b8533112 100644
--- a/plugins/CryptoPP/crypto/zdeflate.h
+++ b/plugins/CryptoPP/crypto/src/zdeflate.h
diff --git a/plugins/CryptoPP/crypto/zinflate.cpp b/plugins/CryptoPP/crypto/src/zinflate.cpp
index 7a0c8aa110..7a0c8aa110 100644
--- a/plugins/CryptoPP/crypto/zinflate.cpp
+++ b/plugins/CryptoPP/crypto/src/zinflate.cpp
diff --git a/plugins/CryptoPP/crypto/zinflate.h b/plugins/CryptoPP/crypto/src/zinflate.h
index 4d536beb2d..4d536beb2d 100644
--- a/plugins/CryptoPP/crypto/zinflate.h
+++ b/plugins/CryptoPP/crypto/src/zinflate.h
diff --git a/plugins/CryptoPP/crypto/zlib.cpp b/plugins/CryptoPP/crypto/src/zlib.cpp
index 528f809122..528f809122 100644
--- a/plugins/CryptoPP/crypto/zlib.cpp
+++ b/plugins/CryptoPP/crypto/src/zlib.cpp
diff --git a/plugins/CryptoPP/crypto/zlib.h b/plugins/CryptoPP/crypto/src/zlib.h
index a9acc7d3fa..a9acc7d3fa 100644
--- a/plugins/CryptoPP/crypto/zlib.h
+++ b/plugins/CryptoPP/crypto/src/zlib.h
diff --git a/plugins/CryptoPP/cryptopp_10.vcxproj b/plugins/CryptoPP/cryptopp_10.vcxproj
index bf339741ce..98651d57fc 100644
--- a/plugins/CryptoPP/cryptopp_10.vcxproj
+++ b/plugins/CryptoPP/cryptopp_10.vcxproj
@@ -176,42 +176,43 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="base16.cpp" />
-    <ClCompile Include="base64.cpp" />
-    <ClCompile Include="commonheaders.cpp">
+    <ClCompile Include="src\base16.cpp" />
+    <ClCompile Include="src\base64.cpp" />
+    <ClCompile Include="src\commonheaders.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="cpp_cntx.cpp" />
-    <ClCompile Include="cpp_gpgw.cpp" />
-    <ClCompile Include="cpp_gzip.cpp" />
-    <ClCompile Include="cpp_keys.cpp" />
-    <ClCompile Include="cpp_misc.cpp" />
-    <ClCompile Include="cpp_pgpw.cpp" />
-    <ClCompile Include="cpp_rsam.cpp" />
-    <ClCompile Include="cpp_rsau.cpp" />
-    <ClCompile Include="cpp_svcs.cpp" />
-    <ClCompile Include="dllloader.cpp" />
-    <ClCompile Include="gettime.cpp" />
-    <ClCompile Include="main.cpp" />
-    <ClCompile Include="mmi.cpp" />
-    <ClCompile Include="utf8.cpp" />
+    <ClCompile Include="src\cpp_cntx.cpp" />
+    <ClCompile Include="src\cpp_gpgw.cpp" />
+    <ClCompile Include="src\cpp_gzip.cpp" />
+    <ClCompile Include="src\cpp_keys.cpp" />
+    <ClCompile Include="src\cpp_misc.cpp" />
+    <ClCompile Include="src\cpp_pgpw.cpp" />
+    <ClCompile Include="src\cpp_rsam.cpp" />
+    <ClCompile Include="src\cpp_rsau.cpp" />
+    <ClCompile Include="src\cpp_svcs.cpp" />
+    <ClCompile Include="src\dllloader.cpp" />
+    <ClCompile Include="src\gettime.cpp" />
+    <ClCompile Include="src\main.cpp" />
+    <ClCompile Include="src\mmi.cpp" />
+    <ClCompile Include="src\utf8.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="base16.h" />
-    <ClInclude Include="base64.h" />
-    <ClInclude Include="commonheaders.h" />
-    <ClInclude Include="cpp_rsam.h" />
-    <ClInclude Include="cpp_rsau.h" />
-    <ClInclude Include="cryptopp.h" />
-    <ClInclude Include="dllloader.h" />
-    <ClInclude Include="gettime.h" />
-    <ClInclude Include="mmi.h" />
-    <ClInclude Include="resource.h" />
-    <ClInclude Include="utf8.h" />
-    <ClInclude Include="version.h" />
+    <ClInclude Include="src\base16.h" />
+    <ClInclude Include="src\base64.h" />
+    <ClInclude Include="src\commonheaders.h" />
+    <ClInclude Include="src\cpp_rsam.h" />
+    <ClInclude Include="src\cpp_rsau.h" />
+    <ClInclude Include="src\cryptopp.h" />
+    <ClInclude Include="src\dllloader.h" />
+    <ClInclude Include="src\gettime.h" />
+    <ClInclude Include="src\mmi.h" />
+    <ClInclude Include="src\resource.h" />
+    <ClInclude Include="src\utf8.h" />
+    <ClInclude Include="src\version.h" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="resource.rc" />
+    <ResourceCompile Include="res\resource.rc" />
+    <ResourceCompile Include="res\version.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/plugins/CryptoPP/cryptopp_10.vcxproj.filters b/plugins/CryptoPP/cryptopp_10.vcxproj.filters
index 7911031f3c..2d664a50f3 100644
--- a/plugins/CryptoPP/cryptopp_10.vcxproj.filters
+++ b/plugins/CryptoPP/cryptopp_10.vcxproj.filters
@@ -15,98 +15,101 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="commonheaders.cpp">
+    <ClCompile Include="src\commonheaders.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="cpp_cntx.cpp">
+    <ClCompile Include="src\cpp_cntx.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="cpp_gpgw.cpp">
+    <ClCompile Include="src\cpp_gpgw.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="cpp_gzip.cpp">
+    <ClCompile Include="src\cpp_gzip.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="cpp_keys.cpp">
+    <ClCompile Include="src\cpp_keys.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="cpp_misc.cpp">
+    <ClCompile Include="src\cpp_misc.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="cpp_pgpw.cpp">
+    <ClCompile Include="src\cpp_pgpw.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="cpp_rsam.cpp">
+    <ClCompile Include="src\cpp_rsam.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="cpp_rsau.cpp">
+    <ClCompile Include="src\cpp_rsau.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="cpp_svcs.cpp">
+    <ClCompile Include="src\cpp_svcs.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="dllloader.cpp">
+    <ClCompile Include="src\dllloader.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="gettime.cpp">
+    <ClCompile Include="src\gettime.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="main.cpp">
+    <ClCompile Include="src\main.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="mmi.cpp">
+    <ClCompile Include="src\mmi.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="utf8.cpp">
+    <ClCompile Include="src\utf8.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="base16.cpp">
+    <ClCompile Include="src\base16.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="base64.cpp">
+    <ClCompile Include="src\base64.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="base16.h">
+    <ClInclude Include="src\base16.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="base64.h">
+    <ClInclude Include="src\base64.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="commonheaders.h">
+    <ClInclude Include="src\commonheaders.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="cpp_rsam.h">
+    <ClInclude Include="src\cpp_rsam.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="cpp_rsau.h">
+    <ClInclude Include="src\cpp_rsau.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="cryptopp.h">
+    <ClInclude Include="src\cryptopp.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="dllloader.h">
+    <ClInclude Include="src\dllloader.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="gettime.h">
+    <ClInclude Include="src\gettime.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="mmi.h">
+    <ClInclude Include="src\mmi.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="resource.h">
+    <ClInclude Include="src\resource.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="utf8.h">
+    <ClInclude Include="src\utf8.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="version.h">
+    <ClInclude Include="src\version.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="resource.rc">
+    <ResourceCompile Include="res\resource.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+    <ResourceCompile Include="res\version.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
diff --git a/plugins/CryptoPP/!whatsnew.txt b/plugins/CryptoPP/docs/!whatsnew.txt
index a5931a12ee..a5931a12ee 100644
--- a/plugins/CryptoPP/!whatsnew.txt
+++ b/plugins/CryptoPP/docs/!whatsnew.txt
diff --git a/plugins/CryptoPP/readme.txt b/plugins/CryptoPP/docs/readme.txt
index 9030e21e02..9030e21e02 100644
--- a/plugins/CryptoPP/readme.txt
+++ b/plugins/CryptoPP/docs/readme.txt
diff --git a/plugins/CryptoPP/resource.rc b/plugins/CryptoPP/res/resource.rc
index 4ebdb73637..24b43511b9 100644
--- a/plugins/CryptoPP/resource.rc
+++ b/plugins/CryptoPP/res/resource.rc
@@ -1,8 +1,7 @@
 // Microsoft Visual C++ generated resource script.
 //
-#include "resource.h"
+#include "..\src\resource.h"
 #include "afxres.h"
-#include "version.rc"
 
 /////////////////////////////////////////////////////////////////////////////
 // Russian resources
@@ -13,9 +12,9 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 #pragma code_page(1251)
 
 #ifdef DLL_FROM_RESOURCE
-1 666 "gpgw\\release\\gnupgw.dll"
-6 666 "pgpw\\release6\\pgpsdkw6.dll"
-8 666 "pgpw\\release8\\pgpsdkw8.dll"
+1 666 "..\\src\\gpgw\\release\\gnupgw.dll"
+6 666 "..\\src\\pgpw\\release6\\pgpsdkw6.dll"
+8 666 "..\\src\\pgpw\\release8\\pgpsdkw8.dll"
 #endif
 
 #endif //_WIN32
diff --git a/plugins/CryptoPP/version.rc b/plugins/CryptoPP/res/version.rc
index e02af4c2cc..b4914d803f 100644
--- a/plugins/CryptoPP/version.rc
+++ b/plugins/CryptoPP/res/version.rc
@@ -2,7 +2,8 @@
 #error this file is not editable by Microsoft Visual C++
 #endif //APSTUDIO_INVOKED
 
-#include "version.h"
+#include "..\src\version.h"
+#include "afxres.h"
 
 /////////////////////////////////////////////////////////////////////////////
 //
diff --git a/plugins/CryptoPP/GPGw/Release/GnuPGw.dll b/plugins/CryptoPP/src/GPGw/Release/GnuPGw.dll
index 7dba65ea45..7dba65ea45 100644
--- a/plugins/CryptoPP/GPGw/Release/GnuPGw.dll
+++ b/plugins/CryptoPP/src/GPGw/Release/GnuPGw.dll
diff --git a/plugins/CryptoPP/GPGw/Release/GnuPGw.map b/plugins/CryptoPP/src/GPGw/Release/GnuPGw.map
index ec55dd6734..ec55dd6734 100644
--- a/plugins/CryptoPP/GPGw/Release/GnuPGw.map
+++ b/plugins/CryptoPP/src/GPGw/Release/GnuPGw.map
diff --git a/plugins/CryptoPP/GPGw/commonheaders.c b/plugins/CryptoPP/src/GPGw/commonheaders.c
index 5404e4ed80..5404e4ed80 100644
--- a/plugins/CryptoPP/GPGw/commonheaders.c
+++ b/plugins/CryptoPP/src/GPGw/commonheaders.c
diff --git a/plugins/CryptoPP/GPGw/commonheaders.h b/plugins/CryptoPP/src/GPGw/commonheaders.h
index 4ae6e155a7..4ae6e155a7 100644
--- a/plugins/CryptoPP/GPGw/commonheaders.h
+++ b/plugins/CryptoPP/src/GPGw/commonheaders.h
diff --git a/plugins/CryptoPP/GPGw/gpg.c b/plugins/CryptoPP/src/GPGw/gpg.c
index 8ec3a57b11..8ec3a57b11 100644
--- a/plugins/CryptoPP/GPGw/gpg.c
+++ b/plugins/CryptoPP/src/GPGw/gpg.c
diff --git a/plugins/CryptoPP/GPGw/gpg.h b/plugins/CryptoPP/src/GPGw/gpg.h
index 5a06071e4a..5a06071e4a 100644
--- a/plugins/CryptoPP/GPGw/gpg.h
+++ b/plugins/CryptoPP/src/GPGw/gpg.h
diff --git a/plugins/CryptoPP/GPGw/keys.c b/plugins/CryptoPP/src/GPGw/keys.c
index 4cfbe4f71d..4cfbe4f71d 100644
--- a/plugins/CryptoPP/GPGw/keys.c
+++ b/plugins/CryptoPP/src/GPGw/keys.c
diff --git a/plugins/CryptoPP/GPGw/keys.h b/plugins/CryptoPP/src/GPGw/keys.h
index 394c6c05b8..394c6c05b8 100644
--- a/plugins/CryptoPP/GPGw/keys.h
+++ b/plugins/CryptoPP/src/GPGw/keys.h
diff --git a/plugins/CryptoPP/GPGw/language.c b/plugins/CryptoPP/src/GPGw/language.c
index 4997711629..4997711629 100644
--- a/plugins/CryptoPP/GPGw/language.c
+++ b/plugins/CryptoPP/src/GPGw/language.c
diff --git a/plugins/CryptoPP/GPGw/language.h b/plugins/CryptoPP/src/GPGw/language.h
index 6c3548b4c3..6c3548b4c3 100644
--- a/plugins/CryptoPP/GPGw/language.h
+++ b/plugins/CryptoPP/src/GPGw/language.h
diff --git a/plugins/CryptoPP/GPGw/main.c b/plugins/CryptoPP/src/GPGw/main.c
index fc23b24262..fc23b24262 100644
--- a/plugins/CryptoPP/GPGw/main.c
+++ b/plugins/CryptoPP/src/GPGw/main.c
diff --git a/plugins/CryptoPP/GPGw/passdialog.c b/plugins/CryptoPP/src/GPGw/passdialog.c
index cbba1139ab..cbba1139ab 100644
--- a/plugins/CryptoPP/GPGw/passdialog.c
+++ b/plugins/CryptoPP/src/GPGw/passdialog.c
diff --git a/plugins/CryptoPP/GPGw/passdialog.h b/plugins/CryptoPP/src/GPGw/passdialog.h
index b59f421b3c..b59f421b3c 100644
--- a/plugins/CryptoPP/GPGw/passdialog.h
+++ b/plugins/CryptoPP/src/GPGw/passdialog.h
diff --git a/plugins/CryptoPP/GPGw/passphrases.c b/plugins/CryptoPP/src/GPGw/passphrases.c
index 5e93936ffc..5e93936ffc 100644
--- a/plugins/CryptoPP/GPGw/passphrases.c
+++ b/plugins/CryptoPP/src/GPGw/passphrases.c
diff --git a/plugins/CryptoPP/GPGw/passphrases.h b/plugins/CryptoPP/src/GPGw/passphrases.h
index 9a2c25dadd..9a2c25dadd 100644
--- a/plugins/CryptoPP/GPGw/passphrases.h
+++ b/plugins/CryptoPP/src/GPGw/passphrases.h
diff --git a/plugins/CryptoPP/GPGw/pipeexec.c b/plugins/CryptoPP/src/GPGw/pipeexec.c
index ea54f85d1a..ea54f85d1a 100644
--- a/plugins/CryptoPP/GPGw/pipeexec.c
+++ b/plugins/CryptoPP/src/GPGw/pipeexec.c
diff --git a/plugins/CryptoPP/GPGw/pipeexec.h b/plugins/CryptoPP/src/GPGw/pipeexec.h
index 241e071a53..241e071a53 100644
--- a/plugins/CryptoPP/GPGw/pipeexec.h
+++ b/plugins/CryptoPP/src/GPGw/pipeexec.h
diff --git a/plugins/CryptoPP/GPGw/resource.h b/plugins/CryptoPP/src/GPGw/resource.h
index af5efe29d7..af5efe29d7 100644
--- a/plugins/CryptoPP/GPGw/resource.h
+++ b/plugins/CryptoPP/src/GPGw/resource.h
diff --git a/plugins/CryptoPP/GPGw/resource.rc b/plugins/CryptoPP/src/GPGw/resource.rc
index 53968a5d2e..53968a5d2e 100644
--- a/plugins/CryptoPP/GPGw/resource.rc
+++ b/plugins/CryptoPP/src/GPGw/resource.rc
diff --git a/plugins/CryptoPP/GPGw/size.h b/plugins/CryptoPP/src/GPGw/size.h
index e9382f7a2b..e9382f7a2b 100644
--- a/plugins/CryptoPP/GPGw/size.h
+++ b/plugins/CryptoPP/src/GPGw/size.h
diff --git a/plugins/CryptoPP/GPGw/tools.c b/plugins/CryptoPP/src/GPGw/tools.c
index 002f18824d..002f18824d 100644
--- a/plugins/CryptoPP/GPGw/tools.c
+++ b/plugins/CryptoPP/src/GPGw/tools.c
diff --git a/plugins/CryptoPP/GPGw/tools.h b/plugins/CryptoPP/src/GPGw/tools.h
index 74da8552d3..74da8552d3 100644
--- a/plugins/CryptoPP/GPGw/tools.h
+++ b/plugins/CryptoPP/src/GPGw/tools.h
diff --git a/plugins/CryptoPP/GPGw/userdialog.c b/plugins/CryptoPP/src/GPGw/userdialog.c
index bb82917c55..bb82917c55 100644
--- a/plugins/CryptoPP/GPGw/userdialog.c
+++ b/plugins/CryptoPP/src/GPGw/userdialog.c
diff --git a/plugins/CryptoPP/GPGw/userdialog.h b/plugins/CryptoPP/src/GPGw/userdialog.h
index 5f49882a29..5f49882a29 100644
--- a/plugins/CryptoPP/GPGw/userdialog.h
+++ b/plugins/CryptoPP/src/GPGw/userdialog.h
diff --git a/plugins/CryptoPP/PGPw/Release6/PGPsdkW6.dll b/plugins/CryptoPP/src/PGPw/Release6/PGPsdkW6.dll
index 90a7a2abfc..90a7a2abfc 100644
--- a/plugins/CryptoPP/PGPw/Release6/PGPsdkW6.dll
+++ b/plugins/CryptoPP/src/PGPw/Release6/PGPsdkW6.dll
diff --git a/plugins/CryptoPP/PGPw/Release6/PGPsdkW6.map b/plugins/CryptoPP/src/PGPw/Release6/PGPsdkW6.map
index 6f9fa4584c..6f9fa4584c 100644
--- a/plugins/CryptoPP/PGPw/Release6/PGPsdkW6.map
+++ b/plugins/CryptoPP/src/PGPw/Release6/PGPsdkW6.map
diff --git a/plugins/CryptoPP/PGPw/Release8/PGPsdkW8.dll b/plugins/CryptoPP/src/PGPw/Release8/PGPsdkW8.dll
index f026dde7fd..f026dde7fd 100644
--- a/plugins/CryptoPP/PGPw/Release8/PGPsdkW8.dll
+++ b/plugins/CryptoPP/src/PGPw/Release8/PGPsdkW8.dll
diff --git a/plugins/CryptoPP/PGPw/Release8/PGPsdkW8.map b/plugins/CryptoPP/src/PGPw/Release8/PGPsdkW8.map
index e6ccff0c57..e6ccff0c57 100644
--- a/plugins/CryptoPP/PGPw/Release8/PGPsdkW8.map
+++ b/plugins/CryptoPP/src/PGPw/Release8/PGPsdkW8.map
diff --git a/plugins/CryptoPP/PGPw/commonheaders.cpp b/plugins/CryptoPP/src/PGPw/commonheaders.cpp
index 763395fcd6..763395fcd6 100644
--- a/plugins/CryptoPP/PGPw/commonheaders.cpp
+++ b/plugins/CryptoPP/src/PGPw/commonheaders.cpp
diff --git a/plugins/CryptoPP/PGPw/commonheaders.h b/plugins/CryptoPP/src/PGPw/commonheaders.h
index 8c79d2ec5c..8c79d2ec5c 100644
--- a/plugins/CryptoPP/PGPw/commonheaders.h
+++ b/plugins/CryptoPP/src/PGPw/commonheaders.h
diff --git a/plugins/CryptoPP/PGPw/main.cpp b/plugins/CryptoPP/src/PGPw/main.cpp
index 8427046a16..8427046a16 100644
--- a/plugins/CryptoPP/PGPw/main.cpp
+++ b/plugins/CryptoPP/src/PGPw/main.cpp
diff --git a/plugins/CryptoPP/PGPw/sdk6/include/pgpBase.h b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpBase.h
index 7e460c800a..7e460c800a 100644
--- a/plugins/CryptoPP/PGPw/sdk6/include/pgpBase.h
+++ b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpBase.h
diff --git a/plugins/CryptoPP/PGPw/sdk6/include/pgpBigNum.h b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpBigNum.h
index 81c6b17429..81c6b17429 100644
--- a/plugins/CryptoPP/PGPw/sdk6/include/pgpBigNum.h
+++ b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpBigNum.h
diff --git a/plugins/CryptoPP/PGPw/sdk6/include/pgpCBC.h b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpCBC.h
index 9e3ea0382a..9e3ea0382a 100644
--- a/plugins/CryptoPP/PGPw/sdk6/include/pgpCBC.h
+++ b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpCBC.h
diff --git a/plugins/CryptoPP/PGPw/sdk6/include/pgpCFB.h b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpCFB.h
index 54ae8d7e43..54ae8d7e43 100644
--- a/plugins/CryptoPP/PGPw/sdk6/include/pgpCFB.h
+++ b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpCFB.h
diff --git a/plugins/CryptoPP/PGPw/sdk6/include/pgpConfig.h b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpConfig.h
index f72f0d4c9b..f72f0d4c9b 100644
--- a/plugins/CryptoPP/PGPw/sdk6/include/pgpConfig.h
+++ b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpConfig.h
diff --git a/plugins/CryptoPP/PGPw/sdk6/include/pgpEncode.h b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpEncode.h
index 8b87c1c2f9..8b87c1c2f9 100644
--- a/plugins/CryptoPP/PGPw/sdk6/include/pgpEncode.h
+++ b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpEncode.h
diff --git a/plugins/CryptoPP/PGPw/sdk6/include/pgpErrors.h b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpErrors.h
index 52ffcfeaca..52ffcfeaca 100644
--- a/plugins/CryptoPP/PGPw/sdk6/include/pgpErrors.h
+++ b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpErrors.h
diff --git a/plugins/CryptoPP/PGPw/sdk6/include/pgpFeatures.h b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpFeatures.h
index 96016ad2b5..96016ad2b5 100644
--- a/plugins/CryptoPP/PGPw/sdk6/include/pgpFeatures.h
+++ b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpFeatures.h
diff --git a/plugins/CryptoPP/PGPw/sdk6/include/pgpGroups.h b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpGroups.h
index 65e4bc209a..65e4bc209a 100644
--- a/plugins/CryptoPP/PGPw/sdk6/include/pgpGroups.h
+++ b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpGroups.h
diff --git a/plugins/CryptoPP/PGPw/sdk6/include/pgpHMAC.h b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpHMAC.h
index a04dc9545d..a04dc9545d 100644
--- a/plugins/CryptoPP/PGPw/sdk6/include/pgpHMAC.h
+++ b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpHMAC.h
diff --git a/plugins/CryptoPP/PGPw/sdk6/include/pgpHash.h b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpHash.h
index 101120d47a..101120d47a 100644
--- a/plugins/CryptoPP/PGPw/sdk6/include/pgpHash.h
+++ b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpHash.h
diff --git a/plugins/CryptoPP/PGPw/sdk6/include/pgpKeyServer.h b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpKeyServer.h
index 25579aacd0..25579aacd0 100644
--- a/plugins/CryptoPP/PGPw/sdk6/include/pgpKeyServer.h
+++ b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpKeyServer.h
diff --git a/plugins/CryptoPP/PGPw/sdk6/include/pgpKeys.h b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpKeys.h
index 8bfdc34cc3..8bfdc34cc3 100644
--- a/plugins/CryptoPP/PGPw/sdk6/include/pgpKeys.h
+++ b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpKeys.h
diff --git a/plugins/CryptoPP/PGPw/sdk6/include/pgpMemoryMgr.h b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpMemoryMgr.h
index 7480d52b55..7480d52b55 100644
--- a/plugins/CryptoPP/PGPw/sdk6/include/pgpMemoryMgr.h
+++ b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpMemoryMgr.h
diff --git a/plugins/CryptoPP/PGPw/sdk6/include/pgpOptionList.h b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpOptionList.h
index 7ccbc8e1b7..7ccbc8e1b7 100644
--- a/plugins/CryptoPP/PGPw/sdk6/include/pgpOptionList.h
+++ b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpOptionList.h
diff --git a/plugins/CryptoPP/PGPw/sdk6/include/pgpPFLConfig.h b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpPFLConfig.h
index a5d7e67415..a5d7e67415 100644
--- a/plugins/CryptoPP/PGPw/sdk6/include/pgpPFLConfig.h
+++ b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpPFLConfig.h
diff --git a/plugins/CryptoPP/PGPw/sdk6/include/pgpPFLErrors.h b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpPFLErrors.h
index ca35c79876..ca35c79876 100644
--- a/plugins/CryptoPP/PGPw/sdk6/include/pgpPFLErrors.h
+++ b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpPFLErrors.h
diff --git a/plugins/CryptoPP/PGPw/sdk6/include/pgpPubTypes.h b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpPubTypes.h
index a420bfb537..a420bfb537 100644
--- a/plugins/CryptoPP/PGPw/sdk6/include/pgpPubTypes.h
+++ b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpPubTypes.h
diff --git a/plugins/CryptoPP/PGPw/sdk6/include/pgpPublicKey.h b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpPublicKey.h
index d780876a75..d780876a75 100644
--- a/plugins/CryptoPP/PGPw/sdk6/include/pgpPublicKey.h
+++ b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpPublicKey.h
diff --git a/plugins/CryptoPP/PGPw/sdk6/include/pgpRandomPool.h b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpRandomPool.h
index 5a7fabeb7e..5a7fabeb7e 100644
--- a/plugins/CryptoPP/PGPw/sdk6/include/pgpRandomPool.h
+++ b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpRandomPool.h
diff --git a/plugins/CryptoPP/PGPw/sdk6/include/pgpSDKPrefs.h b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpSDKPrefs.h
index 2662786474..2662786474 100644
--- a/plugins/CryptoPP/PGPw/sdk6/include/pgpSDKPrefs.h
+++ b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpSDKPrefs.h
diff --git a/plugins/CryptoPP/PGPw/sdk6/include/pgpSockets.h b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpSockets.h
index c884cc5523..c884cc5523 100644
--- a/plugins/CryptoPP/PGPw/sdk6/include/pgpSockets.h
+++ b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpSockets.h
diff --git a/plugins/CryptoPP/PGPw/sdk6/include/pgpSymmetricCipher.h b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpSymmetricCipher.h
index b1dec160e2..b1dec160e2 100644
--- a/plugins/CryptoPP/PGPw/sdk6/include/pgpSymmetricCipher.h
+++ b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpSymmetricCipher.h
diff --git a/plugins/CryptoPP/PGPw/sdk6/include/pgpTLS.h b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpTLS.h
index ec2903aa74..ec2903aa74 100644
--- a/plugins/CryptoPP/PGPw/sdk6/include/pgpTLS.h
+++ b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpTLS.h
diff --git a/plugins/CryptoPP/PGPw/sdk6/include/pgpUserInterface.h b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpUserInterface.h
index 8d2e05db40..8d2e05db40 100644
--- a/plugins/CryptoPP/PGPw/sdk6/include/pgpUserInterface.h
+++ b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpUserInterface.h
diff --git a/plugins/CryptoPP/PGPw/sdk6/include/pgpUtilities.h b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpUtilities.h
index d92c999cf9..d92c999cf9 100644
--- a/plugins/CryptoPP/PGPw/sdk6/include/pgpUtilities.h
+++ b/plugins/CryptoPP/src/PGPw/sdk6/include/pgpUtilities.h
diff --git a/plugins/CryptoPP/PGPw/sdk6/lib/PGP_SDK.lib b/plugins/CryptoPP/src/PGPw/sdk6/lib/PGP_SDK.lib
index 9332eae432..9332eae432 100644
--- a/plugins/CryptoPP/PGPw/sdk6/lib/PGP_SDK.lib
+++ b/plugins/CryptoPP/src/PGPw/sdk6/lib/PGP_SDK.lib
diff --git a/plugins/CryptoPP/PGPw/sdk6/lib/PGPsdkNL.lib b/plugins/CryptoPP/src/PGPw/sdk6/lib/PGPsdkNL.lib
index 30c53907d9..30c53907d9 100644
--- a/plugins/CryptoPP/PGPw/sdk6/lib/PGPsdkNL.lib
+++ b/plugins/CryptoPP/src/PGPw/sdk6/lib/PGPsdkNL.lib
diff --git a/plugins/CryptoPP/PGPw/sdk6/lib/PGPsdkUI.lib b/plugins/CryptoPP/src/PGPw/sdk6/lib/PGPsdkUI.lib
index 65f6c55e7b..65f6c55e7b 100644
--- a/plugins/CryptoPP/PGPw/sdk6/lib/PGPsdkUI.lib
+++ b/plugins/CryptoPP/src/PGPw/sdk6/lib/PGPsdkUI.lib
diff --git a/plugins/CryptoPP/PGPw/sdk8/include/pflTypes.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pflTypes.h
index 00f3242fd4..00f3242fd4 100644
--- a/plugins/CryptoPP/PGPw/sdk8/include/pflTypes.h
+++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pflTypes.h
diff --git a/plugins/CryptoPP/PGPw/sdk8/include/pgpAPIAdapter.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpAPIAdapter.h
index e473df49e2..e473df49e2 100644
--- a/plugins/CryptoPP/PGPw/sdk8/include/pgpAPIAdapter.h
+++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpAPIAdapter.h
diff --git a/plugins/CryptoPP/PGPw/sdk8/include/pgpBER.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpBER.h
index ad20d033fd..ad20d033fd 100644
--- a/plugins/CryptoPP/PGPw/sdk8/include/pgpBER.h
+++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpBER.h
diff --git a/plugins/CryptoPP/PGPw/sdk8/include/pgpBase.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpBase.h
index 53a1df46e7..53a1df46e7 100644
--- a/plugins/CryptoPP/PGPw/sdk8/include/pgpBase.h
+++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpBase.h
diff --git a/plugins/CryptoPP/PGPw/sdk8/include/pgpBigNum.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpBigNum.h
index fdc65e2017..fdc65e2017 100644
--- a/plugins/CryptoPP/PGPw/sdk8/include/pgpBigNum.h
+++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpBigNum.h
diff --git a/plugins/CryptoPP/PGPw/sdk8/include/pgpCBC.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpCBC.h
index 26ae61d57f..26ae61d57f 100644
--- a/plugins/CryptoPP/PGPw/sdk8/include/pgpCBC.h
+++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpCBC.h
diff --git a/plugins/CryptoPP/PGPw/sdk8/include/pgpCFB.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpCFB.h
index 9745f969ec..9745f969ec 100644
--- a/plugins/CryptoPP/PGPw/sdk8/include/pgpCFB.h
+++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpCFB.h
diff --git a/plugins/CryptoPP/PGPw/sdk8/include/pgpConfig.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpConfig.h
index f2e9f883a1..f2e9f883a1 100644
--- a/plugins/CryptoPP/PGPw/sdk8/include/pgpConfig.h
+++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpConfig.h
diff --git a/plugins/CryptoPP/PGPw/sdk8/include/pgpEC.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpEC.h
index c12ded4444..c12ded4444 100644
--- a/plugins/CryptoPP/PGPw/sdk8/include/pgpEC.h
+++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpEC.h
diff --git a/plugins/CryptoPP/PGPw/sdk8/include/pgpEncode.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpEncode.h
index 9f2830ddf0..9f2830ddf0 100644
--- a/plugins/CryptoPP/PGPw/sdk8/include/pgpEncode.h
+++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpEncode.h
diff --git a/plugins/CryptoPP/PGPw/sdk8/include/pgpErrors.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpErrors.h
index 7174b0a9e6..7174b0a9e6 100644
--- a/plugins/CryptoPP/PGPw/sdk8/include/pgpErrors.h
+++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpErrors.h
diff --git a/plugins/CryptoPP/PGPw/sdk8/include/pgpFeatures.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpFeatures.h
index ad628a283b..ad628a283b 100644
--- a/plugins/CryptoPP/PGPw/sdk8/include/pgpFeatures.h
+++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpFeatures.h
diff --git a/plugins/CryptoPP/PGPw/sdk8/include/pgpGroups.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpGroups.h
index 2f6ebd07af..2f6ebd07af 100644
--- a/plugins/CryptoPP/PGPw/sdk8/include/pgpGroups.h
+++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpGroups.h
diff --git a/plugins/CryptoPP/PGPw/sdk8/include/pgpHMAC.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpHMAC.h
index 3dc58a6ff9..3dc58a6ff9 100644
--- a/plugins/CryptoPP/PGPw/sdk8/include/pgpHMAC.h
+++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpHMAC.h
diff --git a/plugins/CryptoPP/PGPw/sdk8/include/pgpHash.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpHash.h
index 44225347ee..44225347ee 100644
--- a/plugins/CryptoPP/PGPw/sdk8/include/pgpHash.h
+++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpHash.h
diff --git a/plugins/CryptoPP/PGPw/sdk8/include/pgpHashWords.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpHashWords.h
index 4c3c82cb8b..4c3c82cb8b 100644
--- a/plugins/CryptoPP/PGPw/sdk8/include/pgpHashWords.h
+++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpHashWords.h
diff --git a/plugins/CryptoPP/PGPw/sdk8/include/pgpIKE.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpIKE.h
index 23a28c8bc2..23a28c8bc2 100644
--- a/plugins/CryptoPP/PGPw/sdk8/include/pgpIKE.h
+++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpIKE.h
diff --git a/plugins/CryptoPP/PGPw/sdk8/include/pgpKeyServer.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpKeyServer.h
index 27594ea8b1..27594ea8b1 100644
--- a/plugins/CryptoPP/PGPw/sdk8/include/pgpKeyServer.h
+++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpKeyServer.h
diff --git a/plugins/CryptoPP/PGPw/sdk8/include/pgpKeys.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpKeys.h
index 8700cee34e..8700cee34e 100644
--- a/plugins/CryptoPP/PGPw/sdk8/include/pgpKeys.h
+++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpKeys.h
diff --git a/plugins/CryptoPP/PGPw/sdk8/include/pgpLDAP.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpLDAP.h
index 1cdce41630..1cdce41630 100644
--- a/plugins/CryptoPP/PGPw/sdk8/include/pgpLDAP.h
+++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpLDAP.h
diff --git a/plugins/CryptoPP/PGPw/sdk8/include/pgpMemoryMgr.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpMemoryMgr.h
index 1a86a22a46..1a86a22a46 100644
--- a/plugins/CryptoPP/PGPw/sdk8/include/pgpMemoryMgr.h
+++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpMemoryMgr.h
diff --git a/plugins/CryptoPP/PGPw/sdk8/include/pgpOptionList.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpOptionList.h
index a0ef6ceab6..a0ef6ceab6 100644
--- a/plugins/CryptoPP/PGPw/sdk8/include/pgpOptionList.h
+++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpOptionList.h
diff --git a/plugins/CryptoPP/PGPw/sdk8/include/pgpPFLConfig.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpPFLConfig.h
index 8474d66aa0..8474d66aa0 100644
--- a/plugins/CryptoPP/PGPw/sdk8/include/pgpPFLConfig.h
+++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpPFLConfig.h
diff --git a/plugins/CryptoPP/PGPw/sdk8/include/pgpPFLErrors.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpPFLErrors.h
index f0264cafd0..f0264cafd0 100644
--- a/plugins/CryptoPP/PGPw/sdk8/include/pgpPFLErrors.h
+++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpPFLErrors.h
diff --git a/plugins/CryptoPP/PGPw/sdk8/include/pgpPubTypes.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpPubTypes.h
index 6082d4bb62..6082d4bb62 100644
--- a/plugins/CryptoPP/PGPw/sdk8/include/pgpPubTypes.h
+++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpPubTypes.h
diff --git a/plugins/CryptoPP/PGPw/sdk8/include/pgpPublicKey.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpPublicKey.h
index 8ed1adc9ae..8ed1adc9ae 100644
--- a/plugins/CryptoPP/PGPw/sdk8/include/pgpPublicKey.h
+++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpPublicKey.h
diff --git a/plugins/CryptoPP/PGPw/sdk8/include/pgpRandomPool.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpRandomPool.h
index b965b498d3..b965b498d3 100644
--- a/plugins/CryptoPP/PGPw/sdk8/include/pgpRandomPool.h
+++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpRandomPool.h
diff --git a/plugins/CryptoPP/PGPw/sdk8/include/pgpReconstruct.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpReconstruct.h
index 756a19619e..756a19619e 100644
--- a/plugins/CryptoPP/PGPw/sdk8/include/pgpReconstruct.h
+++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpReconstruct.h
diff --git a/plugins/CryptoPP/PGPw/sdk8/include/pgpSECSH.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpSECSH.h
index 4a964f40ed..4a964f40ed 100644
--- a/plugins/CryptoPP/PGPw/sdk8/include/pgpSECSH.h
+++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpSECSH.h
diff --git a/plugins/CryptoPP/PGPw/sdk8/include/pgpSKEP.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpSKEP.h
index 217c88e1b8..217c88e1b8 100644
--- a/plugins/CryptoPP/PGPw/sdk8/include/pgpSKEP.h
+++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpSKEP.h
diff --git a/plugins/CryptoPP/PGPw/sdk8/include/pgpShare.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpShare.h
index 04d6da569c..04d6da569c 100644
--- a/plugins/CryptoPP/PGPw/sdk8/include/pgpShare.h
+++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpShare.h
diff --git a/plugins/CryptoPP/PGPw/sdk8/include/pgpShareFile.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpShareFile.h
index 4a7aa3e920..4a7aa3e920 100644
--- a/plugins/CryptoPP/PGPw/sdk8/include/pgpShareFile.h
+++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpShareFile.h
diff --git a/plugins/CryptoPP/PGPw/sdk8/include/pgpSockets.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpSockets.h
index e82ab45026..e82ab45026 100644
--- a/plugins/CryptoPP/PGPw/sdk8/include/pgpSockets.h
+++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpSockets.h
diff --git a/plugins/CryptoPP/PGPw/sdk8/include/pgpSymmetricCipher.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpSymmetricCipher.h
index 61a700e33e..61a700e33e 100644
--- a/plugins/CryptoPP/PGPw/sdk8/include/pgpSymmetricCipher.h
+++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpSymmetricCipher.h
diff --git a/plugins/CryptoPP/PGPw/sdk8/include/pgpTLS.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpTLS.h
index f901b1b0db..f901b1b0db 100644
--- a/plugins/CryptoPP/PGPw/sdk8/include/pgpTLS.h
+++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpTLS.h
diff --git a/plugins/CryptoPP/PGPw/sdk8/include/pgpUserInterface.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpUserInterface.h
index 210f1656f2..210f1656f2 100644
--- a/plugins/CryptoPP/PGPw/sdk8/include/pgpUserInterface.h
+++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpUserInterface.h
diff --git a/plugins/CryptoPP/PGPw/sdk8/include/pgpUtilities.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpUtilities.h
index dc1ca20d62..dc1ca20d62 100644
--- a/plugins/CryptoPP/PGPw/sdk8/include/pgpUtilities.h
+++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpUtilities.h
diff --git a/plugins/CryptoPP/PGPw/sdk8/lib/PGPsdk.lib b/plugins/CryptoPP/src/PGPw/sdk8/lib/PGPsdk.lib
index c0950deded..c0950deded 100644
--- a/plugins/CryptoPP/PGPw/sdk8/lib/PGPsdk.lib
+++ b/plugins/CryptoPP/src/PGPw/sdk8/lib/PGPsdk.lib
diff --git a/plugins/CryptoPP/PGPw/sdk8/lib/PGPsdkNL.lib b/plugins/CryptoPP/src/PGPw/sdk8/lib/PGPsdkNL.lib
index 09b4a3463e..09b4a3463e 100644
--- a/plugins/CryptoPP/PGPw/sdk8/lib/PGPsdkNL.lib
+++ b/plugins/CryptoPP/src/PGPw/sdk8/lib/PGPsdkNL.lib
diff --git a/plugins/CryptoPP/PGPw/sdk8/lib/PGPsdkUI.lib b/plugins/CryptoPP/src/PGPw/sdk8/lib/PGPsdkUI.lib
index 9a9ae7f89c..9a9ae7f89c 100644
--- a/plugins/CryptoPP/PGPw/sdk8/lib/PGPsdkUI.lib
+++ b/plugins/CryptoPP/src/PGPw/sdk8/lib/PGPsdkUI.lib
diff --git a/plugins/CryptoPP/base16.cpp b/plugins/CryptoPP/src/base16.cpp
index ace113ff76..ace113ff76 100644
--- a/plugins/CryptoPP/base16.cpp
+++ b/plugins/CryptoPP/src/base16.cpp
diff --git a/plugins/CryptoPP/base16.h b/plugins/CryptoPP/src/base16.h
index 2a2c18c42a..2a2c18c42a 100644
--- a/plugins/CryptoPP/base16.h
+++ b/plugins/CryptoPP/src/base16.h
diff --git a/plugins/CryptoPP/base64.cpp b/plugins/CryptoPP/src/base64.cpp
index 7495dd234f..7495dd234f 100644
--- a/plugins/CryptoPP/base64.cpp
+++ b/plugins/CryptoPP/src/base64.cpp
diff --git a/plugins/CryptoPP/base64.h b/plugins/CryptoPP/src/base64.h
index 1024ecbbd7..1024ecbbd7 100644
--- a/plugins/CryptoPP/base64.h
+++ b/plugins/CryptoPP/src/base64.h
diff --git a/plugins/CryptoPP/commonheaders.cpp b/plugins/CryptoPP/src/commonheaders.cpp
index 04a92adb1c..04a92adb1c 100644
--- a/plugins/CryptoPP/commonheaders.cpp
+++ b/plugins/CryptoPP/src/commonheaders.cpp
diff --git a/plugins/CryptoPP/commonheaders.h b/plugins/CryptoPP/src/commonheaders.h
index d42577d7bc..d42577d7bc 100644
--- a/plugins/CryptoPP/commonheaders.h
+++ b/plugins/CryptoPP/src/commonheaders.h
diff --git a/plugins/CryptoPP/cpp_cntx.cpp b/plugins/CryptoPP/src/cpp_cntx.cpp
index 72c35dcc96..72c35dcc96 100644
--- a/plugins/CryptoPP/cpp_cntx.cpp
+++ b/plugins/CryptoPP/src/cpp_cntx.cpp
diff --git a/plugins/CryptoPP/cpp_gpgw.cpp b/plugins/CryptoPP/src/cpp_gpgw.cpp
index 0ef3d77626..0ef3d77626 100644
--- a/plugins/CryptoPP/cpp_gpgw.cpp
+++ b/plugins/CryptoPP/src/cpp_gpgw.cpp
diff --git a/plugins/CryptoPP/cpp_gzip.cpp b/plugins/CryptoPP/src/cpp_gzip.cpp
index 36a4ae7e20..36a4ae7e20 100644
--- a/plugins/CryptoPP/cpp_gzip.cpp
+++ b/plugins/CryptoPP/src/cpp_gzip.cpp
diff --git a/plugins/CryptoPP/cpp_keys.cpp b/plugins/CryptoPP/src/cpp_keys.cpp
index b216eb6a2f..b216eb6a2f 100644
--- a/plugins/CryptoPP/cpp_keys.cpp
+++ b/plugins/CryptoPP/src/cpp_keys.cpp
diff --git a/plugins/CryptoPP/cpp_misc.cpp b/plugins/CryptoPP/src/cpp_misc.cpp
index 5e5720df18..5e5720df18 100644
--- a/plugins/CryptoPP/cpp_misc.cpp
+++ b/plugins/CryptoPP/src/cpp_misc.cpp
diff --git a/plugins/CryptoPP/cpp_pgpw.cpp b/plugins/CryptoPP/src/cpp_pgpw.cpp
index 8633690009..8633690009 100644
--- a/plugins/CryptoPP/cpp_pgpw.cpp
+++ b/plugins/CryptoPP/src/cpp_pgpw.cpp
diff --git a/plugins/CryptoPP/cpp_rsam.cpp b/plugins/CryptoPP/src/cpp_rsam.cpp
index 3cdb391660..3cdb391660 100644
--- a/plugins/CryptoPP/cpp_rsam.cpp
+++ b/plugins/CryptoPP/src/cpp_rsam.cpp
diff --git a/plugins/CryptoPP/cpp_rsam.h b/plugins/CryptoPP/src/cpp_rsam.h
index 92c1143212..92c1143212 100644
--- a/plugins/CryptoPP/cpp_rsam.h
+++ b/plugins/CryptoPP/src/cpp_rsam.h
diff --git a/plugins/CryptoPP/cpp_rsau.cpp b/plugins/CryptoPP/src/cpp_rsau.cpp
index e9ad825dd0..e9ad825dd0 100644
--- a/plugins/CryptoPP/cpp_rsau.cpp
+++ b/plugins/CryptoPP/src/cpp_rsau.cpp
diff --git a/plugins/CryptoPP/cpp_rsau.h b/plugins/CryptoPP/src/cpp_rsau.h
index bc45a248c5..bc45a248c5 100644
--- a/plugins/CryptoPP/cpp_rsau.h
+++ b/plugins/CryptoPP/src/cpp_rsau.h
diff --git a/plugins/CryptoPP/cpp_svcs.cpp b/plugins/CryptoPP/src/cpp_svcs.cpp
index e2a1dd9053..e2a1dd9053 100644
--- a/plugins/CryptoPP/cpp_svcs.cpp
+++ b/plugins/CryptoPP/src/cpp_svcs.cpp
diff --git a/plugins/CryptoPP/cryptopp.h b/plugins/CryptoPP/src/cryptopp.h
index b2d3867f2c..8657e29c6a 100644
--- a/plugins/CryptoPP/cryptopp.h
+++ b/plugins/CryptoPP/src/cryptopp.h
@@ -6,32 +6,20 @@
 #include <list>
 #include <map>
 
-//#pragma warning(push)
-// 4231: nonstandard extension used : 'extern' before template explicit instantiation
-// 4250: dominance
-// 4251: member needs to have dll-interface
-// 4275: base needs to have dll-interface
-// 4660: explicitly instantiating a class that's already implicitly instantiated
-// 4661: no suitable definition provided for explicit template instantiation request
-// 4700: unused variable names...
-// 4706: long names...
-// 4786: identifer was truncated in debug information
-// 4355: 'this' : used in base member initializer list
 #pragma warning(disable: 4231 4250 4251 4275 4660 4661 4700 4706 4786 4355)
 #define CRYPTOPP_ENABLE_NAMESPACE_WEAK 1
-#include "crypto/modes.h"
-#include "crypto/osrng.h"
-#include "crypto/rsa.h"
-#include "crypto/aes.h"
-#include "crypto/dh.h"
-#include "crypto/crc.h"
-#include "crypto/ripemd.h"
-#include "crypto/sha.h"
-#include "crypto/tiger.h"
-#include "crypto/gzip.h"
-#include "crypto/zlib.h"
-#include "crypto/files.h"
-//#pragma warning(pop)
+#include "../crypto/src/modes.h"
+#include "../crypto/src/osrng.h"
+#include "../crypto/src/rsa.h"
+#include "../crypto/src/aes.h"
+#include "../crypto/src/dh.h"
+#include "../crypto/src/crc.h"
+#include "../crypto/src/ripemd.h"
+#include "../crypto/src/sha.h"
+#include "../crypto/src/tiger.h"
+#include "../crypto/src/gzip.h"
+#include "../crypto/src/zlib.h"
+#include "../crypto/src/files.h"
 
 USING_NAMESPACE(CryptoPP);
 USING_NAMESPACE(std)
diff --git a/plugins/CryptoPP/dllloader.cpp b/plugins/CryptoPP/src/dllloader.cpp
index 160e5d98c4..160e5d98c4 100644
--- a/plugins/CryptoPP/dllloader.cpp
+++ b/plugins/CryptoPP/src/dllloader.cpp
diff --git a/plugins/CryptoPP/dllloader.h b/plugins/CryptoPP/src/dllloader.h
index 0563810248..0563810248 100644
--- a/plugins/CryptoPP/dllloader.h
+++ b/plugins/CryptoPP/src/dllloader.h
diff --git a/plugins/CryptoPP/gettime.cpp b/plugins/CryptoPP/src/gettime.cpp
index 5b44d84301..5b44d84301 100644
--- a/plugins/CryptoPP/gettime.cpp
+++ b/plugins/CryptoPP/src/gettime.cpp
diff --git a/plugins/CryptoPP/gettime.h b/plugins/CryptoPP/src/gettime.h
index 00c8d90915..00c8d90915 100644
--- a/plugins/CryptoPP/gettime.h
+++ b/plugins/CryptoPP/src/gettime.h
diff --git a/plugins/CryptoPP/main.cpp b/plugins/CryptoPP/src/main.cpp
index a5613db216..a5613db216 100644
--- a/plugins/CryptoPP/main.cpp
+++ b/plugins/CryptoPP/src/main.cpp
diff --git a/plugins/CryptoPP/mmi.cpp b/plugins/CryptoPP/src/mmi.cpp
index 68026578bb..68026578bb 100644
--- a/plugins/CryptoPP/mmi.cpp
+++ b/plugins/CryptoPP/src/mmi.cpp
diff --git a/plugins/CryptoPP/mmi.h b/plugins/CryptoPP/src/mmi.h
index 1ea57eb621..1ea57eb621 100644
--- a/plugins/CryptoPP/mmi.h
+++ b/plugins/CryptoPP/src/mmi.h
diff --git a/plugins/CryptoPP/resource.h b/plugins/CryptoPP/src/resource.h
index 106d77a2ca..106d77a2ca 100644
--- a/plugins/CryptoPP/resource.h
+++ b/plugins/CryptoPP/src/resource.h
diff --git a/plugins/CryptoPP/utf8.cpp b/plugins/CryptoPP/src/utf8.cpp
index e071e3aaeb..e071e3aaeb 100644
--- a/plugins/CryptoPP/utf8.cpp
+++ b/plugins/CryptoPP/src/utf8.cpp
diff --git a/plugins/CryptoPP/utf8.h b/plugins/CryptoPP/src/utf8.h
index 5a9b3eaceb..5a9b3eaceb 100644
--- a/plugins/CryptoPP/utf8.h
+++ b/plugins/CryptoPP/src/utf8.h
diff --git a/plugins/CryptoPP/version.h b/plugins/CryptoPP/src/version.h
index 27cbf73c16..27cbf73c16 100644
--- a/plugins/CryptoPP/version.h
+++ b/plugins/CryptoPP/src/version.h