diff --git a/libretroshare/src/libretroshare.pro b/libretroshare/src/libretroshare.pro
index 6c8620617..36db181aa 100644
--- a/libretroshare/src/libretroshare.pro
+++ b/libretroshare/src/libretroshare.pro
@@ -418,7 +418,6 @@ HEADERS += pqi/authssl.h \
pqi/pqiqos.h \
pqi/pqi.h \
pqi/pqi_base.h \
- pqi/pqiarchive.h \
pqi/pqiassist.h \
pqi/pqibin.h \
pqi/pqihandler.h \
@@ -576,7 +575,6 @@ SOURCES += pqi/authgpg.cc \
pqi/p3netmgr.cc \
pqi/p3notify.cc \
pqi/pqiqos.cc \
- pqi/pqiarchive.cc \
pqi/pqibin.cc \
pqi/pqihandler.cc \
pqi/p3historymgr.cc \
diff --git a/libretroshare/src/pgp/pgphandler.cc b/libretroshare/src/pgp/pgphandler.cc
index 709231f20..f5ca9fa1e 100644
--- a/libretroshare/src/pgp/pgphandler.cc
+++ b/libretroshare/src/pgp/pgphandler.cc
@@ -19,8 +19,6 @@
* along with this program. If not, see . *
* *
*******************************************************************************/
-#pragma once
-
#include
#include
#include
diff --git a/libretroshare/src/pgp/pgpkeyutil.cc b/libretroshare/src/pgp/pgpkeyutil.cc
index e8f1f1d5b..76b332edf 100644
--- a/libretroshare/src/pgp/pgpkeyutil.cc
+++ b/libretroshare/src/pgp/pgpkeyutil.cc
@@ -19,8 +19,6 @@
* along with this program. If not, see . *
* *
*******************************************************************************/
-#pragma once
-
#include
#include
#include "pgpkeyutil.h"
diff --git a/libretroshare/src/pgp/rscertificate.cc b/libretroshare/src/pgp/rscertificate.cc
index 88424fa29..a72a589bf 100644
--- a/libretroshare/src/pgp/rscertificate.cc
+++ b/libretroshare/src/pgp/rscertificate.cc
@@ -19,8 +19,6 @@
* along with this program. If not, see . *
* *
*******************************************************************************/
-#pragma once
-
#include
#include
#include
diff --git a/libretroshare/src/pqi/p3cfgmgr.cc b/libretroshare/src/pqi/p3cfgmgr.cc
index d601c460e..7f9f03547 100644
--- a/libretroshare/src/pqi/p3cfgmgr.cc
+++ b/libretroshare/src/pqi/p3cfgmgr.cc
@@ -25,7 +25,6 @@
#include "pqi/authssl.h"
#include "pqi/pqibin.h"
#include "pqi/pqistore.h"
-#include "pqi/pqiarchive.h"
#include
#include
#include
diff --git a/libretroshare/src/services/p3msgservice.cc b/libretroshare/src/services/p3msgservice.cc
index 54fdc710e..5b270749b 100644
--- a/libretroshare/src/services/p3msgservice.cc
+++ b/libretroshare/src/services/p3msgservice.cc
@@ -24,7 +24,6 @@
#include "retroshare/rsidentity.h"
#include "pqi/pqibin.h"
-#include "pqi/pqiarchive.h"
#include "pqi/p3linkmgr.h"
#include "pqi/authgpg.h"
#include "pqi/p3cfgmgr.h"
diff --git a/libretroshare/src/pqi/pqiarchive.cc b/libretroshare/src/unused/pqiarchive.cc
similarity index 100%
rename from libretroshare/src/pqi/pqiarchive.cc
rename to libretroshare/src/unused/pqiarchive.cc
diff --git a/libretroshare/src/pqi/pqiarchive.h b/libretroshare/src/unused/pqiarchive.h
similarity index 100%
rename from libretroshare/src/pqi/pqiarchive.h
rename to libretroshare/src/unused/pqiarchive.h
diff --git a/libretroshare/src/zeroconf/p3zcnatassist.cc b/libretroshare/src/zeroconf/p3zcnatassist.cc
index 1e35de50b..9e3ed5e58 100644
--- a/libretroshare/src/zeroconf/p3zcnatassist.cc
+++ b/libretroshare/src/zeroconf/p3zcnatassist.cc
@@ -1,29 +1,24 @@
-/*
- * libretroshare/src/zeroconf: p3zeroconf.cc
- *
- * ZeroConf interface for RetroShare.
- *
- * Copyright 2011-2011 by Robert Fernie.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License Version 2 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA.
- *
- * Please report all bugs and problems to "retroshare@lunamutt.com".
- *
- */
-
-
+/*******************************************************************************
+ * libretroshare/src/zeroconf: p3zcnatassist.cc *
+ * *
+ * libretroshare: retroshare core library *
+ * *
+ * Copyright 2011-2012 by Robert Fernie *
+ * *
+ * This program is free software: you can redistribute it and/or modify *
+ * it under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation, either version 3 of the *
+ * License, or (at your option) any later version. *
+ * *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public License *
+ * along with this program. If not, see . *
+ * *
+ *******************************************************************************/
#include "zeroconf/p3zeroconf.h"
#include "zeroconf/p3zcnatassist.h"
diff --git a/libretroshare/src/zeroconf/p3zcnatassist.h b/libretroshare/src/zeroconf/p3zcnatassist.h
index ad92d9a2a..9e5bcc313 100644
--- a/libretroshare/src/zeroconf/p3zcnatassist.h
+++ b/libretroshare/src/zeroconf/p3zcnatassist.h
@@ -1,29 +1,24 @@
-/*
- * libretroshare/src/zeroconf: p3zcnatassist.h
- *
- * ZeroConf interface for RetroShare.
- *
- * Copyright 2011-2012 by Robert Fernie.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License Version 2 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA.
- *
- * Please report all bugs and problems to "retroshare@lunamutt.com".
- *
- */
-
-
+/*******************************************************************************
+ * libretroshare/src/zeroconf: p3zcnatassist.h *
+ * *
+ * libretroshare: retroshare core library *
+ * *
+ * Copyright 2011-2012 by Robert Fernie *
+ * *
+ * This program is free software: you can redistribute it and/or modify *
+ * it under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation, either version 3 of the *
+ * License, or (at your option) any later version. *
+ * *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public License *
+ * along with this program. If not, see . *
+ * *
+ *******************************************************************************/
#ifndef MRK_P3_ZC_NAT_ASSIST_H
#define MRK_P3_ZC_NAT_ASSIST_H
diff --git a/libretroshare/src/zeroconf/p3zeroconf.cc b/libretroshare/src/zeroconf/p3zeroconf.cc
index b4417ddbd..65aedc7f6 100644
--- a/libretroshare/src/zeroconf/p3zeroconf.cc
+++ b/libretroshare/src/zeroconf/p3zeroconf.cc
@@ -1,29 +1,24 @@
-/*
- * libretroshare/src/zeroconf: p3zeroconf.cc
- *
- * ZeroConf interface for RetroShare.
- *
- * Copyright 2011-2011 by Robert Fernie.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License Version 2 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA.
- *
- * Please report all bugs and problems to "retroshare@lunamutt.com".
- *
- */
-
-
+/*******************************************************************************
+ * libretroshare/src/zeroconf: p3zeroconf.cc *
+ * *
+ * libretroshare: retroshare core library *
+ * *
+ * Copyright 2011-2012 by Robert Fernie *
+ * *
+ * This program is free software: you can redistribute it and/or modify *
+ * it under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation, either version 3 of the *
+ * License, or (at your option) any later version. *
+ * *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public License *
+ * along with this program. If not, see . *
+ * *
+ *******************************************************************************/
#include "zeroconf/p3zeroconf.h"
#include
#include
diff --git a/libretroshare/src/zeroconf/p3zeroconf.h b/libretroshare/src/zeroconf/p3zeroconf.h
index 46365633b..9b7e21b5c 100644
--- a/libretroshare/src/zeroconf/p3zeroconf.h
+++ b/libretroshare/src/zeroconf/p3zeroconf.h
@@ -1,29 +1,24 @@
-/*
- * libretroshare/src/zeroconf: p3zeroconf.h
- *
- * ZeroConf interface for RetroShare.
- *
- * Copyright 2011-2011 by Robert Fernie.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License Version 2 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA.
- *
- * Please report all bugs and problems to "retroshare@lunamutt.com".
- *
- */
-
-
+/*******************************************************************************
+ * libretroshare/src/zeroconf: p3zeroconf.h *
+ * *
+ * libretroshare: retroshare core library *
+ * *
+ * Copyright 2011-2012 by Robert Fernie *
+ * *
+ * This program is free software: you can redistribute it and/or modify *
+ * it under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation, either version 3 of the *
+ * License, or (at your option) any later version. *
+ * *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public License *
+ * along with this program. If not, see . *
+ * *
+ *******************************************************************************/
#ifndef MRK_P3_ZEROCONF_H
#define MRK_P3_ZEROCONF_H