diff --git a/audio/clementine-player/files/patch-src_core_mergedproxymodel.h b/audio/clementine-player/files/patch-src_core_mergedproxymodel.h
deleted file mode 100644
index 94996d1..0000000
--- a/audio/clementine-player/files/patch-src_core_mergedproxymodel.h
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/core/mergedproxymodel.h.orig	2014-04-23 10:16:44 UTC
-+++ src/core/mergedproxymodel.h
-@@ -25,10 +25,12 @@
- using std::placeholders::_1;
- using std::placeholders::_2;
- 
-+#ifndef Q_MOC_RUN
- #include <boost/multi_index_container.hpp>
- #include <boost/multi_index/member.hpp>
- #include <boost/multi_index/ordered_index.hpp>
- #include <boost/multi_index/hashed_index.hpp>
-+#endif
- 
- using boost::multi_index::multi_index_container;
- using boost::multi_index::indexed_by;
diff --git a/audio/clementine-player/files/patch-src_library_groupbydialog.h b/audio/clementine-player/files/patch-src_library_groupbydialog.h
deleted file mode 100644
index 3a9ce9c..0000000
--- a/audio/clementine-player/files/patch-src_library_groupbydialog.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/library/groupbydialog.h.orig	2014-04-23 10:16:44 UTC
-+++ src/library/groupbydialog.h
-@@ -25,9 +25,11 @@
- using std::placeholders::_1;
- using std::placeholders::_2;
- 
-+#ifndef Q_MOC_RUN
- #include <boost/multi_index_container.hpp>
- #include <boost/multi_index/member.hpp>
- #include <boost/multi_index/ordered_index.hpp>
-+#endif
- 
- #include "librarymodel.h"
- 
diff --git a/cad/openscad/files/patch-src_colormap.h b/cad/openscad/files/patch-src_colormap.h
deleted file mode 100644
index 7acadcf..0000000
--- a/cad/openscad/files/patch-src_colormap.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/colormap.h.orig	2015-03-05 16:25:10 UTC
-+++ src/colormap.h
-@@ -5,9 +5,11 @@
- #include <list>
- #include "linalg.h"
- 
-+#ifndef Q_MOC_RUN
- #include <boost/shared_ptr.hpp>
- #include <boost/filesystem.hpp>
- #include <boost/property_tree/ptree.hpp>
-+#endif
- 
- namespace fs = boost::filesystem;
- 
diff --git a/cad/openscad/files/patch-src_scintillaeditor.h b/cad/openscad/files/patch-src_scintillaeditor.h
deleted file mode 100644
index 8715629..0000000
--- a/cad/openscad/files/patch-src_scintillaeditor.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/scintillaeditor.h.orig	2015-03-05 20:25:13 UTC
-+++ src/scintillaeditor.h
-@@ -11,9 +11,11 @@
- #include "scadlexer.h"
- #include "parsersettings.h"
- 
-+#ifndef Q_MOC_RUN
- #include <boost/shared_ptr.hpp>
- #include <boost/property_tree/ptree.hpp>
- #include <boost/property_tree/json_parser.hpp>
-+#endif
- 
- class EditorColorScheme
- {
diff --git a/devel/qt4-moc/files/patch-src__tools__moc__main.cpp b/devel/qt4-moc/files/patch-src__tools__moc__main.cpp
index 53bbcc5..34ebde2 100644
--- a/devel/qt4-moc/files/patch-src__tools__moc__main.cpp
+++ b/devel/qt4-moc/files/patch-src__tools__moc__main.cpp
@@ -10,7 +10,7 @@ What we do to work around the issue is define some Boost include guards so that
 they end up being skipped by moc when it is preprocessing a file.
 --- src/tools/moc/main.cpp.orig	2015-05-07 14:14:44 UTC
 +++ src/tools/moc/main.cpp
-@@ -190,6 +190,13 @@ int runMoc(int _argc, char **_argv)
+@@ -190,6 +190,17 @@ int runMoc(int _argc, char **_argv)
  
      // Workaround a bug while parsing the boost/type_traits/has_operator.hpp header. See QTBUG-22829
      pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"];
@@ -21,6 +21,10 @@ they end up being skipped by moc when it is preprocessing a file.
 +    //
 +    // For Boost >= 1.55.
 +    pp.macros["BOOST_LEXICAL_CAST_INCLUDED"];
++    // For Boost >= 1.60.
++    pp.macros["BOOST_NEXT_PRIOR_HPP_INCLUDED"];
++    pp.macros["BOOST_TYPE_TRAITS_HPP"];
++    pp.macros["BOOST_TT_HAS_PRE_INCREMENT_HPP_INCLUDED"];
  
      QByteArray filename;
      QByteArray output;
diff --git a/graphics/aqsis/files/patch-include_aqsis_tex_buffers_channellist.h b/graphics/aqsis/files/patch-include_aqsis_tex_buffers_channellist.h
deleted file mode 100644
index f92fe68..0000000
--- a/graphics/aqsis/files/patch-include_aqsis_tex_buffers_channellist.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- include/aqsis/tex/buffers/channellist.h.orig	2012-08-24 12:26:50 UTC
-+++ include/aqsis/tex/buffers/channellist.h
-@@ -43,7 +43,9 @@
- #include <iosfwd>
- #include <vector>
- 
-+#ifndef Q_MOC_RUN
- #include <boost/format.hpp>
-+#endif
- 
- #include <aqsis/tex/buffers/channelinfo.h>
- #include <aqsis/tex/texexception.h>
diff --git a/graphics/aqsis/files/patch-include_aqsis_tex_buffers_mixedimagebuffer.h b/graphics/aqsis/files/patch-include_aqsis_tex_buffers_mixedimagebuffer.h
deleted file mode 100644
index a6f4a71..0000000
--- a/graphics/aqsis/files/patch-include_aqsis_tex_buffers_mixedimagebuffer.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- include/aqsis/tex/buffers/mixedimagebuffer.h.orig	2012-08-24 12:26:50 UTC
-+++ include/aqsis/tex/buffers/mixedimagebuffer.h
-@@ -45,9 +45,11 @@
- #include <string>
- #include <vector>
- 
-+#ifndef Q_MOC_RUN
- #include <boost/shared_array.hpp>
- #include <boost/shared_ptr.hpp>
- #include <boost/utility.hpp>
-+#endif
- 
- #include <aqsis/math/math.h>
- #include <aqsis/tex/buffers/channellist.h>
diff --git a/graphics/aqsis/files/patch-include_aqsis_util_socket.h b/graphics/aqsis/files/patch-include_aqsis_util_socket.h
deleted file mode 100644
index ab52c4b..0000000
--- a/graphics/aqsis/files/patch-include_aqsis_util_socket.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- include/aqsis/util/socket.h.orig	2012-08-24 12:26:50 UTC
-+++ include/aqsis/util/socket.h
-@@ -32,7 +32,9 @@
- 
- #include <sstream>
- 
-+#ifndef Q_MOC_RUN
- #include <boost/utility.hpp>
-+#endif
- 
- #ifdef AQSIS_SYSTEM_WIN32
- #	include <winsock2.h>
diff --git a/graphics/aqsis/files/patch-tools_piqsl_displayserverimage.cpp b/graphics/aqsis/files/patch-tools_piqsl_displayserverimage.cpp
deleted file mode 100644
index 1111fea..0000000
--- a/graphics/aqsis/files/patch-tools_piqsl_displayserverimage.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
---- tools/piqsl/displayserverimage.cpp.orig	2012-08-24 12:26:50 UTC
-+++ tools/piqsl/displayserverimage.cpp
-@@ -39,11 +39,13 @@
- #include	<map>
- #include	<algorithm>
- 
-+#ifndef Q_MOC_RUN
- #include	<boost/archive/iterators/base64_from_binary.hpp>
- #include	<boost/archive/iterators/transform_width.hpp>
- #include	<boost/archive/iterators/insert_linebreaks.hpp>
- #include	<boost/format.hpp>
- #include	<boost/filesystem.hpp>
-+#endif
- 
- #include	"displayserverimage.h"
- 
diff --git a/graphics/aqsis/files/patch-tools_piqsl_image.h b/graphics/aqsis/files/patch-tools_piqsl_image.h
deleted file mode 100644
index d6b3650..0000000
--- a/graphics/aqsis/files/patch-tools_piqsl_image.h
+++ /dev/null
@@ -1,15 +0,0 @@
---- tools/piqsl/image.h.orig	2012-08-24 12:26:50 UTC
-+++ tools/piqsl/image.h
-@@ -46,10 +46,12 @@
- #include <QtCore/QObject>
- #include <QtGui/QImage>
- 
-+#ifndef Q_MOC_RUN
- #include <boost/shared_ptr.hpp>
- #include <boost/shared_array.hpp>
- #include <boost/filesystem/path.hpp>
- #include <boost/thread/mutex.hpp>
-+#endif
- 
- #include "tinyxml.h"
- 
diff --git a/graphics/evolvotron/files/patch-libfunction_useful.h b/graphics/evolvotron/files/patch-libfunction_useful.h
deleted file mode 100644
index 0b1bdb7..0000000
--- a/graphics/evolvotron/files/patch-libfunction_useful.h
+++ /dev/null
@@ -1,18 +0,0 @@
---- libfunction/useful.h.orig	2013-01-26 12:49:04 UTC
-+++ libfunction/useful.h
-@@ -40,6 +40,7 @@
- #include <sstream>
- #include <vector>
- 
-+#ifndef Q_MOC_RUN
- #include <boost/array.hpp>
- #include <boost/ptr_container/ptr_map.hpp>
- #include <boost/ptr_container/ptr_vector.hpp>
-@@ -49,6 +50,7 @@
- #include <boost/tuple/tuple.hpp>
- #include <boost/utility.hpp>
- #include <boost/version.hpp>
-+#endif
- 
- //! Convenience typedef.
- typedef unsigned int uint;
diff --git a/multimedia/gstreamer-qt4/files/patch-src_QGlib_connect.cpp b/multimedia/gstreamer-qt4/files/patch-src_QGlib_connect.cpp
deleted file mode 100644
index 2666a82..0000000
--- a/multimedia/gstreamer-qt4/files/patch-src_QGlib_connect.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/QGlib/connect.cpp.orig	2013-10-14 08:44:40 UTC
-+++ src/QGlib/connect.cpp
-@@ -20,10 +20,13 @@
- #include <glib-object.h>
- #include <QtCore/QHash>
- #include <QtCore/QMutex>
-+
-+#ifndef Q_MOC_RUN
- #include <boost/multi_index_container.hpp>
- #include <boost/multi_index/sequenced_index.hpp>
- #include <boost/multi_index/ordered_index.hpp>
- #include <boost/multi_index/member.hpp>
-+#endif
- 
- namespace QGlib {
- namespace Private {
diff --git a/multimedia/gstreamer-qt4/files/patch-src_QGlib_connect.h b/multimedia/gstreamer-qt4/files/patch-src_QGlib_connect.h
deleted file mode 100644
index 112f0a6..0000000
--- a/multimedia/gstreamer-qt4/files/patch-src_QGlib_connect.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/QGlib/connect.h.orig	2013-10-14 08:44:40 UTC
-+++ src/QGlib/connect.h
-@@ -25,8 +25,11 @@
- #include <QtCore/QSharedPointer>
- #include <QtCore/QFlags>
- #include <QtCore/QHash>
-+
-+#ifndef Q_MOC_RUN
- #include <boost/type_traits.hpp>
- #include <boost/utility/enable_if.hpp>
-+#endif
- 
- namespace QGlib {
- 
diff --git a/multimedia/gstreamer-qt4/files/patch-src_QGlib_connectimpl.h b/multimedia/gstreamer-qt4/files/patch-src_QGlib_connectimpl.h
deleted file mode 100644
index 5ef0f39..0000000
--- a/multimedia/gstreamer-qt4/files/patch-src_QGlib_connectimpl.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/QGlib/connectimpl.h.orig	2013-10-14 08:44:40 UTC
-+++ src/QGlib/connectimpl.h
-@@ -26,7 +26,9 @@
- # include "refpointer.h"
- # include <QtCore/QList>
- # include <stdexcept>
-+#ifndef Q_MOC_RUN
- # include <boost/type_traits.hpp>
-+#endif
- 
- 
- namespace QGlib {
diff --git a/multimedia/gstreamer-qt4/files/patch-src_QGlib_refpointer.h b/multimedia/gstreamer-qt4/files/patch-src_QGlib_refpointer.h
deleted file mode 100644
index b8a188f..0000000
--- a/multimedia/gstreamer-qt4/files/patch-src_QGlib_refpointer.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/QGlib/refpointer.h.orig	2013-10-14 08:44:40 UTC
-+++ src/QGlib/refpointer.h
-@@ -23,8 +23,10 @@
- #include "type.h"
- #include "wrap.h"
- #include <cstddef>
-+#ifndef Q_MOC_RUN
- #include <boost/type_traits.hpp>
- #include <boost/utility/enable_if.hpp>
-+#endif
- #include <QtCore/QHash>
- 
- namespace QGlib {
diff --git a/multimedia/gstreamer-qt4/files/patch-src_QGlib_type.h b/multimedia/gstreamer-qt4/files/patch-src_QGlib_type.h
deleted file mode 100644
index 6be012c..0000000
--- a/multimedia/gstreamer-qt4/files/patch-src_QGlib_type.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/QGlib/type.h.orig	2013-10-14 08:44:40 UTC
-+++ src/QGlib/type.h
-@@ -21,7 +21,9 @@
- 
- #include "global.h"
- #include <QtCore/QList>
-+#ifndef Q_MOC_RUN
- #include <boost/mpl/if.hpp>
-+#endif
- 
- /*
-  * This is a re-definition of GType inside the QGlib::Private namespace.
diff --git a/multimedia/gstreamer-qt4/files/patch-src_QGlib_value.h b/multimedia/gstreamer-qt4/files/patch-src_QGlib_value.h
deleted file mode 100644
index 1b4a6b1..0000000
--- a/multimedia/gstreamer-qt4/files/patch-src_QGlib_value.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/QGlib/value.h.orig	2013-10-14 08:44:40 UTC
-+++ src/QGlib/value.h
-@@ -23,8 +23,10 @@
- #include "type.h"
- #include "refpointer.h"
- #include "error.h"
-+#ifndef Q_MOC_RUN
- #include <boost/mpl/if.hpp>
- #include <boost/type_traits.hpp>
-+#endif
- #include <stdexcept>
- #include <QtCore/QString>
- #include <QtCore/QDebug>
diff --git a/net-p2p/namecoin/files/patch-src_allocators.h b/net-p2p/namecoin/files/patch-src_allocators.h
deleted file mode 100644
index 54e70f92..0000000
--- a/net-p2p/namecoin/files/patch-src_allocators.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/allocators.h.orig	2014-12-18 14:47:02 UTC
-+++ src/allocators.h
-@@ -7,7 +7,9 @@
- 
- #include <string.h>
- #include <string>
-+#ifndef Q_MOC_RUN
- #include <boost/thread/mutex.hpp>
-+#endif
- #include <map>
- #include <openssl/crypto.h> // for OPENSSL_cleanse()
- 
diff --git a/net-p2p/namecoin/files/patch-src_qt_guiutil.h b/net-p2p/namecoin/files/patch-src_qt_guiutil.h
deleted file mode 100644
index 9c77f2c..0000000
--- a/net-p2p/namecoin/files/patch-src_qt_guiutil.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/qt/guiutil.h.orig	2014-12-18 14:47:02 UTC
-+++ src/qt/guiutil.h
-@@ -5,7 +5,9 @@
- #include <QObject>
- #include <QMessageBox>
- 
-+#ifndef Q_MOC_RUN
- #include <boost/filesystem.hpp>
-+#endif
- 
- class SendCoinsRecipient;
- 
diff --git a/net-p2p/namecoin/files/patch-src_util.h b/net-p2p/namecoin/files/patch-src_util.h
deleted file mode 100644
index b043204..0000000
--- a/net-p2p/namecoin/files/patch-src_util.h
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/util.h.orig	2014-12-18 14:47:02 UTC
-+++ src/util.h
-@@ -15,11 +15,13 @@
- #include <vector>
- #include <string>
- 
-+#ifndef Q_MOC_RUN
- #include <boost/version.hpp>
- #include <boost/thread.hpp>
- #include <boost/interprocess/sync/interprocess_recursive_mutex.hpp>
- #include <boost/date_time/gregorian/gregorian_types.hpp>
- #include <boost/date_time/posix_time/posix_time_types.hpp>
-+#endif
- 
- #include <openssl/sha.h>
- #include <openssl/ripemd.h>
diff --git a/science/avogadro/files/patch-libavogadro_src_pythonengine__p.h b/science/avogadro/files/patch-libavogadro_src_pythonengine__p.h
deleted file mode 100644
index 8264664..0000000
--- a/science/avogadro/files/patch-libavogadro_src_pythonengine__p.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- libavogadro/src/pythonengine_p.h.orig	2013-12-06 15:50:04 UTC
-+++ libavogadro/src/pythonengine_p.h
-@@ -27,7 +27,9 @@
- 
- #include <avogadro/global.h>
- #include <avogadro/engine.h>
-+#ifndef Q_MOC_RUN
- #include <boost/python.hpp>
-+#endif
- 
- namespace Avogadro {
- 
diff --git a/science/avogadro/files/patch-libavogadro_src_pythonextension__p.h b/science/avogadro/files/patch-libavogadro_src_pythonextension__p.h
deleted file mode 100644
index df7a103..0000000
--- a/science/avogadro/files/patch-libavogadro_src_pythonextension__p.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- libavogadro/src/pythonextension_p.h.orig	2013-12-06 15:50:04 UTC
-+++ libavogadro/src/pythonextension_p.h
-@@ -29,7 +29,9 @@
- #include <avogadro/extension.h>
- #include <avogadro/primitive.h>
- #include <avogadro/glwidget.h>
-+#ifndef Q_MOC_RUN
- #include <boost/python.hpp>
-+#endif
- 
- #include <QWidget>
- #include <QList>
diff --git a/science/avogadro/files/patch-libavogadro_src_pythoninterpreter.h b/science/avogadro/files/patch-libavogadro_src_pythoninterpreter.h
deleted file mode 100644
index 203d31c..0000000
--- a/science/avogadro/files/patch-libavogadro_src_pythoninterpreter.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- libavogadro/src/pythoninterpreter.h.orig	2013-12-06 15:50:04 UTC
-+++ libavogadro/src/pythoninterpreter.h
-@@ -26,7 +26,9 @@
- #define PYTHONINTERPRETER_H
- 
- #include <avogadro/global.h>
-+#ifndef Q_MOC_RUN
- #include <boost/python.hpp>
-+#endif
- #include <avogadro/primitive.h>
- #include <QString>
- 
diff --git a/science/avogadro/files/patch-libavogadro_src_pythonscript.h b/science/avogadro/files/patch-libavogadro_src_pythonscript.h
deleted file mode 100644
index 6d44246..0000000
--- a/science/avogadro/files/patch-libavogadro_src_pythonscript.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- libavogadro/src/pythonscript.h.orig	2013-12-06 15:50:04 UTC
-+++ libavogadro/src/pythonscript.h
-@@ -27,7 +27,9 @@
- #define PYTHONSCRIPT_H
- 
- #include <avogadro/global.h>
-+#ifndef Q_MOC_RUN
- #include <boost/python.hpp>
-+#endif
- 
- #include "pythonerror.h"
- 
diff --git a/science/avogadro/files/patch-libavogadro_src_pythontool__p.h b/science/avogadro/files/patch-libavogadro_src_pythontool__p.h
deleted file mode 100644
index 88b3fb3..0000000
--- a/science/avogadro/files/patch-libavogadro_src_pythontool__p.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- libavogadro/src/pythontool_p.h.orig	2013-12-06 15:50:04 UTC
-+++ libavogadro/src/pythontool_p.h
-@@ -27,7 +27,9 @@
- 
- #include <avogadro/global.h>
- #include <avogadro/tool.h>
-+#ifndef Q_MOC_RUN
- #include <boost/python.hpp>
-+#endif
- 
- #include <QObject>
- #include <QAction>